build argv[] for builtin commands

[elogind.git] / udev / udev-builtin-usb_id.c

diff --git a/udev/udev-builtin-usb_id.c b/udev/udev-builtin-usb_id.c
index 95368ecf22f72804fc0020febc6354fbca725e4a..21c3c03d8ace0b67447e422f119a7d7e433a5558 100644 (file)
--- a/udev/udev-builtin-usb_id.c
+++ b/udev/udev-builtin-usb_id.c
@@ -31,20 +31,6 @@
 
 #include "udev.h"
 
 
 #include "udev.h"
 

-static char vendor_str[64];
-static char vendor_str_enc[256];
-static const char *vendor_id = "";
-static char model_str[64];
-static char model_str_enc[256];
-static const char *product_id = "";
-static char serial_str[UTIL_NAME_SIZE];
-static char packed_if_str[UTIL_NAME_SIZE];
-static char revision_str[64];
-static char type_str[64];
-static char instance_str[64];
-static const char *ifnum;
-static const char *driver;
-

 static void set_usb_iftype(char *to, int if_class_num, size_t len)
 {
        char *type = "generic";
 static void set_usb_iftype(char *to, int if_class_num, size_t len)
 {
        char *type = "generic";


@@ -253,14 +239,39 @@ out:
  * 6.) If the device supplies a serial number, this number
  *     is concatenated with the identification with an underscore '_'.
  */
  * 6.) If the device supplies a serial number, this number
  *     is concatenated with the identification with an underscore '_'.
  */

-static int usb_id(struct udev_device *dev)
+static int builtin_usb_id(struct udev_device *dev, int argc, char *argv[], bool test)

 {
 {

+       char vendor_str[64];
+       char vendor_str_enc[256];
+       const char *vendor_id;
+       char model_str[64];
+       char model_str_enc[256];
+       const char *product_id;
+       char serial_str[UTIL_NAME_SIZE];
+       char packed_if_str[UTIL_NAME_SIZE];
+       char revision_str[64];
+       char type_str[64];
+       char instance_str[64];
+       const char *ifnum = NULL;
+       const char *driver = NULL;
+       char serial[256];
+

        struct udev *udev = udev_device_get_udev(dev);
        struct udev_device *dev_interface = NULL;
        struct udev_device *dev_usb = NULL;
        const char *if_class, *if_subclass;
        int if_class_num;
        int protocol = 0;
        struct udev *udev = udev_device_get_udev(dev);
        struct udev_device *dev_interface = NULL;
        struct udev_device *dev_usb = NULL;
        const char *if_class, *if_subclass;
        int if_class_num;
        int protocol = 0;

+       size_t l;
+       char *s;
+
+       vendor_str[0] = '\0';
+       model_str[0] = '\0';
+       serial_str[0] = '\0';
+       packed_if_str[0] = '\0';
+       revision_str[0] = '\0';
+       type_str[0] = '\0';
+       instance_str[0] = '\0';

 
        dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
 
 
        dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
 


@@ -276,7 +287,7 @@ static int usb_id(struct udev_device *dev)
        if (dev_interface == NULL) {
                info(udev, "unable to access usb_interface device of '%s'\n",
                     udev_device_get_syspath(dev));
        if (dev_interface == NULL) {
                info(udev, "unable to access usb_interface device of '%s'\n",
                     udev_device_get_syspath(dev));

-               return 1;
+               return EXIT_FAILURE;

        }
 
        ifnum = udev_device_get_sysattr_value(dev_interface, "bInterfaceNumber");
        }
 
        ifnum = udev_device_get_sysattr_value(dev_interface, "bInterfaceNumber");


@@ -286,7 +297,7 @@ static int usb_id(struct udev_device *dev)
        if (!if_class) {
                info(udev, "%s: cannot get bInterfaceClass attribute\n",
                     udev_device_get_sysname(dev));
        if (!if_class) {
                info(udev, "%s: cannot get bInterfaceClass attribute\n",
                     udev_device_get_sysname(dev));

-               return 1;
+               return EXIT_FAILURE;

        }
 
        if_class_num = strtoul(if_class, NULL, 16);
        }
 
        if_class_num = strtoul(if_class, NULL, 16);


@@ -307,7 +318,7 @@ static int usb_id(struct udev_device *dev)
        if (!dev_usb) {
                info(udev, "unable to find parent 'usb' device of '%s'\n",
                     udev_device_get_syspath(dev));
        if (!dev_usb) {
                info(udev, "unable to find parent 'usb' device of '%s'\n",
                     udev_device_get_syspath(dev));

-               return 1;
+               return EXIT_FAILURE;

        }
 
        /* all interfaces of the device in a single string */
        }
 
        /* all interfaces of the device in a single string */


@@ -339,8 +350,8 @@ static int usb_id(struct udev_device *dev)
                        goto fallback;
                }
                udev_util_encode_string(scsi_vendor, vendor_str_enc, sizeof(vendor_str_enc));
                        goto fallback;
                }
                udev_util_encode_string(scsi_vendor, vendor_str_enc, sizeof(vendor_str_enc));

