chiark / gitweb /
[PATCH] remove udev_dbus.h from Makefile
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index b872f42494e68070e34452e6221dca619fb5e650..52b98c8d452efb8d99a94a82005d42ce797479ba 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <signal.h>
-#include <stdarg.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
 
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
+{
+       va_list args;
+
+       if (!udev_log)
+               return;
+
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
+}
+#endif
+
 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;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-static void print_record(char *path, struct udevice *dev)
-{
-       printf("P: %s\n", path);
-       printf("N: %s\n", dev->name);
-       printf("S: %s\n", dev->symlink);
-       printf("O: %s\n", dev->owner);
-       printf("G: %s\n", dev->group);
-       printf("\n");
-}
-
-enum query_type {
-       NONE,
-       NAME,
-       SYMLINK,
-       OWNER,
-       GROUP
-};
-
-static inline int udev_user(int argc, char **argv)
-{
-       static const char short_options[] = "dp:q:rVh";
-       int option;
-       int retval = -EINVAL;
-       struct udevice dev;
-       int root = 0;
-       enum query_type query = NONE;
-       char result[NAME_SIZE] = "";
-       char path[NAME_SIZE] = "";
-
-       /* get command line options */
-       while (1) {
-               option = getopt(argc, argv, short_options);
-               if (option == -1)
-                       break;
-
-               dbg("option '%c'", option);
-               switch (option) {
-               case 'p':
-                       dbg("udev path: %s\n", optarg);
-                       strfieldcpy(path, optarg);
-                       break;
-
-               case 'q':
-                       dbg("udev query: %s\n", optarg);
-
-                       if (strcmp(optarg, "name") == 0) {
-                               query = NAME;
-                               break;
-                       }
-
-                       if (strcmp(optarg, "symlink") == 0) {
-                               query = SYMLINK;
-                               break;
-                       }
-
-                       if (strcmp(optarg, "owner") == 0) {
-                               query = OWNER;
-                               break;
-                       }
-
-                       if (strcmp(optarg, "group") == 0) {
-                               query = GROUP;
-                               break;
-                       }
-
-                       printf("unknown query type\n");
-                       return -EINVAL;
-
-               case 'r':
-                       root = 1;
-                       break;
-
-               case 'd':
-                       retval = udevdb_open_ro();
-                       if (retval != 0) {
-                               printf("unable to open udev database\n");
-                               return -EACCES;
-                       }
-                       retval = udevdb_dump(print_record);
-                       udevdb_exit();
-                       return retval;
-
-               case 'V':
-                       printf("udev, version %s\n", UDEV_VERSION);
-                       return 0;
-
-               case 'h':
-                       retval = 0;
-               case '?':
-               default:
-                       goto help;
-               }
-       }
-
-       /* process options */
-       if (query != NONE) {
-               if (path[0] == '\0') {
-                       printf("query needs device path specified\n");
-                       return -EINVAL;
-               }
-
-               retval = udevdb_open_ro();
-               if (retval != 0) {
-                       printf("unable to open udev database\n");
-                       return -EACCES;
-               }
-               retval = udevdb_get_dev(path, &dev);
-               if (retval == 0) {
-                       switch(query) {
-                       case NAME:
-                               if (root)
-                               strfieldcpy(result, udev_root);
-                               strncat(result, dev.name, sizeof(result));
-                               break;
-
-                       case SYMLINK:
-                               strfieldcpy(result, dev.symlink);
-                               break;
-
-                       case GROUP:
-                               strfieldcpy(result, dev.group);
-                               break;
-
-                       case OWNER:
-                               strfieldcpy(result, dev.owner);
-                               break;
-
-                       default:
-                               break;
-                       }
-                       printf("%s\n", result);
-               } else {
-                       printf("device not found in udev database\n");
-               }
-               udevdb_exit();
-               return retval;
-       }
-
-       if (root) {
-               printf("%s\n", udev_root);
-               return 0;
-       }
-
-help:
-       printf("Usage: [-pqrdVh]\n"
-              "  -q TYPE  query database for the specified value:\n"
-              "             'name'    name of device node\n"
-              "             'symlink' pointing to node\n"
-              "             'owner'   of node\n"
-              "             'group'   of node\n"
-              "  -p PATH  sysfs device path used for query\n"
-              "  -r       print udev root\n"
-              "  -d       dump whole database\n"
-              "  -V       print udev version\n"
-              "  -h       print this help text\n"
-              "\n");
-       return retval;
-}
-
 static char *subsystem_blacklist[] = {
        "net",
        "scsi_host",
        "scsi_device",
        "usb_host",
        "pci_bus",
-       "",
+       "pcmcia_socket",
+       ""
 };
 
-static inline int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
 {
        char *action;
        char *devpath;
        char *subsystem;
        int retval = -EINVAL;
        int i;
+       struct sigaction act;
 
-       subsystem = argv[1];
+       action = get_action();
+       if (!action) {
+               dbg("no action?");
+               goto exit;
+       }
 
        devpath = get_devpath();
        if (!devpath) {
-               dbg ("no devpath?");
+               dbg("no devpath?");
                goto exit;
        }
        dbg("looking at '%s'", devpath);
@@ -276,6 +107,11 @@ static inline int udev_hotplug(int argc, char **argv)
        }
 
        /* skip blacklisted subsystems */
+       subsystem = get_subsystem(main_argv[1]);
+       if (!subsystem) {
+               dbg("no subsystem?");
+               goto exit;
+       }
        i = 0;
        while (subsystem_blacklist[i][0] != '\0') {
                if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -285,45 +121,33 @@ static inline int udev_hotplug(int argc, char **argv)
                i++;
        }
 
-       action = get_action();
-       if (!action) {
-               dbg ("no action?");
-               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;
+               goto exit;
        }
 
        /* 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)
-               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;
+       act.sa_handler = sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+
+       if (strcmp(action, "add") == 0) {
+               namedev_init();
+               retval = udev_add_device(devpath, subsystem, 0);
+       } 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();
+       udevdb_exit();
 
 exit:
        if (retval > 0)
@@ -332,26 +156,17 @@ exit:
        return -retval;
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
 {
-       int retval;
        main_argv = argv;
        main_envp = envp;
 
-       dbg("version %s", UDEV_VERSION);
+       init_logging("udev");
 
        /* 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);
-       }
+       dbg("version %s", UDEV_VERSION);
 
-       return retval;
+       return udev_hotplug();
 }
-
-