chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm,scsi_id: add short options to help strings and to the man page
[elogind.git]
/
src
/
udev
/
udevadm-test.c
diff --git
a/src/udev/udevadm-test.c
b/src/udev/udevadm-test.c
index df1409bff64cdcb2c8a2f40e19b2036aecdb7b1e..cd75fad674dd72dbdf5ef400d381bc7d10dae037 100644
(file)
--- 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;
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' },
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);
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;
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 <syspath>\n"
break;
case 'h':
printf("Usage: udevadm test OPTIONS <syspath>\n"
- " --action=<string> 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);
exit(EXIT_SUCCESS);
-
default
:
+
case '?'
:
exit(EXIT_FAILURE);
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;
if (syspath == NULL) {
fprintf(stderr, "syspath parameter missing\n");
rc = 2;