X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fedd_id%2Fedd_id.c;h=90656b44119226d165c1696c4ce9ac6dae55cd79;hp=9d745c505a68ae66fc9b774c980a7511d3edc5a5;hb=eba87f55f6383cd61a11fce2ae37ac8100d6ded2;hpb=01618658fd82dbc5e6315b639f00e87c6fee3c54

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index 9d745c505..90656b441 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -25,33 +25,16 @@
 
 #include "../../udev/udev.h"
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+static void log_fn(struct udev *udev, int priority,
+		   const char *file, int line, const char *fn,
+		   const char *format, va_list args)
 {
-	va_list args;
-	static int udev_log = -1;
-
-	if (udev_log == -1) {
-		const char *value;
-
-		value = getenv("UDEV_LOG");
-		if (value)
-			udev_log = log_priority(value);
-		else
-			udev_log = LOG_ERR;
-	}
-
-	if (priority > udev_log)
-		return;
-
-	va_start(args, format);
 	vsyslog(priority, format, args);
-	va_end(args);
 }
-#endif
 
 int main(int argc, char *argv[])
 {
+	struct udev *udev;
 	const char *node = NULL;
 	int i;
 	int export = 0;
@@ -62,9 +45,15 @@ int main(int argc, char *argv[])
 	int sysfs_fd;
 	DIR *dir = NULL;
 	int rc = 1;
-	char match[NAME_MAX] = "";
+	char filename[UTIL_PATH_SIZE];
+	char match[UTIL_PATH_SIZE];
+
+	udev = udev_new();
+	if (udev == NULL)
+		goto exit;
 
 	logging_init("edd_id");
+	udev_set_log_fn(udev, log_fn);
 
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];
@@ -75,15 +64,16 @@ int main(int argc, char *argv[])
 			node = arg;
 	}
 	if (node == NULL) {
-		err("no node specified\n");
+		err(udev, "no node specified\n");
 		fprintf(stderr, "no node specified\n");
 		goto exit;
 	}
 
 	/* check for kernel support */
-	dir = opendir("/sys/firmware/edd");
+	util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), "/firmware/edd", NULL);
+	dir = opendir(filename);
 	if (dir == NULL) {
-		info("no kernel EDD support\n");
+		info(udev, "no kernel EDD support\n");
 		fprintf(stderr, "no kernel EDD support\n");
 		rc = 2;
 		goto exit;
@@ -91,7 +81,7 @@ int main(int argc, char *argv[])
 
 	disk_fd = open(node, O_RDONLY);
 	if (disk_fd < 0) {
-		info("unable to open '%s'\n", node);
+		info(udev, "unable to open '%s'\n", node);
 		fprintf(stderr, "unable to open '%s'\n", node);
 		rc = 3;
 		goto closedir;
@@ -99,45 +89,45 @@ int main(int argc, char *argv[])
 
 	/* check for valid MBR signature */
 	if (lseek(disk_fd, 510, SEEK_SET) < 0) {
-		info("seek to MBR validity failed '%s'\n", node);
+		info(udev, "seek to MBR validity failed '%s'\n", node);
 		rc = 4;
 		goto close;
 	}
 	if (read(disk_fd, &mbr_valid, sizeof(mbr_valid)) != sizeof(mbr_valid)) {
-		info("read MBR validity failed '%s'\n", node);
+		info(udev, "read MBR validity failed '%s'\n", node);
 		rc = 5;
 		goto close;
 	}
 	if (mbr_valid != 0xAA55) {
 		fprintf(stderr, "no valid MBR signature '%s'\n", node);
-		info("no valid MBR signature '%s'\n", node);
+		info(udev, "no valid MBR signature '%s'\n", node);
 		rc=6;
 		goto close;
 	}
 
 	/* read EDD signature */
 	if (lseek(disk_fd, 440, SEEK_SET) < 0) {
-		info("seek to signature failed '%s'\n", node);
+		info(udev, "seek to signature failed '%s'\n", node);
 		rc = 7;
 		goto close;
 	}
 	if (read(disk_fd, &disk_id, sizeof(disk_id)) != sizeof(disk_id)) {
-		info("read signature failed '%s'\n", node);
+		info(udev, "read signature failed '%s'\n", node);
 		rc = 8;
 		goto close;
 	}
 	/* all zero is invalid */
-	info("read id 0x%08x from '%s'\n", disk_id, node);
+	info(udev, "read id 0x%08x from '%s'\n", disk_id, node);
 	if (disk_id == 0) {
 		fprintf(stderr, "no EDD signature '%s'\n", node);
-		info("'%s' signature is zero\n", node);
+		info(udev, "'%s' signature is zero\n", node);
 		rc = 9;
 		goto close;
 	}
 
 	/* lookup signature in sysfs to determine the name */
+	match[0] = '\0';
 	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char file[PATH_SIZE];
 		char sysfs_id_buf[256];
 		uint32_t sysfs_id;
 		ssize_t size;
@@ -145,33 +135,31 @@ int main(int argc, char *argv[])
 		if (dent->d_name[0] == '.')
 			continue;
 
-		snprintf(file, sizeof(file), "/sys/firmware/edd/%s/mbr_signature", dent->d_name);
-		file[sizeof(file)-1] = '\0';
-
-		sysfs_fd = open(file, O_RDONLY);
+		util_strscpyl(filename, sizeof(filename), dent->d_name, "/mbr_signature", NULL);
+		sysfs_fd = openat(dirfd(dir), filename, O_RDONLY);
 		if (sysfs_fd < 0) {
-			info("unable to open sysfs '%s'\n", file);
+			info(udev, "unable to open sysfs '%s'\n", filename);
 			continue;
 		}
 
 		size = read(sysfs_fd, sysfs_id_buf, sizeof(sysfs_id_buf)-1);
 		close(sysfs_fd);
 		if (size <= 0) {
-			info("read sysfs '%s' failed\n", file);
+			info(udev, "read sysfs '%s' failed\n", filename);
 			continue;
 		}
 		sysfs_id_buf[size] = '\0';
-		info("read '%s' from '%s'\n", sysfs_id_buf, file);
+		info(udev, "read '%s' from '%s'\n", sysfs_id_buf, filename);
 		sysfs_id = strtoul(sysfs_id_buf, NULL, 16);
 
 		/* look for matching value, that appears only once */
 		if (disk_id == sysfs_id) {
 			if (match[0] == '\0') {
 				/* store id */
-				strlcpy(match, dent->d_name, sizeof(match));
+				util_strscpy(match, sizeof(match), dent->d_name);
 			} else {
 				/* error, same signature for another device */
-				info("'%s' does not have a unique signature\n", node);
+				info(udev, "'%s' does not have a unique signature\n", node);
 				fprintf(stderr, "'%s' does not have a unique signature\n", node);
 				rc = 10;
 				goto exit;
@@ -192,6 +180,7 @@ close:
 closedir:
 	closedir(dir);
 exit:
+	udev_unref(udev);
 	logging_close();
 	return rc;
 }