/*
- * 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
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);
}
}
},
{
.name = "settle",
- .cmd = udevadm_settle, "",
+ .cmd = udevadm_settle,
.help = "wait for the event queue to finish",
},
{
};
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);
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);
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;
}
out:
udev_selinux_exit(udev);
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}