X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_lib.c;h=86a526f7e816ecca46aedf4dc622a355d92b7b74;hb=8a0dc204e902a47a5b251c6d4a29eddb8f4a634a;hp=e9c16c863a3407ac0705923c375b8264441b3f39;hpb=4a539daf1e5daa17b52239478d97f8dc7a6506b6;p=elogind.git

diff --git a/udev_lib.c b/udev_lib.c
index e9c16c863..86a526f7e 100644
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -28,78 +28,86 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/utsname.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_lib.h"
 #include "list.h"
 
 
-char *get_action(void)
+void udev_set_values(struct udevice *udev, const char* devpath,
+		     const char *subsystem, const char* action)
 {
-	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;
+	memset(udev, 0x00, sizeof(struct udevice));
+
+	if (devpath)
+		strfieldcpy(udev->devpath, devpath);
+	if (subsystem)
+		strfieldcpy(udev->subsystem, 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';
 }
 
-char *get_devnode(void)
+int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
 {
-	char *devnode;
-
-	devnode = getenv("DEVNODE");
-	if (devnode != NULL && strlen(devnode) > NAME_SIZE)
-		devnode[NAME_SIZE-1] = '\0';
+	static int kversion = 0;
+	static int kpatchlevel;
+	static int ksublevel;
+
+	if (kversion == 0) {
+		struct utsname uts;
+		if (uname(&uts) != 0)
+			return -1;
+
+		if (sscanf (uts.release, "%u.%u.%u", &kversion, &kpatchlevel, &ksublevel) != 3) {
+			kversion = 0;
+			return -1;
+		}
+	}
 
-	return devnode;
+	if (kversion >= version && kpatchlevel >= patchlevel && ksublevel >= sublevel)
+		return 1;
+	else
+		return 0;
 }
 
-char *get_seqnum(void)
+int create_path(const char *path)
 {
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-
-	return seqnum;
-}
+	char p[NAME_SIZE];
+	char *pos;
+	struct stat stats;
 
-char *get_subsystem(char *subsystem)
-{
-	if (subsystem != NULL && strlen(subsystem) > SUBSYSTEM_SIZE)
-		subsystem[SUBSYSTEM_SIZE-1] = '\0';
+	strcpy (p, path);
+	pos = strrchr(p, '/');
+	if (pos == p || pos == NULL)
+		return 0;
 
-	return subsystem;
-}
+	while (pos[-1] == '/')
+		pos--;
 
-char get_device_type(const char *path, const char *subsystem)
-{
-	if (strcmp(subsystem, "block") == 0 ||
-	    strstr(path, "/block/") != NULL)
-		return 'b';
+	pos[0] = '\0';
 
-	if (strcmp(subsystem, "net") == 0 ||
-	    strstr(path, "/class/net/") != NULL)
-		return 'n';
+	dbg("stat '%s'\n", p);
+	if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
+		return 0;
 
-	if (strstr(path, "/class/") != NULL)
-		return 'c';
+	if (create_path (p) != 0)
+		return -1;
 
-	return '\0';
+	dbg("mkdir '%s'\n", p);
+	return mkdir(p, 0755);
 }
 
 int file_map(const char *filename, char **buf, size_t *bufsize)
@@ -113,11 +121,13 @@ int file_map(const char *filename, char **buf, size_t *bufsize)
 	}
 
 	if (fstat(fd, &stats) < 0) {
+		close(fd);
 		return -1;
 	}
 
 	*buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
 	if (*buf == MAP_FAILED) {
+		close(fd);
 		return -1;
 	}
 	*bufsize = stats.st_size;
@@ -141,6 +151,15 @@ size_t buf_get_line(char *buf, size_t buflen, size_t cur)
 	return count - cur;
 }
 
+void no_trailing_slash(char *path)
+{
+	int len;
+
+	len = strlen(path);
+	if (len > 0 && path[len-1] == '/')
+		path[len-1] = '\0';
+}
+
 struct files {
 	struct list_head list;
 	char name[NAME_SIZE];
@@ -169,13 +188,13 @@ static int file_list_insert(char *filename, struct list_head *file_list)
 	return 0;
 }
 
-/* calls function for file or every file found in directory */
-int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
+/* 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)
 {
 	struct dirent *ent;
 	DIR *dir;
 	char *ext;
-	char file[NAME_SIZE];
 	struct files *loop_file;
 	struct files *tmp_file;
 	LIST_HEAD(file_list);
@@ -209,11 +228,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);