X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=6d646b0ee6f1f51f4c0f0969d6da2f2b4b6dc5e5;hp=b6e5275a1625db0ca5a05a6ed1580d85e1c637fb;hb=a3b836c6c22614d2aa746d89ddfaa6888e47691f;hpb=fe0c4102add2b362e1e21ac591dc679ac18b2fce

diff --git a/udev_utils.c b/udev_utils.c
index b6e5275a1..6d646b0ee 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -110,6 +110,26 @@ char *name_list_key_add(struct list_head *name_list, const char *key, const char
 	return new_name->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)
 {
 	struct name_entry *name_loop;
@@ -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';