X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=69da86563de6fb4f2038d2d47bbbde6ccb66f702;hp=c710811ed4995636daa8d49f31e5c65d69b2a045;hb=b466e9ab3951207a3c0c8d2ba6167be1eac1e41a;hpb=bd770e018301edd34c53d276872865ca13e824fa diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c index c710811ed..69da86563 100644 --- a/udev/udevadm-control.c +++ b/udev/udevadm-control.c @@ -1,23 +1,17 @@ /* - * Copyright (C) 2005-2006 Kay Sievers + * Copyright (C) 2005-2008 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. */ -#include "config.h" - #include #include #include @@ -36,173 +30,134 @@ static void print_help(void) { printf("Usage: udevadm control COMMAND\n" + " --exit instruct the daemon to cleanup and exit\n" " --log-priority= set the udev log level for the daemon\n" " --stop-exec-queue keep udevd from executing events, queue only\n" " --start-exec-queue execute events, flush queue\n" " --reload-rules reloads the rules files\n" - " --env== set a global environment variable\n" - " --max-childs= maximum number of childs\n" - " --max-childs-running= maximum number of childs running at the same time\n" + " --property== set a global property for all events\n" + " --children-max= maximum number of children\n" + " --timeout= maximum time to block for a reply\n" " --help print this help text\n\n"); } int udevadm_control(struct udev *udev, int argc, char *argv[]) { struct udev_ctrl *uctrl = NULL; + int timeout = 60; int rc = 1; - /* compat values with '_' will be removed in a future release */ static const struct option options[] = { - { "log-priority", 1, NULL, 'l' }, - { "log_priority", 1, NULL, 'l' + 256 }, - { "stop-exec-queue", 0, NULL, 's' }, - { "stop_exec_queue", 0, NULL, 's' + 256 }, - { "start-exec-queue", 0, NULL, 'S' }, - { "start_exec_queue", 0, NULL, 'S' + 256}, - { "reload-rules", 0, NULL, 'R' }, - { "reload_rules", 0, NULL, 'R' + 256}, - { "env", 1, NULL, 'e' }, - { "max-childs", 1, NULL, 'm' }, - { "max_childs", 1, NULL, 'm' + 256}, - { "max-childs-running", 1, NULL, 'M' }, - { "max_childs_running", 1, NULL, 'M' + 256}, - { "help", 0, NULL, 'h' }, + { "exit", no_argument, NULL, 'e' }, + { "log-priority", required_argument, NULL, 'l' }, + { "stop-exec-queue", no_argument, NULL, 's' }, + { "start-exec-queue", no_argument, NULL, 'S' }, + { "reload-rules", no_argument, NULL, 'R' }, + { "property", required_argument, NULL, 'p' }, + { "env", required_argument, NULL, 'p' }, + { "children-max", required_argument, NULL, 'm' }, + { "timeout", required_argument, NULL, 't' }, + { "help", no_argument, NULL, 'h' }, {} }; if (getuid() != 0) { fprintf(stderr, "root privileges required\n"); - goto exit; + return 1; } uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH); if (uctrl == NULL) - goto exit; + return 2; - while (1) { + for (;;) { int option; - int i; - char *endp; - option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL); + option = getopt_long(argc, argv, "el:sSRp:m:h", options, NULL); if (option == -1) break; - if (option > 255) { - fprintf(stderr, "udevadm control expects commands without underscore, " - "this will stop working in a future release\n"); - err(udev, "udevadm control expects commands without underscore, " - "this will stop working in a future release\n"); - } - switch (option) { - case 'l': - case 'l' + 256: - i = log_priority(optarg); + case 'e': + if (udev_ctrl_send_exit(uctrl, timeout) < 0) + rc = 2; + else + rc = 0; + break; + case 'l': { + int i; + + i = util_log_priority(optarg); if (i < 0) { fprintf(stderr, "invalid number '%s'\n", optarg); - goto exit; + goto out; } - udev_ctrl_send_set_log_level(uctrl, log_priority(optarg)); - rc = 0; + if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg), timeout) < 0) + rc = 2; + else + rc = 0; break; + } case 's': - case 's' + 256: - udev_ctrl_send_stop_exec_queue(uctrl); - rc = 0; + if (udev_ctrl_send_stop_exec_queue(uctrl, timeout) < 0) + rc = 2; + else + rc = 0; break; case 'S': - case 'S' + 256: - udev_ctrl_send_start_exec_queue(uctrl); - rc = 0; + if (udev_ctrl_send_start_exec_queue(uctrl, timeout) < 0) + rc = 2; + else + rc = 0; break; case 'R': - case 'R' + 256: - udev_ctrl_send_reload_rules(uctrl); - rc = 0; + if (udev_ctrl_send_reload_rules(uctrl, timeout) < 0) + rc = 2; + else + rc = 0; break; - case 'e': + case 'p': if (strchr(optarg, '=') == NULL) { - fprintf(stderr, "expect = instead of '%s'\n", optarg); - goto exit; + fprintf(stderr, "expect = instead of '%s'\n", optarg); + goto out; } - udev_ctrl_send_set_env(uctrl, optarg); - rc = 0; + if (udev_ctrl_send_set_env(uctrl, optarg, timeout) < 0) + rc = 2; + else + rc = 0; break; - case 'm': - case 'm' + 256: + case 'm': { + char *endp; + int i; + i = strtoul(optarg, &endp, 0); if (endp[0] != '\0' || i < 1) { fprintf(stderr, "invalid number '%s'\n", optarg); - goto exit; + goto out; } - udev_ctrl_send_set_max_childs(uctrl, i); - rc = 0; + if (udev_ctrl_send_set_children_max(uctrl, i, timeout) < 0) + rc = 2; + else + rc = 0; break; - case 'M': - case 'M' + 256: - i = strtoul(optarg, &endp, 0); - if (endp[0] != '\0' || i < 1) { - fprintf(stderr, "invalid number '%s'\n", optarg); - goto exit; - } - udev_ctrl_send_set_max_childs_running(uctrl, i); - rc = 0; + } + case 't': { + int seconds; + + seconds = atoi(optarg); + if (seconds >= 0) + timeout = seconds; + else + fprintf(stderr, "invalid timeout value\n"); break; + } case 'h': print_help(); rc = 0; - goto exit; - default: - goto exit; - } - } - - /* compat stuff which will be removed in a future release */ - if (argv[optind] != NULL) { - const char *arg = argv[optind]; - - fprintf(stderr, "udevadm control commands requires the -- format, " - "this will stop working in a future release\n"); - err(udev, "udevadm control commands requires the -- format, " - "this will stop working in a future release\n"); - - if (!strncmp(arg, "log_priority=", strlen("log_priority="))) { - udev_ctrl_send_set_log_level(uctrl, log_priority(&arg[strlen("log_priority=")])); - rc = 0; - goto exit; - } else if (!strcmp(arg, "stop_exec_queue")) { - udev_ctrl_send_stop_exec_queue(uctrl); - rc = 0; - goto exit; - } else if (!strcmp(arg, "start_exec_queue")) { - udev_ctrl_send_start_exec_queue(uctrl); - rc = 0; - goto exit; - } else if (!strcmp(arg, "reload_rules")) { - udev_ctrl_send_reload_rules(uctrl); - rc = 0; - goto exit; - } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) { - udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0)); - rc = 0; - goto exit; - } else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) { - udev_ctrl_send_set_max_childs_running(uctrl, strtoul(&arg[strlen("max_childs_running=")], NULL, 0)); - rc = 0; - goto exit; - } else if (!strncmp(arg, "env", strlen("env"))) { - udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]); - rc = 0; - goto exit; + break; } } - - if (rc != 0) { - fprintf(stderr, "unrecognized command\n"); - err(udev, "unrecognized command\n"); - } -exit: +out: udev_ctrl_unref(uctrl); return rc; }