X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=130a71b3d0db6e9d17e65f5f54eb65a2b9767f45;hp=50020b57d9a28640e5933d28fe00f58020b2c1f7;hb=6415f8973241c6d854067f488f8419f0251c0336;hpb=033e9f8cde5a7feec1334888aec69def99c945b5 diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c index 50020b57d..130a71b3d 100644 --- a/udev/udevadm-control.c +++ b/udev/udevadm-control.c @@ -30,156 +30,145 @@ 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" + " --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[]) +static int adm_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[] = { + { "exit", no_argument, NULL, 'e' }, { "log-priority", required_argument, NULL, 'l' }, - { "log_priority", required_argument, NULL, 'l' + 256 }, { "stop-exec-queue", no_argument, NULL, 's' }, - { "stop_exec_queue", no_argument, NULL, 's' + 256 }, { "start-exec-queue", no_argument, NULL, 'S' }, - { "start_exec_queue", no_argument, NULL, 'S' + 256}, { "reload-rules", no_argument, NULL, 'R' }, - { "reload_rules", no_argument, NULL, 'R' + 256}, - { "env", required_argument, NULL, 'e' }, - { "max-childs", required_argument, NULL, 'm' }, - { "max_childs", required_argument, NULL, 'm' + 256}, + { "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); + uctrl = udev_ctrl_new(udev); 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: + 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, util_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 '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"); + case 't': { + int seconds; - if (!strncmp(arg, "log_priority=", strlen("log_priority="))) { - udev_ctrl_send_set_log_level(uctrl, util_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, "env", strlen("env"))) { - udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]); + seconds = atoi(optarg); + if (seconds >= 0) + timeout = seconds; + else + fprintf(stderr, "invalid timeout value\n"); + break; + } + case 'h': + print_help(); rc = 0; - goto exit; + break; } } - if (rc != 0) { - fprintf(stderr, "unrecognized command\n"); - err(udev, "unrecognized command\n"); - } -exit: + if (argv[optind] != NULL) + fprintf(stderr, "unknown option\n"); + else if (optind == 1) + fprintf(stderr, "missing option\n"); +out: udev_ctrl_unref(uctrl); return rc; } + +const struct udevadm_cmd udevadm_control = { + .name = "control", + .cmd = adm_control, + .help = "control the udev daemon", +};