X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_utils.c;h=5cdfb1421d5d7e6fed15dde7e22a3b6dca08954f;hb=51603798046c8e673cad8ddecea7e6c86eef0d9c;hp=c6658e6933fbcc0a795d26c3dcbf71044aabf19a;hpb=28ce66de1750320d7f09547d8910d42ae580fe5e;p=elogind.git

diff --git a/udev_utils.c b/udev_utils.c
index c6658e693..5cdfb1421 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <dirent.h>
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>
@@ -38,19 +39,23 @@
 #include "list.h"
 
 
-int 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);
 
 	if (subsystem)
 		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));
-		no_trailing_slash(udev->devpath);
+		remove_trailing_char(udev->devpath, '/');
 
 		if (strncmp(udev->devpath, "/block/", 7) == 0)
 			udev->type = DEV_BLOCK;
@@ -228,12 +233,24 @@ 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';
 }
 
@@ -265,15 +282,12 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
-		      struct udevice *udev, const char *dirname, const char *suffix)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
 {
 	struct dirent *ent;
 	DIR *dir;
 	char *ext;
-	struct name_entry *loop_file;
-	struct name_entry *tmp_file;
-	LIST_HEAD(file_list);
+	char filename[PATH_SIZE];
 
 	dbg("open directory '%s'", dirname);
 	dir = opendir(dirname);
@@ -290,7 +304,7 @@ int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *
 		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;
@@ -299,22 +313,73 @@ int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *
 			continue;
 
 		dbg("put file '%s/%s' in list", dirname, ent->d_name);
-		name_list_add(&file_list, ent->d_name, 1);
-	}
-
-	/* call function for every file in the list */
-	list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
-		char filename[PATH_SIZE];
 
-		snprintf(filename, sizeof(filename), "%s/%s", dirname, loop_file->name);
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
 		filename[sizeof(filename)-1] = '\0';
+		name_list_add(name_list, filename, 1);
+	}
 
-		handler_function(udev, filename);
+	closedir(dir);
+	return 0;
+}
+
+int execute_command(const char *command, const char *subsystem)
+{
+	int retval;
+	pid_t pid;
+	char arg[PATH_SIZE];
+	char *argv[(PATH_SIZE / 2) + 1];
+	char *pos;
+	int devnull;
+	int i;
+
+	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]);
+	}
 
-		list_del(&loop_file->node);
-		free(loop_file);
+	pid = fork();
+	switch (pid) {
+	case 0:
+		/* child */
+		devnull = open("/dev/null", O_RDWR);
+		if (devnull >= 0) {
+			dup2(devnull, STDIN_FILENO);
+			dup2(devnull, STDOUT_FILENO);
+			dup2(devnull, STDERR_FILENO);
+			close(devnull);
+		}
+		retval = execv(arg, argv);
+		err("exec of child failed");
+		_exit(1);
+	case -1:
+		dbg("fork of child failed");
+		break;
+		return -1;
+	default:
+		waitpid(pid, NULL, 0);
 	}
 
-	closedir(dir);
 	return 0;
 }