chiark / gitweb /
[PATCH] more logging.h cleanups to be a bit more flexible.
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index b872f42494e68070e34452e6221dca619fb5e650..9f10cc212539466e5e03edc05016976d90069e24 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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#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"
 char **main_argv;
 char **main_envp;
 
+#ifdef LOG
+unsigned char logname[42];
+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");
        }
@@ -83,165 +91,6 @@ static inline char *get_seqnum(void)
        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",
@@ -251,15 +100,20 @@ static char *subsystem_blacklist[] = {
        "",
 };
 
-static inline int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(int argc, char **argv)
 {
        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) {
@@ -276,6 +130,7 @@ static inline int udev_hotplug(int argc, char **argv)
        }
 
        /* skip blacklisted subsystems */
+       subsystem = argv[1];
        i = 0;
        while (subsystem_blacklist[i][0] != '\0') {
                if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -285,15 +140,12 @@ 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 our configuration */
+       udev_init_config();
+
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
@@ -302,9 +154,11 @@ static inline int udev_hotplug(int argc, char **argv)
        }
 
        /* set up a default signal handler for now */
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGKILL, sig_handler);
+       act.sa_handler = sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
 
        /* initialize the naming deamon */
        namedev_init();
@@ -334,24 +188,13 @@ exit:
 
 int main(int argc, char **argv, char **envp)
 {
-       int retval;
        main_argv = argv;
        main_envp = envp;
 
+       init_logging("udev");
        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);
-       }
-
-       return retval;
+       return udev_hotplug(argc, argv);
 }