-               udev_util_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1);
-               udev_util_replace_chars(vendor_str, NULL);
+               util_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1);
+               util_replace_chars(vendor_str, NULL);

 
                scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
                if (!scsi_model) {
 
                scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
                if (!scsi_model) {


@@ -349,8 +360,8 @@ static int usb_id(struct udev_device *dev)
                        goto fallback;
                }
                udev_util_encode_string(scsi_model, model_str_enc, sizeof(model_str_enc));
                        goto fallback;
                }
                udev_util_encode_string(scsi_model, model_str_enc, sizeof(model_str_enc));

-               udev_util_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1);
-               udev_util_replace_chars(model_str, NULL);
+               util_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1);
+               util_replace_chars(model_str, NULL);

 
                scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
                if (!scsi_type) {
 
                scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
                if (!scsi_type) {


@@ -366,8 +377,8 @@ static int usb_id(struct udev_device *dev)
                             udev_device_get_sysname(dev_scsi));
                        goto fallback;
                }
                             udev_device_get_sysname(dev_scsi));
                        goto fallback;
                }

-               udev_util_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1);
-               udev_util_replace_chars(revision_str, NULL);
+               util_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1);
+               util_replace_chars(revision_str, NULL);

 
                /*
                 * some broken devices have the same identifiers
 
                /*
                 * some broken devices have the same identifiers


@@ -389,11 +400,11 @@ fallback:
                        usb_vendor = vendor_id;
                if (!usb_vendor) {
                        info(udev, "No USB vendor information available\n");
                        usb_vendor = vendor_id;
                if (!usb_vendor) {
                        info(udev, "No USB vendor information available\n");

-                       return 1;
+                       return EXIT_FAILURE;

                }
                udev_util_encode_string(usb_vendor, vendor_str_enc, sizeof(vendor_str_enc));
                }
                udev_util_encode_string(usb_vendor, vendor_str_enc, sizeof(vendor_str_enc));

-               udev_util_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1);
-               udev_util_replace_chars(vendor_str, NULL);
+               util_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1);
+               util_replace_chars(vendor_str, NULL);

        }
 
        if (model_str[0] == '\0') {
        }
 
        if (model_str[0] == '\0') {


@@ -404,11 +415,11 @@ fallback:
                        usb_model = product_id;
                if (!usb_model) {
                        dbg(udev, "No USB model information available\n");
                        usb_model = product_id;
                if (!usb_model) {
                        dbg(udev, "No USB model information available\n");

-                       return 1;
+                       return EXIT_FAILURE;

                }
                udev_util_encode_string(usb_model, model_str_enc, sizeof(model_str_enc));
                }
                udev_util_encode_string(usb_model, model_str_enc, sizeof(model_str_enc));

-               udev_util_replace_whitespace(usb_model, model_str, sizeof(model_str)-1);
-               udev_util_replace_chars(model_str, NULL);
+               util_replace_whitespace(usb_model, model_str, sizeof(model_str)-1);
+               util_replace_chars(model_str, NULL);

        }
 
        if (revision_str[0] == '\0') {
        }
 
        if (revision_str[0] == '\0') {


@@ -416,8 +427,8 @@ fallback:
 
                usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice");
                if (usb_rev) {
 
                usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice");
                if (usb_rev) {

-                       udev_util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
-                       udev_util_replace_chars(revision_str, NULL);
+                       util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
+                       util_replace_chars(revision_str, NULL);

                }
        }
 
                }
        }
 


@@ -426,28 +437,16 @@ fallback:
 
                usb_serial = udev_device_get_sysattr_value(dev_usb, "serial");
                if (usb_serial) {
 
                usb_serial = udev_device_get_sysattr_value(dev_usb, "serial");
                if (usb_serial) {

-                       udev_util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
-                       udev_util_replace_chars(serial_str, NULL);
+                       util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
+                       util_replace_chars(serial_str, NULL);

                }
        }
                }
        }

-       return 0;
-}
-
-static int builtin_usb_id(struct udev_device *dev, bool test)
-{
-       char serial[256];
-       size_t l;
-       char *s;
-       int err;
-
-       err = usb_id(dev);
-       if (err)
-               return EXIT_FAILURE;

 
        s = serial;
        l = util_strpcpyl(&s, sizeof(serial), vendor_str, "_", model_str, NULL);
        if (serial_str[0] != '\0')
                l = util_strpcpyl(&s, l, "_", serial_str, NULL);
 
        s = serial;
        l = util_strpcpyl(&s, sizeof(serial), vendor_str, "_", model_str, NULL);
        if (serial_str[0] != '\0')
                l = util_strpcpyl(&s, l, "_", serial_str, NULL);

+

        if (instance_str[0] != '\0')
                util_strpcpyl(&s, l, "-", instance_str, NULL);
 
        if (instance_str[0] != '\0')
                util_strpcpyl(&s, l, "-", instance_str, NULL);
 


@@ -479,4 +478,5 @@ const struct udev_builtin udev_builtin_usb_id = {
        .name = "usb_id",
        .cmd = builtin_usb_id,
        .help = "usb device properties",
        .name = "usb_id",
        .cmd = builtin_usb_id,
        .help = "usb device properties",

+       .run_once = true,

 };
 };