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

diff --git a/udev_lib.c b/udev_lib.c
index 7fb45f0b5..86a526f7e 100644
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -28,6 +28,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/utsname.h>
 
 #include "udev.h"
 #include "logging.h"
@@ -35,89 +36,51 @@
 #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;
-}
-
-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';
+	memset(udev, 0x00, sizeof(struct udevice));
 
-	return subsystem;
+	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';
 }
 
-#define BLOCK_PATH		"/block/"
-#define CLASS_PATH		"/class/"
-#define NET_PATH		"/class/net/"
-
-char get_device_type(const char *path, const char *subsystem)
+int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
 {
-	if (strcmp(subsystem, "block") == 0)
-		return 'b';
-
-	if (strcmp(subsystem, "net") == 0)
-		return 'n';
-
-	if (strncmp(path, BLOCK_PATH, strlen(BLOCK_PATH)) == 0 &&
-	    strlen(path) > strlen(BLOCK_PATH))
-		return 'b';
-
-	if (strncmp(path, NET_PATH, strlen(NET_PATH)) == 0 &&
-	    strlen(path) > strlen(NET_PATH))
-		return 'n';
-
-	if (strncmp(path, CLASS_PATH, strlen(CLASS_PATH)) == 0 &&
-	    strlen(path) > strlen(CLASS_PATH))
-		return 'c';
-
-	return '\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;
+		}
+	}
 
-void udev_set_values(struct udevice *udev, const char* devpath, const char *subsystem)
-{
-	memset(udev, 0x00, sizeof(struct udevice));
-	strfieldcpy(udev->devpath, devpath);
-	strfieldcpy(udev->subsystem, subsystem);
-	udev->type = get_device_type(devpath, subsystem);
+	if (kversion >= version && kpatchlevel >= patchlevel && ksublevel >= sublevel)
+		return 1;
+	else
+		return 0;
 }
 
 int create_path(const char *path)
@@ -226,12 +189,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);
@@ -265,10 +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) {
-		snprintf(file, NAME_SIZE-1, "%s/%s", dirname, loop_file->name);
-		file[NAME_SIZE-1] = '\0';
+		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);
@@ -277,22 +242,3 @@ int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 	closedir(dir);
 	return 0;
 }
-
-/* Set the FD_CLOEXEC  flag of desc if value is nonzero,
-   or clear the flag if value is 0.
-   Return 0 on success, or -1 on error with errno  set. */ 
-	
-int set_cloexec_flag (int desc, int value)
-{
-	int oldflags = fcntl (desc, F_GETFD, 0);
-	/* If reading the flags failed, return error indication now. */
-	if (oldflags < 0)
-		return oldflags;
-	/* Set just the flag we want to set. */
-	if (value != 0)
-		oldflags |= FD_CLOEXEC;
-	else
-		oldflags &= ~FD_CLOEXEC;
-	/* Store modified flag word in the descriptor. */
-	return fcntl (desc, F_SETFD, oldflags);
-}