fix compilation with --enable-debug

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

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 80a4da4c96427c63183ea84951fb025a18d0865b..8c8ac244be99e57006ccc0c58295d670cf80c612 100644 (file)
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -1,7 +1,7 @@
 /*
  * libudev - interface to udev device information
  *
 /*
  * 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
  *
  * 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 <stdio.h>
 #include <string.h>
 #include <stddef.h>

+#include <stdbool.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>


@@ -21,10 +22,66 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
 #include "libudev.h"
 #include "libudev-private.h"
 

+static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
+{
+       struct udev *udev = udev_device_get_udev(dev);
+       char filename[UTIL_PATH_SIZE];
+
+       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/tags/", tag, "/",
+                     udev_device_get_subsystem(dev), ":", udev_device_get_sysname(dev), NULL);
+
+       if (add) {
+               util_create_path(udev, filename);
+               symlink(udev_device_get_devpath(dev), filename);
+               /* possibly cleanup old entries after a device renaming */
+               if (udev_device_get_sysname_old(dev) != NULL) {
+                       char filename_old[UTIL_PATH_SIZE];
+
+                       util_strscpyl(filename_old, sizeof(filename_old), udev_get_dev_path(udev), "/.udev/tags/", tag, "/",
+                                     udev_device_get_subsystem(dev), ":", udev_device_get_sysname_old(dev), NULL);
+                       unlink(filename_old);
+               }
+       } 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)
 {
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];
 int udev_device_update_db(struct udev_device *udev_device)
 {
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];

+       char filename_tmp[UTIL_PATH_SIZE];

        FILE *f;
        char target[232]; /* on 64bit, tmpfs inlines up to 239 bytes */
        size_t devlen = strlen(udev_get_dev_path(udev))+1;
        FILE *f;
        char target[232]; /* on 64bit, tmpfs inlines up to 239 bytes */
        size_t devlen = strlen(udev_get_dev_path(udev))+1;


@@ -35,14 +92,12 @@ int udev_device_update_db(struct udev_device *udev_device)
 
        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);
 
        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);

-       unlink(filename);
+       util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);

 
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(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))

                        goto file;
                        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;
                goto file;
        if (udev_device_get_devlink_priority(udev_device) != 0)
                goto file;


@@ -66,21 +121,24 @@ int udev_device_update_db(struct udev_device *udev_device)
                        goto file;
                }
        }
                        goto file;
                }
        }

-       info(udev, "create db link (%s)\n", target);
-       udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
-       util_create_path(udev, filename);
-       ret = symlink(target, filename);
+       udev_selinux_setfscreatecon(udev, filename_tmp, S_IFLNK);
+       util_create_path(udev, filename_tmp);
+       ret = symlink(target, filename_tmp);

        udev_selinux_resetfscreatecon(udev);
        udev_selinux_resetfscreatecon(udev);

-       if (ret == 0)
-               goto out;
+       if (ret != 0)
+               goto file;
+       ret = rename(filename_tmp, filename);
+       if (ret != 0)
+               goto file;
+       info(udev, "created db link (%s)\n", target);
+       goto out;

 file:
 file:

-       util_create_path(udev, filename);
-       f = fopen(filename, "w");
+       util_create_path(udev, filename_tmp);
+       f = fopen(filename_tmp, "w");

        if (f == NULL) {
        if (f == NULL) {

-               err(udev, "unable to create db file '%s': %m\n", filename);
+               err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);

                return -1;
                return -1;

-               }
-       info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);
+       }

 
        if (udev_device_get_devnode(udev_device) != NULL) {
                fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);
 
        if (udev_device_get_devnode(udev_device) != NULL) {
                fprintf(f, "N:%s\n", &udev_device_get_devnode(udev_device)[devlen]);


@@ -88,23 +146,23 @@ file:
                        fprintf(f, "S:%s\n", &udev_list_entry_get_name(list_entry)[devlen]);
        }
        if (udev_device_get_devlink_priority(udev_device) != 0)
                        fprintf(f, "S:%s\n", &udev_list_entry_get_name(list_entry)[devlen]);
        }
        if (udev_device_get_devlink_priority(udev_device) != 0)

-               fprintf(f, "L:%u\n", udev_device_get_devlink_priority(udev_device));
+               fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));

        if (udev_device_get_event_timeout(udev_device) >= 0)
        if (udev_device_get_event_timeout(udev_device) >= 0)

-               fprintf(f, "T:%u\n", udev_device_get_event_timeout(udev_device));
-       if (udev_device_get_num_fake_partitions(udev_device) != 0)
-               fprintf(f, "A:%u\n", udev_device_get_num_fake_partitions(udev_device));
-       if (udev_device_get_ignore_remove(udev_device))
-               fprintf(f, "R:%u\n", udev_device_get_ignore_remove(udev_device));
+               fprintf(f, "T:%i\n", udev_device_get_event_timeout(udev_device));

        if (udev_device_get_watch_handle(udev_device) >= 0)
        if (udev_device_get_watch_handle(udev_device) >= 0)

-               fprintf(f, "W:%u\n", udev_device_get_watch_handle(udev_device));
+               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)) {
        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));
        }
                        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);
        fclose(f);

+       rename(filename_tmp, filename);
+       info(udev, "created db file for '%s' in '%s'\n", udev_device_get_devpath(udev_device), filename);

 out:
        return 0;
 }
 out:
        return 0;
 }


@@ -126,6 +184,9 @@ int udev_device_rename_db(struct udev_device *udev_device)
        char filename_old[UTIL_PATH_SIZE];
        char filename[UTIL_PATH_SIZE];
 
        char filename_old[UTIL_PATH_SIZE];
        char filename[UTIL_PATH_SIZE];
 

+       if (strcmp(udev_device_get_sysname(udev_device), udev_device_get_sysname_old(udev_device)) == 0)
+               return 0;
+

        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/",
        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/",