X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=073cde1074f921ef920a44aeddb5aa5fb2189875;hp=c35b287881a060633f65e530abdf9390c0a48f69;hb=66f74a2d1411e9761ac90c5a2f81d70b22ec936d;hpb=6bf0ffe8fd312c1e6549cb1721d7a7efeee77185

diff --git a/udev_utils.c b/udev_utils.c
index c35b28788..073cde107 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -47,6 +47,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 	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 (subsystem)
 		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
@@ -112,6 +113,10 @@ void udev_cleanup_device(struct udevice *udev)
 		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)
@@ -303,10 +308,14 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 			dbg("'%s' is already in the list", name);
 			return 0;
 		}
-		if (sort && strcmp(loop_name->name, name) > 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");
@@ -314,6 +323,35 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 	}
 
 	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;
+	}
+
+	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;
@@ -361,15 +399,20 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	return 0;
 }
 
-int execute_command(const char *command, const char *subsystem)
+int execute_program(const char *command, const char *subsystem,
+		    char *result, size_t ressize, size_t *reslen)
 {
-	int retval;
+	int retval = 0;
+	int count;
+	int status;
+	int pipefds[2];
 	pid_t pid;
-	char arg[PATH_SIZE];
-	char *argv[(PATH_SIZE / 2) + 1];
 	char *pos;
+	char arg[PATH_SIZE];
+	char *argv[(sizeof(arg) / 2) + 1];
 	int devnull;
 	int i;
+	size_t len;
 
 	strlcpy(arg, command, sizeof(arg));
 	i = 0;
@@ -397,27 +440,68 @@ int execute_command(const char *command, const char *subsystem)
 		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
 	}
 
+	if (result) {
+		if (pipe(pipefds) != 0) {
+			err("pipe failed");
+			return -1;
+		}
+	}
+
 	pid = fork();
-	switch (pid) {
+	switch(pid) {
 	case 0:
-		/* child */
+		/* child dup2 write side of pipe to STDOUT */
 		devnull = open("/dev/null", O_RDWR);
 		if (devnull >= 0) {
 			dup2(devnull, STDIN_FILENO);
-			dup2(devnull, STDOUT_FILENO);
+			if (!result)
+				dup2(devnull, STDOUT_FILENO);
 			dup2(devnull, STDERR_FILENO);
 			close(devnull);
 		}
-		retval = execv(arg, argv);
-		err("exec of child '%s' failed", command);
+		if (result)
+			dup2(pipefds[1], STDOUT_FILENO);
+		execv(arg, argv);
+		err("exec of program failed");
 		_exit(1);
 	case -1:
-		dbg("fork of child '%s' failed", command);
-		break;
+		err("fork of '%s' failed", arg);
 		return -1;
 	default:
-		waitpid(pid, NULL, 0);
+		/* 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);
+
+		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+			dbg("exec program status 0x%x", status);
+			retval = -1;
+		}
 	}
 
-	return 0;
+	return retval;
 }