rules: SUSE - move last distro rule to package

[elogind.git] / udev / udevadm.c

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 99ac3300829ae9c8382e0f79928e323835c6d767..19b89ad05cbfb9cbf5ac38cbf8cff5d6e9b836f9 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,11 @@ static void log_fn(struct udev *udev, int priority,
                fprintf(stderr, "%s: ", fn);
                vfprintf(stderr, format, args);
        } else {
+               va_list args2;
+
+               va_copy(args2, args);
+               vfprintf(stderr, format, args2);
+               va_end(args2);
                vsyslog(priority, format, args);
        }
 }
@@ -131,7 +136,6 @@ int main(int argc, char *argv[])
        };
        const char *command;
        int i;
-       const char *pos;
        int rc = 1;
 
        udev = udev_new();
@@ -142,37 +146,7 @@ int main(int argc, char *argv[])
        udev_set_log_fn(udev, log_fn);
        udev_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;
-               }
-       }
-
-       while (1) {
+       for (;;) {
                int option;
 
                option = getopt_long(argc, argv, "+dhV", options, NULL);