scsi_id: accept tabs in /etc/scsi_id.conf

[elogind.git] / extras / scsi_id / scsi_id.c

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 6458f2b7ac1ce553c89f243f431b108ed2baeaa0..c00145f30efe20b6a9863d14577d2e528a7101da 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -4,21 +4,14 @@
  * Main section of the scsi_id program
  *
  * Copyright (C) IBM Corp. 2003
+ * Copyright (C) SUSE Linux Products GmbH, 2006
  *
- *  This library is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2.1 of the
- *  License, or (at your option) any later version.
+ * Author:
+ *     Patrick Mansfield<patmans@us.ibm.com>
  *
- *  This library is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #include <stdio.h>
@@ -384,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  */
@@ -409,8 +402,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
        /*
         * optind is a global extern used by getopt. Since we can call
         * set_options twice (once for command line, and once for config
-        * file) we have to reset this back to 1. [Note glibc handles
-        * setting this to 0, but klibc does not.]
+        * file) we have to reset this back to 1.
         */
        optind = 1;
        while (1) {
@@ -622,11 +614,12 @@ static int scsi_id(const char *devpath, char *maj_min_dev)
 {
        int retval;
        int dev_type = 0;
-       char *serial, *unaligned_buf;
        struct sysfs_device *dev;
        struct sysfs_device *dev_scsi;
        int good_dev;
        int page_code;
+       char serial[MAX_SERIAL_LEN];
+       char serial_short[MAX_SERIAL_LEN];
 
        dbg("devpath %s\n", devpath);
 
@@ -658,36 +651,32 @@ static int scsi_id(const char *devpath, char *maj_min_dev)
        retval = per_dev_options(dev_scsi, &good_dev, &page_code);
        dbg("per dev options: good %d; page code 0x%x", good_dev, page_code);
 
-#define ALIGN   512
-       unaligned_buf = malloc(MAX_SERIAL_LEN + ALIGN);
-       serial = (char*) (((unsigned long) unaligned_buf + (ALIGN - 1))
-                         & ~(ALIGN - 1));
-       dbg("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
-#undef ALIGN
-
        if (!good_dev) {
                retval = 1;
        } else if (scsi_get_serial(dev_scsi, maj_min_dev, page_code,
-                                  serial, MAX_SERIAL_LEN)) {
+                                  serial, serial_short, MAX_SERIAL_LEN)) {
                retval = always_info?0:1;
        } else {
                retval = 0;
        }
        if (!retval) {
                if (export) {
-                       static char serial_str[64];
+                       char serial_str[MAX_SERIAL_LEN];
+
                        printf("ID_VENDOR=%s\n", vendor_str);
                        printf("ID_MODEL=%s\n", model_str);
                        printf("ID_REVISION=%s\n", revision_str);
                        set_str(serial_str, serial, sizeof(serial_str));
                        printf("ID_SERIAL=%s\n", serial_str);
+                       set_str(serial_str, serial_short, sizeof(serial_str));
+                       printf("ID_SERIAL_SHORT=%s\n", serial_str);
                        printf("ID_TYPE=%s\n", type_str);
                        printf("ID_BUS=scsi\n");
                } else {
                        if (reformat_serial)
                                format_serial(serial);
                        if (display_bus_id)
-                               printf("%s: ", dev_scsi->kernel_name);
+                               printf("%s: ", dev_scsi->kernel);
                        printf("%s\n", serial);
                }
                dbg("%s\n", serial);