[PATCH] proper cleanup on udevdb_init() failure

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 6e7ac25175b8dc9450b9426cda9a266f538c2288..71c5f1fba538f33043495d231650722db7992e09 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -27,15 +27,20 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
+/* global variables */
+char **main_argv;
+char **main_envp;
 
-static char *get_action(void)
+static inline char *get_action(void)
 {
        char *action;
 
@@ -43,22 +48,34 @@ static char *get_action(void)
        return action;
 }
 
+static inline char *get_devpath(void)
+{
+       char *devpath;
+
+       devpath = getenv("DEVPATH");
+       return devpath;
+}
 
-static char *get_device(void)
+static inline char *get_seqnum(void)
 {
-       char *device;
+       char *seqnum;
 
-       device = getenv("DEVPATH");
-       return device;
+       seqnum = getenv("SEQNUM");
+       return seqnum;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char **argv, char **envp)
 {
        char *action;
-       char *device;
+       char *devpath;
        char *subsystem;
        int retval = -EINVAL;
        
+       main_argv = argv;
+       main_envp = envp;
+
+       dbg("version %s", UDEV_VERSION);
+
        if (argc != 2) {
                dbg ("unknown number of arguments");
                goto exit;
@@ -66,17 +83,17 @@ int main(int argc, char *argv[])
 
        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;
        }
 
@@ -92,29 +109,38 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
+       /* initialize our configuration */
+       udev_init_config();
+
+       /* connect to the system message bus */
+       sysbus_connect();
+
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
-               dbg("Unable to initialize database.");
-               goto exit;
+               dbg("unable to initialize database");
+               goto exit_sysbus;
        }
 
        /* initialize the naming deamon */
        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();
 
-exit:  
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
+
+exit:
        return retval;
 }
-