use global udev_log variable instead of parameter in run_program

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index b6e5275a1625db0ca5a05a6ed1580d85e1c637fb..e2f84cf24a48638ffbd7ff6bc864dc4fc9a50a5a 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -54,7 +54,7 @@ int log_priority(const char *priority)
        return 0;
 }
 
-char *name_list_add(struct list_head *name_list, const char *name, int sort)
+struct name_entry *name_list_add(struct list_head *name_list, const char *name, int sort)
 {
        struct name_entry *loop_name;
        struct name_entry *new_name;
@@ -63,7 +63,7 @@ char *name_list_add(struct list_head *name_list, const char *name, int sort)
                /* avoid doubles */
                if (strcmp(loop_name->name, name) == 0) {
                        dbg("'%s' is already in the list", name);
-                       return loop_name->name;
+                       return loop_name;
                }
        }
 
@@ -81,10 +81,10 @@ char *name_list_add(struct list_head *name_list, const char *name, int sort)
        dbg("adding '%s'", new_name->name);
        list_add_tail(&new_name->node, &loop_name->node);
 
-       return new_name->name;
+       return new_name;
 }
 
-char *name_list_key_add(struct list_head *name_list, const char *key, const char *value)
+struct name_entry *name_list_key_add(struct list_head *name_list, const char *key, const char *value)
 {
        struct name_entry *loop_name;
        struct name_entry *new_name;
@@ -94,7 +94,7 @@ char *name_list_key_add(struct list_head *name_list, const char *key, const char
                        dbg("key already present '%s', replace it", loop_name->name);
                        snprintf(loop_name->name, sizeof(loop_name->name), "%s=%s", key, value);
                        loop_name->name[sizeof(loop_name->name)-1] = '\0';
-                       return loop_name->name;
+                       return loop_name;
                }
        }
 
@@ -107,7 +107,27 @@ char *name_list_key_add(struct list_head *name_list, const char *key, const char
        dbg("adding '%s'", new_name->name);
        list_add_tail(&new_name->node, &loop_name->node);
 
-       return new_name->name;
+       return new_name;
+}
+
+int name_list_key_remove(struct list_head *name_list, const char *key)
+{
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;
+       size_t keylen = strlen(key);
+       int retval = 0;
+
+       list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+               if (strncmp(name_loop->name, key, keylen) != 0)
+                       continue;
+               if (name_loop->name[keylen] != '=')
+                       continue;
+               list_del(&name_loop->node);
+               free(name_loop);
+               retval = 1;
+               break;
+       }
+       return retval;
 }
 
 void name_list_cleanup(struct list_head *name_list)
@@ -126,7 +146,6 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 {
        struct dirent *ent;
        DIR *dir;
-       char *ext;
        char filename[PATH_SIZE];
 
        dbg("open directory '%s'", dirname);
@@ -145,14 +164,16 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
                        continue;
 
                /* look for file matching with specified suffix */
-               ext = strrchr(ent->d_name, '.');
-               if (ext == NULL)
-                       continue;
-
-               if (strcmp(ext, suffix) != 0)
-                       continue;
-
-               dbg("put file '%s/%s' in list", dirname, ent->d_name);
+               if (suffix != NULL) {
+                       const char *ext;
+
+                       ext = strrchr(ent->d_name, '.');
+                       if (ext == NULL)
+                               continue;
+                       if (strcmp(ext, suffix) != 0)
+                               continue;
+               }
+               dbg("put file '%s/%s' into list", dirname, ent->d_name);
 
                snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
                filename[sizeof(filename)-1] = '\0';