X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=272afbab6e7ae8b3d8937f091ddf11382b527eae;hp=a3984771188a50d33a3e6b02fcf38922868ea8df;hb=9f1da3613897346b6a45e1f7a706d2315bc0f420;hpb=2e5a8b99f89f30ee06b39da7dee024a7361b9886

diff --git a/udev.c b/udev.c
index a39847711..272afbab6 100644
--- a/udev.c
+++ b/udev.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -34,8 +35,21 @@
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
+/* global variables */
+char **main_argv;
+char **main_envp;
+
+char sysfs_path[SYSFS_PATH_MAX];
+char udev_config_dir[PATH_MAX];
+char udev_root[PATH_MAX];
+char udev_db_filename[PATH_MAX+NAME_MAX];
+char udev_permission_filename[PATH_MAX+NAME_MAX];
+char udev_rules_filename[PATH_MAX+NAME_MAX];
+char udev_config_filename[PATH_MAX+NAME_MAX];
+char default_mode_str[NAME_MAX];
 
-static char *get_action(void)
+
+static inline char *get_action(void)
 {
 	char *action;
 
@@ -43,22 +57,26 @@ static char *get_action(void)
 	return action;
 }
 
-
-static char *get_device(void)
+static inline char *get_devpath(void)
 {
-	char *device;
+	char *devpath;
 
-	device = getenv("DEVPATH");
-	return device;
+	devpath = getenv("DEVPATH");
+	return devpath;
 }
 
-char **main_argv;
-char **main_envp;
+static inline char *get_seqnum(void)
+{
+	char *seqnum;
+
+	seqnum = getenv("SEQNUM");
+	return seqnum;
+}
 
 int main(int argc, char **argv, char **envp)
 {
 	char *action;
-	char *device;
+	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
 	
@@ -74,17 +92,17 @@ int main(int argc, char **argv, char **envp)
 
 	subsystem = argv[1];
 
-	device = get_device();
-	if (!device) {
-		dbg ("no device?");
+	devpath = get_devpath();
+	if (!devpath) {
+		dbg ("no devpath?");
 		goto exit;
 	}
-	dbg("looking at %s", device);
+	dbg("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
-	if (!strstr(device, "class") &&
-	    !strstr(device, "block")) {
-		dbg("not block or class");
+	if (!strstr(devpath, "class") &&
+	    !strstr(devpath, "block")) {
+		dbg("not a block or class device");
 		goto exit;
 	}
 
@@ -100,10 +118,13 @@ int main(int argc, char **argv, char **envp)
 		goto exit;
 	}
 
+	/* initialize our configuration */
+	udev_init_config();
+
 	/* initialize udev database */
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
-		dbg("Unable to initialize database.");
+		dbg("unable to initialize database");
 		goto exit;
 	}
 
@@ -111,13 +132,13 @@ int main(int argc, char **argv, char **envp)
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(device, argv[1]);
+		retval = udev_add_device(devpath, subsystem);
 
 	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(device, argv[1]);
+		retval = udev_remove_device(devpath, subsystem);
 
 	else {
-		dbg("Unknown action: %s", action);
+		dbg("unknown action '%s'", action);
 		retval = -EINVAL;
 	}
 	udevdb_exit();
@@ -125,4 +146,3 @@ int main(int argc, char **argv, char **envp)
 exit:	
 	return retval;
 }
-