[PATCH] minor grammer fixes for the udev_vs_devfs document

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 74572625afaae0830175bcf653e2063fc3d0b7b3..0d0a5da2074d22d1ab731831021da0570dd72946 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -27,14 +27,38 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
+#include <signal.h>
+#include <stdarg.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 void sig_handler(int signum)
+{
+       dbg("caught signal %d", signum);
+       switch (signum) {
+               case SIGINT:
+               case SIGTERM:
+               case SIGKILL:
+                       sysbus_disconnect();
+                       udevdb_exit();
+                       exit(20 + signum);
+                       break;
+               default:
+                       dbg("unhandled signal");
+       }
+}
+
+static inline char *get_action(void)
 {
        char *action;
 
@@ -42,40 +66,99 @@ static char *get_action(void)
        return action;
 }
 
+static inline char *get_devpath(void)
+{
+       char *devpath;
 
-static char *get_device(void)
+       devpath = getenv("DEVPATH");
+       return devpath;
+}
+
+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[])
+static inline int udev_user(int argc, char **argv)
+{
+       static const char short_options[] = "q:rVh";
+       int option;
+       int retval = -EINVAL;
+       struct udevice dev;
+
+       while (1) {
+               option = getopt(argc, argv, short_options);
+               if (option == -1)
+                       break;
+
+               dbg("option '%c'", option);
+               switch (option) {
+               case 'q':
+                       dbg("udev query: %s\n", optarg);
+                       retval = udevdb_open_ro();
+                       if (retval != 0) {
+                               printf("unable to open udev database\n");
+                               return -1;
+                       }
+                       retval = udevdb_get_dev(optarg, &dev);
+                       if (retval == 0) {
+                               printf("%s\n", dev.name);
+                       } else {
+                               printf("device not found in udev database\n");
+                       }
+                       udevdb_exit();
+                       return retval;
+
+               case 'r':
+                       printf("%s\n", udev_root);
+                       return 0;
+
+               case 'V':
+                       printf("udev, version %s\n", UDEV_VERSION);
+                       return 0;
+
+               case 'h':
+                       retval = 0;
+               case '?':
+               default:
+                       goto help;
+               }
+       }
+
+help:
+       printf("Usage: [-qrVh]\n"
+              "  -q <path>  query database for the name of the created node\n"
+              "  -r         print udev root\n"
+              "  -V         print udev version\n"
+              "  -h         print this help text\n"
+              "\n");
+
+       return retval;
+}
+
+static inline int udev_hotplug(int argc, char **argv)
 {
        char *action;
-       char *device;
+       char *devpath;
        char *subsystem;
        int retval = -EINVAL;
-       
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
-               goto exit;
-       }
 
        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;
        }
 
@@ -91,19 +174,64 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
+       /* 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_sysbus;
+       }
+
+       /* set up a default signal handler for now */
+       signal(SIGINT, sig_handler);
+       signal(SIGTERM, sig_handler);
+       signal(SIGKILL, sig_handler);
+
        /* initialize the naming deamon */
        namedev_init();
 
        if (strcmp(action, "add") == 0)
-               return udev_add_device(device, argv[1]);
+               retval = udev_add_device(devpath, subsystem);
+
+       else if (strcmp(action, "remove") == 0)
+               retval = udev_remove_device(devpath, subsystem);
+
+       else {
+               dbg("unknown action '%s'", action);
+               retval = -EINVAL;
+       }
+       udevdb_exit();
+
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
 
-       if (strcmp(action, "remove") == 0)
-               return udev_remove_device(device, argv[1]);
+exit:
+       return retval;
+}
+
+int main(int argc, char **argv, char **envp)
+{
+       main_argv = argv;
+       main_envp = envp;
+       int retval;
 
-       dbg("Unknown action: %s", action);
-       retval = -EINVAL;
+       dbg("version %s", UDEV_VERSION);
+
+       /* initialize our configuration */
+       udev_init_config();
+
+       if (argc == 2 && argv[1][0] != '-') {
+               dbg("called by hotplug");
+               retval = udev_hotplug(argc, argv);
+       } else {
+               dbg("called by user");
+               retval = udev_user(argc, argv);
+       }
 
-exit:  
        return retval;
 }
 
+