" --start-exec-queue execute events, flush queue\n"
" --reload-rules reloads the rules files\n"
" --property=<KEY>=<value> set a global property for all events\n"
- " --max-childs=<N> maximum number of childs\n"
+ " --children-max=<N> maximum number of children\n"
" --help print this help text\n\n");
}
struct udev_ctrl *uctrl = NULL;
int rc = 1;
- /* compat values with '_' will be removed in a future release */
static const struct option options[] = {
{ "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},
{ "property", required_argument, NULL, 'p' },
{ "env", required_argument, NULL, 'p' },
- { "max-childs", required_argument, NULL, 'm' },
- { "max_childs", required_argument, NULL, 'm' + 256},
+ { "children-max", required_argument, NULL, 'm' },
{ "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:sSRp:m:M:h", options, NULL);
+ option = getopt_long(argc, argv, "l: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 = util_log_priority(optarg);
if (i < 0) {
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
- 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)) < 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) < 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) < 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) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'p':
if (strchr(optarg, '=') == NULL) {
- fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg);
+ fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
goto exit;
}
- udev_ctrl_send_set_env(uctrl, optarg);
- rc = 0;
+ if (udev_ctrl_send_set_env(uctrl, optarg) < 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(uctrl, i);
- rc = 0;
+ if (udev_ctrl_send_set_children_max(uctrl, i) < 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 --<command> format, "
- "this will stop working in a future release\n");
- err(udev, "udevadm control commands requires the --<command> 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, 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=")]);
- rc = 0;
- goto exit;
+ break;
}
}
- if (rc != 0) {
- fprintf(stderr, "unrecognized command\n");
+ if (rc == 1)
err(udev, "unrecognized command\n");
- }
exit:
udev_ctrl_unref(uctrl);
return rc;
~ianmdlvl / elogind.git / blobdiff