fix spelling

[elogind.git] / udev / udevadm-control.c

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 12b1e45f236ef8728996879a5404f688eebb85d5..3eb03d8b04d63c48d990d62221db1725ec58e5c7 100644 (file)
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -12,8 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include "config.h"
-
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>
@@ -36,7 +34,7 @@ static void print_help(void)
                "  --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=<KEY>=<value>      set a global environment variable\n"
+               "  --property=<KEY>=<value> set a global property for all events\n"
                "  --max-childs=<N>         maximum number of childs\n"
                "  --help                   print this help text\n\n");
 }
@@ -48,18 +46,19 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 
        /* 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},
-               { "help", 0, NULL, 'h' },
+               { "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},
+               { "help", no_argument, NULL, 'h' },
                {}
        };
 
@@ -77,7 +76,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                int i;
                char *endp;
 
-               option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL);
+               option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL);
                if (option == -1)
                        break;
 
@@ -91,12 +90,12 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                switch (option) {
                case 'l':
                case 'l' + 256:
-                       i = log_priority(optarg);
+                       i = util_log_priority(optarg);
                        if (i < 0) {
                                fprintf(stderr, "invalid number '%s'\n", optarg);
                                goto exit;
                        }
-                       udev_ctrl_send_set_log_level(uctrl, log_priority(optarg));
+                       udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
                        rc = 0;
                        break;
                case 's':
@@ -114,9 +113,9 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                        udev_ctrl_send_reload_rules(uctrl);
                        rc = 0;
                        break;
-               case 'e':
+               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);
@@ -151,7 +150,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                    "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=")]));
+                       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")) {