[PATCH] add udevinfo to install target of Makefile

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 0d0a5da2074d22d1ab731831021da0570dd72946..4c67477c202882b6814e97c83005d822053080b8 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
@@ -24,16 +23,14 @@
 #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"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -82,71 +79,28 @@ static inline char *get_seqnum(void)
        return seqnum;
 }
 
-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 char *subsystem_blacklist[] = {
+       "net",
+       "scsi_host",
+       "scsi_device",
+       "usb_host",
+       "pci_bus",
+       "",
+};
 
-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;
 
-       subsystem = argv[1];
+       action = get_action();
+       if (!action) {
+               dbg ("no action?");
+               goto exit;
+       }
 
        devpath = get_devpath();
        if (!devpath) {
@@ -162,21 +116,23 @@ static inline int udev_hotplug(int argc, char **argv)
                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?");
-               goto exit;
+       /* skip blacklisted subsystems */
+       subsystem = argv[1];
+       i = 0;
+       while (subsystem_blacklist[i][0] != '\0') {
+               if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
+                       dbg("don't care about '%s' devices", subsystem);
+                       goto exit;
+               }
+               i++;
        }
 
        /* 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) {
@@ -209,29 +165,20 @@ exit_sysbus:
        sysbus_disconnect();
 
 exit:
-       return retval;
+       if (retval > 0)
+               retval = 0;
+
+       return -retval;
 }
 
 int main(int argc, char **argv, char **envp)
 {
        main_argv = argv;
        main_envp = envp;
-       int retval;
 
        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);
 }