edd_id: use openat()

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

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index d7aec1488ccd5fe86dd714d20c1723c49d2ae8b8..90656b44119226d165c1696c4ce9ac6dae55cd79 100644 (file)
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -45,9 +45,10 @@ 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();
+       udev = udev_new();
        if (udev == NULL)
                goto exit;
 
@@ -69,7 +70,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");
@@ -124,8 +126,8 @@ 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;
@@ -133,30 +135,28 @@ 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 */
                if (disk_id == sysfs_id) {
                        if (match[0] == '\0') {
                                /* store id */
-                               util_strlcpy(match, dent->d_name, sizeof(match));
+                               util_strscpy(match, sizeof(match), dent->d_name);
                        } else {
                                /* error, same signature for another device */
                                info(udev, "'%s' does not have a unique signature\n", node);