[systemd-devel] [PATCH] add parameters checking for 'udevadm trigger'
Yang Zhiyong
yangzy.fnst at cn.fujitsu.com
Tue Oct 22 11:10:01 CEST 2013
Signed-off-by: Yang Zhiyong <yangzy.fnst at cn.fujitsu.com>
---
src/udev/udevadm-trigger.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
mode change 100644 => 100755 src/udev/udevadm-trigger.c
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
old mode 100644
new mode 100755
index f472996..2c0f86d
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -111,8 +111,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, "unknown option\n");
+ rc = 1;
+ goto exit;
+ }
break;
+ }
switch (option) {
case 'v':
@@ -133,7 +139,13 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
}
break;
case 'c':
- action = optarg;
+ if (streq(optarg, "add") || streq(optarg, "change") || streq(optarg, "remove")) {
+ action = optarg;
+ } else {
+ log_error("unknown action '%s'\n", optarg);
+ rc = 2;
+ goto exit;
+ }
break;
case 's':
udev_enumerate_add_match_subsystem(udev_enumerate, optarg);
--
1.7.1
More information about the systemd-devel
mailing list