fix list handling in enumerate and rules file sorting

[elogind.git] / udev / lib / libudev.c

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 3f7d0e547e61a774f5ff4c07d00dd2d97ac235cd..2d8b7754ffff73abd38df3f2dfe426f0d61398c5 100644 (file)
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -38,6 +38,7 @@ struct udev {
        char *sys_path;
        char *dev_path;
        char *rules_path;
+       struct udev_list_node properties_list;
        int log_priority;
        int run;
 };
@@ -84,7 +85,7 @@ void udev_set_userdata(struct udev *udev, void *userdata)
  * Create udev library context.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev library context.
+ * release the resources of the udev library context.
  *
  * Returns: a new udev library context
  **/
@@ -95,13 +96,13 @@ struct udev *udev_new(void)
        char *config_file;
        FILE *f;
 
-       udev = malloc(sizeof(struct udev));
+       udev = calloc(1, sizeof(struct udev));
        if (udev == NULL)
                return NULL;
-       memset(udev, 0x00, (sizeof(struct udev)));
        udev->refcount = 1;
        udev->log_fn = log_stderr;
        udev->log_priority = LOG_ERR;
+       udev_list_init(&udev->properties_list);
        udev->run = 1;
        udev->dev_path = strdup(UDEV_PREFIX "/dev");
        udev->sys_path = strdup("/sys");
@@ -117,6 +118,7 @@ struct udev *udev_new(void)
                free(udev->sys_path);
                udev->sys_path = strdup(env);
                util_remove_trailing_chars(udev->sys_path, '/');
+               udev_add_property(udev, "SYSFS_PATH", udev->sys_path);
        }
 
        env = getenv("UDEV_RUN");
@@ -195,7 +197,7 @@ struct udev *udev_new(void)
                        }
 
                        if (strcasecmp(key, "udev_log") == 0) {
-                               udev->log_priority = util_log_priority(val);
+                               udev_set_log_priority(udev, util_log_priority(val));
                                continue;
                        }
                        if (strcasecmp(key, "udev_root") == 0) {
@@ -219,21 +221,22 @@ struct udev *udev_new(void)
                free(udev->dev_path);
                udev->dev_path = strdup(env);
                util_remove_trailing_chars(udev->dev_path, '/');
+               udev_add_property(udev, "UDEV_ROOT", udev->dev_path);
        }
 
        env = getenv("UDEV_LOG");
        if (env != NULL)
-               udev->log_priority = util_log_priority(env);
+               udev_set_log_priority(udev, util_log_priority(env));
 
        if (udev->dev_path == NULL || udev->sys_path == NULL)
                goto err;
-       info(udev, "context %p created\n", udev);
-       info(udev, "log_priority=%d\n", udev->log_priority);
-       info(udev, "config_file='%s'\n", config_file);
-       info(udev, "dev_path='%s'\n", udev->dev_path);
-       info(udev, "sys_path='%s'\n", udev->sys_path);
+       dbg(udev, "context %p created\n", udev);
+       dbg(udev, "log_priority=%d\n", udev->log_priority);
+       dbg(udev, "config_file='%s'\n", config_file);
+       dbg(udev, "dev_path='%s'\n", udev->dev_path);
+       dbg(udev, "sys_path='%s'\n", udev->sys_path);
        if (udev->rules_path != NULL)
-               info(udev, "rules_path='%s'\n", udev->rules_path);
+               dbg(udev, "rules_path='%s'\n", udev->rules_path);
        free(config_file);
        return udev;
 err:
@@ -264,7 +267,7 @@ struct udev *udev_ref(struct udev *udev)
  * @udev: udev library context
  *
  * Drop a reference of the udev library context. If the refcount
- * reaches zero, the ressources of the context will be released.
+ * reaches zero, the resources of the context will be released.
  *
  **/
 void udev_unref(struct udev *udev)
@@ -274,10 +277,11 @@ void udev_unref(struct udev *udev)
        udev->refcount--;
        if (udev->refcount > 0)
                return;
+       udev_list_cleanup_entries(udev, &udev->properties_list);
        free(udev->dev_path);
        free(udev->sys_path);
        free(udev->rules_path);
-       info(udev, "context %p released\n", udev);
+       dbg(udev, "context %p released\n", udev);
        free(udev);
 }
 
@@ -286,9 +290,9 @@ void udev_unref(struct udev *udev)
  * @udev: udev library context
  * @log_fn: function to be called for logging messages
  *
- * The built-in logging, which writes to stderr, it can be
+ * The built-in logging writes to stderr. It can be
  * overridden by a custom function, to plug log messages
- * into the users logging functionality.
+ * into the users' logging functionality.
  *
  **/
 void udev_set_log_fn(struct udev *udev,
@@ -307,7 +311,11 @@ int udev_get_log_priority(struct udev *udev)
 
 void udev_set_log_priority(struct udev *udev, int priority)
 {
+       char num[32];
+
        udev->log_priority = priority;
+       snprintf(num, sizeof(num), "%u", udev->log_priority);
+       udev_add_property(udev, "UDEV_LOG", num);
 }
 
 const char *udev_get_rules_path(struct udev *udev)
@@ -353,3 +361,22 @@ const char *udev_get_dev_path(struct udev *udev)
                return NULL;
        return udev->dev_path;
 }
+
+struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value)
+{
+       if (value == NULL) {
+               struct udev_list_entry *list_entry;
+
+               list_entry = udev_get_properties_list_entry(udev);
+               list_entry = udev_list_entry_get_by_name(list_entry, key);
+               if (list_entry != NULL)
+                       udev_list_entry_delete(list_entry);
+               return NULL;
+       }
+       return udev_list_entry_add(udev, &udev->properties_list, key, value, 1, 0);
+}
+
+struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev)
+{
+       return udev_list_get_entry(&udev->properties_list);
+}