From c2666405031cfda5720ddb9ecd88c1b476babc2a Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 17 May 2007 02:17:13 +0200 Subject: [PATCH] udevsettle: use long options --- udevsettle.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/udevsettle.c b/udevsettle.c index f76ad716..42a03baf 100644 --- a/udevsettle.c +++ b/udevsettle.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -60,33 +61,37 @@ int main(int argc, char *argv[], char *envp[]) ssize_t len; int timeout = DEFAULT_TIMEOUT; int loop; - int i; + static const struct option options[] = { + { "timeout", 1, NULL, 't' }, + { "help", 0, NULL, 'h' }, + {} + }; + int option; int rc = 1; + int seconds; logging_init("udevsettle"); udev_config_init(); dbg("version %s", UDEV_VERSION); sysfs_init(); - for (i = 1 ; i < argc; i++) { - char *arg = argv[i]; + while (1) { + option = getopt_long(argc, argv, "t:h", options, NULL); + if (option == -1) + break; - if (strncmp(arg, "--timeout=", 10) == 0) { - char *str = &arg[10]; - int seconds; - - seconds = atoi(str); + switch (option) { + case 't': + seconds = atoi(optarg); if (seconds > 0) timeout = seconds; else fprintf(stderr, "invalid timeout value\n"); dbg("timeout=%i", timeout); - } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { - printf("Usage: udevsettle [--help] [--timeout=]\n"); + break; + case 'h': + printf("Usage: udevsettle [--help] [--timeout=]\n\n"); goto exit; - } else { - fprintf(stderr, "unrecognized option '%s'\n", arg); - err("unrecognized option '%s'\n", arg); } } -- 2.39.5