@cmd files may contain options enclosed in double quotes

src/H/msgdef.h

@@ -6,7 +6,7 @@
  * v2.06: Japanese texts removed.
  * v2.07: listing texts moved to ltext.h
  */
-pick( MSG_USAGE,              "usage: JWasm [ options ] filelist [@env_var]\n" "Run \"JWasm -?\" or \"JWasm -h\" for more info\n" )
+pick( MSG_USAGE,              "usage: JWasm [ options ] filelist [@{env_var | file}]\n" )
 pick( MSG_ASSEMBLY_RESULTS,   "%s: %lu lines, %u passes, %u ms, %u warnings, %u errors" )
 pick( MSG_JWASM,              "JWasm v" _JWASM_VERSION_ ", " __DATE__ )
 pick( MSG_JWASM2,             "Masm-compatible assembler.\n" "Portions Copyright (c) 1992-2002 Sybase, Inc. All Rights Reserved.\n" "Source code is available under the Sybase Open Watcom Public License.\n" )
@@ -25,7 +25,7 @@ pick( TXT_ALIASNAME,          "alias" ) /* v2.10: added */
 
 /* error/warning message text constants */
 
-pick( msg_unused2,          "" )
+pick( MSG_USAGE2,             "Run \"JWasm -?\" or \"JWasm -h\" for more info\n" )
 pick( msg_unused3,          "" )
 pick( msg_unused4,          "" )
 pick( msg_unused5,          "" )

src/H/types.h

@@ -2,7 +2,7 @@
 /* prototypes of TYPES.C */
 
 #ifndef _TYPES_H_INCLUDED
-#define _TYPES_H_INCLUDED_
+#define _TYPES_H_INCLUDED
 
 /* qualified_type us used for parsing a qualified type. */
 struct qualified_type {

src/H/usage.h

@@ -1,16 +1,16 @@
-"   JWasm [options] asm-file [options] [asm-file] ... [@env_var]\n\n\0"
-"options:\0"
+//"   JWasm [options] asm-file [options] [asm-file] ... [@env_var|file]\n\n\0"
+"options:\0"        "\n\0"
 #if AMD64_SUPPORT
-"-<0|1|..|10>[p]\0" "Set CPU: 0=8086 (default), 1=80186, 2=80286, 3=80386,\0"
+"-{0|1|..|10}[p]\0" "Set CPU: 0=8086 (default), 1=80186, 2=80286, 3=80386,\0"
 "\0"                "4=80486, 5=Pentium, 6=PPro, 7=P2, 8=P3, 9=P4, 10=x86-64;\0"
 "\0"                "<p> allows privileged instructions\0"
 #else
-"-<0|1|..|6>[p]\0"  "Set CPU: 0=8086 (default), 1=80186, 2=80286, 3=80386,\0"
+"-{0|1|..|6}[p]\0"  "Set CPU: 0=8086 (default), 1=80186, 2=80286, 3=80386,\0"
 "\0"                "4=80486, 5=Pentium, 6=Pentium Pro;\0"
 "\0"                "<p> allows privileged instructions\0"
 #endif
 "-c\0"              "Assemble without linking (always set)\0"
-"-C<p|u|x>\0"       "Set OPTION CASEMAP: p=NONE, u=ALL, x=NOTPUBLIC (default)\0"
+"-C{p|u|x}\0"       "Set OPTION CASEMAP: p=NONE, u=ALL, x=NOTPUBLIC (default)\0"
 "-D<name>[=text]\0" "Define text macro\0"
 "-e<number>\0"      "Set error limit number (default=50)\0"
 "-EP\0"             "Output preprocessed listing to stdout\0"
@@ -26,12 +26,12 @@
 "-FPi87\0"          "80x87 instructions (default)\0"
 "-fpc\0"            "Disallow floating-point instructions (.NO87)\0"
 "-fp<n>\0"          "Set FPU, <n> is: 0=8087 (default), 2=80287, 3=80387\0"
-"-G<c|d|r|z>\0"     "Use Pascal, C, Fastcall or Stdcall calling convention\0"
+"-G{c|d|r|z}\0"     "Use Pascal, C, Fastcall or Stdcall calling convention\0"
 "-I<directory>\0"   "Add directory to list of include directories\0"
-"-m<t|s|c|m|l|h|f>\0" "Set memory model:\0"
+"-m{t|s|c|m|l|h|f}\0" "Set memory model:\0"
 "\0"                "(Tiny, Small, Compact, Medium, Large, Huge, Flat)\0"
 "-nc=<name>\0"       "Set class name of code segment\0"
-"-n<d|m|t>=<name>\0" "Set name of d)ata segment, m)odule or t)ext segment\0"
+"-n{d|m|t}=<name>\0" "Set name of d)ata segment, m)odule or t)ext segment\0"
 #if COCTALS
 "-o\0"              "Allow C form of octal constants\0"
 #endif
@@ -56,30 +56,30 @@
 "-Zd\0"             "Add line number debug info (OMF & COFF only)\0"
 "-Zf\0"             "Make all symbols public\0"
 #if OWFC_SUPPORT
-"-zf<0|1>\0"        "Set FASTCALL type: 0=MS VC style (default),\0"
+"-zf{0|1}\0"        "Set FASTCALL type: 0=MS VC style (default),\0"
 "\0"                "1=OW register calling convention\0"
 #endif
 "-Zg\0"             "Generated code is to exactly match Masm's one\0"
-"-Zi[0|1|2|3]\0"    "Add symbolic debug info (OMF & COFF): 0=globals\0"
+"-Zi[{0|1|2|3}]\0"  "Add symbolic debug info (OMF & COFF): 0=globals\0"
 "\0"                "1= +locals, 2= +types (default), 3= +constants\0"
 "-zlc\0"            "No OMF records about data in code\0"
 "-zld\0"            "No OMF records about far call optimization\0"
 #if COFF_SUPPORT
-"-zl<f|p|s>\0"      "Suppress items in COFF symbol table: f=no .file entry,\0"
+"-zl{f|p|s}\0"      "Suppress items in COFF symbol table: f=no .file entry,\0"
 "\0"                "p=no static procs, s=no auxiliary entries for sections\0"
 #endif
 "-Zm\0"             "Masm v5.1 compatibility\0"
 "-Zne\0"            "Disable syntax extensions not supported by Masm\0"
 "-Zp[n]\0"          "Set structure alignment, n=<1|2|4|8|16|32>\0"
 "-Zs\0"             "Perform syntax check only\0"
-"-zt<0|1|2>\0"      "Set STDCALL symbol decoration: 0=No name decoration,\0"
+"-zt{0|1|2}\0"      "Set STDCALL symbol decoration: 0=No name decoration,\0"
 "\0"                "1=No '@size' suffix for functions, 2=Full (default)\0"
 "-Zv8\0"            "Enable Masm v8+ PROC visibility\0"
 "-zze\0"            "No name decoration for exported symbols\0"
 #if COFF_SUPPORT
 "-zzs\0"            "Store decorated name of start address (COFF only)\0"
 #endif
-"@env_var\0"        "Environment variable or file containing further commands\0"
+//"@{env_var | file}\0" "Environment variable or file containing further commands\0"
 "output formats:\0\0"
 #if BIN_SUPPORT
 "-bin\0"            "plain binary file\0"