X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=003d7bded93cec5f68838514619ea9fd43897ae2;hp=de43dee30d032b7fd95f865db9f89f9a285eb64f;hb=b12a1fb1c6073c0679e80f515fe97cb21fa88e65;hpb=59d6bfefceac1a31b0408e60cd251b5035cf3b50

diff --git a/udev_utils.c b/udev_utils.c
index de43dee30..003d7bded 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -30,75 +30,8 @@
 #include <syslog.h>
 #include <sys/utsname.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
 
-/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
-int strcmp_pattern(const char *p, const char *s)
-{
-	if (s[0] == '\0') {
-		while (p[0] == '*')
-			p++;
-		return (p[0] != '\0');
-	}
-	switch (p[0]) {
-	case '[':
-		{
-			int not = 0;
-			p++;
-			if (p[0] == '!') {
-				not = 1;
-				p++;
-			}
-			while ((p[0] != '\0') && (p[0] != ']')) {
-				int match = 0;
-				if (p[1] == '-') {
-					if ((s[0] >= p[0]) && (s[0] <= p[2]))
-						match = 1;
-					p += 3;
-				} else {
-					match = (p[0] == s[0]);
-					p++;
-				}
-				if (match ^ not) {
-					while ((p[0] != '\0') && (p[0] != ']'))
-						p++;
-					if (p[0] == ']')
-						return strcmp_pattern(p+1, s+1);
-				}
-			}
-		}
-		break;
-	case '*':
-		if (strcmp_pattern(p, s+1))
-			return strcmp_pattern(p+1, s);
-		return 0;
-	case '\0':
-		if (s[0] == '\0') {
-			return 0;
-		}
-		break;
-	default:
-		if ((p[0] == s[0]) || (p[0] == '?'))
-			return strcmp_pattern(p+1, s+1);
-		break;
-	}
-	return 1;
-}
-
-int string_is_true(const char *str)
-{
-	if (strcasecmp(str, "true") == 0)
-		return 1;
-	if (strcasecmp(str, "yes") == 0)
-		return 1;
-	if (strcasecmp(str, "1") == 0)
-		return 1;
-	return 0;
-}
 
 int log_priority(const char *priority)
 {
@@ -120,51 +53,7 @@ int log_priority(const char *priority)
 	return 0;
 }
 
-int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
-{
-	static unsigned int kversion = 0;
-	static unsigned int kpatchlevel;
-	static unsigned int ksublevel;
-
-	if (kversion == 0) {
-		struct utsname uts;
-		if (uname(&uts) != 0)
-			return -1;
-
-		if (sscanf (uts.release, "%u.%u.%u", &kversion, &kpatchlevel, &ksublevel) != 3) {
-			kversion = 0;
-			return -1;
-		}
-	}
-
-	if (kversion >= version && kpatchlevel >= patchlevel && ksublevel >= sublevel)
-		return 1;
-	else
-		return 0;
-}
-
-void replace_untrusted_chars(char *string)
-{
-	size_t len;
-
-	for (len = 0; string[len] != '\0'; len++) {
-		if (strchr(";,~\\()\'", string[len])) {
-			info("replace '%c' in '%s'", string[len], string);
-			string[len] = '_';
-		}
-	}
-}
-
-void remove_trailing_char(char *path, char c)
-{
-	size_t len;
-
-	len = strlen(path);
-	while (len > 0 && path[len-1] == c)
-		path[--len] = '\0';
-}
-
-int name_list_add(struct list_head *name_list, const char *name, int sort)
+char *name_list_add(struct list_head *name_list, const char *name, int sort)
 {
 	struct name_entry *loop_name;
 	struct name_entry *new_name;
@@ -173,7 +62,7 @@ int 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 0;
+			return loop_name->name;
 		}
 	}
 
@@ -184,19 +73,17 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 		}
 
 	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
+	if (new_name == 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);
 
-	return 0;
+	return new_name->name;
 }
 
-int name_list_key_add(struct list_head *name_list, const char *key, const char *value)
+char *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;
@@ -206,22 +93,31 @@ int 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 0;
+			return loop_name->name;
 		}
 	}
 
 	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
+	if (new_name == 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);
 
-	return 0;
+	return new_name->name;
+}
+
+void name_list_cleanup(struct list_head *name_list)
+{
+	struct name_entry *name_loop;
+	struct name_entry *temp_loop;
+
+	list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
 }
 
 /* calls function for every file found in specified directory */
@@ -235,7 +131,7 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	dbg("open directory '%s'", dirname);
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		dbg("unable to open '%s'", dirname);
+		err("unable to open '%s': %s", dirname, strerror(errno));
 		return -1;
 	}