move syslog wrapper to libudev

[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 943cbb21ca969a01d95ae2b183edd6d52f30f1d8..7cf2f3765dfcc0604afb61d674252a229340d880 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -27,7 +27,8 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 #include "scsi_id.h"
 
 static const struct option options[] = {
@@ -59,6 +60,8 @@ static int reformat_serial;
 static int export;
 static char vendor_str[64];
 static char model_str[64];
+static char vendor_enc_str[256];
+static char model_enc_str[256];
 static char revision_str[16];
 static char type_str[16];
 
@@ -103,7 +106,7 @@ static void set_type(const char *from, char *to, size_t len)
                        break;
                }
        }
-       util_strlcpy(to, type, len);
+       util_strscpy(to, len, type);
 }
 
 /*
@@ -352,7 +355,7 @@ static int set_options(struct udev *udev,
 
                case 'd':
                        dev_specified = 1;
-                       util_strlcpy(maj_min_dev, optarg, MAX_PATH_LEN);
+                       util_strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
                        break;
 
                case 'e':
@@ -360,7 +363,7 @@ static int set_options(struct udev *udev,
                        break;
 
                case 'f':
-                       util_strlcpy(config_file, optarg, MAX_PATH_LEN);
+                       util_strscpy(config_file, MAX_PATH_LEN, optarg);
                        break;
 
                case 'g':
@@ -426,7 +429,7 @@ static int set_options(struct udev *udev,
        }
        if (optind < argc && !dev_specified) {
                dev_specified = 1;
-               util_strlcpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
+               util_strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
        }
        return 0;
 }
@@ -501,6 +504,9 @@ static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, co
        if (retval)
                return retval;
 
+       udev_util_encode_string(dev_scsi->vendor, vendor_enc_str, sizeof(vendor_enc_str));
+       udev_util_encode_string(dev_scsi->model, model_enc_str, sizeof(model_enc_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));
@@ -538,58 +544,61 @@ static void format_serial(char *serial)
 
 /*
  * scsi_id: try to get an id, if one is found, printf it to stdout.
- * returns a value passed to exit() - 0 if printed an id, else 1. This
- * could be expanded, for example, if we want to report a failure like no
- * memory etc. return 2, and return 1 for expected cases (like broken
- * device found) that do not print an id.
+ * returns a value passed to exit() - 0 if printed an id, else 1.
  */
 static int scsi_id(struct udev *udev, char *maj_min_dev)
 {
-       int retval;
        struct scsi_id_device dev_scsi;
        int good_dev;
        int page_code;
-       char serial_short[MAX_SERIAL_LEN];
+       int retval = 0;
 
-       serial_short[0] = '\0';
-       set_inq_values(udev, &dev_scsi, maj_min_dev);
+       memset(&dev_scsi, 0x00, sizeof(struct scsi_id_device));
+
+       if (set_inq_values(udev, &dev_scsi, maj_min_dev) < 0) {
+               retval = 1;
+               goto out;
+       }
 
        /* get per device (vendor + model) options from the config file */
-       retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
+       per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
        dbg(udev, "per dev options: good %d; page code 0x%x\n", good_dev, page_code);
-
        if (!good_dev) {
                retval = 1;
-       } else if (scsi_get_serial(udev,
-                                  &dev_scsi, maj_min_dev, page_code,
-                                  serial_short, MAX_SERIAL_LEN)) {
-               retval = 1;
-       } else {
-               retval = 0;
+               goto out;
        }
-       if (!retval) {
-               if (export) {
-                       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);
+       /* read serial number from mode pages (no values for optical drives) */
+       scsi_get_serial(udev, &dev_scsi, maj_min_dev, page_code, MAX_SERIAL_LEN);
+
+       if (export) {
+               char serial_str[MAX_SERIAL_LEN];
+
+               printf("ID_VENDOR=%s\n", vendor_str);
+               printf("ID_VENDOR_ENC=%s\n", vendor_enc_str);
+               printf("ID_MODEL=%s\n", model_str);
+               printf("ID_MODEL_ENC=%s\n", model_enc_str);
+               printf("ID_REVISION=%s\n", revision_str);
+               printf("ID_TYPE=%s\n", type_str);
+               if (dev_scsi.serial[0] != '\0') {
                        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);
-                       udev_util_replace_whitespace(serial_short, serial_str, sizeof(serial_str));
+                       udev_util_replace_whitespace(dev_scsi.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 {
-                       if (reformat_serial)
-                               format_serial(dev_scsi.serial);
-                       printf("%s\n", dev_scsi.serial);
                }
-               dbg(udev, "%s\n", dev_scsi.serial);
-               retval = 0;
+               goto out;
        }
 
+       if (dev_scsi.serial[0] == '\0') {
+               retval = 1;
+               goto out;
+       }
+       if (reformat_serial)
+               format_serial(dev_scsi.serial);
+       printf("%s\n", dev_scsi.serial);
+out:
        return retval;
 }
 
@@ -605,7 +614,7 @@ int main(int argc, char **argv)
        if (udev == NULL)
                goto exit;
 
-       logging_init("scsi_id");
+       udev_log_init("scsi_id");
        udev_set_log_fn(udev, log_fn);
 
        /*
@@ -641,6 +650,6 @@ int main(int argc, char **argv)
 
 exit:
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return retval;
 }