From 58310f6698b69e78a782e2caa7c1c5d34ebdd1b5 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 25 Feb 2007 22:14:14 +0100 Subject: scsi_id: accept tabs in /etc/scsi_id.conf --- extras/scsi_id/scsi_id.8 | 2 +- extras/scsi_id/scsi_id.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'extras') 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 */ -- cgit v1.2.3-54-g00ecf