X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_lib.c;h=6807f817a1e7b119e6ea8ca64dc2d1d628192c95;hb=2092fbcdebf5313f29b43bdaa57a22baf0c0269f;hp=8f6aa4237734a906c609484c0b8e6626cc7ecbc8;hpb=686cecf24216770190133aa6f270bb2b124329a7;p=elogind.git

diff --git a/udev_lib.c b/udev_lib.c
index 8f6aa4237..6807f817a 100644
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -29,63 +29,12 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_lib.h"
 #include "list.h"
 
 
-char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	if (action != NULL && strlen(action) > ACTION_SIZE)
-		action[ACTION_SIZE-1] = '\0';
-
-	return action;
-}
-
-char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	if (devpath != NULL && strlen(devpath) > DEVPATH_SIZE)
-		devpath[DEVPATH_SIZE-1] = '\0';
-
-	return devpath;
-}
-
-char *get_devname(void)
-{
-	char *devname;
-
-	devname = getenv("DEVNAME");
-	if (devname != NULL && strlen(devname) > NAME_SIZE)
-		devname[NAME_SIZE-1] = '\0';
-
-	return devname;
-}
-
-char *get_seqnum(void)
-{
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-
-	return seqnum;
-}
-
-char *get_subsystem(char *subsystem)
-{
-	if (subsystem != NULL && strlen(subsystem) > SUBSYSTEM_SIZE)
-		subsystem[SUBSYSTEM_SIZE-1] = '\0';
-
-	return subsystem;
-}
-
 #define BLOCK_PATH		"/block/"
 #define CLASS_PATH		"/class/"
 #define NET_PATH		"/class/net/"
@@ -113,6 +62,43 @@ char get_device_type(const char *path, const char *subsystem)
 	return '\0';
 }
 
+void udev_set_values(struct udevice *udev, const char* devpath,
+		     const char *subsystem, const char* action)
+{
+	memset(udev, 0x00, sizeof(struct udevice));
+	strfieldcpy(udev->devpath, devpath);
+	strfieldcpy(udev->subsystem, subsystem);
+	strfieldcpy(udev->action, action);
+	udev->type = get_device_type(devpath, subsystem);
+}
+
+int create_path(const char *path)
+{
+	char p[NAME_SIZE];
+	char *pos;
+	struct stat stats;
+
+	strcpy (p, path);
+	pos = strrchr(p, '/');
+	if (pos == p || pos == NULL)
+		return 0;
+
+	while (pos[-1] == '/')
+		pos--;
+
+	pos[0] = '\0';
+
+	dbg("stat '%s'\n", p);
+	if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
+		return 0;
+
+	if (create_path (p) != 0)
+		return -1;
+
+	dbg("mkdir '%s'\n", p);
+	return mkdir(p, 0755);
+}
+
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
 	struct stat stats;
@@ -154,18 +140,7 @@ size_t buf_get_line(char *buf, size_t buflen, size_t cur)
 	return count - cur;
 }
 
-void leading_slash(char *path)
-{
-	int len;
-
-	len = strlen(path);
-	if (len > 0 && path[len-1] != '/') {
-		path[len] = '/';
-		path[len+1] = '\0';
-	}
-}
-
-void no_leading_slash(char *path)
+void no_trailing_slash(char *path)
 {
 	int len;
 
@@ -203,12 +178,12 @@ static int file_list_insert(char *filename, struct list_head *file_list)
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
+int call_foreach_file(file_fnct_t fnct, const char *dirname,
+		      const char *suffix, void *data)
 {
 	struct dirent *ent;
 	DIR *dir;
 	char *ext;
-	char file[NAME_SIZE];
 	struct files *loop_file;
 	struct files *tmp_file;
 	LIST_HEAD(file_list);
@@ -242,11 +217,12 @@ int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 
 	/* call function for every file in the list */
 	list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-		strfieldcpy(file, dirname);
-		strfieldcat(file, "/");
-		strfieldcat(file, loop_file->name);
+		char filename[NAME_SIZE];
+
+		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
+		filename[NAME_SIZE-1] = '\0';
 
-		fnct(file);
+		fnct(filename, data);
 
 		list_del(&loop_file->list);
 		free(loop_file);