diff options
| author | Yang Zhiyong <yangzy.fnst@cn.fujitsu.com> | 2013-11-03 19:50:58 +0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-11-07 01:23:54 -0500 |
| commit | c5383e7942e5d7323406feec2f35ff25a7771919 (patch) | |
| tree | 0bd3803abfe7b22751c9848504bcceb2e0bb90a6 | |
| parent | 4e93793da8919a10adc9c96eb82f47c6b134abf2 (diff) | |
udevadm-trigger: add parameters checking
| -rw-r--r-- | src/udev/udevadm-trigger.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index f472996965..d10ca59cca 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -32,6 +32,7 @@ #include <sys/un.h> #include "udev.h" +#include "util.h" static int verbose; static int dry_run; @@ -111,8 +112,14 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) char buf[UTIL_PATH_SIZE]; option = getopt_long(argc, argv, "vng:o:t:hc:p:s:S:a:A:y:b:", options, NULL); - if (option == -1) + if (option == -1) { + if (optind < argc) { + fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]); + rc = 1; + goto exit; + } break; + } switch (option) { case 'v': @@ -133,7 +140,13 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) } break; case 'c': - action = optarg; + if (!nulstr_contains("add\0" "remove\0" "change\0", optarg)) { + log_error("unknown action '%s'\n", optarg); + rc = 2; + goto exit; + } else { + action = optarg; + } break; case 's': udev_enumerate_add_match_subsystem(udev_enumerate, optarg); |