Reject improper use of command-line options

We already did diagnose these (via 'getopt_long'), but then proceeded with execution.
SourceryTools · Nov 16, 2022 · d93bdb4 · d93bdb4
1 parent 7a8e9fb
commit d93bdb4
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 43 deletions.
diff --git a/nvptx-as.cc b/nvptx-as.cc
@@ -1095,6 +1095,26 @@ program_available (const char *progname)
   return false;
 }
 
+ATTRIBUTE_NORETURN static void
+usage (FILE *stream, int status)
+{
+  fprintf (stream, "\
+Usage: nvptx-none-as [option...] [asmfile]\n\
+Options:\n\
+  -m TARGET             Override target architecture used for ptxas\n\
+                        verification (default: deduce from input's preamble)\n\
+  -o FILE               Write output to FILE\n\
+  -v                    Be verbose\n\
+  --verify              Do verify output is acceptable to ptxas\n\
+  --no-verify           Do not verify output is acceptable to ptxas\n\
+  --help                Print this help and exit\n\
+  --version             Print version number and exit\n\
+\n\
+Report bugs to %s.\n",
+	   REPORT_BUGS_TO);
+  exit (status);
+}
+
 static struct option long_options[] = {
   {"traditional-format",     no_argument, 0,  0 },
   {"save-temps",  no_argument,       0,  0 },
@@ -1144,21 +1164,8 @@ main (int argc, char **argv)
 	  /* Ignore include paths.  */
 	  break;
 	case 'h':
-	  printf ("\
-Usage: nvptx-none-as [option...] [asmfile]\n\
-Options:\n\
-  -m TARGET             Override target architecture used for ptxas\n\
-                        verification (default: deduce from input's preamble)\n\
-  -o FILE               Write output to FILE\n\
-  -v                    Be verbose\n\
-  --verify              Do verify output is acceptable to ptxas\n\
-  --no-verify           Do not verify output is acceptable to ptxas\n\
-  --help                Print this help and exit\n\
-  --version             Print version number and exit\n\
-\n\
-Report bugs to %s.\n",
-		  REPORT_BUGS_TO);
-	  exit (0);
+	  usage (stdout, 0);
+	  break;
 	case 'V':
 	  printf ("\
 nvptx-none-as %s%s\n\
@@ -1170,6 +1177,7 @@ This program has absolutely no warranty.\n",
 		  PKGVERSION, NVPTX_TOOLS_VERSION, "2015");
 	  exit (0);
 	default:
+	  usage (stderr, 1);
 	  break;
 	}
     }

diff --git a/nvptx-ld.cc b/nvptx-ld.cc
@@ -337,6 +337,24 @@ process_refs_defs (file *f, const char *ptx)
     }
 }
 
+ATTRIBUTE_NORETURN static void
+usage (FILE *stream, int status)
+{
+  fprintf (stream, "\
+Usage: nvptx-none-ld [option...] [files]\n\
+Options:\n\
+  -o FILE               Write output to FILE\n\
+  -v                    Be verbose\n\
+  -l LIBRARY            Link with LIBRARY\n\
+  -L DIR                Search for libraries in DIR\n\
+  --help                Print this help and exit\n\
+  --version             Print version number and exit\n\
+\n\
+Report bugs to %s.\n",
+	  REPORT_BUGS_TO);
+  exit (status);
+}
+
 static const struct option long_options[] = {
   {"help", no_argument, 0, 'h' },
   {"version", no_argument, 0, 'V' },
@@ -375,19 +393,8 @@ main (int argc, char **argv)
 	  libpaths.push_back (optarg);
 	  break;
 	case 'h':
-	  printf ("\
-Usage: nvptx-none-ld [option...] [files]\n\
-Options:\n\
-  -o FILE               Write output to FILE\n\
-  -v                    Be verbose\n\
-  -l LIBRARY            Link with LIBRARY\n\
-  -L DIR                Search for libraries in DIR\n\
-  --help                Print this help and exit\n\
-  --version             Print version number and exit\n\
-\n\
-Report bugs to %s.\n",
-		  REPORT_BUGS_TO);
-	  exit (0);
+	  usage (stdout, 0);
+	  break;
 	case 'V':
 	  printf ("\
 nvptx-none-ld %s%s\n\
@@ -399,6 +406,7 @@ This program has absolutely no warranty.\n",
 		  PKGVERSION, NVPTX_TOOLS_VERSION, "2015");
 	  exit (0);
 	default:
+	  usage (stderr, 1);
 	  break;
 	}
     }

diff --git a/nvptx-run.cc b/nvptx-run.cc
@@ -32,6 +32,9 @@ extern "C" CUresult cuGetErrorName (CUresult, const char **);
 extern "C" CUresult cuGetErrorString (CUresult, const char **);
 #endif
 
