[PATCH] 004 changelog entrys

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 1ac1c985076be16e6d1eab73fdd65d7b58cb7d33..a3984771188a50d33a3e6b02fcf38922868ea8df 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -23,8 +23,16 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+

 #include "udev.h"
 #include "udev_version.h"
 #include "udev.h"
 #include "udev_version.h"

+#include "namedev.h"
+#include "udevdb.h"
+#include "libsysfs/libsysfs.h"

 
 
 static char *get_action(void)
 
 
 static char *get_action(void)


@@ -36,48 +44,85 @@ static char *get_action(void)
 }
 
 
 }
 
 

-/* yeah this should be dynamically allocated... */
-static char device[255];
-

 static char *get_device(void)
 {
 static char *get_device(void)
 {

-       char *temp;
-
-       temp = getenv("DEVPATH");
-       if (temp == NULL)
-               return NULL;
-       strcpy(device, SYSFS_ROOT);
-       strcat(device, temp);
+       char *device;

 
 

+       device = getenv("DEVPATH");

        return device;
 }
 
        return device;
 }
 

+char **main_argv;
+char **main_envp;

 
 

-int main(int argc, char *argv[])
+int main(int argc, char **argv, char **envp)

 {
 {

-       char *subsystem;

        char *action;
        char *action;

-       char *dev;
+       char *device;
+       char *subsystem;
+       int retval = -EINVAL;

        
        

+       main_argv = argv;
+       main_envp = envp;
+
+       dbg("version %s", UDEV_VERSION);
+

        if (argc != 2) {
                dbg ("unknown number of arguments");
        if (argc != 2) {
                dbg ("unknown number of arguments");

-               return 1;
+               goto exit;

        }
 
        subsystem = argv[1];
 
        }
 
        subsystem = argv[1];
 

+       device = get_device();
+       if (!device) {
+               dbg ("no device?");
+               goto exit;
+       }
+       dbg("looking at %s", device);
+
+       /* we only care about class devices and block stuff */
+       if (!strstr(device, "class") &&
+           !strstr(device, "block")) {
+               dbg("not block or class");
+               goto exit;
+       }
+
+       /* but we don't care about net class devices */
+       if (strcmp(subsystem, "net") == 0) {
+               dbg("don't care about net devices");
+               goto exit;
+       }
+

        action = get_action();
        if (!action) {
                dbg ("no action?");
        action = get_action();
        if (!action) {
                dbg ("no action?");

-               return 1;
+               goto exit;

        }
 
        }
 

-       dev = get_device();
-       if (!dev) {
-               dbg ("no device?");
-               return 1;
+       /* initialize udev database */
+       retval = udevdb_init(UDEVDB_DEFAULT);
+       if (retval != 0) {
+               dbg("Unable to initialize database.");
+               goto exit;
+       }
+
+       /* initialize the naming deamon */
+       namedev_init();
+
+       if (strcmp(action, "add") == 0)
+               retval = udev_add_device(device, argv[1]);
+
+       else if (strcmp(action, "remove") == 0)
+               retval = udev_remove_device(device, argv[1]);
+
+       else {
+               dbg("Unknown action: %s", action);
+               retval = -EINVAL;

        }
        }

+       udevdb_exit();

 
 

-       return 0;
+exit:  
+       return retval;

 }
 
 }