[nasm:master] options: Add --v option

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  e743843d154fb59bb7f6ad369aa12a746a2a2e0e
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=e743843d154fb59bb7f6ad369aa12a746a2a2e0e
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Fri, 9 May 2014 22:34:34 +0400
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Fri, 9 May 2014 22:34:37 +0400

options: Add --v option

It's been requested a long ago to handle '--v' option same was as
a regualar '-v'. From initial report

 | NASM and yasm are in many respects compatible but yasm uses --v
 | instead of -v for version.  As often --v is used for version I
 | end up using --v initially in NASM.  This patch allows me to compile
 | Mozilla apps which use yasm with NASM by merely renaming NASM to yasm
 | so that the build environment does not have to be updated (Mozilla
 | would not accept changes to allow use of NASM).

Reported-by: Andy Willis <abw...@gm...>
Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 nasm.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nasm.c b/nasm.c
index 6060119..5cf04a9 100644
--- a/nasm.c
+++ b/nasm.c
@@ -634,6 +634,13 @@ struct textargs textopts[] = {
     {NULL, 0}
 };
 
+static void show_version(void)
+{
+    printf("NASM version %s compiled on %s%s\n",
+           nasm_version, nasm_date, nasm_compile_options);
+    exit(0);
+}
+
 static bool stopoptions = false;
 static bool process_arg(char *p, char *q)
 {
@@ -775,7 +782,7 @@ static bool process_arg(char *p, char *q)
                 ("usage: nasm [-@ response file] [-o outfile] [-f format] "
                  "[-l listfile]\n"
                  "            [options...] [--] filename\n"
-                 "    or nasm -v   for version info\n\n"
+                 "    or nasm -v (or --v) for version info\n\n"
                  "    -t          assemble in SciTech TASM compatible mode\n"
                  "    -g          generate debug information in selected format\n");
             printf
@@ -841,9 +848,7 @@ static bool process_arg(char *p, char *q)
             break;
 
         case 'v':
-            printf("NASM version %s compiled on %s%s\n",
-                   nasm_version, nasm_date, nasm_compile_options);
-            exit(0);    /* never need usage message here */
+            show_version();
             break;
 
         case 'e':       /* preprocess only */
@@ -936,6 +941,10 @@ set_warning:
                     stopoptions = 1;
                     break;
                 }
+
+                if (!nasm_stricmp(p, "--v"))
+                    show_version();
+
                 for (s = 0; textopts[s].label; s++) {
                     if (!nasm_stricmp(p + 2, textopts[s].label)) {
                         break;