From 13558c1e7cb2a1a2ea1b1c13ff554063de8afaf0 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Fri, 9 May 2014 22:34:34 +0400 Subject: [PATCH] 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 Signed-off-by: Cyrill Gorcunov Signed-off-by: H. Peter Anvin --- nasm.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/nasm.c b/nasm.c index 2bb3029..7388331 100644 --- a/nasm.c +++ b/nasm.c @@ -635,6 +635,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) { @@ -776,7 +783,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 @@ -842,9 +849,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 */ @@ -937,6 +942,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; -- 2.7.4