fix lookup for name in the udevdb, it should return the devpath

[elogind.git] / udev_db.c

diff --git a/udev_db.c b/udev_db.c
index f606b5e05c7eddd570ca9b3f11cff8a5ae768315..9b40a5904e751d531490e8cc2398a8c499b2ef2f 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -1,8 +1,6 @@
 /*
  * udev_db.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -68,10 +66,18 @@ int udev_db_add_device(struct udevice *udev)
        if (udev->test_run)
                return 0;
 
-       get_db_filename(udev->devpath, filename, sizeof(filename));
+       /* don't write anything if udev created only the node with the
+        * kernel name without any interesting data to remember
+        */
+       if (strcmp(udev->name, udev->kernel_name) == 0 &&
+           list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
+           !udev->partitions && !udev->ignore_remove) {
+               dbg("nothing interesting to store in udevdb, skip");
+               goto exit;
+       }
 
+       get_db_filename(udev->devpath, filename, sizeof(filename));
        create_path(filename);
-
        f = fopen(filename, "w");
        if (f == NULL) {
                err("unable to create db file '%s'", filename);
@@ -84,11 +90,15 @@ int udev_db_add_device(struct udevice *udev)
        list_for_each_entry(name_loop, &udev->symlink_list, node)
                fprintf(f, "S:%s\n", name_loop->name);
        fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-       fprintf(f, "A:%u\n", udev->partitions);
-       fprintf(f, "R:%u\n", udev->ignore_remove);
-
+       if (udev->partitions)
+               fprintf(f, "A:%u\n", udev->partitions);
+       if (udev->ignore_remove)
+               fprintf(f, "R:%u\n", udev->ignore_remove);
+       list_for_each_entry(name_loop, &udev->env_list, node)
+               fprintf(f, "E:%s\n", name_loop->name);
        fclose(f);
 
+exit:
        return 0;
 }
 
@@ -103,7 +113,7 @@ static int parse_db_file(struct udevice *udev, const char *filename)
        size_t count;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err("unable to read db file '%s'", filename);
+               dbg("no db file to read '%s'", filename);
                return -1;
        }
 
@@ -116,39 +126,52 @@ static int parse_db_file(struct udevice *udev, const char *filename)
                switch(bufline[0]) {
                case 'P':
                        if (count > sizeof(udev->devpath))
-                               count = sizeof(udev->devpath)-1;
-                       strlcpy(udev->devpath, &bufline[2], count-2);
+                               count = sizeof(udev->devpath);
+                       memcpy(udev->devpath, &bufline[2], count-2);
+                       udev->devpath[count-2] = '\0';
                        break;
                case 'N':
                        if (count > sizeof(udev->name))
-                               count = sizeof(udev->name)-1;
-                       strlcpy(udev->name, &bufline[2], count-2);
+                               count = sizeof(udev->name);
+                       memcpy(udev->name, &bufline[2], count-2);
+                       udev->name[count-2] = '\0';
                        break;
                case 'M':
                        if (count > sizeof(line))
-                               count = sizeof(line)-1;
-                       strlcpy(line, &bufline[2], count-2);
+                               count = sizeof(line);
+                       memcpy(line, &bufline[2], count-2);
+                       line[count-2] = '\0';
                        sscanf(line, "%u:%u", &major, &minor);
                        udev->devt = makedev(major, minor);
                        break;
                case 'S':
-                       if (count >  sizeof(line))
-                               count =  sizeof(line)-1;
-                       strlcpy(line, &bufline[2], count-2);
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       memcpy(line, &bufline[2], count-2);
+                       line[count-2] = '\0';
                        name_list_add(&udev->symlink_list, line, 0);
                        break;
                case 'A':
-                       if (count >  sizeof(line))
-                               count =  sizeof(line)-1;
-                       strlcpy(line, &bufline[2], count-2);
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       memcpy(line, &bufline[2], count-2);
+                       line[count-2] = '\0';
                        udev->partitions = atoi(line);
                        break;
                case 'R':
-                       if (count >  sizeof(line))
-                               count =  sizeof(line)-1;
-                       strlcpy(line, &bufline[2], count-2);
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       memcpy(line, &bufline[2], count-2);
+                       line[count-2] = '\0';
                        udev->ignore_remove = atoi(line);
                        break;
+               case 'E':
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       memcpy(line, &bufline[2], count-2);
+                       line[count-2] = '\0';
+                       name_list_add(&udev->env_list, line, 0);
+                       break;
                }
        }
        file_unmap(buf, bufsize);
@@ -184,6 +207,8 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
 int udev_db_search_name(char *devpath, size_t len, const char *name)
 {
        DIR *dir;
+       char path[PATH_SIZE];
+       int found = 0;
 
        dir = opendir(udev_db_path);
        if (dir == NULL) {
@@ -191,10 +216,9 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
                return -1;
        }
 
-       while (1) {
+       while (!found) {
                struct dirent *ent;
                char filename[PATH_SIZE];
-               char path[PATH_SIZE];
                char nodename[PATH_SIZE];
                char *bufline;
                char *buf;
@@ -219,7 +243,7 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
                }
 
                cur = 0;
-               while (cur < bufsize) {
+               while (cur < bufsize && !found) {
                        count = buf_get_line(buf, bufsize, cur);
                        bufline = &buf[cur];
                        cur += count+1;
@@ -227,20 +251,20 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
                        switch(bufline[0]) {
                        case 'P':
                                if (count > sizeof(path))
-                                       count = sizeof(path)-1;
-                               strlcpy(path, &bufline[2], count-2);
+                                       count = sizeof(path);
+                               memcpy(path, &bufline[2], count-2);
+                               path[count-2] = '\0';
                                break;
                        case 'N':
                        case 'S':
                                if (count > sizeof(nodename))
-                                       count = sizeof(nodename)-1;
-                               strlcpy(nodename, &bufline[2], count-2);
+                                       count = sizeof(nodename);
+                               memcpy(nodename, &bufline[2], count-2);
+                               nodename[count-2] = '\0';
                                dbg("compare '%s' '%s'", nodename, name);
                                if (strcmp(nodename, name) == 0) {
-                                       strlcpy(devpath, path, len);
-                                       file_unmap(buf, bufsize);
-                                       closedir(dir);
-                                       return 0;
+                                       found = 1;
+                                       break;
                                }
                                break;
                        default:
@@ -251,7 +275,11 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
        }
 
        closedir(dir);
-       return -1;
+       if (found) {
+               strlcpy(devpath, path, len);
+               return 0;
+       } else
+               return -1;
 }
 
 int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
@@ -302,13 +330,15 @@ int udev_db_dump_names(int (*handler_function)(const char *path, const char *nam
                        switch(bufline[0]) {
                        case 'P':
                                if (count > sizeof(path))
-                                       count = sizeof(path)-1;
-                               strlcpy(path, &bufline[2], count-2);
+                                       count = sizeof(path);
+                               memcpy(path, &bufline[2], count-2);
+                               path[count-2] = '\0';
                                break;
                        case 'N':
                                if (count > sizeof(nodename))
-                               count = sizeof(nodename)-1;
-                               strlcpy(nodename, &bufline[2], count-2);
+                                       count = sizeof(nodename);
+                               memcpy(nodename, &bufline[2], count-2);
+                               nodename[count-2] = '\0';
                                break;
                        default:
                                continue;