SZS v2.28a.beta

1 files changed, 16 insertions, 3 deletions

diff --git a/project/src/wstrt.c b/project/src/wstrt.c
index 7708f78..81ee94d 100644
--- a/project/src/wstrt.c
+++ b/project/src/wstrt.c
@@ -311,7 +311,7 @@ static enumError cmd_hexdump()
 {
     //--- list addresses of option --vaddr and --faddr
 
-    if ( logging > 1 )
+    if ( logging >= 2 )
     {
 	if (dol_sections)
 	    fprintf(stdlog,"\nSections: %s\n",
@@ -363,7 +363,7 @@ static enumError cmd_hexdump()
 	    else
 		TranslateAllDolOffsets(dol,&mm,true);
 
-	    if ( logging > 1 )
+	    if ( logging >= 2 )
 	    {
 		fputs("\nList of virtual addresses to dump:\n\n",stdlog);
 		PrintMemMap(&mm,stdlog,5,0);
@@ -1583,13 +1583,15 @@ static enumError CheckOptions ( int argc, char ** argv, bool is_env )
 	case GO_COMPATIBLE:	err += ScanOptCompatible(optarg); break;
 	case GO_WIDTH:		err += ScanOptWidth(optarg); break;
 	case GO_MAX_WIDTH:	err += ScanOptMaxWidth(optarg); break;
+	case GO_NO_PAGER:	opt_no_pager = true; break;
 	case GO_QUIET:		verbose = verbose > -1 ? -1 : verbose - 1; break;
 	case GO_VERBOSE:	verbose = verbose <  0 ?  0 : verbose + 1; break;
 	case GO_LOGGING:	logging++; break;
+	case GO_TIMING:		log_timing++; break;
 	case GO_WARN:		err += ScanOptWarn(optarg); break;
 	case GO_DE:		use_de = true; break;
 	case GO_CT_CODE:	ctcode_enabled = true; break;
-	case GO_LE_CODE:	lecode_enabled = true; break;
+	case GO_LE_CODE:	lecode_enabled = true; break; // optional argument ignored
 	case GO_COLORS:		err += ScanOptColorize(0,optarg,0); break;
 	case GO_NO_COLORS:	opt_colorize = COLMD_OFF; break;
 
@@ -1788,6 +1790,7 @@ static enumError CheckCommand ( int argc, char ** argv )
 	case CMD_HELP:		PrintHelpColor(&InfoUI_wstrt); break;
 	case CMD_CONFIG:	err = cmd_config(); break;
 	case CMD_ARGTEST:	err = cmd_argtest(argc,argv); break;
+	case CMD_EXPAND:	err = cmd_expand(argc,argv); break;
 	case CMD_TEST:		err = cmd_test(); break;
 	case CMD_COLORS:	err = Command_COLORS(brief_count?-brief_count:long_count,0,0);
 					break;
@@ -1835,6 +1838,15 @@ static enumError CheckCommand ( int argc, char ** argv )
     int main ( int argc, char ** argv )
 #endif
 {
+ #if !SZS_WRAPPER
+    ArgManager_t am = {0};
+    SetupArgManager(&am,LOUP_AUTO,argc,argv,false);
+    ExpandAtArgManager(&am,AMXM_SHORT,10,false);
+    argc = am.argc;
+    argv = am.argv;
+ #endif
+
+    tool_name = "wstrt";
     print_title_func = print_title;
     SetupLib(argc,argv,WSTRT_SHORT,VERSION,TITLE);
 
@@ -1868,6 +1880,7 @@ static enumError CheckCommand ( int argc, char ** argv )
 
     if (SIGINT_level)
 	err = ERROR0(ERR_INTERRUPT,"Program interrupted by user.");
+    ClosePager();
     return err;
 }