always include config.h from Makefile

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

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index fb4c28ac3eecdd2c36c3209fdb8cccd5e893cd29..f482147b68cd270fad090a8b82eebb57d7418e7f 100644 (file)
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -11,8 +11,6 @@
  *     Free Software Foundation version 2 of the License.
  */
 
-#include <config.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -147,7 +145,7 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
                        break;
                }
        }
-       strlcpy(to, type, len);
+       util_strlcpy(to, type, len);
 
        return type_num;
 }
@@ -180,7 +178,7 @@ static void set_scsi_type(char *to, const char *from, size_t len)
                        break;
                }
        }
-       strlcpy(to, type, len);
+       util_strlcpy(to, type, len);
 }
 
 /*
@@ -408,14 +406,14 @@ int main(int argc, char **argv)
 
        env = getenv("DEVPATH");
        if (env != NULL)
-               strlcpy(devpath, env, sizeof(devpath));
+               util_strlcpy(devpath, env, sizeof(devpath));
        else {
                if (argv[optind] == NULL) {
                        fprintf(stderr, "No device specified\n");
                        retval = 1;
                        goto exit;
                }
-               strlcpy(devpath, argv[optind], sizeof(devpath));
+               util_strlcpy(devpath, argv[optind], sizeof(devpath));
        }
 
        retval = usb_id(udev, devpath);
@@ -423,16 +421,16 @@ int main(int argc, char **argv)
        if (retval == 0) {
                char serial[256];
 
-               strlcpy(serial, vendor_str, sizeof(serial));
-               strlcat(serial, "_", sizeof(serial));
-               strlcat(serial, model_str, sizeof(serial));
+               util_strlcpy(serial, vendor_str, sizeof(serial));
+               util_strlcat(serial, "_", sizeof(serial));
+               util_strlcat(serial, model_str, sizeof(serial));
                if (serial_str[0] != '\0') {
-                       strlcat(serial, "_", sizeof(serial));
-                       strlcat(serial, serial_str, sizeof(serial));
+                       util_strlcat(serial, "_", sizeof(serial));
+                       util_strlcat(serial, serial_str, sizeof(serial));
                }
                if (instance_str[0] != '\0') {
-                       strlcat(serial, "-", sizeof(serial));
-                       strlcat(serial, instance_str, sizeof(serial));
+                       util_strlcat(serial, "-", sizeof(serial));
+                       util_strlcat(serial, instance_str, sizeof(serial));
                }
 
                if (export) {