X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_utils.c;h=2b5683fda65b5801207fb8a878cac167fe32a758;hb=67747e1de37158cd58782f432ccba8db55251592;hp=145f02b5e120cf3de2fe72d5e17c7565ed445b55;hpb=915a12adc2ea28dc2391788c66b829caefefcfb4;p=elogind.git

diff --git a/udev_utils.c b/udev_utils.c
index 145f02b5e..2b5683fda 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -31,6 +31,7 @@
 #include <sys/mman.h>
 #include <sys/utsname.h>
 
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
@@ -45,25 +46,25 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 	INIT_LIST_HEAD(&udev->symlink_list);
 
 	if (subsystem)
-		strfieldcpy(udev->subsystem, subsystem);
+		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
 
 	if (devpath) {
-		strfieldcpy(udev->devpath, devpath);
+		strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
 		no_trailing_slash(udev->devpath);
 
 		if (strncmp(udev->devpath, "/block/", 7) == 0)
-			udev->type = BLOCK;
+			udev->type = DEV_BLOCK;
 		else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-			udev->type = NET;
+			udev->type = DEV_NET;
 		else if (strncmp(udev->devpath, "/class/", 7) == 0)
-			udev->type = CLASS;
+			udev->type = DEV_CLASS;
 		else if (strncmp(udev->devpath, "/devices/", 9) == 0)
-			udev->type = PHYSDEV;
+			udev->type = DEV_DEVICE;
 
 		/* get kernel name */
 		pos = strrchr(udev->devpath, '/');
 		if (pos) {
-			strfieldcpy(udev->kernel_name, &pos[1]);
+			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 '/' */
@@ -78,14 +79,14 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 			pos = &udev->kernel_name[strlen(udev->kernel_name)];
 			while (isdigit(pos[-1]))
 				pos--;
-			strfieldcpy(udev->kernel_number, 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");
+	strcpy(udev->owner, "root");
+	strcpy(udev->group, "root");
 
 	return 0;
 }
@@ -126,7 +127,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;
 
@@ -176,41 +177,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;
@@ -292,22 +258,19 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 		return -ENOMEM;
 	}
 
-	strfieldcpy(new_name->name, name);
+	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(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);
@@ -324,7 +287,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;
@@ -333,20 +296,10 @@ 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[NAME_SIZE];
-
-		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-		filename[NAME_SIZE-1] = '\0';
-
-		handler_function(udev, filename);
 
-		list_del(&loop_file->node);
-		free(loop_file);
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
+		name_list_add(name_list, filename, 1);
 	}
 
 	closedir(dir);