Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay

[elogind.git] / udev_db.c

diff --git a/udev_db.c b/udev_db.c
index 806fc71bce3b9f07f2a8d376c3cce5f2f5676249..6f10b1e58d1318c998f7151caffc43c8d16b33bf 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -68,13 +68,21 @@ 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) {
-               dbg("unable to create db file '%s'", filename);
+               err("unable to create db file '%s'", filename);
                return -1;
        }
        dbg("storing data for device '%s' in '%s'", udev->devpath, filename);
@@ -84,11 +92,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 +115,7 @@ static int parse_db_file(struct udevice *udev, const char *filename)
        size_t count;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               dbg("unable to read db file '%s'", filename);
+               err("unable to read db file '%s'", filename);
                return -1;
        }
 
@@ -116,39 +128,45 @@ 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);
+                       strlcpy(udev->devpath, &bufline[2], count-1);
                        break;
                case 'N':
                        if (count > sizeof(udev->name))
-                               count = sizeof(udev->name)-1;
-                       strlcpy(udev->name, &bufline[2], count-2);
+                               count = sizeof(udev->name);
+                       strlcpy(udev->name, &bufline[2], count-1);
                        break;
                case 'M':
                        if (count > sizeof(line))
-                               count = sizeof(line)-1;
-                       strlcpy(line, &bufline[2], count-2);
+                               count = sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
                        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);
+                       strlcpy(line, &bufline[2], count-1);
                        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);
+                       strlcpy(line, &bufline[2], count-1);
                        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);
+                       strlcpy(line, &bufline[2], count-1);
                        udev->ignore_remove = atoi(line);
                        break;
+               case 'E':
+                       if (count > sizeof(line))
+                               count =  sizeof(line);
+                       strlcpy(line, &bufline[2], count-1);
+                       name_list_add(&udev->env_list, line, 0);
+                       break;
                }
        }
        file_unmap(buf, bufsize);
@@ -187,7 +205,7 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 
        dir = opendir(udev_db_path);
        if (dir == NULL) {
-               dbg("unable to udev db '%s'", udev_db_path);
+               err("unable to open udev_db '%s'", udev_db_path);
                return -1;
        }
 
@@ -214,7 +232,7 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
                dbg("looking at '%s'", filename);
 
                if (file_map(filename, &buf, &bufsize) != 0) {
-                       dbg("unable to read db file '%s'", filename);
+                       err("unable to read db file '%s'", filename);
                        continue;
                }
 
@@ -227,14 +245,14 @@ 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);
+                               strlcpy(path, &bufline[2], count-1);
                                break;
                        case 'N':
                        case 'S':
                                if (count > sizeof(nodename))
-                                       count = sizeof(nodename)-1;
-                               strlcpy(nodename, &bufline[2], count-2);
+                                       count = sizeof(nodename);
+                               strlcpy(nodename, &bufline[2], count-1);
                                dbg("compare '%s' '%s'", nodename, name);
                                if (strcmp(nodename, name) == 0) {
                                        strlcpy(devpath, path, len);
@@ -260,7 +278,7 @@ int udev_db_dump_names(int (*handler_function)(const char *path, const char *nam
 
        dir = opendir(udev_db_path);
        if (dir == NULL) {
-               dbg("unable to udev db '%s'", udev_db_path);
+               err("unable to open udev_db '%s'", udev_db_path);
                return -1;
        }
 
@@ -287,7 +305,7 @@ int udev_db_dump_names(int (*handler_function)(const char *path, const char *nam
                dbg("looking at '%s'", filename);
 
                if (file_map(filename, &buf, &bufsize) != 0) {
-                       dbg("unable to read db file '%s'", filename);
+                       err("unable to read db file '%s'", filename);
                        continue;
                }
 
@@ -302,13 +320,13 @@ 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);
+                               strlcpy(path, &bufline[2], count-1);
                                break;
                        case 'N':
                                if (count > sizeof(nodename))
-                               count = sizeof(nodename)-1;
-                               strlcpy(nodename, &bufline[2], count-2);
+                                       count = sizeof(nodename);
+                               strlcpy(nodename, &bufline[2], count-1);
                                break;
                        default:
                                continue;