minor fixes (return error on unrecognized option)

mh0fm4 · Feb 25, 2006 · 95450e7 · 95450e7
1 parent af67fa9
commit 95450e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/libbench2/bench-main.c b/libbench2/bench-main.c
@@ -18,7 +18,7 @@
  *
  */
 
-/* $Id: bench-main.c,v 1.18 2006-02-25 02:25:48 athena Exp $ */
+/* $Id: bench-main.c,v 1.19 2006-02-25 04:13:49 stevenj Exp $ */
 
 #include "bench.h"
 #include "my-getopt.h"
@@ -169,7 +169,8 @@ int bench_main(int argc, char *argv[])
 
 	      case '?':
 		   /* my_getopt() already printed an error message. */
-		   break;
+		   cleanup();
+		   return 1;
 
 	      default:
 		   abort ();

diff --git a/libbench2/my-getopt.c b/libbench2/my-getopt.c
@@ -124,6 +124,11 @@ int my_getopt(int argc, char *argv[], const struct my_option *optarray)
 		    ++p;
 		    switch (l->argtype) {
 			case NOARG: 
+			     if (*p) {
+				  fprintf(stderr, "option -%c does not "
+					  "take an argument\n", l->short_name);
+				  return '?';
+			     }
 		    ok1:
 			     return l->short_name;
 			case OPTARG: 

diff --git a/tools/fftw-wisdom.c b/tools/fftw-wisdom.c
@@ -70,7 +70,7 @@ static int prob_size_cmp(const void *p1_, const void *p2_)
 static struct my_option options[] =
 {
   {"help", NOARG, 'h'},
-  {"version", OPTARG, 'V'},
+  {"version", NOARG, 'V'},
   {"verbose", OPTARG, 'v'},
 
   {"canonical", NOARG, 'c'},
@@ -271,8 +271,9 @@ int bench_main(int argc, char *argv[])
 #endif
 
 	      case '?':
-		   /* `getopt_long' already printed an error message. */
-		   break;
+		   /* `my_getopt' already printed an error message. */
+		   cleanup();
+		   return EXIT_FAILURE;
 
 	      default:
 		   abort ();