X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=37607492acf906267469b7741c228b2fa5d56a55;hp=b650096593308f7e0e7e6c67ff64c5895940cc55;hb=db949b02489f521e32a052280f913e06b7c87e37;hpb=e6764498e7592f216a1895eacc485448fa4a1660

diff --git a/udev_utils.c b/udev_utils.c
index b65009659..37607492a 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -50,7 +50,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 
 	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;
@@ -177,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[0]))
-		++string;
-	if (string[0] == '"')
-		++string;
-	else
-		return -ENODEV;
-
-	temp = strsep(&string, "\"");
-	if (!string || temp[0] == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-
-	return 0;
-}
-
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
 	struct stat stats;
@@ -263,12 +228,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';
 }
 
@@ -300,15 +277,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);
@@ -325,7 +299,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;
@@ -334,20 +308,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[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';
-
-		handler_function(udev, filename);
-
-		list_del(&loop_file->node);
-		free(loop_file);
+		name_list_add(name_list, filename, 1);
 	}
 
 	closedir(dir);