summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2007-02-25 22:14:14 +0100
committerKay Sievers <kay.sievers@suse.de>2007-02-25 22:14:14 +0100
commit58310f6698b69e78a782e2caa7c1c5d34ebdd1b5 (patch)
tree40743bbcd8c331714684ce91c8c8db74b289297c /extras
parente7c39acbe724f0bc067dbab7eb3f8cdc073f3c67 (diff)
scsi_id: accept tabs in /etc/scsi_id.conf
Diffstat (limited to 'extras')
-rw-r--r--extras/scsi_id/scsi_id.82
-rw-r--r--extras/scsi_id/scsi_id.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 86237a7e81..ba7e42f8c7 100644
--- a/extras/scsi_id/scsi_id.8
+++ b/extras/scsi_id/scsi_id.8
@@ -154,7 +154,7 @@ of 312345:
.sp
.nf
-BUS=="scsi", PROGRAM=="/sbin/scsi_id -d %N -s %p", RESULT=="312345", NAME="disk%n"
+SUBSYSTEMS=="scsi", PROGRAM=="/sbin/scsi_id -d %N -s %p", RESULT=="312345", NAME="disk%n"
.fi
.P
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 7fd6066c01..c00145f30e 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -377,11 +377,11 @@ static int get_file_options(const char *vendor, const char *model,
/*
* argv[0] at 0 is skipped by getopt, but
* store the buffer address there for
- * alter freeing.
+ * later freeing
*/
(*newargv)[c] = buffer;
for (c = 1; c < *argc; c++)
- (*newargv)[c] = strsep(&buffer, " ");
+ (*newargv)[c] = strsep(&buffer, " \t");
}
} else {
/* No matches */