chiark / gitweb /
[PATCH] minor grammer fixes for the udev_vs_devfs document
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index b3e18ff9daec621fb87d89486e54d0fce04af6ab..0d0a5da2074d22d1ab731831021da0570dd72946 100644 (file)
--- a/udev.c
+++ b/udev.c
 #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 sysfs_path[SYSFS_PATH_MAX];
+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 char *get_action(void)
+static inline char *get_action(void)
 {
        char *action;
 
@@ -44,272 +66,172 @@ 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;
 }
 
-/* 
- * Right now the major/minor of a device is stored in a file called
- * "dev" in sysfs.
- * The number is stored as:
- *     MMmm
- *             MM is the major
- *             mm is the minor
- *             The value is in hex.
- * Yes, this will probably change when we go to a bigger major/minor
- * range, and will have to be changed at that time.
- */
-static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
+static inline char *get_seqnum(void)
 {
-       char temp[3];
-       int retval = 0;
-
-       char *dev;
-
-       dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
-       if (dev == NULL)
-               return -ENODEV;
-
-       dbg("dev = %s", dev);
-
-       temp[0] = dev[0];
-       temp[1] = dev[1];
-       temp[2] = 0x00;
-       *major = (int)strtol(&temp[0], NULL, 16);
+       char *seqnum;
 
-       temp[0] = dev[2];
-       temp[1] = dev[3];
-       temp[2] = 0x00;
-       *minor = (int)strtol(&temp[0], NULL, 16);
-
-       dbg("found major = %d, minor = %d", *major, *minor);
-
-       retval = 0;
-       return retval;
+       seqnum = getenv("SEQNUM");
+       return seqnum;
 }
 
-/*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
- */
-static char *get_name(char *dev, int major, int minor)
+static inline int udev_user(int argc, char **argv)
 {
-       static char name[100];
-       char *temp;
-
-       temp = strrchr(dev, '/');
-       if (temp == NULL)
-               return NULL;
-       strncpy(name, &temp[1], sizeof(name));
-
-       dbg("name is %s", name);
-
-       return &name[0];
-}
+       static const char short_options[] = "q:rVh";
+       int option;
+       int retval = -EINVAL;
+       struct udevice dev;
 
-/*
- * We also want to add some permissions here, and possibly some symlinks
- */
-static int create_node(char *name, char type, int major, int minor, int mode)
-{
-       char *argv[7];
-       char mode_string[100];
-       char type_string[3];
-       char major_string[20];
-       char minor_string[20];
-       char filename[255];
-       int retval = 0;
-
-       strncpy(filename, UDEV_ROOT, sizeof(filename));
-       strncat(filename, name, sizeof(filename));
-
-       snprintf(mode_string, sizeof(mode_string), "--mode=%#o", mode);
-       snprintf(type_string, sizeof(type_string), "%c", type);
-       snprintf(major_string, sizeof(major_string), "%d", major);
-       snprintf(minor_string, sizeof(minor_string), "%d", minor);
-       
-       argv[0] = MKNOD;
-       argv[1] = mode_string;
-       argv[2] = filename;
-       argv[3] = type_string;
-       argv[4] = major_string;
-       argv[5] = minor_string;
-       argv[6] = NULL;
-       dbg ("executing %s %s %s %s %s %s",
-               argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
-       switch (fork()) {
-               case 0:
-                       /* we are the child, so lets run the program */
-                       execv (MKNOD, argv);
-                       exit(0);
-                       break;
-               case (-1):
-                       dbg ("fork failed.");
-                       retval = -EFAULT;
+       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:
-                       break;
+                       goto help;
+               }
        }
-       return retval;
-}
-
-/*
- * We also want to clean up any symlinks that were created in create_node()
- */
-static int delete_node(char *name)
-{
-       char filename[255];
 
-       strncpy(filename, UDEV_ROOT, sizeof(filename));
-       strncat(filename, name, sizeof(filename));
+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");
 
-       dbg("unlinking %s", filename);
-       return unlink(filename);
+       return retval;
 }
 
