path_id: fix fibre channel handling

[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 10ec98c8bf5c7f319cf888f76bffe4ee0776dd51..943cbb21ca969a01d95ae2b183edd6d52f30f1d8 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -31,17 +31,17 @@
 #include "scsi_id.h"
 
 static const struct option options[] = {
-       { "device", 1, NULL, 'd' },
-       { "config", 1, NULL, 'f' },
-       { "page", 1, NULL, 'p' },
-       { "blacklisted", 0, NULL, 'b' },
-       { "whitelisted", 0, NULL, 'g' },
-       { "replace-whitespace", 0, NULL, 'u' },
-       { "sg-version", 1, NULL, 's' },
-       { "verbose", 0, NULL, 'v' },
-       { "version", 0, NULL, 'V' },
-       { "export", 0, NULL, 'x' },
-       { "help", 0, NULL, 'h' },
+       { "device", required_argument, NULL, 'd' },
+       { "config", required_argument, NULL, 'f' },
+       { "page", required_argument, NULL, 'p' },
+       { "blacklisted", no_argument, NULL, 'b' },
+       { "whitelisted", no_argument, NULL, 'g' },
+       { "replace-whitespace", no_argument, NULL, 'u' },
+       { "sg-version", required_argument, NULL, 's' },
+       { "verbose", no_argument, NULL, 'v' },
+       { "version", no_argument, NULL, 'V' },
+       { "export", no_argument, NULL, 'x' },
+       { "help", no_argument, NULL, 'h' },
        {}
 };
 
@@ -69,39 +69,7 @@ static void log_fn(struct udev *udev, int priority,
        vsyslog(priority, format, args);
 }
 
-static void set_str(char *to, const char *from, size_t count)
-{
-       size_t i, j, len;
-
-       /* strip trailing whitespace */
-       len = strnlen(from, count);
-       while (len && isspace(from[len-1]))
-               len--;
-
-       /* strip leading whitespace */
-       i = 0;
-       while (isspace(from[i]) && (i < len))
-               i++;
-
-       j = 0;
-       while (i < len) {
-               /* substitute multiple whitespace */
-               if (isspace(from[i])) {
-                       while (isspace(from[i]))
-                               i++;
-                       to[j++] = '_';
-               }
-               /* skip chars */
-               if (from[i] == '/') {
-                       i++;
-                       continue;
-               }
-               to[j++] = from[i++];
-       }
-       to[j] = '\0';
-}
-
-static void set_type(char *to, const char *from, size_t len)
+static void set_type(const char *from, char *to, size_t len)
 {
        int type_num;
        char *eptr;
@@ -135,8 +103,7 @@ static void set_type(char *to, const char *from, size_t len)
                        break;
                }
        }
-       strncpy(to, type, len);
-       to[len-1] = '\0';
+       util_strlcpy(to, type, len);
 }
 
 /*
@@ -385,8 +352,7 @@ static int set_options(struct udev *udev,
 
                case 'd':
                        dev_specified = 1;
-                       strncpy(maj_min_dev, optarg, MAX_PATH_LEN);
-                       maj_min_dev[MAX_PATH_LEN-1] = '\0';
+                       util_strlcpy(maj_min_dev, optarg, MAX_PATH_LEN);
                        break;
 
                case 'e':
@@ -394,8 +360,7 @@ static int set_options(struct udev *udev,
                        break;
 
                case 'f':
-                       strncpy(config_file, optarg, MAX_PATH_LEN);
-                       config_file[MAX_PATH_LEN-1] = '\0';
+                       util_strlcpy(config_file, optarg, MAX_PATH_LEN);
                        break;
 
                case 'g':
@@ -461,8 +426,7 @@ static int set_options(struct udev *udev,
        }
        if (optind < argc && !dev_specified) {
                dev_specified = 1;
-               strncpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
-               maj_min_dev[MAX_PATH_LEN-1] = '\0';
+               util_strlcpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
        }
        return 0;
 }
@@ -537,11 +501,13 @@ static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, co
        if (retval)
                return retval;
 
-       set_str(vendor_str, dev_scsi->vendor, sizeof(vendor_str));
-       set_str(model_str, dev_scsi->model, sizeof(model_str));
-       set_type(type_str, dev_scsi->type, sizeof(type_str));
-       set_str(revision_str, dev_scsi->revision, sizeof(revision_str));
-
+       udev_util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
+       udev_util_replace_chars(vendor_str, NULL);
+       udev_util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
+       udev_util_replace_chars(model_str, NULL);
+       set_type(dev_scsi->type, type_str, sizeof(type_str));
+       udev_util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
+       udev_util_replace_chars(revision_str, NULL);
        return 0;
 }
 
@@ -583,8 +549,9 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
        struct scsi_id_device dev_scsi;
        int good_dev;
        int page_code;
-       char serial_short[MAX_SERIAL_LEN] = "";
+       char serial_short[MAX_SERIAL_LEN];
 
+       serial_short[0] = '\0';
        set_inq_values(udev, &dev_scsi, maj_min_dev);
 
        /* get per device (vendor + model) options from the config file */
@@ -607,9 +574,11 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
                        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, dev_scsi.serial, sizeof(serial_str));
+                       udev_util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+                       udev_util_replace_chars(serial_str, NULL);
                        printf("ID_SERIAL=%s\n", serial_str);
-                       set_str(serial_str, serial_short, sizeof(serial_str));
+                       udev_util_replace_whitespace(serial_short, serial_str, sizeof(serial_str));
+                       udev_util_replace_chars(serial_str, NULL);
                        printf("ID_SERIAL_SHORT=%s\n", serial_str);
                        printf("ID_TYPE=%s\n", type_str);
                } else {