X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=073cde1074f921ef920a44aeddb5aa5fb2189875;hp=e6580d2c0acdca0404e17b2cddb1eee19ec0ad6d;hb=aaff09a30ab849186c0d4ad8bde83876d7a1a63d;hpb=5ef42682053f57fc031d420f0a2ae3e204421b8d

diff --git a/udev_utils.c b/udev_utils.c
index e6580d2c0..073cde107 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -27,39 +27,127 @@
 #include <errno.h>
 #include <ctype.h>
 #include <dirent.h>
+#include <syslog.h>
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>
 
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
 #include "list.h"
 
 
-void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action)
 {
+	char *pos;
+
 	memset(udev, 0x00, sizeof(struct udevice));
+	INIT_LIST_HEAD(&udev->symlink_list);
+	INIT_LIST_HEAD(&udev->run_list);
+	INIT_LIST_HEAD(&udev->env_list);
 
-	if (devpath)
-		strfieldcpy(udev->devpath, devpath);
 	if (subsystem)
-		strfieldcpy(udev->subsystem, subsystem);
-
-	if (strcmp(udev->subsystem, "block") == 0)
-		udev->type = BLOCK;
-	else if (strcmp(udev->subsystem, "net") == 0)
-		udev->type = NET;
-	else if (strncmp(udev->devpath, "/block/", 7) == 0)
-		udev->type = BLOCK;
-	else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-		udev->type = NET;
-	else if (strncmp(udev->devpath, "/class/", 7) == 0)
-		udev->type = CLASS;
-
-	udev->mode = 0660;
-	strcpy(udev->owner, "root");
-	strcpy(udev->group, "root");
+		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
+
+	if (action)
+		strlcpy(udev->action, action, sizeof(udev->action));
+
+	if (devpath) {
+		strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
+		remove_trailing_char(udev->devpath, '/');
+
+		if (strncmp(udev->devpath, "/block/", 7) == 0)
+			udev->type = DEV_BLOCK;
+		else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
+			udev->type = DEV_NET;
+		else if (strncmp(udev->devpath, "/class/", 7) == 0)
+			udev->type = DEV_CLASS;
+		else if (strncmp(udev->devpath, "/devices/", 9) == 0)
+			udev->type = DEV_DEVICE;
+
+		/* get kernel name */
+		pos = strrchr(udev->devpath, '/');
+		if (pos) {
+			strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));
+			dbg("kernel_name='%s'", udev->kernel_name);
+
+			/* Some block devices have '!' in their name, change that to '/' */
+			pos = udev->kernel_name;
+			while (pos[0] != '\0') {
+				if (pos[0] == '!')
+					pos[0] = '/';
+				pos++;
+			}
+
+			/* get kernel number */
+			pos = &udev->kernel_name[strlen(udev->kernel_name)];
+			while (isdigit(pos[-1]))
+				pos--;
+			strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
+			dbg("kernel_number='%s'", udev->kernel_number);
+		}
+	}
+
+	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
+		udev->mode = 0660;
+		strcpy(udev->owner, "root");
+		strcpy(udev->group, "root");
+	}
+
+	return 0;
+}
+
+void udev_cleanup_device(struct udevice *udev)
+{
+	struct name_entry *name_loop;
+	struct name_entry *temp_loop;
+
+	list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
+	list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
+	list_for_each_entry_safe(name_loop, temp_loop, &udev->env_list, node) {
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
+}
+
+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)
+{
+	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)
@@ -87,7 +175,7 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
 
 int create_path(const char *path)
 {
-	char p[NAME_SIZE];
+	char p[PATH_SIZE];
 	char *pos;
 	struct stat stats;
 
@@ -137,41 +225,6 @@ int unlink_secure(const char *filename)
 	return retval;
 }
 
-int parse_get_pair(char **orig_string, char **left, char **right)
-{
-	char *temp;
-	char *string = *orig_string;
-
-	if (!string)
-		return -ENODEV;
-
-	/* eat any whitespace */
-	while (isspace(*string) || *string == ',')
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
-
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	else
-		return -ENODEV;
-
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
-	return 0;
-}
-
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
 	struct stat stats;
@@ -199,7 +252,7 @@ int file_map(const char *filename, char **buf, size_t *bufsize)
 	return 0;
 }
 