-struct sysfs_class_device *get_class_dev(char *device_name)
+static inline int udev_hotplug(int argc, char **argv)
 {
-       char dev_path[SYSFS_PATH_MAX];
-       struct sysfs_class_device *class_dev;
-
-       strcpy(dev_path, sysfs_path);
-       strcat(dev_path, device_name);
+       char *action;
+       char *devpath;
+       char *subsystem;
+       int retval = -EINVAL;
 
-       dbg("looking at %s", dev_path);
+       subsystem = argv[1];
 
-       /* open up the sysfs class device for this thing... */
-       class_dev = sysfs_open_class_device(dev_path);
-       if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device failed");
-               return NULL;
+       devpath = get_devpath();
+       if (!devpath) {
+               dbg ("no devpath?");
+               goto exit;
        }
-       dbg("class_dev->name = %s", class_dev->name);
+       dbg("looking at '%s'", devpath);
 
-       return class_dev;
-}
-
-static int add_device(char *device, char *subsystem)
-{
-       struct sysfs_class_device *class_dev;
-       struct device_attr attr;
-       //char *name;
-       int major;
-       int minor;
-       char type;
-       //int mode;
-       int retval = -EINVAL;
+       /* we only care about class devices and block stuff */
+       if (!strstr(devpath, "class") &&
+           !strstr(devpath, "block")) {
+               dbg("not a block or class device");
+               goto exit;
+       }
 
-       /* for now, the block layer is the only place where block devices are */
-       if (strcmp(subsystem, "block") == 0)
-               type = 'b';
-       else
-               type = 'c';
+       /* but we don't care about net class devices */
+       if (strcmp(subsystem, "net") == 0) {
+               dbg("don't care about net devices");
+               goto exit;
+       }
 
-       class_dev = get_class_dev(device);
-       if (class_dev == NULL)
+       action = get_action();
+       if (!action) {
+               dbg ("no action?");
                goto exit;
+       }
 
-       retval = namedev_name_device(class_dev, &attr);
-       if (retval)
-               return retval;
+       /* connect to the system message bus */
+       sysbus_connect();
 
-       retval = get_major_minor(class_dev, &major, &minor);
-       if (retval) {
-               dbg ("get_major_minor failed");
-               goto exit;
+       /* initialize udev database */
+       retval = udevdb_init(UDEVDB_DEFAULT);
+       if (retval != 0) {
+               dbg("unable to initialize database");
+               goto exit_sysbus;
        }
 
-       sysfs_close_class_device(class_dev);
+       /* set up a default signal handler for now */
+       signal(SIGINT, sig_handler);
+       signal(SIGTERM, sig_handler);
+       signal(SIGKILL, sig_handler);
 
-       return create_node(attr.name, type, major, minor, attr.mode);
+       /* initialize the naming deamon */
+       namedev_init();
 
-exit:
-       return retval;
-}
+       if (strcmp(action, "add") == 0)
+               retval = udev_add_device(devpath, subsystem);
 
-static int remove_device(char *device)
-{
-       char *name;
-       int retval = 0;
+       else if (strcmp(action, "remove") == 0)
+               retval = udev_remove_device(devpath, subsystem);
 
-       name = get_name(device, 0, 0);
-       if (name == NULL) {
-               dbg ("get_name failed");
-               retval = -ENODEV;
-               goto exit;
+       else {
+               dbg("unknown action '%s'", action);
+               retval = -EINVAL;
        }
+       udevdb_exit();
 
-       return delete_node(name);
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
 
 exit:
        return retval;
 }
-       
-static int udev_init(void)
-{
-       int retval;
-
-       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-       dbg("sysfs_path = %s", sysfs_path);
-       return retval;
-}
 
-int main(int argc, char *argv[])
+int main(int argc, char **argv, char **envp)
 {
-       char *action;
-       char *device;
-       int retval = -EINVAL;
-       
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
-               goto exit;
-       }
+       main_argv = argv;
+       main_envp = envp;
+       int retval;
 
-       device = get_device();
-       if (!device) {
-               dbg ("no device?");
-               goto exit;
-       }
-       dbg("looking at %s", device);
+       dbg("version %s", UDEV_VERSION);
 
-       /* we only care about class devices and block stuff */
-       if (!strstr(device, "class") &&
-           !strstr(device, "block")) {
-               dbg("not block or class");
-               goto exit;
-       }
-       
-       /* sleep for a second or two to give the kernel a chance to
-        * create the dev file
-        */
-       sleep(1);
+       /* initialize our configuration */
+       udev_init_config();
 
-       udev_init();
-       namedev_init();
-
-       action = get_action();
-       if (!action) {
-               dbg ("no action?");
-               goto exit;
+       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);
        }
 
-       if (strcmp(action, "add") == 0)
-               return add_device(device, argv[1]);
-
-       if (strcmp(action, "remove") == 0)
-               return remove_device(device);
-
-       dbg("Unknown action: %s", action);
-       return -EINVAL;
-
-       retval = 0;
-exit:  
        return retval;
 }
 
+