X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_utils.c;h=d572581f656b1f4822dc89fc81289a984a298c33;hb=83b069c6e695446688715cc4404bcfaa3288e649;hp=fe18892de19fa2eeb3332ad526b8b5c533430cd9;hpb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404;p=elogind.git

diff --git a/udev_utils.c b/udev_utils.c
index fe18892de..d572581f6 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -31,42 +31,82 @@
 #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)
 {
+	char *pos;
+
 	memset(udev, 0x00, sizeof(struct udevice));
+	INIT_LIST_HEAD(&udev->symlink_list);
 
-	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);
+		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
+
+	if (devpath) {
+		strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
+		no_trailing_slash(udev->devpath);
+
+		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;
+		else if (strncmp(udev->devpath, "/devices/", 9) == 0)
+			udev->type = PHYSDEV;
+
+		/* 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);
+		}
+	}
+
+	udev->mode = 0660;
+	strcpy(udev->owner, "0");
+	strcpy(udev->group, "0");
+
+	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);
+	}
+}
+
+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;
@@ -87,7 +127,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;
 
@@ -112,6 +152,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 parse_get_pair(char **orig_string, char **left, char **right)
 {
 	char *temp;
@@ -131,19 +196,19 @@ int parse_get_pair(char **orig_string, char **left, char **right)
 		return -ENODEV;
 
 	/* take the right side and strip off the '"' */
-	while (isspace(*string))
+	while (isspace(string[0]))
 		++string;
-	if (*string == '"')
+	if (string[0] == '"')
 		++string;
 	else
 		return -ENODEV;
 
 	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
+	if (!string || temp[0] == '\0')
 		return -ENODEV;
 	*right = temp;
 	*orig_string = string;
-	
+
 	return 0;
 }
 
@@ -200,50 +265,49 @@ size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
 
 void no_trailing_slash(char *path)
 {
-	int len;
+	size_t len;
 
 	len = strlen(path);
-	if (len > 0 && path[len-1] == '/')
-		path[len-1] = '\0';
+	while (len > 0 && path[len-1] == '/')
+		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;
-
-	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) {
+		/* 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 call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
+		      struct udevice *udev, const char *dirname, const char *suffix)
 {
 	struct dirent *ent;
 	DIR *dir;
 	char *ext;
-	struct files *loop_file;
-	struct files *tmp_file;
+	struct name_entry *loop_file;
+	struct name_entry *tmp_file;
 	LIST_HEAD(file_list);
 
 	dbg("open directory '%s'", dirname);
@@ -270,19 +334,19 @@ 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);
+		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, list) {
-		char filename[NAME_SIZE];
+	list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
+		char filename[PATH_SIZE];
 
-		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-		filename[NAME_SIZE-1] = '\0';
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, loop_file->name);
+		filename[sizeof(filename)-1] = '\0';
 
-		fnct(filename, data);
+		handler_function(udev, filename);
 
-		list_del(&loop_file->list);
+		list_del(&loop_file->node);
 		free(loop_file);
 	}