X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fedd_id%2Fedd_id.c;h=15295ed31f40aee552172574b456d07c19b964b1;hb=9fa68615bb0315501625c6cde3f3077257c740e7;hp=9e9667fc62ab87a0abd6517e4a0eeb9e64994fa9;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2;p=elogind.git

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index 9e9667fc6..15295ed31 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -23,7 +23,8 @@
 #include <dirent.h>
 #include <stdint.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static void log_fn(struct udev *udev, int priority,
 		   const char *file, int line, const char *fn,
@@ -45,13 +46,14 @@ 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_log_init("edd_id");
 	udev_set_log_fn(udev, log_fn);
 
 	for (i = 1 ; i < argc; i++) {
@@ -69,7 +71,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* 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(udev, "no kernel EDD support\n");
 		fprintf(stderr, "no kernel EDD support\n");
@@ -126,7 +129,6 @@ int main(int argc, char *argv[])
 	/* lookup signature in sysfs to determine the name */
 	match[0] = '\0';
 	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char file[UTIL_PATH_SIZE];
 		char sysfs_id_buf[256];
 		uint32_t sysfs_id;
 		ssize_t size;
@@ -134,23 +136,21 @@ 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(udev, "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(udev, "read sysfs '%s' failed\n", file);
+			info(udev, "read sysfs '%s' failed\n", filename);
 			continue;
 		}
 		sysfs_id_buf[size] = '\0';
-		info(udev, "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 */
@@ -182,6 +182,6 @@ closedir:
 	closedir(dir);
 exit:
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }