From 7643ac9a8add1f07ffc237c054feb443b5612717 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 17 Dec 2013 21:48:14 -0500 Subject: udevadm,scsi_id: add short options to help strings and to the man page Also clean things up a bit here and there. --- src/udev/udevadm-test.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'src/udev/udevadm-test.c') diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c index df1409bff6..cd75fad674 100644 --- a/src/udev/udevadm-test.c +++ b/src/udev/udevadm-test.c @@ -43,7 +43,7 @@ static int adm_test(struct udev *udev, int argc, char *argv[]) struct udev_list_entry *entry; sigset_t mask, sigmask_orig; int err; - int rc = 0; + int rc = 0, c; static const struct option options[] = { { "action", required_argument, NULL, 'a' }, @@ -54,14 +54,8 @@ static int adm_test(struct udev *udev, int argc, char *argv[]) log_debug("version %s\n", VERSION); - for (;;) { - int option; - - option = getopt_long(argc, argv, "a:s:N:fh", options, NULL); - if (option == -1) - break; - - switch (option) { + while((c = getopt_long(argc, argv, "a:N:h", options, NULL)) >= 0) + switch (c) { case 'a': action = optarg; break; @@ -80,15 +74,18 @@ static int adm_test(struct udev *udev, int argc, char *argv[]) break; case 'h': printf("Usage: udevadm test OPTIONS \n" - " --action= set action string\n" - " --help\n\n"); + " -a,--action=ACTION set action string\n" + " -N,--resolve-names=early|late|never when to resolve names\n" + " -h,--help print this help string\n" + "\n"); exit(EXIT_SUCCESS); - default: + case '?': exit(EXIT_FAILURE); + default: + assert_not_reached("Unknown option"); } - } - syspath = argv[optind]; + syspath = argv[optind]; if (syspath == NULL) { fprintf(stderr, "syspath parameter missing\n"); rc = 2; -- cgit v1.2.3-54-g00ecf