X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=64a7ba9caae0929356584acf1217f897fc43078e;hp=bdf0233e3ae1c5828f6cedc4acfea3463a227a58;hb=7628ff6e144a94c48e463d0188022f5661e0ba40;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132

diff --git a/udev_utils.c b/udev_utils.c
index bdf0233e3..64a7ba9ca 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -25,46 +25,131 @@
 #include <unistd.h>
 #include <fcntl.h>
 #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_set_values(struct udevice *udev, const char* devpath,
-		     const char *subsystem, const char* action)
+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 (devpath)
-		strfieldcpy(udev->devpath, devpath);
 	if (subsystem)
-		strfieldcpy(udev->subsystem, subsystem);
+		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
+
 	if (action)
-		strfieldcpy(udev->action, action);
-
-	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';
+		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;
 }
 
-int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
+void udev_cleanup_device(struct udevice *udev)
 {
-	static int kversion = 0;
-	static int kpatchlevel;
-	static int ksublevel;
+	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);
+	}
+}
+
+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)
+{
+	static unsigned int kversion = 0;
+	static unsigned int kpatchlevel;
+	static unsigned int ksublevel;
 
 	if (kversion == 0) {
 		struct utsname uts;
@@ -85,7 +170,7 @@ int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
 
 int create_path(const char *path)
 {
-	char p[NAME_SIZE];
+	char p[PATH_SIZE];
 	char *pos;
 	struct stat stats;
 
@@ -110,6 +195,31 @@ int create_path(const char *path)
 	return mkdir(p, 0755);
 }
 
+/* Reset permissions on the device node, before unlinking it to make sure,
+ * that permisions of possible hard links will be removed too.
+ */
+int unlink_secure(const char *filename)
+{
+	int retval;
+
+	retval = chown(filename, 0, 0);
+	if (retval)
+		dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
+
+	retval = chmod(filename, 0000);
+	if (retval)
+		dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
+
+	retval = unlink(filename);
+	if (errno == ENOENT)
+		retval = 0;
+
+	if (retval)
+		dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
+
+	return retval;
+}
+
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
 	struct stat stats;
@@ -142,62 +252,80 @@ void file_unmap(char *buf, size_t bufsize)
 	munmap(buf, bufsize);
 }
 
-size_t buf_get_line(char *buf, size_t buflen, size_t cur)
+/* return number of chars until the next newline, skip escaped newline */
+size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
 {
-	size_t count = 0;
+	int escape = 0;
+	size_t count;
+
+	for (count = cur; count < buflen; count++) {
+		if (!escape && buf[count] == '\n')
+			break;
 
-	for (count = cur; count < buflen && buf[count] != '\n'; count++);
+		if (buf[count] == '\\')
+			escape = 1;
+		else
+			escape = 0;
+	}
 
 	return count - cur;
 }
 
-void no_trailing_slash(char *path)
+void replace_untrusted_chars(char *string)
 {
-	int len;
+	size_t len;
 
-	len = strlen(path);
-	if (len > 0 && path[len-1] == '/')
-		path[len-1] = '\0';
+	for (len = 0; string[len] != '\0'; len++) {
+		if (strchr(";,~\\()\'", string[len])) {
+			info("replace '%c' in '%s'", string[len], string);
+			string[len] = '_';
+		}
+	}
 }
 
-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)
+void remove_trailing_char(char *path, char c)
 {
-	struct files *loop_file;
-	struct files *new_file;
+	size_t len;
 
-	list_for_each_entry(loop_file, file_list, list) {
-		if (strcmp(loop_file->name, filename) > 0) {
-			break;
+	len = strlen(path);
+	while (len > 0 && path[len-1] == c)
+		path[--len] = '\0';
+}
+
+int name_list_add(struct list_head *name_list, const char *name, int sort)
+{
+	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 (sort && strcmp(loop_name->name, name) > 0)
+			break;
 	}
 
-	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);
+	strlcpy(new_name->name, name, sizeof(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);
@@ -214,7 +342,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;
@@ -223,22 +351,73 @@ 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, sizeof(filename), "%s/%s", dirname, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
+		name_list_add(name_list, filename, 1);
+	}
 
-		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-		filename[NAME_SIZE-1] = '\0';
+	closedir(dir);
+	return 0;
+}
 
-		fnct(filename, data);
+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->list);
-		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 '%s' failed", command);
+		_exit(1);
+	case -1:
+		dbg("fork of child '%s' failed", command);
+		break;
+		return -1;
+	default:
+		waitpid(pid, NULL, 0);
 	}
 
-	closedir(dir);
 	return 0;
 }