udevadm: print all messages to stderr with priority higher or equal than LOG_ERR

[elogind.git] / udev / udevadm.c

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 8fd976a6deac47db644279d72811bb947c0f54d3..3d94215ba97d04524516eca820354304973f5262 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007-2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  * 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
@@ -35,6 +35,8 @@ static void log_fn(struct udev *udev, int priority,
                fprintf(stderr, "%s: ", fn);
                vfprintf(stderr, format, args);
        } else {
+               if (priority <= LOG_ERR)
+                       vfprintf(stderr, format, args);
                vsyslog(priority, format, args);
        }
 }
@@ -79,7 +81,7 @@ static const struct command cmds[] = {
        },
        {
                .name = "settle",
-               .cmd = udevadm_settle, "",
+               .cmd = udevadm_settle,
                .help = "wait for the event queue to finish",
        },
        {
@@ -131,46 +133,15 @@ int main(int argc, char *argv[])
        };
        const char *command;
        int i;
-       const char *pos;
        int rc = 1;
 
        udev = udev_new();
        if (udev == NULL)
                goto out;
 
-       logging_init("udevadm");
+       udev_log_init("udevadm");
        udev_set_log_fn(udev, log_fn);
-       selinux_init(udev);
-
-       /* see if we are a compat link, this will be removed in a future release */
-       command = argv[0];
-       pos = strrchr(command, '/');
-       if (pos != NULL)
-               command = &pos[1];
-
-       /* the trailing part of the binary or link name is the command */
-       if (strncmp(command, "udev", 4) == 0)
-               command = &command[4];
-
-       for (i = 0; cmds[i].cmd != NULL; i++) {
-               if (strcmp(cmds[i].name, command) == 0) {
-                       char path[128];
-                       char prog[512];
-                       ssize_t len;
-
-                       snprintf(path, sizeof(path), "/proc/%lu/exe", (unsigned long) getppid());
-                       len = readlink(path, prog, sizeof(prog));
-                       if (len > 0) {
-                               prog[len] = '\0';
-                               fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-                                      "this will stop working in a future release\n", prog, argv[0], command);
-                               err(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-                                   "this will stop working in a future release\n", prog, argv[0], command);
-                       }
-                       rc = run_command(udev, &cmds[i], argc, argv);
-                       goto out;
-               }
-       }
+       udev_selinux_init(udev);
 
        while (1) {
                int option;
@@ -200,7 +171,9 @@ int main(int argc, char *argv[])
        if (command != NULL)
                for (i = 0; cmds[i].cmd != NULL; i++) {
                        if (strcmp(cmds[i].name, command) == 0) {
-                               optind++;
+                               argc -= optind;
+                               argv += optind;
+                               optind = 0;
                                rc = run_command(udev, &cmds[i], argc, argv);
                                goto out;
                        }
@@ -210,8 +183,8 @@ int main(int argc, char *argv[])
        help(udev, argc, argv);
        rc = 2;
 out:
-       selinux_exit(udev);
+       udev_selinux_exit(udev);
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return rc;
 }