timeout: use more standard option parsing

* src/timeout.c (main): Don't use parse_long_options()
which is a helper for commands that don't have any
long options specific to them.
* tests/misc/timeout-parameters: Remove a case that now
passes due to us accepting multiple instances of the
--help and --version options.
* THANKS: Add the author.

Signed-off-by: Pádraig Brady <P@draigBrady.com>

diff --git a/THANKS b/THANKS
index 65a3ab93b5b30e101529f59ca2ece1dabdb67d7e..fad308aa780ef12842f1560d8c324e005672af72 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -337,6 +337,7 @@ Keith Owens                         kaos@audio.apana.org.au
 Keith Thompson                      kst@cts.com
 Ken Pizzini                         kenp@halcyon.com
 Kevin Mudrick                       kmudrick@healthmarketscience.com
+Kim Hansen                          kim@i9.dk
 Kirk Kelsey                         kirk.kelsey@0x4b.net
 Kristin E Thomas                    kristint@us.ibm.com
 Kjetil Torgrim Homme                kjetilho@ifi.uio.no

diff --git a/src/timeout.c b/src/timeout.c
index 49fc4d879bd0c86da237699ee25d5b7778b1a8ad..d1ea06d83f85714952465d8e4fa2fd323ad5b83f 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -66,7 +66,6 @@
 #include "operand2sig.h"
 #include "cloexec.h"
 #include "error.h"
-#include "long-options.h"
 #include "quote.h"
 
 #define PROGRAM_NAME "timeout"
@@ -83,6 +82,8 @@ static struct option const long_options[] =
 {
   {"kill-after", required_argument, NULL, 'k'},
   {"signal", required_argument, NULL, 's'},
+  {GETOPT_HELP_OPTION_DECL},
+  {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
 };
 
@@ -261,9 +262,6 @@ main (int argc, char **argv)
   initialize_exit_failure (EXIT_CANCELED);
   atexit (close_stdout);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version,
-                      usage, AUTHORS, (char const *) NULL);
-
   while ((c = getopt_long (argc, argv, "+k:s:", long_options, NULL)) != -1)
     {
       switch (c)
@@ -271,11 +269,17 @@ main (int argc, char **argv)
         case 'k':
           kill_after = parse_duration (optarg);
           break;
+
         case 's':
           term_signal = operand2sig (optarg, signame);
           if (term_signal == -1)
             usage (EXIT_CANCELED);
           break;
+
+        case_GETOPT_HELP_CHAR;
+
+        case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+
         default:
           usage (EXIT_CANCELED);
           break;

diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters
index 610813103bea5cdb359b2835e6b2c24d87e49839..42d7b13b26c5c932216b796b6aabddd8d868d331 100755 (executable)
--- a/tests/misc/timeout-parameters
+++ b/tests/misc/timeout-parameters
@@ -27,10 +27,6 @@ getlimits_
 
 # internal errors are 125, distinct from execution failure
 
-# --help and --version must be specified alone
-timeout --help --version
-test $? = 125 || fail=1
-
 # invalid timeout
 timeout invalid sleep 0
 test $? = 125 || fail=1