From 06ff18cd020779c226f7c25d22016e06b898f303 Mon Sep 17 00:00:00 2001 From: Wiimm Date: Sat, 9 Jul 2022 11:48:24 +0200 Subject: SZS v2.28a.beta --- project/src/ui/ui-wstrt.c | 285 +++++++++++++++++++++++++++------------------- 1 file changed, 170 insertions(+), 115 deletions(-) (limited to 'project/src/ui/ui-wstrt.c') diff --git a/project/src/ui/ui-wstrt.c b/project/src/ui/ui-wstrt.c index b82ca2a..f3900b7 100644 --- a/project/src/ui/ui-wstrt.c +++ b/project/src/ui/ui-wstrt.c @@ -551,6 +551,11 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " --width is set." }, + { OPT_NO_PAGER, false, false, false, true, false, 0, "no-pager", + 0, + "Forbid the internal usage of a pager." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple usage is possible." @@ -566,7 +571,14 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = { OPT_LOGGING, false, false, false, false, false, 'L', "logging", 0, - "This debug option enables the logging of internal lists and maps." + "This debug option enables the logging of internal lists and maps. Set" + " it up to three times to be more verbose.\n" + }, + + { OPT_TIMING, false, false, false, false, false, 0, "timing", + 0, + "Activate the timing of some operations. Logging level 3 activates" + " them too.\n" }, { OPT_WARN, false, false, false, false, false, 'W', "warn", @@ -886,7 +898,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " directory." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 118 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 120 }; @@ -1066,6 +1078,7 @@ static const KeywordTab_t CommandTab[] = { CMD_HELP, "?", 0, 0 }, { CMD_CONFIG, "CONFIG", 0, 0 }, { CMD_ARGTEST, "ARGTEST", 0, 0 }, + { CMD_EXPAND, "EXPAND", 0, 0 }, { CMD_TEST, "TEST", 0, 0 }, { CMD_COLORS, "COLORS", 0, 0 }, { CMD_ERROR, "ERROR", "ERR", 0 }, @@ -1111,9 +1124,12 @@ static const struct option OptionLong[] = { "width", 1, 0, GO_WIDTH }, { "max-width", 1, 0, GO_MAX_WIDTH }, { "maxwidth", 1, 0, GO_MAX_WIDTH }, + { "no-pager", 0, 0, GO_NO_PAGER }, + { "nopager", 0, 0, GO_NO_PAGER }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, + { "timing", 0, 0, GO_TIMING }, { "warn", 1, 0, 'W' }, { "de", 0, 0, GO_DE }, { "colors", 2, 0, GO_COLORS }, @@ -1327,93 +1343,95 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x083 */ OPT_COMPATIBLE, /* 0x084 */ OPT_WIDTH, /* 0x085 */ OPT_MAX_WIDTH, - /* 0x086 */ OPT_DE, - /* 0x087 */ OPT_COLORS, - /* 0x088 */ OPT_NO_COLORS, - /* 0x089 */ OPT_CT_CODE, - /* 0x08a */ OPT_LE_CODE, - /* 0x08b */ OPT_CHDIR, - /* 0x08c */ OPT_VS_REGION, - /* 0x08d */ OPT_BT_REGION, - /* 0x08e */ OPT_ALL_RANKS, - /* 0x08f */ OPT_POINTS, - /* 0x090 */ OPT_CHEAT, - /* 0x091 */ OPT_HTTPS, - /* 0x092 */ OPT_DOMAIN, - /* 0x093 */ OPT_WIIMMFI, - /* 0x094 */ OPT_TWIIMMFI, - /* 0x095 */ OPT_WC24, - /* 0x096 */ OPT_WCODE, - /* 0x097 */ OPT_ADD_WCODE, - /* 0x098 */ OPT_PB_MODE, - /* 0x099 */ OPT_PATCHED_BY, - /* 0x09a */ OPT_VS, - /* 0x09b */ OPT_VS2, - /* 0x09c */ OPT_BT, - /* 0x09d */ OPT_BT2, - /* 0x09e */ OPT_CANNON, - /* 0x09f */ OPT_MENO, - /* 0x0a0 */ OPT_UTF_8, - /* 0x0a1 */ OPT_NO_UTF_8, - /* 0x0a2 */ OPT_FORCE, - /* 0x0a3 */ OPT_REPAIR_MAGICS, - /* 0x0a4 */ OPT_OLD, - /* 0x0a5 */ OPT_STD, - /* 0x0a6 */ OPT_NEW, - /* 0x0a7 */ OPT_EXTRACT, - /* 0x0a8 */ OPT_NUMBER, - /* 0x0a9 */ OPT_CLEAN_DOL, - /* 0x0aa */ OPT_ADD_LECODE, - /* 0x0ab */ OPT_ADD_CTCODE, - /* 0x0ac */ OPT_CT_DIR, - /* 0x0ad */ OPT_MOVE_D8, - /* 0x0ae */ OPT_ADD_SECTION, - /* 0x0af */ OPT_FULL_GCH, - /* 0x0b0 */ OPT_GCT_NO_SEP, - /* 0x0b1 */ OPT_GCT_SEP, - /* 0x0b2 */ OPT_GCT_ASM_SEP, - /* 0x0b3 */ OPT_GCT_LIST, - /* 0x0b4 */ OPT_GCT_MOVE, - /* 0x0b5 */ OPT_GCT_ADDR, - /* 0x0b6 */ OPT_GCT_SPACE, - /* 0x0b7 */ OPT_ALLOW_USER_GCH, - /* 0x0b8 */ OPT_CREATE_SECT, - /* 0x0b9 */ OPT_WPF, - /* 0x0ba */ OPT_SECTIONS, - /* 0x0bb */ OPT_PORT_DB, - /* 0x0bc */ OPT_ORDER, - /* 0x0bd */ OPT_VADDR, - /* 0x0be */ OPT_FADDR, - /* 0x0bf */ OPT_SNAME, - /* 0x0c0 */ OPT_INT1, - /* 0x0c1 */ OPT_INT2, - /* 0x0c2 */ OPT_INT3, - /* 0x0c3 */ OPT_INT4, - /* 0x0c4 */ OPT_INT5, - /* 0x0c5 */ OPT_INT6, - /* 0x0c6 */ OPT_INT7, - /* 0x0c7 */ OPT_INT8, - /* 0x0c8 */ OPT_FLOAT, - /* 0x0c9 */ OPT_DOUBLE, - /* 0x0ca */ OPT_LE, - /* 0x0cb */ OPT_BE, - /* 0x0cc */ OPT_ZEROS, - /* 0x0cd */ OPT_HEX, - /* 0x0ce */ OPT_DEC, - /* 0x0cf */ OPT_C_SYNTAX, - /* 0x0d0 */ OPT_ADDR, - /* 0x0d1 */ OPT_ALIGN, - /* 0x0d2 */ OPT_TRIGGER, - /* 0x0d3 */ OPT_NO_ADDR, - /* 0x0d4 */ OPT_NO_NUMBERS, - /* 0x0d5 */ OPT_NO_TEXT, - /* 0x0d6 */ OPT_FORMAT, - /* 0x0d7 */ OPT_NO_NULL, - /* 0x0d8 */ OPT_NARROW, - /* 0x0d9 */ OPT_SMALL, - /* 0x0da */ OPT_WIDE, - /* 0x0db */ OPT_BYTES, - /* 0x0dc */ 0,0,0,0, + /* 0x086 */ OPT_NO_PAGER, + /* 0x087 */ OPT_TIMING, + /* 0x088 */ OPT_DE, + /* 0x089 */ OPT_COLORS, + /* 0x08a */ OPT_NO_COLORS, + /* 0x08b */ OPT_CT_CODE, + /* 0x08c */ OPT_LE_CODE, + /* 0x08d */ OPT_CHDIR, + /* 0x08e */ OPT_VS_REGION, + /* 0x08f */ OPT_BT_REGION, + /* 0x090 */ OPT_ALL_RANKS, + /* 0x091 */ OPT_POINTS, + /* 0x092 */ OPT_CHEAT, + /* 0x093 */ OPT_HTTPS, + /* 0x094 */ OPT_DOMAIN, + /* 0x095 */ OPT_WIIMMFI, + /* 0x096 */ OPT_TWIIMMFI, + /* 0x097 */ OPT_WC24, + /* 0x098 */ OPT_WCODE, + /* 0x099 */ OPT_ADD_WCODE, + /* 0x09a */ OPT_PB_MODE, + /* 0x09b */ OPT_PATCHED_BY, + /* 0x09c */ OPT_VS, + /* 0x09d */ OPT_VS2, + /* 0x09e */ OPT_BT, + /* 0x09f */ OPT_BT2, + /* 0x0a0 */ OPT_CANNON, + /* 0x0a1 */ OPT_MENO, + /* 0x0a2 */ OPT_UTF_8, + /* 0x0a3 */ OPT_NO_UTF_8, + /* 0x0a4 */ OPT_FORCE, + /* 0x0a5 */ OPT_REPAIR_MAGICS, + /* 0x0a6 */ OPT_OLD, + /* 0x0a7 */ OPT_STD, + /* 0x0a8 */ OPT_NEW, + /* 0x0a9 */ OPT_EXTRACT, + /* 0x0aa */ OPT_NUMBER, + /* 0x0ab */ OPT_CLEAN_DOL, + /* 0x0ac */ OPT_ADD_LECODE, + /* 0x0ad */ OPT_ADD_CTCODE, + /* 0x0ae */ OPT_CT_DIR, + /* 0x0af */ OPT_MOVE_D8, + /* 0x0b0 */ OPT_ADD_SECTION, + /* 0x0b1 */ OPT_FULL_GCH, + /* 0x0b2 */ OPT_GCT_NO_SEP, + /* 0x0b3 */ OPT_GCT_SEP, + /* 0x0b4 */ OPT_GCT_ASM_SEP, + /* 0x0b5 */ OPT_GCT_LIST, + /* 0x0b6 */ OPT_GCT_MOVE, + /* 0x0b7 */ OPT_GCT_ADDR, + /* 0x0b8 */ OPT_GCT_SPACE, + /* 0x0b9 */ OPT_ALLOW_USER_GCH, + /* 0x0ba */ OPT_CREATE_SECT, + /* 0x0bb */ OPT_WPF, + /* 0x0bc */ OPT_SECTIONS, + /* 0x0bd */ OPT_PORT_DB, + /* 0x0be */ OPT_ORDER, + /* 0x0bf */ OPT_VADDR, + /* 0x0c0 */ OPT_FADDR, + /* 0x0c1 */ OPT_SNAME, + /* 0x0c2 */ OPT_INT1, + /* 0x0c3 */ OPT_INT2, + /* 0x0c4 */ OPT_INT3, + /* 0x0c5 */ OPT_INT4, + /* 0x0c6 */ OPT_INT5, + /* 0x0c7 */ OPT_INT6, + /* 0x0c8 */ OPT_INT7, + /* 0x0c9 */ OPT_INT8, + /* 0x0ca */ OPT_FLOAT, + /* 0x0cb */ OPT_DOUBLE, + /* 0x0cc */ OPT_LE, + /* 0x0cd */ OPT_BE, + /* 0x0ce */ OPT_ZEROS, + /* 0x0cf */ OPT_HEX, + /* 0x0d0 */ OPT_DEC, + /* 0x0d1 */ OPT_C_SYNTAX, + /* 0x0d2 */ OPT_ADDR, + /* 0x0d3 */ OPT_ALIGN, + /* 0x0d4 */ OPT_TRIGGER, + /* 0x0d5 */ OPT_NO_ADDR, + /* 0x0d6 */ OPT_NO_NUMBERS, + /* 0x0d7 */ OPT_NO_TEXT, + /* 0x0d8 */ OPT_FORMAT, + /* 0x0d9 */ OPT_NO_NULL, + /* 0x0da */ OPT_NARROW, + /* 0x0db */ OPT_SMALL, + /* 0x0dc */ OPT_WIDE, + /* 0x0dd */ OPT_BYTES, + /* 0x0de */ 0,0, /* 0x0e0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x0f0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x100 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, @@ -1455,140 +1473,147 @@ static u8 option_allowed_cmd_ARGTEST[66] = // cmd #4 1,1,1,1,1, 1 }; -static u8 option_allowed_cmd_TEST[66] = // cmd #5 +static u8 option_allowed_cmd_EXPAND[66] = // cmd #5 { 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1 }; -static u8 option_allowed_cmd_COLORS[66] = // cmd #6 +static u8 option_allowed_cmd_TEST[66] = // cmd #6 +{ + 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, + 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, + 1,1,1,1,1, 1 +}; + +static u8 option_allowed_cmd_COLORS[66] = // cmd #7 { 0,1,1,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_ERROR[66] = // cmd #7 +static u8 option_allowed_cmd_ERROR[66] = // cmd #8 { 0,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_FILETYPE[66] = // cmd #8 +static u8 option_allowed_cmd_FILETYPE[66] = // cmd #9 { 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_FILEATTRIB[66] = // cmd #9 +static u8 option_allowed_cmd_FILEATTRIB[66] = // cmd #10 { 0,0,0,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_RAWDUMP[66] = // cmd #10 +static u8 option_allowed_cmd_RAWDUMP[66] = // cmd #11 { 0,0,0,0,0, 0,1,1,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_DUMP[66] = // cmd #11 +static u8 option_allowed_cmd_DUMP[66] = // cmd #12 { 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_CDUMP[66] = // cmd #12 +static u8 option_allowed_cmd_CDUMP[66] = // cmd #13 { 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_HEXDUMP[66] = // cmd #13 +static u8 option_allowed_cmd_HEXDUMP[66] = // cmd #14 { 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1 }; -static u8 option_allowed_cmd_PORT[66] = // cmd #14 +static u8 option_allowed_cmd_PORT[66] = // cmd #15 { 0,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,1,1,1,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_WHERE[66] = // cmd #15 +static u8 option_allowed_cmd_WHERE[66] = // cmd #16 { 0,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,1,1,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_HTTPS[66] = // cmd #16 +static u8 option_allowed_cmd_HTTPS[66] = // cmd #17 { 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_EXTRACT[66] = // cmd #17 +static u8 option_allowed_cmd_EXTRACT[66] = // cmd #18 { 0,0,0,0,0, 0,1,1,0,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_TRACKS[66] = // cmd #18 +static u8 option_allowed_cmd_TRACKS[66] = // cmd #19 { 0,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_ARENAS[66] = // cmd #19 +static u8 option_allowed_cmd_ARENAS[66] = // cmd #20 { 0,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_FILES[66] = // cmd #20 +static u8 option_allowed_cmd_FILES[66] = // cmd #21 { 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_FIND[66] = // cmd #21 +static u8 option_allowed_cmd_FIND[66] = // cmd #22 { 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_POINTS[66] = // cmd #22 +static u8 option_allowed_cmd_POINTS[66] = // cmd #23 { 0,1,1,0,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_ANALYZE[66] = // cmd #23 +static u8 option_allowed_cmd_ANALYZE[66] = // cmd #24 { 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0 }; -static u8 option_allowed_cmd_PATCH[66] = // cmd #24 +static u8 option_allowed_cmd_PATCH[66] = // cmd #25 { 0,0,0,0,0, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, @@ -1611,9 +1636,11 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_COMPATIBLE, OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, + OptionInfo + OPT_NO_PAGER, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, + OptionInfo + OPT_TIMING, OptionInfo + OPT_WARN, OptionInfo + OPT_DE, OptionInfo + OPT_COLORS, @@ -1685,6 +1712,12 @@ static const InfoOption_t * option_tab_cmd_ARGTEST[] = 0 }; +static const InfoOption_t * option_tab_cmd_EXPAND[] = +{ + + 0 +}; + static const InfoOption_t * option_tab_cmd_TEST[] = { @@ -1753,6 +1786,7 @@ static const InfoOption_t * option_tab_cmd_HEXDUMP[] = OptionInfo + OPT_FADDR, OptionInfo + OPT_SNAME, OptionInfo + OPT_LOGGING, + OptionInfo + OPT_TIMING, OptionInfo + OPT_NONE, // separator @@ -2020,7 +2054,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Wiimms StaticR Tool : Manipulate the 'main.dol' and 'StaticR.rel'" " files of Mario Kart Wii.", 0, - 40, + 42, option_tab_tool, 0 }, @@ -2086,13 +2120,32 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = 0, "wstrt ARGTEST ...", "This debug command accepts all kinds of parameters and prints one" - " line for each parameter.", + " line for each parameter. All tools know the ARGTEST command.", 0, 0, option_tab_cmd_ARGTEST, option_allowed_cmd_ARGTEST }, + { CMD_EXPAND, + false, + false, + false, + "EXPAND", + 0, + "wstrt EXPAND ...", + "This debug command accepts (like ARGTEST) all kinds of parameters and" + " prints one line for each parameter. After that, the parameter is" + " treated as a filename with wildcards and all matching files are" + " searched. The special parameters '+h' and '/h' enable or disable the" + " search for hidden directories and files (files beginning with a" + " point). All tools know the EXPAND command.", + 0, + 0, + option_tab_cmd_EXPAND, + option_allowed_cmd_EXPAND + }, + { CMD_TEST, false, false, @@ -2132,7 +2185,8 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "ERR", "wstrt ERROR [error_code]", "Translate an exit code to a message name. If no exit code is entered," - " print a table with all error messages.", + " print a table with all error messages. All tools know the ERROR" + " command.", 0, 4, option_tab_cmd_ERROR, @@ -2147,7 +2201,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "FT", "wstrt FILETYPE file...", "Scan the header of the entered files and print file type and path for" - " each file as list.", + " each file as list. All tools know the FILETYPE command.", 0, 2, option_tab_cmd_FILETYPE, @@ -2164,7 +2218,8 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Print a table with attributes for all known file types. If at least" " one keyword is entered, only matching file types are printed. A" " keyword is either a file type (like 'BRRES' or 'BMG') or one of the" - " printed keywords (like 'ARCHIVE' or 'EXTRACT').", + " printed keywords (like 'ARCHIVE' or 'EXTRACT'). All tools know the" + " FILEATTRIB command.", 0, 1, option_tab_cmd_FILEATTRIB, @@ -2226,7 +2281,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " Select parts by --vaddr, --faddr and --sname. Without selectors, the" " whole file is dumped.", 0, - 32, + 33, option_tab_cmd_HEXDUMP, option_allowed_cmd_HEXDUMP }, -- cgit v1.3.1