-void file_unmap(char *buf, size_t bufsize)
+void file_unmap(void *buf, size_t bufsize)
 {
 	munmap(buf, bufsize);
 }
@@ -223,53 +276,94 @@ size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
 	return count - cur;
 }
 
-void no_trailing_slash(char *path)
+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] == '/')
+	while (len > 0 && path[len-1] == c)
 		path[--len] = '\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_add(struct list_head *name_list, const char *name, int sort)
 {
-	struct files *loop_file;
-	struct files *new_file;
+	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;
+		}
+	}
 
-	list_for_each_entry(loop_file, file_list, list) {
-		if (strcmp(loop_file->name, filename) > 0) {
-			break;
+	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;
 	}
 
-	new_file = malloc(sizeof(struct files));
-	if (new_file == 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;
+}
+
+int 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 0;
+		}
+	}
+
+	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);
@@ -286,7 +380,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;
@@ -295,22 +389,119 @@ 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);
+
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
+		name_list_add(name_list, filename, 1);
 	}
 
-	/* call function for every file in the list */
-	list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-		char filename[NAME_SIZE];
+	closedir(dir);
+	return 0;
+}
+
+int execute_program(const char *command, const char *subsystem,
+		    char *result, size_t ressize, size_t *reslen)
+{
+	int retval = 0;
+	int count;
+	int status;
+	int pipefds[2];
+	pid_t pid;
+	char *pos;
+	char arg[PATH_SIZE];
+	char *argv[(sizeof(arg) / 2) + 1];
+	int devnull;
+	int i;
+	size_t len;
 
-		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-		filename[NAME_SIZE-1] = '\0';
+	strlcpy(arg, command, sizeof(arg));
+	i = 0;
+	if (strchr(arg, ' ')) {
+		pos = arg;
+		while (pos != NULL) {
+			if (pos[0] == '\'') {
+				/* don't separate if in apostrophes */
+				pos++;
+				argv[i] = strsep(&pos, "\'");
+				while (pos && pos[0] == ' ')
+					pos++;
+			} else {
+				argv[i] = strsep(&pos, " ");
+			}
+			dbg("arg[%i] '%s'", i, argv[i]);
+			i++;
+		}
+		argv[i] =  NULL;
+		dbg("execute '%s' with parsed arguments", arg);
+	} else {
+		argv[0] = arg;
+		argv[1] = (char *) subsystem;
+		argv[2] = NULL;
+		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
+	}
 
-		fnct(filename, data);
+	if (result) {
+		if (pipe(pipefds) != 0) {
+			err("pipe failed");
+			return -1;
+		}
+	}
+
+	pid = fork();
+	switch(pid) {
+	case 0:
+		/* child dup2 write side of pipe to STDOUT */
+		devnull = open("/dev/null", O_RDWR);
+		if (devnull >= 0) {
+			dup2(devnull, STDIN_FILENO);
+			if (!result)
+				dup2(devnull, STDOUT_FILENO);
+			dup2(devnull, STDERR_FILENO);
+			close(devnull);
+		}
+		if (result)
+			dup2(pipefds[1], STDOUT_FILENO);
+		execv(arg, argv);
+		err("exec of program failed");
+		_exit(1);
+	case -1:
+		err("fork of '%s' failed", arg);
+		return -1;
+	default:
+		/* parent reads from pipefds[0] */
+		if (result) {
+			close(pipefds[1]);
+			len = 0;
+			while (1) {
+				count = read(pipefds[0], result + len, ressize - len-1);
+				if (count < 0) {
+					err("read failed with '%s'", strerror(errno));
+					retval = -1;
+					break;
+				}
+
+				if (count == 0)
+					break;
+
+				len += count;
+				if (len >= ressize-1) {
+					err("ressize %ld too short", (long)ressize);
+					retval = -1;
+					break;
+				}
+			}
+			result[len] = '\0';
+			close(pipefds[0]);
+			if (reslen)
+				*reslen = len;
+		}
+		waitpid(pid, &status, 0);
 
-		list_del(&loop_file->list);
-		free(loop_file);
+		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+			dbg("exec program status 0x%x", status);
+			retval = -1;
+		}
 	}
 
-	closedir(dir);
-	return 0;
+	return retval;
 }