X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=e1630b67b5a097166b6322b837861796fd4c5291;hp=b198892c012f2ae8f95356845066336f92c1ba42;hb=e9b647708440d4bff4c250292b72b0c59087e3df;hpb=3a020a85da768808a03f1574b001d1d06d55ae07

diff --git a/udev_utils.c b/udev_utils.c
index b198892c0..e1630b67b 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -1,6 +1,4 @@
 /*
- * udev_utils.c - generic stuff used by udev
- *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -56,68 +54,88 @@ 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;
+	struct name_entry *name_loop;
+	struct name_entry *name_new;
 
-	list_for_each_entry(loop_name, name_list, node) {
-		/* avoid doubles */
-		if (strcmp(loop_name->name, name) == 0) {
+	/* avoid duplicate entries */
+	list_for_each_entry(name_loop, name_list, node) {
+		if (strcmp(name_loop->name, name) == 0) {
 			dbg("'%s' is already in the list", name);
-			return loop_name->name;
+			return name_loop;
 		}
 	}
 
 	if (sort)
-		list_for_each_entry(loop_name, name_list, node) {
-			if (sort && strcmp(loop_name->name, name) > 0)
+		list_for_each_entry(name_loop, name_list, node) {
+			if (strcmp(name_loop->name, name) > 0)
 				break;
 		}
 
-	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL)
+	name_new = malloc(sizeof(struct name_entry));
+	if (name_new == NULL)
 		return NULL;
 
-	strlcpy(new_name->name, name, sizeof(new_name->name));
-	dbg("adding '%s'", new_name->name);
-	list_add_tail(&new_name->node, &loop_name->node);
+	strlcpy(name_new->name, name, sizeof(name_new->name));
+	dbg("adding '%s'", name_new->name);
+	list_add_tail(&name_new->node, &name_loop->node);
 
-	return new_name->name;
+	return name_new;
 }
 
-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;
-
-	list_for_each_entry(loop_name, name_list, node) {
-		if (strncmp(loop_name->name, key, strlen(key)) == 0) {
-			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;
+	struct name_entry *name_loop;
+	struct name_entry *name_new;
+
+	list_for_each_entry(name_loop, name_list, node) {
+		if (strncmp(name_loop->name, key, strlen(key)) == 0) {
+			dbg("key already present '%s', replace it", name_loop->name);
+			snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value);
+			name_loop->name[sizeof(name_loop->name)-1] = '\0';
+			return name_loop;
 		}
 	}
 
-	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL)
+	name_new = malloc(sizeof(struct name_entry));
+	if (name_new == NULL)
 		return NULL;
 
-	snprintf(new_name->name, sizeof(new_name->name), "%s=%s", key, value);
-	new_name->name[sizeof(new_name->name)-1] = '\0';
-	dbg("adding '%s'", new_name->name);
-	list_add_tail(&new_name->node, &loop_name->node);
+	snprintf(name_new->name, sizeof(name_new->name), "%s=%s", key, value);
+	name_new->name[sizeof(name_new->name)-1] = '\0';
+	dbg("adding '%s'", name_new->name);
+	list_add_tail(&name_new->node, &name_loop->node);
+
+	return name_new;
+}
 
-	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 *name_tmp;
+	size_t keylen = strlen(key);
+	int retval = 0;
+
+	list_for_each_entry_safe(name_loop, name_tmp, 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;
-	struct name_entry *temp_loop;
+	struct name_entry *name_tmp;
 
-	list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+	list_for_each_entry_safe(name_loop, name_tmp, name_list, node) {
 		list_del(&name_loop->node);
 		free(name_loop);
 	}
@@ -128,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);
@@ -147,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';
@@ -174,7 +193,7 @@ uid_t lookup_user(const char *user)
 	pw = getpwnam(user);
 	if (pw == NULL) {
 		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err("specified user unknown '%s'", user);
+			err("specified user '%s' unknown", user);
 		else
 			err("error resolving user '%s': %s", user, strerror(errno));
 	} else
@@ -192,7 +211,7 @@ extern gid_t lookup_group(const char *group)
 	gr = getgrnam(group);
 	if (gr == NULL) {
 		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err("specified group unknown '%s'", group);
+			err("specified group '%s' unknown", group);
 		else
 			err("error resolving group '%s': %s", group, strerror(errno));
 	} else