X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=de43dee30d032b7fd95f865db9f89f9a285eb64f;hp=0b730d565b666fd7f9f648a782de3d99d6b92d96;hb=db481105c2cf2092e1499736d6619bf194f91711;hpb=65ab1334122b6ed427ce39f48fb40757d44f8d71

diff --git a/udev_utils.c b/udev_utils.c
index 0b730d565..de43dee30 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -1,7 +1,7 @@
 /*
- * udev_lib - generic stuff used by udev
+ * udev_utils.c - generic stuff used by udev
  *
- * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -25,47 +25,106 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <ctype.h>
 #include <dirent.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
+#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;
+}
 
-void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int string_is_true(const char *str)
 {
-	memset(udev, 0x00, sizeof(struct udevice));
-
-	if (devpath)
-		strfieldcpy(udev->devpath, devpath);
-	if (subsystem)
-		strfieldcpy(udev->subsystem, subsystem);
-
-	if (strcmp(udev->subsystem, "block") == 0)
-		udev->type = 'b';
-	else if (strcmp(udev->subsystem, "net") == 0)
-		udev->type = 'n';
-	else if (strncmp(udev->devpath, "/block/", 7) == 0)
-		udev->type = 'b';
-	else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-		udev->type = 'n';
-	else if (strncmp(udev->devpath, "/class/", 7) == 0)
-		udev->type = 'c';
-
-	udev->mode = default_mode;
-	strfieldcpy(udev->owner, default_owner);
-	strfieldcpy(udev->group, default_group);
+	if (strcasecmp(str, "true") == 0)
+		return 1;
+	if (strcasecmp(str, "yes") == 0)
+		return 1;
+	if (strcasecmp(str, "1") == 0)
+		return 1;
+	return 0;
 }
 
-int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
+int log_priority(const char *priority)
 {
-	static int kversion = 0;
-	static int kpatchlevel;
-	static int ksublevel;
+	char *endptr;
+	int prio;
+
+	prio = strtol(priority, &endptr, 10);
+	if (endptr[0] == '\0')
+		return prio;
+	if (strncasecmp(priority, "err", 3) == 0)
+		return LOG_ERR;
+	if (strcasecmp(priority, "info") == 0)
+		return LOG_INFO;
+	if (strcasecmp(priority, "debug") == 0)
+		return LOG_DEBUG;
+	if (string_is_true(priority))
+		return LOG_ERR;
+
+	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;
@@ -84,121 +143,94 @@ int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
 		return 0;
 }
 
-int create_path(const char *path)
+void replace_untrusted_chars(char *string)
 {
-	char p[NAME_SIZE];
-	char *pos;
-	struct stat stats;
-
-	strcpy (p, path);
-	pos = strrchr(p, '/');
-	if (pos == p || pos == NULL)
-		return 0;
-
-	while (pos[-1] == '/')
-		pos--;
+	size_t len;
 
-	pos[0] = '\0';
-
-	dbg("stat '%s'\n", p);
-	if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-		return 0;
+	for (len = 0; string[len] != '\0'; len++) {
+		if (strchr(";,~\\()\'", string[len])) {
+			info("replace '%c' in '%s'", string[len], string);
+			string[len] = '_';
+		}
+	}
+}
 
-	if (create_path (p) != 0)
-		return -1;
+void remove_trailing_char(char *path, char c)
+{
+	size_t len;
 
-	dbg("mkdir '%s'\n", p);
-	return mkdir(p, 0755);
+	len = strlen(path);
+	while (len > 0 && path[len-1] == c)
+		path[--len] = '\0';
 }
 
-int file_map(const char *filename, char **buf, size_t *bufsize)
+int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
-	struct stat stats;
-	int fd;
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		return -1;
+	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;
+		}
 	}
 
-	if (fstat(fd, &stats) < 0) {
-		close(fd);
-		return -1;
-	}
+	if (sort)
+		list_for_each_entry(loop_name, name_list, node) {
+			if (sort && strcmp(loop_name->name, name) > 0)
+				break;
+		}
 
-	*buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	if (*buf == MAP_FAILED) {
-		close(fd);
-		return -1;
+	new_name = malloc(sizeof(struct name_entry));
+	if (new_name == NULL) {
+		dbg("error malloc");
+		return -ENOMEM;
 	}
-	*bufsize = stats.st_size;
 
-	close(fd);
+	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;
 }
 
-void file_unmap(char *buf, size_t bufsize)
-{
-	munmap(buf, bufsize);
-}
-
-size_t buf_get_line(char *buf, size_t buflen, size_t cur)
-{
-	size_t count = 0;
-
-	for (count = cur; count < buflen && buf[count] != '\n'; count++);
-
-	return count - cur;
-}
-
-void no_trailing_slash(char *path)
-{
-	int len;
-
-	len = strlen(path);
-	if (len > 0 && path[len-1] == '/')
-		path[len-1] = '\0';
-}
-
-struct files {
-	struct list_head list;
-	char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int file_list_insert(char *filename, struct list_head *file_list)
+int name_list_key_add(struct list_head *name_list, const char *key, const char *value)
 {
-	struct files *loop_file;
-	struct files *new_file;
-
-	list_for_each_entry(loop_file, file_list, list) {
-		if (strcmp(loop_file->name, filename) > 0) {
-			break;
+	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;
 		}
 	}
 
-	new_file = malloc(sizeof(struct files));
-	if (new_file == NULL) {
+	new_name = malloc(sizeof(struct name_entry));
+	if (new_name == NULL) {
 		dbg("error malloc");
 		return -ENOMEM;
 	}
 
-	strfieldcpy(new_file->name, filename);
-	list_add_tail(&new_file->list, &loop_file->list);
+	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;
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(file_fnct_t fnct, const char *dirname,
-		      const char *suffix, void *data)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
 {
 	struct dirent *ent;
 	DIR *dir;
 	char *ext;
-	struct files *loop_file;
-	struct files *tmp_file;
-	LIST_HEAD(file_list);
+	char filename[PATH_SIZE];
 
 	dbg("open directory '%s'", dirname);
 	dir = opendir(dirname);
@@ -215,7 +247,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
 		if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
 			continue;
 
-		/* look for file with specified suffix */
+		/* look for file matching with specified suffix */
 		ext = strrchr(ent->d_name, '.');
 		if (ext == NULL)
 			continue;
@@ -224,20 +256,10 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
 			continue;
 
 		dbg("put file '%s/%s' in list", dirname, ent->d_name);
-		file_list_insert(ent->d_name, &file_list);
-	}
-
-	/* call function for every file in the list */
-	list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-		char filename[NAME_SIZE];
-
-		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-		filename[NAME_SIZE-1] = '\0';
-
-		fnct(filename, data);
 
-		list_del(&loop_file->list);
-		free(loop_file);
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
+		name_list_add(name_list, filename, 1);
 	}
 
 	closedir(dir);