+#define HAVE_DECL_BASENAME 1
+#include "libiberty.h"
+
 #include "version.h"
 
 #define DO_PRAGMA(x) _Pragma (#x)
@@ -205,6 +208,26 @@ compile_file (FILE *f, CUmodule *phModule, CUfunction *phKernel)
   fatal_unless_success (r, "could not find kernel __main");
 }
 
+ATTRIBUTE_NORETURN static void
+usage (FILE *stream, int status)
+{
+  fprintf (stream, "\
+Usage: nvptx-none-run [option...] program [argument...]\n\
+Options:\n\
+  -S, --stack-size N    Set per-lane GPU stack size to N (default: auto)\n\
+  -H, --heap-size N     Set GPU heap size to N (default: 256 MiB)\n\
+  -L, --lanes N         Launch N lanes (for testing gcc -muniform-simt)\n\
+  -O, --optlevel N      Pass PTX JIT option to set optimization level N\n\
+  -g, --lineinfo        Pass PTX JIT option to generate line information\n\
+  -G, --debuginfo       Pass PTX JIT option to generate debug information\n\
+  --help                Print this help and exit\n\
+  --version             Print version number and exit\n\
+\n\
+Report bugs to %s.\n",
+	   REPORT_BUGS_TO);
+  exit (status);
+}
+
 static const struct option long_options[] =
   {
     { "stack-size", required_argument, 0, 'S' },
@@ -254,21 +277,8 @@ main (int argc, char **argv)
 	  jitopt_debuginfo = 1;
 	  break;
 	case 'h':
-	  printf ("\
-Usage: nvptx-none-run [option...] program [argument...]\n\
-Options:\n\
-  -S, --stack-size N    Set per-lane GPU stack size to N (default: auto)\n\
-  -H, --heap-size N     Set GPU heap size to N (default: 256 MiB)\n\
-  -L, --lanes N         Launch N lanes (for testing gcc -muniform-simt)\n\
-  -O, --optlevel N      Pass PTX JIT option to set optimization level N\n\
-  -g, --lineinfo        Pass PTX JIT option to generate line information\n\
-  -G, --debuginfo       Pass PTX JIT option to generate debug information\n\
-  --help                Print this help and exit\n\
-  --version             Print version number and exit\n\
-\n\
-Report bugs to %s.\n",
-		  REPORT_BUGS_TO);
-	  exit (0);
+	  usage (stdout, 0);
+	  break;
 	case 'V':
 	  printf ("\
 nvptx-none-run %s%s\n\
@@ -280,6 +290,7 @@ This program has absolutely no warranty.\n",
 		  PKGVERSION, NVPTX_TOOLS_VERSION, "2015");
 	  exit (0);
 	default:
+	  usage (stderr, 1);
 	  break;
 	}
     }

diff --git a/test/as/options-1.test b/test/as/options-1.test
@@ -0,0 +1,37 @@
+Improper use of command-line options.
+
+
+    invalid option -- '/'
+
+RUN: %target_as_cmd -/ > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-as '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option requires an argument -- 'o'
+
+RUN: %target_as_cmd -o > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-as '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    unrecognized option '--holp'
+
+RUN: %target_as_cmd --holp > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-as '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option '--help' doesn't allow an argument
+
+RUN: %target_as_cmd --help=abc > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-as '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
diff --git a/test/ld/options-1.test b/test/ld/options-1.test
@@ -0,0 +1,37 @@
+Improper use of command-line options.
+
+
+    invalid option -- '/'
+
+RUN: %target_ld_cmd -/ > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-ld '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option requires an argument -- 'o'
+
+RUN: %target_ld_cmd -o > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-ld '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    unrecognized option '--holp'
+
+RUN: %target_ld_cmd --holp > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-ld '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option '--help' doesn't allow an argument
+
+RUN: %target_ld_cmd --help=abc > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-ld '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
diff --git a/test/run/options-1.test b/test/run/options-1.test
@@ -0,0 +1,46 @@
+Improper use of command-line options.
+
+
+    invalid option -- '/'
+
+RUN: %target_run_cmd -/ > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-run '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option requires an argument -- 'o'
+
+RUN: %target_run_cmd -o > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-run '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    unrecognized option '--holp'
+
+RUN: %target_run_cmd --holp > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-run '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option '--help' doesn't allow an argument
+
+RUN: %target_run_cmd --help=abc > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-run '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout
+
+
+    option '--stack-size' requires an argument
+
+RUN: %target_run_cmd --stack-size > %t.stdout 2> %t.stderr; r=$?; [ x"$r" = x1 ]
+RUN: test -s %t.stderr
+RUN: < %t.stderr grep -qe '^Usage: nvptx-none-run '
+RUN: test -f %t.stdout
+RUN: ! test -s %t.stdout