summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2000-12-31 17:54:29 +0000
committerad <ad@NetBSD.org>2000-12-31 17:54:29 +0000
commit2f5cf27275e91f2272e696a88aa741fa9f376192 (patch)
treeb054bf717270636e39407b7ba1941e9f058b653b /sys/dev
parente3514a4191769a0733344e3375207fb7ea611eef (diff)
PR 6402: some SCSI devices use \377 as blank, so adjust scsipi_strvis().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/scsipiconf.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/scsipi/scsipiconf.c b/sys/dev/scsipi/scsipiconf.c
index 991c7f3862b..72bc5f11a33 100644
--- a/sys/dev/scsipi/scsipiconf.c
+++ b/sys/dev/scsipi/scsipiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.c,v 1.11 2000/06/28 16:38:37 mrg Exp $ */
+/* $NetBSD: scsipiconf.c,v 1.12 2000/12/31 17:54:29 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,6 +65,8 @@
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipiconf.h>
+#define STRVIS_ISWHITE(x) ((x) == ' ' || (x) == '\0' || (x) == (u_char)'\377')
+
int
scsipi_command(sc_link, cmd, cmdlen, data_addr, datalen, retries, timeout, bp,
flags)
@@ -220,9 +222,9 @@ scsipi_strvis(dst, dlen, src, slen)
{
/* Trim leading and trailing blanks and NULs. */
- while (slen > 0 && (src[0] == ' ' || src[0] == '\0'))
+ while (slen > 0 && STRVIS_ISWHITE(src[0]))
++src, --slen;
- while (slen > 0 && (src[slen-1] == ' ' || src[slen-1] == '\0'))
+ while (slen > 0 && STRVIS_ISWHITE(src[slen - 1]))
--slen;
while (slen > 0) {