cleanup usage text for multiple tools

open-watcom · Jan 26, 2024 · 0063afc · 0063afc
1 parent 08a6fc3
commit 0063afc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/bld/cc/gml/options.gml b/bld/cc/gml/options.gml
@@ -133,8 +133,9 @@
 
 :chain. o p
 
-:option. ?
+:option. ? h
 :target. any
+:usagenochain.
 :usage. print this message
 :jusage. このメッセージを表示します
 
@@ -689,12 +690,6 @@
 :usage. set code group name
 :jusage. コード･グループ名を設定します
 
-:option. h
-:target. any
-:usagenochain.
-:usage. print this message
-:jusage. このメッセージを表示します
-
 :usagechain. h Debugging Information format
 
 :option. hc

diff --git a/bld/mstools/asaxp/c/translat.c b/bld/mstools/asaxp/c/translat.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -172,7 +173,7 @@ void OptionsTranslate( OPT_STORAGE *cmdOpts, CmdLine *cmdLine )
         BannerMessage();
     }
 
-    if( cmdOpts->help || cmdOpts->_ ) {
+    if( cmdOpts->help || cmdOpts->_question ) {
         PrintHelpMessage();
         exit( EXIT_SUCCESS );
 

diff --git a/bld/mstools/nmake/c/translat.c b/bld/mstools/nmake/c/translat.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -192,7 +193,7 @@ void OptionsTranslate( OPT_STORAGE *cmdOpts, CmdLine *cmdLine )
         BannerMessage();
     }
 
-    if( cmdOpts->help || cmdOpts->_ ) {
+    if( cmdOpts->help || cmdOpts->_question ) {
         PrintHelpMessage();
         exit( EXIT_SUCCESS );
 

diff --git a/bld/rc/rc/c/param.c b/bld/rc/rc/c/param.c
@@ -888,7 +888,7 @@ int SetOptions( OPT_STORAGE *data, const char *infile, const char *outfile )
 {
     const char  *p;
 
-    if( data->h ) {
+    if( data->_question ) {
         CmdLineParms.PrintHelp = true;
         PrintUsage();
         return( 1 );

diff --git a/bld/rc/rc/h/options.gml b/bld/rc/rc/h/options.gml
@@ -106,7 +106,8 @@
 
 :chain. v zk
 
-:option. h ?
+:option. ? h
+:usagenochain.
 :usage.  print this message
 :jusage. このメッセージを表示します
 

diff --git a/bld/wasm/c/main.c b/bld/wasm/c/main.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -848,6 +848,9 @@ static void set_options( OPT_STORAGE *data )
     if( data->zq ) {
         Options.quiet = true;
     }
+    if( data->_question ) {
+        usage_msg();
+    }
 
     switch( data->mem_model ) {
     case OPT_ENUM_mem_model_mt:
@@ -1100,10 +1103,6 @@ static void set_options( OPT_STORAGE *data )
     if( data->fi ) {
         SetStringOption( &ForceInclude, &(data->fi_value) );
     }
-    if( data->h ) {
-        usage_msg();
-    }
-
 }
 
 static void do_init_stuff( char **cmdline )

diff --git a/bld/wasm/h/options.gml b/bld/wasm/h/options.gml
@@ -107,13 +107,9 @@
 
 
 :chain. 2 3 4 5 6
-:cmt.:chain. m
 
-:option. ?
-:usage. print this message
-:jusage. このメッセージを表示します
-
-:option. h
+:option. ? h
+:usagenochain.
 :usage. print this message
 :jusage. このメッセージを表示します