X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.c;h=19b89ad05cbfb9cbf5ac38cbf8cff5d6e9b836f9;hp=863bc467f0fb31a8c5ad89c3aedee1862223f47e;hb=52934a60c447ae78873b07a01b7fa25e60c86fe4;hpb=742f4cad0d7c4af0a5d27ac6597be7410fa127e6 diff --git a/udev/udevadm.c b/udev/udevadm.c index 863bc467f..19b89ad05 100644 --- a/udev/udevadm.c +++ b/udev/udevadm.c @@ -1,23 +1,20 @@ /* - * Copyright (C) 2007 Kay Sievers + * Copyright (C) 2007-2009 Kay Sievers * - * 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 - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * 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 Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "config.h" - #include #include #include @@ -30,45 +27,46 @@ static int debug; -#ifdef USE_LOG -void log_message(int priority, const char *format, ...) +static void log_fn(struct udev *udev, int priority, + const char *file, int line, const char *fn, + const char *format, va_list args) { - va_list args; - - if (priority > udev_log_priority) - return; - - va_start(args, format); - if (debug) - vprintf(format, args); - else + if (debug) { + 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); - va_end(args); + } } -#endif struct command { const char *name; - int (*cmd)(int argc, char *argv[]); + int (*cmd)(struct udev *udev, int argc, char *argv[]); const char *help; int debug; }; static const struct command cmds[]; -static int version(int argc, char *argv[]) +static int version(struct udev *udev, int argc, char *argv[]) { printf("%s\n", VERSION); return 0; } -static int help(int argc, char *argv[]) +static int help(struct udev *udev, int argc, char *argv[]) { const struct command *cmd; - printf("Usage: udevadm COMMAND [OPTIONS]\n"); + printf("Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n"); for (cmd = cmds; cmd->name != NULL; cmd++) - printf(" %-12s %s\n", cmd->name, cmd->help); + if (cmd->help != NULL) + printf(" %-12s %s\n", cmd->name, cmd->help); printf("\n"); return 0; } @@ -76,98 +74,120 @@ static int help(int argc, char *argv[]) static const struct command cmds[] = { { .name = "info", - .cmd = udevinfo, + .cmd = udevadm_info, .help = "query sysfs or the udev database", }, { .name = "trigger", - .cmd = udevtrigger, + .cmd = udevadm_trigger, .help = "request events from the kernel", }, { .name = "settle", - .cmd = udevsettle, "", + .cmd = udevadm_settle, .help = "wait for the event queue to finish", }, { .name = "control", - .cmd = udevcontrol, + .cmd = udevadm_control, .help = "control the udev daemon", }, { .name = "monitor", - .cmd = udevmonitor, + .cmd = udevadm_monitor, .help = "listen to kernel and udev events", }, { .name = "test", - .cmd = udevtest, + .cmd = udevadm_test, .help = "simulation run", .debug = 1, }, { .name = "version", .cmd = version, - .help = "print the version number", }, { .name = "help", .cmd = help, - .help = "print this help text", }, {} }; +static int run_command(struct udev *udev, const struct command *cmd, int argc, char *argv[]) +{ + if (cmd->debug) { + debug = 1; + if (udev_get_log_priority(udev) < LOG_INFO) + udev_set_log_priority(udev, LOG_INFO); + } + info(udev, "calling: %s\n", cmd->name); + return cmd->cmd(udev, argc, argv); +} + int main(int argc, char *argv[]) { - const char *command = argv[1]; + struct udev *udev; + static const struct option options[] = { + { "debug", no_argument, NULL, 'd' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + {} + }; + const char *command; int i; - const char *pos; - int rc; + int rc = 1; + + udev = udev_new(); + if (udev == NULL) + goto out; + + udev_log_init("udevadm"); + udev_set_log_fn(udev, log_fn); + udev_selinux_init(udev); + + for (;;) { + int option; + + option = getopt_long(argc, argv, "+dhV", options, NULL); + if (option == -1) + break; + + switch (option) { + case 'd': + debug = 1; + if (udev_get_log_priority(udev) < LOG_INFO) + udev_set_log_priority(udev, LOG_INFO); + break; + case 'h': + rc = help(udev, argc, argv); + goto out; + case 'V': + rc = version(udev, argc, argv); + goto out; + default: + goto out; + } + } + command = argv[optind]; - /* find command */ if (command != NULL) for (i = 0; cmds[i].cmd != NULL; i++) { if (strcmp(cmds[i].name, command) == 0) { - debug = cmds[i].debug; - rc = cmds[i].cmd(argc-1, &argv[1]); + argc -= optind; + argv += optind; + optind = 0; + rc = run_command(udev, &cmds[i], argc, argv); goto out; } } - /* try to find compat link, 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 ', " - "this will stop working in a future release\n", prog, argv[0], command); - info("the program '%s' called '%s', it should use 'udevadm %s ', " - "this will stop working in a future release\n", prog, argv[0], command); - } - debug = cmds[i].debug; - rc = cmds[i].cmd(argc, argv); - goto out; - } - } - - fprintf(stderr, "unknown command, try help\n\n"); + fprintf(stderr, "missing or unknown command\n\n"); + help(udev, argc, argv); rc = 2; out: + udev_selinux_exit(udev); + udev_unref(udev); + udev_log_close(); return rc; }