summaryrefslogtreecommitdiff
path: root/nasm.c
diff options
context:
space:
mode:
Diffstat (limited to 'nasm.c')
-rw-r--r--nasm.c17
1 files 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;