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

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index f21362b90..9d745c505 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -18,12 +18,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
 #include <dirent.h>
 #include <stdint.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev/udev.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 	int sysfs_fd;
 	DIR *dir = NULL;
 	int rc = 1;
-	char *match = NULL;
+	char match[NAME_MAX] = "";
 
 	logging_init("edd_id");
 
@@ -74,16 +74,16 @@ int main(int argc, char *argv[])
 		} else
 			node = arg;
 	}
-	if (!node) {
-		err("no node specified");
+	if (node == NULL) {
+		err("no node specified\n");
 		fprintf(stderr, "no node specified\n");
 		goto exit;
 	}
 
 	/* check for kernel support */
 	dir = opendir("/sys/firmware/edd");
-	if (!dir) {
-		info("no kernel EDD support");
+	if (dir == NULL) {
+		info("no kernel EDD support\n");
 		fprintf(stderr, "no kernel EDD support\n");
 		rc = 2;
 		goto exit;
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 
 	disk_fd = open(node, O_RDONLY);
 	if (disk_fd < 0) {
-		info("unable to open '%s'", node);
+		info("unable to open '%s'\n", node);
 		fprintf(stderr, "unable to open '%s'\n", node);
 		rc = 3;
 		goto closedir;
@@ -99,38 +99,38 @@ 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'", node);
+		info("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'", node);
+		info("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'", node);
+		info("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'", node);
+		info("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'", node);
+		info("read signature failed '%s'\n", node);
 		rc = 8;
 		goto close;
 	}
 	/* all zero is invalid */
-	info("read id 0x%08x from '%s'", disk_id, node);
+	info("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", node);
+		info("'%s' signature is zero\n", node);
 		rc = 9;
 		goto close;
 	}
@@ -150,38 +150,42 @@ int main(int argc, char *argv[])
 
 		sysfs_fd = open(file, O_RDONLY);
 		if (sysfs_fd < 0) {
-			info("unable to open sysfs '%s'", file);
+			info("unable to open sysfs '%s'\n", file);
 			continue;
 		}
 
 		size = read(sysfs_fd, sysfs_id_buf, sizeof(sysfs_id_buf)-1);
 		close(sysfs_fd);
-		if (size < 0) {
-			info("read sysfs '%s' failed", file);
+		if (size <= 0) {
+			info("read sysfs '%s' failed\n", file);
 			continue;
 		}
 		sysfs_id_buf[size] = '\0';
-		info("read '%s' from '%s'", sysfs_id_buf, file);
-
+		info("read '%s' from '%s'\n", sysfs_id_buf, file);
 		sysfs_id = strtoul(sysfs_id_buf, NULL, 16);
+
+		/* look for matching value, that appears only once */
 		if (disk_id == sysfs_id) {
-			if (!match) {
-				match = dent->d_name;
+			if (match[0] == '\0') {
+				/* store id */
+				strlcpy(match, dent->d_name, sizeof(match));
 			} else {
-				info("'%s' does not have a unique signature", node);
+				/* error, same signature for another device */
+				info("'%s' does not have a unique signature\n", node);
 				fprintf(stderr, "'%s' does not have a unique signature\n", node);
-				rc=10;
+				rc = 10;
 				goto exit;
 			}
 		}
-
 	}
 
-			if (export)
-		printf("ID_EDD=%s\n", match);
-			else
-		printf("%s\n", match);
-			rc = 0;
+	if (match[0] != '\0') {
+		if (export)
+			printf("ID_EDD=%s\n", match);
+		else
+			printf("%s\n", match);
+		rc = 0;
+	}
 
 close:
 	close(disk_fd);