X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=00b67dadc6fa3ff0a70b97df098a1cbbe2ad64d3;hp=fc1e2e1f7e836f59422f258d273d067a3beee361;hb=661a0bea80d129d5df708e36dbaed745c9d8392e;hpb=fb17920701dcba0d94e3fde566788a868e41d1ad

diff --git a/udev_utils.c b/udev_utils.c
index fc1e2e1f7..00b67dadc 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.
  *
  */
 
@@ -28,77 +26,13 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <syslog.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/types.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,116 +54,88 @@ int log_priority(const char *priority)
 	return 0;
 }
 
-int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
+struct name_entry *name_list_add(struct list_head *name_list, const char *name, int sort)
 {
-	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;
+	struct name_entry *name_loop;
+	struct name_entry *name_new;
+
+	/* 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\n", name);
+			return name_loop;
 		}
 	}
 
-	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] = '_';
+	if (sort)
+		list_for_each_entry(name_loop, name_list, node) {
+			if (strcmp(name_loop->name, name) > 0)
+				break;
 		}
-	}
-}
 
-void remove_trailing_char(char *path, char c)
-{
-	size_t len;
+	name_new = malloc(sizeof(struct name_entry));
+	if (name_new == NULL)
+		return NULL;
 
-	len = strlen(path);
-	while (len > 0 && path[len-1] == c)
-		path[--len] = '\0';
+	strlcpy(name_new->name, name, sizeof(name_new->name));
+	dbg("adding '%s'\n", name_new->name);
+	list_add_tail(&name_new->node, &name_loop->node);
+
+	return name_new;
 }
 
-int name_list_add(struct list_head *name_list, const char *name, int sort)
+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) {
-		/* avoid doubles */
-		if (strcmp(loop_name->name, name) == 0) {
-			dbg("'%s' is already in the list", name);
-			return 0;
+	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\n", 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;
 		}
 	}
 
-	if (sort)
-		list_for_each_entry(loop_name, name_list, node) {
-			if (sort && strcmp(loop_name->name, name) > 0)
-				break;
-		}
-
-	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
+	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);
+	snprintf(name_new->name, sizeof(name_new->name), "%s=%s", key, value);
+	name_new->name[sizeof(name_new->name)-1] = '\0';
+	dbg("adding '%s'\n", name_new->name);
+	list_add_tail(&name_new->node, &name_loop->node);
 
-	return 0;
+	return name_new;
 }
 
-int name_list_key_add(struct list_head *name_list, const char *key, const char *value)
+int name_list_key_remove(struct list_head *name_list, const char *key)
 {
-	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 0;
-		}
-	}
+	struct name_entry *name_loop;
+	struct name_entry *name_tmp;
+	size_t keylen = strlen(key);
+	int retval = 0;
 
-	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
+	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;
 	}
-
-	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 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);
 	}
@@ -240,13 +146,12 @@ 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);
+	dbg("open directory '%s'\n", dirname);
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		dbg("unable to open '%s'", dirname);
+		err("unable to open '%s': %s\n", dirname, strerror(errno));
 		return -1;
 	}
 
@@ -259,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\n", dirname, ent->d_name);
 
 		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
 		filename[sizeof(filename)-1] = '\0';
@@ -276,3 +183,40 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	closedir(dir);
 	return 0;
 }
+
+uid_t lookup_user(const char *user)
+{
+	struct passwd *pw;
+	uid_t uid = 0;
+
+	errno = 0;
+	pw = getpwnam(user);
+	if (pw == NULL) {
+		if (errno == 0 || errno == ENOENT || errno == ESRCH)
+			err("specified user '%s' unknown\n", user);
+		else
+			err("error resolving user '%s': %s\n", user, strerror(errno));
+	} else
+		uid = pw->pw_uid;
+
+	return uid;
+}
+
+extern gid_t lookup_group(const char *group)
+{
+	struct group *gr;
+	gid_t gid = 0;
+
+	errno = 0;
+	gr = getgrnam(group);
+	if (gr == NULL) {
+		if (errno == 0 || errno == ENOENT || errno == ESRCH)
+			err("specified group '%s' unknown\n", group);
+		else
+			err("error resolving group '%s': %s\n", group, strerror(errno));
+	} else
+		gid = gr->gr_gid;
+
+	return gid;
+}
+