udevd: use dev_t or netif ifindex as database key

[elogind.git] / libudev / libudev-device-private.c

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 07249c3885fe973bb0ef9cba922534e69ae66d31..63f947e16b420a9cde1f08862d3eec9816eedfd3 100644 (file)
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -1,7 +1,7 @@
 /*
  * libudev - interface to udev device information
  *
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008-2010 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
@@ -21,8 +22,59 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
+static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
+{
+       const char *id;
+       struct udev *udev = udev_device_get_udev(dev);
+       char filename[UTIL_PATH_SIZE];
+
+       id = udev_device_get_id_filename(dev);
+       if (id == NULL)
+               return;
+       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/tags/", tag, "/", id, NULL);
+
+       if (add) {
+               util_create_path(udev, filename);
+               symlink(udev_device_get_devpath(dev), filename);
+       } else {
+               unlink(filename);
+       }
+}
+
+int udev_device_tag_index(struct udev_device *dev, struct udev_device *dev_old, bool add)
+{
+       struct udev_list_entry *list_entry;
+       bool found;
+
+       if (add && dev_old != NULL) {
+               /* delete possible left-over tags */
+               udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(dev_old)) {
+                       const char *tag_old = udev_list_entry_get_name(list_entry);
+                       struct udev_list_entry *list_entry_current;
+
+                       found = false;
+                       udev_list_entry_foreach(list_entry_current, udev_device_get_tags_list_entry(dev)) {
+                               const char *tag = udev_list_entry_get_name(list_entry_current);
+
+                               if (strcmp(tag, tag_old) == 0) {
+                                       found = true;
+                                       break;
+                               }
+                       }
+                       if (!found)
+                               udev_device_tag(dev_old, tag_old, false);
+               }
+       }
+
+       udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(dev))
+               udev_device_tag(dev, udev_list_entry_get_name(list_entry), add);
+
+       return 0;
+}
+
 int udev_device_update_db(struct udev_device *udev_device)
 {
+       const char *id;
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];
        char filename_tmp[UTIL_PATH_SIZE];
@@ -34,16 +86,16 @@ int udev_device_update_db(struct udev_device *udev_device)
        struct udev_list_entry *list_entry;
        int ret;
 
-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
-                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
+       id = udev_device_get_id_filename(udev_device);
+       if (id == NULL)
+               return -1;
+       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
        util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
 
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device))
-               if (udev_list_entry_get_flag(list_entry))
+               if (udev_list_entry_get_flags(list_entry))
                        goto file;
-       if (udev_device_get_num_fake_partitions(udev_device) != 0)
-               goto file;
-       if (udev_device_get_ignore_remove(udev_device))
+       if (udev_device_get_tags_list_entry(udev_device) != NULL)
                goto file;
        if (udev_device_get_devlink_priority(udev_device) != 0)
                goto file;
@@ -84,7 +136,7 @@ file:
        if (f == NULL) {
                err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
                return -1;
-               }
+       }
 
        if (udev_device_get_devnode(udev_device) != NULL) {
                fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);
@@ -95,19 +147,17 @@ file:
                fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
        if (udev_device_get_event_timeout(udev_device) >= 0)
                fprintf(f, "T:%i\n", udev_device_get_event_timeout(udev_device));
-       if (udev_device_get_num_fake_partitions(udev_device) != 0)
-               fprintf(f, "A:%i\n", udev_device_get_num_fake_partitions(udev_device));
-       if (udev_device_get_ignore_remove(udev_device))
-               fprintf(f, "R:%i\n", udev_device_get_ignore_remove(udev_device));
        if (udev_device_get_watch_handle(udev_device) >= 0)
                fprintf(f, "W:%i\n", udev_device_get_watch_handle(udev_device));
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-               if (!udev_list_entry_get_flag(list_entry))
+               if (!udev_list_entry_get_flags(list_entry))
                        continue;
                fprintf(f, "E:%s=%s\n",
                        udev_list_entry_get_name(list_entry),
                        udev_list_entry_get_value(list_entry));
        }
+       udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(udev_device))
+               fprintf(f, "G:%s\n", udev_list_entry_get_name(list_entry));
        fclose(f);
        rename(filename_tmp, filename);
        info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);
@@ -117,24 +167,14 @@ out:
 
 int udev_device_delete_db(struct udev_device *udev_device)
 {
+       const char *id;
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];
 
-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
-                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
+       id = udev_device_get_id_filename(udev_device);
+       if (id == NULL)
+               return -1;
+       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
        unlink(filename);
        return 0;
 }
-
-int udev_device_rename_db(struct udev_device *udev_device)
-{
-       struct udev *udev = udev_device_get_udev(udev_device);
-       char filename_old[UTIL_PATH_SIZE];
-       char filename[UTIL_PATH_SIZE];
-
-       util_strscpyl(filename_old, sizeof(filename_old), udev_get_dev_path(udev), "/.udev/db/",
-                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname_old(udev_device), NULL);
-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/",
-                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
-       return rename(filename_old, filename);
-}