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 86237a7e817031fd8e438a0f4c46002b77832d5e..ba7e42f8c7d63dc656b54443464cdf3e0525d6fc 100644 (file)
--- a/extras/scsi_id/scsi_id.8
+++ b/extras/scsi_id/scsi_id.8
@@ -154,7 +154,7 @@ of 312345:
 
 .sp
 .nf
 
 .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
 
 .fi
 .P
 

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 7fd6066c0174fc484d3b3d76104935f95069d361..c00145f30efe20b6a9863d14577d2e528a7101da 100644 (file)
--- 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
                                /*
                                 * 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] = buffer;
                                for (c = 1; c < *argc; c++)

-                                       (*newargv)[c] = strsep(&buffer, " ");
+                                       (*newargv)[c] = strsep(&buffer, " \t");

                        }
                } else {
                        /* No matches  */
                        }
                } else {
                        /* No matches  */