From: Kay Sievers <kay.sievers@suse.de>
Date: Sun, 25 Feb 2007 21:14:14 +0000 (+0100)
Subject: scsi_id: accept tabs in /etc/scsi_id.conf
X-Git-Tag: 174~2058
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=58310f6698b69e78a782e2caa7c1c5d34ebdd1b5;ds=sidebyside

scsi_id: accept tabs in /etc/scsi_id.conf
---

diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 86237a7e8..ba7e42f8c 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 7fd6066c0..c00145f30 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  */