[PATCH] cleanup db functions

[elogind.git] / udevtest.c

diff --git a/udevtest.c b/udevtest.c
index dd8375aa5cfe774814fa3c7872cbec5bd2924dd1..4e02ac7dbc2b4f351947c1793a31d68ba405a11e 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -27,26 +27,20 @@
 #include <ctype.h>
 #include <signal.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_sysfs.h"
+#include "udev_utils.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
+#include "logging.h"
 
-/* global variables */
-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_list args;
 
-       /* FIXME use level... */
        va_start(args, format);
        vprintf(format, args);
        va_end(args);
@@ -55,113 +49,71 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
-{
-       switch (signum) {
-               case SIGINT:
-               case SIGTERM:
-                       exit(20 + signum);
-               default:
-                       dbg("unhandled signal");
-       }
-}
-
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
+int main(int argc, char *argv[], char *envp[])
 {
+       struct sysfs_class_device *class_dev;
        char *devpath;
+       char path[SYSFS_PATH_MAX];
+       char temp[NAME_SIZE];
+       struct udevice udev;
+       char *subsystem = NULL;
 
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-static char *subsystem_blacklist[] = {
-       "net",
-       "scsi_host",
-       "scsi_device",
-       "usb_host",
-       "pci_bus",
-       "",
-};
+       info("version %s", UDEV_VERSION);
 
-static int udev_hotplug(int argc, char **argv)
-{
-       char *devpath;
-       char *subsystem;
-       int retval = -EINVAL;
-       int i;
-       struct sigaction act;
-
-       devpath = argv[1];
-       if (!devpath) {
-               dbg("no devpath?");
-               goto exit;
-       }
-       dbg("looking at '%s'", devpath);
-
-       /* 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;
-       }
-
-       /* 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++;
+       if (argc < 2 || argc > 3) {
+               info("Usage: udevtest <devpath> [subsystem]");
+               return 1;
        }
 
        /* initialize our configuration */
        udev_init_config();
 
-       /* set up a default signal handler for now */
-       act.sa_handler = sig_handler;
-       sigemptyset (&act.sa_mask);
-       act.sa_flags = SA_RESTART;
-       sigaction(SIGINT, &act, NULL);
-       sigaction(SIGTERM, &act, NULL);
+       /* remove sysfs_path if given */
+       if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+               devpath = &argv[1][strlen(sysfs_path)] ;
+       }
+       else
+               if (argv[1][0] != '/') {
+                       /* prepend '/' if missing */
+                       strfieldcpy(temp, "/");
+                       strfieldcat(temp, argv[1]);
+                       devpath = temp;
+               } else {
+                       devpath = argv[1];
+               }
+
+       info("looking at '%s'", devpath);
 
        /* initialize the naming deamon */
        namedev_init();
 
-       retval = udev_add_device(devpath, subsystem, 1);
+       if (argc == 3)
+               subsystem = argv[2];
 
-exit:
-       if (retval > 0)
-               retval = 0;
+       /* fill in values and test_run flag*/
+       udev_init_device(&udev, devpath, subsystem);
 
-       return -retval;
-}
+       /* skip subsystems without "dev", but handle net devices */
+       if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
+               info("don't care about '%s' devices", udev.subsystem);
+               return 2;
+       }
 
-int main(int argc, char **argv, char **envp)
-{
-       main_argv = argv;
-       main_envp = envp;
+       /* open the device */
+       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+       class_dev = sysfs_open_class_device_path(path);
+       if (class_dev == NULL) {
+               info("sysfs_open_class_device_path failed");
+               return 1;
+       }
 
-       dbg("version %s", UDEV_VERSION);
+       info("opened class_dev->name='%s'", class_dev->name);
 
-       return udev_hotplug(argc, argv);
-}
+       /* simulate node creation with test flag */
+       udev.test_run = 1;
+       udev_add_device(&udev, class_dev);
 
+       sysfs_close_class_device(class_dev);
 
+       return 0;
+}