X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=42ccddff356f038b7334042dfe546137e25b78a5;hb=9fa68615bb0315501625c6cde3f3077257c740e7;hp=36477669c50e56618733958e8568100750d578ae;hpb=241e5a21f9ad7bc986e1bb74093adf9fdb98b170;p=elogind.git

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 36477669c..42ccddff3 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -21,7 +21,8 @@
 #include <errno.h>
 #include <getopt.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 int debug;
 
@@ -134,7 +135,7 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
 			break;
 		}
 	}
-	util_strlcpy(to, type, len);
+	util_strscpy(to, len, type);
 	return type_num;
 }
 
@@ -166,7 +167,7 @@ static void set_scsi_type(char *to, const char *from, size_t len)
 			break;
 		}
 	}
-	util_strlcpy(to, type, len);
+	util_strscpy(to, len, type);
 }
 
 #define USB_DT_DEVICE			0x01
@@ -455,8 +456,6 @@ int main(int argc, char **argv)
 	};
 	struct udev *udev;
 	struct udev_device *dev = NULL;
-	char syspath[UTIL_PATH_SIZE];
-	const char *devpath;
 	static int export;
 	int retval = 0;
 
@@ -464,7 +463,7 @@ int main(int argc, char **argv)
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("usb_id");
+	udev_log_init("usb_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -491,7 +490,7 @@ int main(int argc, char **argv)
 			export = 1;
 			break;
 		case 'h':
-			printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] <devpath>\n"
+			printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] [<devpath>]\n"
 			       "  --usb-info  use usb strings instead\n"
 			       "  --num-info  use numerical values\n"
 			       "  --export    print values as environment keys\n"
@@ -502,36 +501,40 @@ int main(int argc, char **argv)
 		}
 	}
 
-	devpath = argv[optind];
-	if (devpath == NULL) {
-		fprintf(stderr, "No device specified\n");
-		retval = 1;
-		goto exit;
-	}
-
-	util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-	util_strlcat(syspath, devpath, sizeof(syspath));
-	dev = udev_device_new_from_syspath(udev, syspath);
+	dev = udev_device_new_from_environment(udev);
 	if (dev == NULL) {
-		err(udev, "unable to access '%s'\n", devpath);
-		return 1;
+		char syspath[UTIL_PATH_SIZE];
+		const char *devpath;
+
+		devpath = argv[optind];
+		if (devpath == NULL) {
+			fprintf(stderr, "missing device\n");
+			retval = 1;
+			goto exit;
+		}
+
+		util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
+		dev = udev_device_new_from_syspath(udev, syspath);
+		if (dev == NULL) {
+			err(udev, "unable to access '%s'\n", devpath);
+			retval = 1;
+			goto exit;
+			return 1;
+		}
 	}
 
 	retval = usb_id(dev);
 	if (retval == 0) {
 		char serial[256];
+		size_t l;
+		char *s;
 
-		util_strlcpy(serial, vendor_str, sizeof(serial));
-		util_strlcat(serial, "_", sizeof(serial));
-		util_strlcat(serial, model_str, sizeof(serial));
-		if (serial_str[0] != '\0') {
-			util_strlcat(serial, "_", sizeof(serial));
-			util_strlcat(serial, serial_str, sizeof(serial));
-		}
-		if (instance_str[0] != '\0') {
-			util_strlcat(serial, "-", sizeof(serial));
-			util_strlcat(serial, instance_str, sizeof(serial));
-		}
+		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 (export) {
 			printf("ID_VENDOR=%s\n", vendor_str);
@@ -562,6 +565,6 @@ int main(int argc, char **argv)
 exit:
 	udev_device_unref(dev);
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return retval;
 }