From 246fdb38d7c2fb3054b8f8528e11dc8f17691750 Mon Sep 17 00:00:00 2001 From: Wiimm Date: Tue, 26 Mar 2024 10:35:38 +0100 Subject: SZS 2.42a --- project/src/ui/tab-wbmgt.inc | 3 + project/src/ui/tab-wctct.inc | 5 +- project/src/ui/tab-wimgt.inc | 3 + project/src/ui/tab-wkclt.inc | 3 + project/src/ui/tab-wkmpt.inc | 3 + project/src/ui/tab-wlect.inc | 3 + project/src/ui/tab-wmdlt.inc | 3 + project/src/ui/tab-wpatt.inc | 3 + project/src/ui/tab-wstrt.inc | 3 + project/src/ui/tab-wszst.inc | 55 ++++- project/src/ui/ui-wbmgt.c | 24 ++- project/src/ui/ui-wbmgt.h | 6 +- project/src/ui/ui-wctct.c | 26 ++- project/src/ui/ui-wctct.h | 6 +- project/src/ui/ui-wimgt.c | 24 ++- project/src/ui/ui-wimgt.h | 6 +- project/src/ui/ui-wkclt.c | 24 ++- project/src/ui/ui-wkclt.h | 6 +- project/src/ui/ui-wkmpt.c | 24 ++- project/src/ui/ui-wkmpt.h | 6 +- project/src/ui/ui-wlect.c | 24 ++- project/src/ui/ui-wlect.h | 6 +- project/src/ui/ui-wmdlt.c | 24 ++- project/src/ui/ui-wmdlt.h | 6 +- project/src/ui/ui-wpatt.c | 24 ++- project/src/ui/ui-wpatt.h | 6 +- project/src/ui/ui-wstrt.c | 24 ++- project/src/ui/ui-wstrt.h | 6 +- project/src/ui/ui-wszst.c | 355 +++++++++++++++++++++--------- project/src/ui/ui-wszst.h | 14 +- project/src/ui/ui.def | 500 ++++++++++++++++++++++++++++++++++++++++++- 31 files changed, 1044 insertions(+), 181 deletions(-) (limited to 'project/src/ui') diff --git a/project/src/ui/tab-wbmgt.inc b/project/src/ui/tab-wbmgt.inc index 0b5b527..3c2046f 100644 --- a/project/src/ui/tab-wbmgt.inc +++ b/project/src/ui/tab-wbmgt.inc @@ -231,6 +231,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wctct.inc b/project/src/ui/tab-wctct.inc index 5a114d4..0f624c5 100644 --- a/project/src/ui/tab-wctct.inc +++ b/project/src/ui/tab-wctct.inc @@ -215,6 +215,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, @@ -449,7 +452,7 @@ " is expected. If preceded by a minus sign, the slots are disabled." " The keywords are: @TRACKS@ (slots 0:0x1f), @ARENAS@ (0x20:0x29)" " and @SPECIAL@ (0x36:0x3a)." - " @CTCODE@ is an abbreviation for @ARENAS,SPECIAL@." + " @CTCODE@ is a short cut for @ARENAS,SPECIAL@." "\n " " The default is to enable slot ranges" " @0x00:0x1f@, @0x2a:0x35@, @0x3b:0x41@ and @0x44:0xfe@." }, diff --git a/project/src/ui/tab-wimgt.inc b/project/src/ui/tab-wimgt.inc index 67fb5da..9eec0ed 100644 --- a/project/src/ui/tab-wimgt.inc +++ b/project/src/ui/tab-wimgt.inc @@ -191,6 +191,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wkclt.inc b/project/src/ui/tab-wkclt.inc index 38207d5..2d9b06b 100644 --- a/project/src/ui/tab-wkclt.inc +++ b/project/src/ui/tab-wkclt.inc @@ -306,6 +306,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wkmpt.inc b/project/src/ui/tab-wkmpt.inc index 0accc19..27632c7 100644 --- a/project/src/ui/tab-wkmpt.inc +++ b/project/src/ui/tab-wkmpt.inc @@ -284,6 +284,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wlect.inc b/project/src/ui/tab-wlect.inc index 217419c..d25cf5d 100644 --- a/project/src/ui/tab-wlect.inc +++ b/project/src/ui/tab-wlect.inc @@ -259,6 +259,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wmdlt.inc b/project/src/ui/tab-wmdlt.inc index b927eab..a595cfb 100644 --- a/project/src/ui/tab-wmdlt.inc +++ b/project/src/ui/tab-wmdlt.inc @@ -209,6 +209,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wpatt.inc b/project/src/ui/tab-wpatt.inc index 39413d7..06fe50f 100644 --- a/project/src/ui/tab-wpatt.inc +++ b/project/src/ui/tab-wpatt.inc @@ -174,6 +174,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wstrt.inc b/project/src/ui/tab-wstrt.inc index 3dd0dca..5ee314a 100644 --- a/project/src/ui/tab-wstrt.inc +++ b/project/src/ui/tab-wstrt.inc @@ -243,6 +243,9 @@ "NO_PAGER", "no-pager|nopager", 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "ZERO", "z|zero", + 0, 0 /* copy of wszst */ }, + { T_OPT_GM, "QUIET", "q|quiet", 0, 0 /* copy of wszst */ }, diff --git a/project/src/ui/tab-wszst.inc b/project/src/ui/tab-wszst.inc index af24140..cfe7da5 100644 --- a/project/src/ui/tab-wszst.inc +++ b/project/src/ui/tab-wszst.inc @@ -799,6 +799,14 @@ 0, "Forbid the internal usage of a pager." }, + { T_OPT_GM, "ZERO", "z|zero", + 0, + "This option affects the exit status of the programs." + " Instead of an exit status, the value 0 is returned for OK." + " This happens for notices ({-v}, status<15), warnings ({-vv}, status<29)," + " errors ({-vvv}, status<115) and fatal errors ({-vvvv})." + " The exit status for INTERRUPT (112) is never replaced." }, + { T_OPT_GM, "QUIET", "q|quiet", 0, "Be quiet and print only error messages." @@ -1711,12 +1719,11 @@ { T_OPT_CP, "CUP_ICONS", "cup-icons|cupicons", "image", - "Load given image, convert it to TPL.CMPR and add the result as sub-files" + "Load given image, convert it to TPLx.CMPR and add the result as sub-files" " 'button/timg/ct_icons.tpl' and as 'control/timg/ct_icons.tpl'" " to files 'Channel.szs', 'MenuMulti.szs' and 'MenuSingle.szs'." " Both sub-files are always linked, so that storage space is saved." - " The usual size for each single icon is 128x128." - " This can be changed by LPAR setting CUP-ICON-SIZE." }, + " The usual size for each single icon is 128x128." }, { T_OPT_C, "NO_COPY", "no-copy|nocopy", 0, @@ -2103,15 +2110,39 @@ 0, "If creating a compressed file, create a BZIP2 compatible file." }, + { T_OPT_G, "CYBZ", "cybz", + 0, + "If creating a compressed file, force YBZ compression" + " (YAZ0 file header, but BZIP2 compression)," + " but don't change the payload." }, + + { T_OPT_G, "YBZ", "ybz", + 0, + "If creating a compressed file, force archive format U8" + " with YBZ compression (YAZ0 file header, but BZIP2 compression)." + " Therefore it is a short cut for {--u8 --cybz}." }, + { T_OPT_G, "LZ", "lz", 0, - "If creating a compressed file, force BZ compression" + "If creating a compressed file, force LZ compression" " (a YAZ0 like file format with LZMA compression)." }, { T_OPT_G, "LZMA", "lzma", 0, "If creating a compressed file, create a LZMA compatible file." }, + { T_OPT_G, "CYLZ", "cylz", + 0, + "If creating a compressed file, force YLZ compression" + " (YAZ0 file header, but LZMA compression)," + " but don't change the payload." }, + + { T_OPT_G, "YLZ", "ylz", + 0, + "If creating a compressed file, force archive format U8" + " with YLZ compression (YAZ0 file header, but LZMA compression)." + " Therefore it is a short cut for {--u8 --cylz}." }, + { T_SEP_OPT, 0,0,0,0 }, //----- separator ----- { T_OPT_G, "SH", "sh", @@ -2163,7 +2194,7 @@ { H_OPT_CP, "FMODES", "fmodes|feature-modes|featuremodes", "list", - "--fmodes is an abbreviation for --feature-modes and declares an output filter." + "--fmodes is a short cut for --feature-modes and declares an output filter." " @LIST@ is a keyword list. The keywords are:" " @SECTION, VISUAL, GAMEPLAY, BATTLE, RACING, TIMETRIAL, OFFLINE@ and @ONLINE@." " A feature is only printed if *all* set keywords match." @@ -2511,8 +2542,12 @@ " N modes of 9, 1, 8, 2, 5. @TRY2@ is used for normalizing." " For non bz-compression, @TRY*@ are the same as @BEST@." "\n " + " Do not use compression level >6 for LZMA if the file is intended" + " for Mario Kart Wii, as too much memory is required for decoding.\n" + "\n " " Option {--norm} takes precedence over {--compr}" - " and sets the compression level to @TRY2@ (@BEST@)." + " and sets the compression level for bzip2 to @TRY2@ (@BEST@)" + " and for LZMA to 6." "\n " " For more modes and details type {wszst -C list}." " To force colorized output type {wszst -C clist}." }, @@ -2747,8 +2782,12 @@ { H_COPT, "XYZ", 0,0,0 }, { T_COPT, "BZ", 0,0,0 }, { T_COPT, "BZIP2", 0,0,0 }, + { T_COPT, "CYBZ", 0,0,0 }, + { T_COPT, "YBZ", 0,0,0 }, { T_COPT, "LZ", 0,0,0 }, { T_COPT, "LZMA", 0,0,0 }, + { T_COPT, "CYLZ", 0,0,0 }, + { T_COPT, "YLZ", 0,0,0 }, { T_COPT, "SZS", 0,0,0 }, { H_COPT, "XWU8", 0,0,0 }, { T_COPT, "WBZ", 0,0,0 }, @@ -2771,8 +2810,12 @@ { H_COPT, "XYZ", 0,0,0 }, { T_COPT, "BZ", 0,0,0 }, { T_COPT, "BZIP2", 0,0,0 }, + { T_COPT, "CYBZ", 0,0,0 }, + { T_COPT, "YBZ", 0,0,0 }, { T_COPT, "LZ", 0,0,0 }, { T_COPT, "LZMA", 0,0,0 }, + { T_COPT, "CYLZ", 0,0,0 }, + { T_COPT, "YLZ", 0,0,0 }, { T_COPT, "SZS", 0,0,0 }, { H_COPT, "XWU8", 0,0,0 }, { T_COPT, "WBZ", 0,0,0 }, diff --git a/project/src/ui/ui-wbmgt.c b/project/src/ui/ui-wbmgt.c index c5c1055..6500c1a 100644 --- a/project/src/ui/ui-wbmgt.c +++ b/project/src/ui/ui-wbmgt.c @@ -374,6 +374,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -583,7 +592,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 71 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 72 }; @@ -713,7 +722,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBM:T:A:td:D:E:orupiP:1X"; +static const char OptionShort[] = "VhzqvLYW:c:lHBM:T:A:td:D:E:orupiP:1X"; static const struct option OptionLong[] = { @@ -730,6 +739,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -890,7 +900,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -945,7 +957,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1108,6 +1121,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1541,7 +1555,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "wbmgt [option]... command [option|parameter|file]...", "Wiimms BMG Tool : Convert and patch raw and text BMG (message) files.", 0, - 30, + 31, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wbmgt.h b/project/src/ui/ui-wbmgt.h index 06e69a2..0267dd9 100644 --- a/project/src/ui/ui-wbmgt.h +++ b/project/src/ui/ui-wbmgt.h @@ -104,6 +104,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -132,7 +133,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 71 + OPT__N_TOTAL // == 72 } enumOptions; @@ -395,6 +396,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -454,7 +456,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wbmgt; diff --git a/project/src/ui/ui-wctct.c b/project/src/ui/ui-wctct.c index 2b6b334..aba47a7 100644 --- a/project/src/ui/ui-wctct.c +++ b/project/src/ui/ui-wctct.c @@ -474,6 +474,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -715,12 +724,12 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " separated list of slots (A), slot ranges (A:B) or keywords is" " expected. If preceded by a minus sign, the slots are disabled. The" " keywords are: TRACKS (slots 0:0x1f), ARENAS (0x20:0x29) and SPECIAL" - " (0x36:0x3a). CTCODE is an abbreviation for ARENAS,SPECIAL.\n" + " (0x36:0x3a). CTCODE is a short cut for ARENAS,SPECIAL.\n" " The default is to enable slot ranges 0x00:0x1f, 0x2a:0x35," " 0x3b:0x41 and 0x44:0xfe." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 91 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 92 }; @@ -910,7 +919,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHB1XPNM:T:A:td:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:lHB1XPNM:T:A:td:D:E:orupi"; static const struct option OptionLong[] = { @@ -927,6 +936,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -1116,7 +1126,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -1189,7 +1201,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1352,6 +1365,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1772,7 +1786,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Wiimms CT-CODE Tool : Manage the CT-CODE extension. BRRES, TEX0," " CT-CODE, CT-TEXT and LE-BIN files are accepted as input.", 0, - 33, + 34, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wctct.h b/project/src/ui/ui-wctct.h index 70257de..6645493 100644 --- a/project/src/ui/ui-wctct.h +++ b/project/src/ui/ui-wctct.h @@ -119,6 +119,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -152,7 +153,7 @@ typedef enum enumOptions OPT_CT_LOG, OPT_ALLOW_SLOTS, - OPT__N_TOTAL // == 91 + OPT__N_TOTAL // == 92 } enumOptions; @@ -463,6 +464,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -541,7 +543,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wctct; diff --git a/project/src/ui/ui-wimgt.c b/project/src/ui/ui-wimgt.c index 9d61c4e..901f399 100644 --- a/project/src/ui/ui-wimgt.c +++ b/project/src/ui/ui-wimgt.c @@ -340,6 +340,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -537,7 +546,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 64 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 65 }; @@ -657,7 +666,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBM:T:A:td:D:E:orupiaP:x:"; +static const char OptionShort[] = "VhzqvLYW:c:lHBM:T:A:td:D:E:orupiaP:x:"; static const struct option OptionLong[] = { @@ -674,6 +683,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -820,7 +830,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x076 v */ OPT_VERBOSE, /* 0x077 */ 0, /* 0x078 x */ OPT_TRANSFORM, - /* 0x079 */ 0,0,0,0, 0,0,0, + /* 0x079 */ 0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -868,7 +880,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -978,6 +991,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1307,7 +1321,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Wiimms Image Tool : Extract and convert graphic images. The file" " formats TPL, TEX, BTI, BREFT and PNG are supported.", 0, - 27, + 28, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wimgt.h b/project/src/ui/ui-wimgt.h index 9703127..9051fa6 100644 --- a/project/src/ui/ui-wimgt.h +++ b/project/src/ui/ui-wimgt.h @@ -98,6 +98,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -125,7 +126,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 64 + OPT__N_TOTAL // == 65 } enumOptions; @@ -320,6 +321,7 @@ typedef enum enumGetOpt GO_UPDATE = 'u', GO_VERBOSE = 'v', GO_TRANSFORM = 'x', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -372,7 +374,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wimgt; diff --git a/project/src/ui/ui-wkclt.c b/project/src/ui/ui-wkclt.c index 3981df6..81cbacb 100644 --- a/project/src/ui/ui-wkclt.c +++ b/project/src/ui/ui-wkclt.c @@ -474,6 +474,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -722,7 +731,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 84 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 85 }; @@ -994,7 +1003,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; static const struct option OptionLong[] = { @@ -1011,6 +1020,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -1173,7 +1183,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -1241,7 +1253,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1464,6 +1477,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -2278,7 +2292,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Wiimms KCL Tool : Analyze, modify, export and create KCL and OBJ" " files.", 0, - 31, + 32, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wkclt.h b/project/src/ui/ui-wkclt.h index 3f8a2e9..f467063 100644 --- a/project/src/ui/ui-wkclt.h +++ b/project/src/ui/ui-wkclt.h @@ -113,6 +113,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -145,7 +146,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 84 + OPT__N_TOTAL // == 85 } enumOptions; @@ -473,6 +474,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -546,7 +548,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wkclt; diff --git a/project/src/ui/ui-wkmpt.c b/project/src/ui/ui-wkmpt.c index f04bd3c..fc470b8 100644 --- a/project/src/ui/ui-wkmpt.c +++ b/project/src/ui/ui-wkmpt.c @@ -566,6 +566,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -926,7 +935,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 102 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 103 }; @@ -1211,7 +1220,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:w:lHBXPGNM:T:A:td:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:w:lHBXPGNM:T:A:td:D:E:orupi"; static const struct option OptionLong[] = { @@ -1228,6 +1237,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -1425,7 +1435,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, /* 0x077 w */ OPT_DRAW, - /* 0x078 */ 0,0,0,0, 0,0,0,0, + /* 0x078 */ 0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -1507,7 +1519,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1718,6 +1731,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -2341,7 +2355,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Wiimms KMP Tool : Analyze, modify, export and create (compile) KMP" " files.", 0, - 40, + 41, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wkmpt.h b/project/src/ui/ui-wkmpt.h index d0ac366..8095fce 100644 --- a/project/src/ui/ui-wkmpt.h +++ b/project/src/ui/ui-wkmpt.h @@ -121,6 +121,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -163,7 +164,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 102 + OPT__N_TOTAL // == 103 } enumOptions; @@ -491,6 +492,7 @@ typedef enum enumGetOpt GO_UPDATE = 'u', GO_VERBOSE = 'v', GO_DRAW = 'w', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -579,7 +581,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wkmpt; diff --git a/project/src/ui/ui-wlect.c b/project/src/ui/ui-wlect.c index c265634..912e2e1 100644 --- a/project/src/ui/ui-wlect.c +++ b/project/src/ui/ui-wlect.c @@ -468,6 +468,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -712,7 +721,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 93 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 94 }; @@ -886,7 +895,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBXPM:tCd:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:lHBXPM:tCd:D:E:orupi"; static const struct option OptionLong[] = { @@ -903,6 +912,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -1094,7 +1104,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -1171,7 +1183,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1376,6 +1389,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1969,7 +1983,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "wlect [option]... command [option|parameter|file]...", "Wiimms LE-CODE Tool : Manage the LE-CODE and LEX extensions.", 0, - 37, + 38, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wlect.h b/project/src/ui/ui-wlect.h index dfad948..55aeacb 100644 --- a/project/src/ui/ui-wlect.h +++ b/project/src/ui/ui-wlect.h @@ -119,6 +119,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -154,7 +155,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 93 + OPT__N_TOTAL // == 94 } enumOptions; @@ -462,6 +463,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -545,7 +547,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wlect; diff --git a/project/src/ui/ui-wmdlt.c b/project/src/ui/ui-wmdlt.c index a3e2c36..663346c 100644 --- a/project/src/ui/ui-wmdlt.c +++ b/project/src/ui/ui-wmdlt.c @@ -396,6 +396,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -614,7 +623,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 73 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 74 }; @@ -772,7 +781,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; static const struct option OptionLong[] = { @@ -789,6 +798,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -930,7 +940,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -988,7 +1000,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1145,6 +1158,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1565,7 +1579,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "wmdlt [option]... command [option|parameter|file]...", "Wiimms MDL Tool : Decode raw MDL and encode text MDL files.", 0, - 29, + 30, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wmdlt.h b/project/src/ui/ui-wmdlt.h index e6d46bd..5e7f493 100644 --- a/project/src/ui/ui-wmdlt.h +++ b/project/src/ui/ui-wmdlt.h @@ -105,6 +105,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -134,7 +135,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 73 + OPT__N_TOTAL // == 74 } enumOptions; @@ -385,6 +386,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -447,7 +449,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wmdlt; diff --git a/project/src/ui/ui-wpatt.c b/project/src/ui/ui-wpatt.c index 07ce14d..79b02eb 100644 --- a/project/src/ui/ui-wpatt.c +++ b/project/src/ui/ui-wpatt.c @@ -238,6 +238,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -445,7 +454,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 57 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 58 }; @@ -569,7 +578,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; +static const char OptionShort[] = "VhzqvLYW:c:lHBPNM:T:A:td:D:E:orupi"; static const struct option OptionLong[] = { @@ -586,6 +595,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -709,7 +719,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -752,7 +764,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -867,6 +880,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -1097,7 +1111,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "wpatt [option]... command [option|parameter|file]...", "Wiimms PAT Tool : Decode raw PAT and encode text PAT files.", 0, - 28, + 29, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wpatt.h b/project/src/ui/ui-wpatt.h index ad0847b..fe05b39 100644 --- a/project/src/ui/ui-wpatt.h +++ b/project/src/ui/ui-wpatt.h @@ -90,6 +90,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -118,7 +119,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 57 + OPT__N_TOTAL // == 58 } enumOptions; @@ -302,6 +303,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -348,7 +350,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wpatt; diff --git a/project/src/ui/ui-wstrt.c b/project/src/ui/ui-wstrt.c index d7a4c55..54ac589 100644 --- a/project/src/ui/ui-wstrt.c +++ b/project/src/ui/ui-wstrt.c @@ -593,6 +593,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -949,7 +958,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " directory." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 127 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 128 }; @@ -1160,7 +1169,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "Vh@qvLYW:c:lBHT:A:R:td:D:E:orupi0U"; +static const char OptionShort[] = "Vh@zqvLYW:c:lBHT:A:R:td:D:E:orupi0U"; static const struct option OptionLong[] = { @@ -1178,6 +1187,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -1404,7 +1414,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x074 t */ OPT_TEST, /* 0x075 u */ OPT_UPDATE, /* 0x076 v */ OPT_VERBOSE, - /* 0x077 */ 0,0,0,0, 0,0,0,0, 0, + /* 0x077 */ 0,0,0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -1511,7 +1523,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x110 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x120 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, /* 0x130 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, - /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0, + /* 0x140 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + /* 0x150 */ 0,0,0,0, }; // @@ -1711,6 +1724,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -2170,7 +2184,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, - 44, + 45, option_tab_tool, 0 }, diff --git a/project/src/ui/ui-wstrt.h b/project/src/ui/ui-wstrt.h index 4ed5b83..0fa2cfd 100644 --- a/project/src/ui/ui-wstrt.h +++ b/project/src/ui/ui-wstrt.h @@ -141,6 +141,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -188,7 +189,7 @@ typedef enum enumOptions OPT_CLEAN_DOL, OPT_CT_DIR, - OPT__N_TOTAL // == 127 + OPT__N_TOTAL // == 128 } enumOptions; @@ -518,6 +519,7 @@ typedef enum enumGetOpt GO_TEST = 't', GO_UPDATE = 'u', GO_VERBOSE = 'v', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -633,7 +635,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wstrt; diff --git a/project/src/ui/ui-wszst.c b/project/src/ui/ui-wszst.c index 06ed088..9ea4297 100644 --- a/project/src/ui/ui-wszst.c +++ b/project/src/ui/ui-wszst.c @@ -502,12 +502,12 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = { OPT_CUP_ICONS, false, false, false, false, false, 0, "cup-icons", "image", - "Load given image, convert it to TPL.CMPR and add the result as" + "Load given image, convert it to TPLx.CMPR and add the result as" " sub-files 'button/timg/ct_icons.tpl' and as" " 'control/timg/ct_icons.tpl' to files 'Channel.szs', 'MenuMulti.szs'" " and 'MenuSingle.szs'. Both sub-files are always linked, so that" " storage space is saved. The usual size for each single icon is" - " 128x128. This can be changed by LPAR setting CUP-ICON-SIZE." + " 128x128." }, { OPT_NO_COPY, false, false, false, false, false, 0, "no-copy", @@ -757,10 +757,10 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = { OPT_FMODES, false, true, false, false, false, 0, "fmodes", "list", - "--fmodes is an abbreviation for --feature-modes and declares an" - " output filter. LIST is a keyword list. The keywords are: SECTION," - " VISUAL, GAMEPLAY, BATTLE, RACING, TIMETRIAL, OFFLINE and ONLINE. A" - " feature is only printed if *all* set keywords match.\n" + "--fmodes is a short cut for --feature-modes and declares an output" + " filter. LIST is a keyword list. The keywords are: SECTION, VISUAL," + " GAMEPLAY, BATTLE, RACING, TIMETRIAL, OFFLINE and ONLINE. A feature" + " is only printed if *all* set keywords match.\n" " Each keyword can also be used with a minus as prefix to define a" " second condition. In this case the feature is excluded from printing" " if *any* set keywords match." @@ -1087,8 +1087,11 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " the best compression mode with testing the first N modes of 9, 1, 8," " 2, 5. TRY2 is used for normalizing. For non bz-compression, TRY* are" " the same as BEST.\n" + " Do not use compression level >6 for LZMA if the file is intended" + " for Mario Kart Wii, as too much memory is required for decoding.\n" + "\n" " Option --norm takes precedence over --compr and sets the" - " compression level to TRY2 (BEST).\n" + " compression level for bzip2 to TRY2 (BEST) and for LZMA to 6.\n" " For more modes and details type 'wszst -C list'. To force colorized" " output type 'wszst -C clist'." }, @@ -1302,6 +1305,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "Forbid the internal usage of a pager." }, + { OPT_ZERO, false, false, false, false, false, 'z', "zero", + 0, + "This option affects the exit status of the programs. Instead of an" + " exit status, the value 0 is returned for OK. This happens for" + " notices (-v, status<15), warnings (-vv, status<29), errors (-vvv," + " status<115) and fatal errors (-vvvv). The exit status for INTERRUPT" + " (112) is never replaced." + }, + { OPT_QUIET, false, false, false, false, false, 'q', "quiet", 0, "Be quiet and print only error messages. Multiple use is possible." @@ -1862,9 +1874,22 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "If creating a compressed file, create a BZIP2 compatible file." }, + { OPT_CYBZ, false, false, false, false, false, 0, "cybz", + 0, + "If creating a compressed file, force YBZ compression (YAZ0 file" + " header, but BZIP2 compression), but don't change the payload." + }, + + { OPT_YBZ, false, false, false, false, false, 0, "ybz", + 0, + "If creating a compressed file, force archive format U8 with YBZ" + " compression (YAZ0 file header, but BZIP2 compression). Therefore it" + " is a short cut for '--u8 --cybz'." + }, + { OPT_LZ, false, false, false, false, false, 0, "lz", 0, - "If creating a compressed file, force BZ compression (a YAZ0 like file" + "If creating a compressed file, force LZ compression (a YAZ0 like file" " format with LZMA compression)." }, @@ -1873,6 +1898,19 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = "If creating a compressed file, create a LZMA compatible file." }, + { OPT_CYLZ, false, false, false, false, false, 0, "cylz", + 0, + "If creating a compressed file, force YLZ compression (YAZ0 file" + " header, but LZMA compression), but don't change the payload." + }, + + { OPT_YLZ, false, false, false, false, false, 0, "ylz", + 0, + "If creating a compressed file, force archive format U8 with YLZ" + " compression (YAZ0 file header, but LZMA compression). Therefore it" + " is a short cut for '--u8 --cylz'." + }, + { OPT_SH, false, false, false, false, true, 0, "sh", 0, "Dump info using SH syntax. Use '--var name' as prefix." @@ -1951,7 +1989,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = " helper option." }, - {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 238 + {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 243 }; @@ -2586,7 +2624,7 @@ static const KeywordTab_t CommandTab[] = /////////////// OptionShort & OptionLong /////////////// /////////////////////////////////////////////////////////////////////////////// -static const char OptionShort[] = "VhqvLYW:c:lHB1XPS:M:T:A:x:ts:d:D:E:orupiNC:nRea"; +static const char OptionShort[] = "VhzqvLYW:c:lHB1XPS:M:T:A:x:ts:d:D:E:orupiNC:nRea"; static const struct option OptionLong[] = { @@ -2603,6 +2641,7 @@ static const struct option OptionLong[] = { "maxwidth", 1, 0, GO_MAX_WIDTH }, { "no-pager", 0, 0, GO_NO_PAGER }, { "nopager", 0, 0, GO_NO_PAGER }, + { "zero", 0, 0, 'z' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "logging", 0, 0, 'L' }, @@ -2844,8 +2883,12 @@ static const struct option OptionLong[] = { "bz", 0, 0, GO_BZ }, { "bzip2", 0, 0, GO_BZIP2 }, { "bz2", 0, 0, GO_BZIP2 }, + { "cybz", 0, 0, GO_CYBZ }, + { "ybz", 0, 0, GO_YBZ }, { "lz", 0, 0, GO_LZ }, { "lzma", 0, 0, GO_LZMA }, + { "cylz", 0, 0, GO_CYLZ }, + { "ylz", 0, 0, GO_YLZ }, { "sh", 0, 0, GO_SH }, { "bash", 0, 0, GO_BASH }, { "json", 0, 0, GO_JSON }, @@ -3051,7 +3094,9 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x076 v */ OPT_VERBOSE, /* 0x077 */ 0, /* 0x078 x */ OPT_TRANSFORM, - /* 0x079 */ 0,0,0,0, 0,0,0, + /* 0x079 */ 0, + /* 0x07a z */ OPT_ZERO, + /* 0x07b */ 0,0,0,0, 0, /* 0x080 */ OPT_XHELP, /* 0x081 */ OPT_CONFIG, /* 0x082 */ OPT_YDEBUG, @@ -3188,72 +3233,77 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] = /* 0x105 */ OPT_XYZ, /* 0x106 */ OPT_BZ, /* 0x107 */ OPT_BZIP2, - /* 0x108 */ OPT_LZ, - /* 0x109 */ OPT_LZMA, - /* 0x10a */ OPT_SH, - /* 0x10b */ OPT_BASH, - /* 0x10c */ OPT_JSON, - /* 0x10d */ OPT_PHP, - /* 0x10e */ OPT_MAKEDOC, - /* 0x10f */ OPT_VAR, - /* 0x110 */ OPT_ARRAY, - /* 0x111 */ OPT_AVAR, - /* 0x112 */ OPT_CASE, - /* 0x113 */ OPT_FMODES, - /* 0x114 */ OPT_INSTALL, - /* 0x115 */ OPT_ANALYZE, - /* 0x116 */ OPT_ANALYZE_MODE, - /* 0x117 */ OPT_OLD, - /* 0x118 */ OPT_STD, - /* 0x119 */ OPT_NEW, - /* 0x11a */ OPT_EXTRACT, - /* 0x11b */ OPT_ID_LIST, - /* 0x11c */ OPT_REFERENCE, - /* 0x11d */ OPT_NUMBER, - /* 0x11e */ OPT_REMOVE_SRC, - /* 0x11f */ OPT_IGNORE_SETUP, - /* 0x120 */ OPT_PURGE, - /* 0x121 */ OPT_ALIGN_U8, - /* 0x122 */ OPT_ALIGN_LTA, - /* 0x123 */ OPT_ALIGN_PACK, - /* 0x124 */ OPT_ALIGN_BRRES, - /* 0x125 */ OPT_ALIGN_BREFF, - /* 0x126 */ OPT_ALIGN_BREFT, - /* 0x127 */ OPT_ALIGN, - /* 0x128 */ OPT_ENCODE_ALL, - /* 0x129 */ OPT_ENCODE_IMG, - /* 0x12a */ OPT_NO_ENCODE, - /* 0x12b */ OPT_NO_RECURSE, - /* 0x12c */ OPT_AUTO_ADD, - /* 0x12d */ OPT_NO_ECHO, - /* 0x12e */ OPT_PT_DIR, - /* 0x12f */ OPT_RM_AIPARAM, - /* 0x130 */ OPT_U8, - /* 0x131 */ OPT_SZS, - /* 0x132 */ OPT_WU8, - /* 0x133 */ OPT_XWU8, - /* 0x134 */ OPT_WBZ, - /* 0x135 */ OPT_WLZ, - /* 0x136 */ OPT_LFL, - /* 0x137 */ OPT_PACK, - /* 0x138 */ OPT_BRRES, - /* 0x139 */ OPT_BREFF, - /* 0x13a */ OPT_BREFT, - /* 0x13b */ OPT_NO_COMPRESS, - /* 0x13c */ OPT_FAST, - /* 0x13d */ OPT_LINKS, - /* 0x13e */ OPT_BASEDIR, - /* 0x13f */ OPT_DECODE, - /* 0x140 */ OPT_MIPMAPS, - /* 0x141 */ OPT_NO_MIPMAPS, - /* 0x142 */ OPT_N_MIPMAPS, - /* 0x143 */ OPT_MAX_MIPMAPS, - /* 0x144 */ OPT_MIPMAP_SIZE, - /* 0x145 */ OPT_FAST_MIPMAPS, - /* 0x146 */ OPT_CMPR_DEFAULT, - /* 0x147 */ OPT_CUT, - /* 0x148 */ OPT_RAW, - /* 0x149 */ OPT_SECTIONS, + /* 0x108 */ OPT_CYBZ, + /* 0x109 */ OPT_YBZ, + /* 0x10a */ OPT_LZ, + /* 0x10b */ OPT_LZMA, + /* 0x10c */ OPT_CYLZ, + /* 0x10d */ OPT_YLZ, + /* 0x10e */ OPT_SH, + /* 0x10f */ OPT_BASH, + /* 0x110 */ OPT_JSON, + /* 0x111 */ OPT_PHP, + /* 0x112 */ OPT_MAKEDOC, + /* 0x113 */ OPT_VAR, + /* 0x114 */ OPT_ARRAY, + /* 0x115 */ OPT_AVAR, + /* 0x116 */ OPT_CASE, + /* 0x117 */ OPT_FMODES, + /* 0x118 */ OPT_INSTALL, + /* 0x119 */ OPT_ANALYZE, + /* 0x11a */ OPT_ANALYZE_MODE, + /* 0x11b */ OPT_OLD, + /* 0x11c */ OPT_STD, + /* 0x11d */ OPT_NEW, + /* 0x11e */ OPT_EXTRACT, + /* 0x11f */ OPT_ID_LIST, + /* 0x120 */ OPT_REFERENCE, + /* 0x121 */ OPT_NUMBER, + /* 0x122 */ OPT_REMOVE_SRC, + /* 0x123 */ OPT_IGNORE_SETUP, + /* 0x124 */ OPT_PURGE, + /* 0x125 */ OPT_ALIGN_U8, + /* 0x126 */ OPT_ALIGN_LTA, + /* 0x127 */ OPT_ALIGN_PACK, + /* 0x128 */ OPT_ALIGN_BRRES, + /* 0x129 */ OPT_ALIGN_BREFF, + /* 0x12a */ OPT_ALIGN_BREFT, + /* 0x12b */ OPT_ALIGN, + /* 0x12c */ OPT_ENCODE_ALL, + /* 0x12d */ OPT_ENCODE_IMG, + /* 0x12e */ OPT_NO_ENCODE, + /* 0x12f */ OPT_NO_RECURSE, + /* 0x130 */ OPT_AUTO_ADD, + /* 0x131 */ OPT_NO_ECHO, + /* 0x132 */ OPT_PT_DIR, + /* 0x133 */ OPT_RM_AIPARAM, + /* 0x134 */ OPT_U8, + /* 0x135 */ OPT_SZS, + /* 0x136 */ OPT_WU8, + /* 0x137 */ OPT_XWU8, + /* 0x138 */ OPT_WBZ, + /* 0x139 */ OPT_WLZ, + /* 0x13a */ OPT_LFL, + /* 0x13b */ OPT_PACK, + /* 0x13c */ OPT_BRRES, + /* 0x13d */ OPT_BREFF, + /* 0x13e */ OPT_BREFT, + /* 0x13f */ OPT_NO_COMPRESS, + /* 0x140 */ OPT_FAST, + /* 0x141 */ OPT_LINKS, + /* 0x142 */ OPT_BASEDIR, + /* 0x143 */ OPT_DECODE, + /* 0x144 */ OPT_MIPMAPS, + /* 0x145 */ OPT_NO_MIPMAPS, + /* 0x146 */ OPT_N_MIPMAPS, + /* 0x147 */ OPT_MAX_MIPMAPS, + /* 0x148 */ OPT_MIPMAP_SIZE, + /* 0x149 */ OPT_FAST_MIPMAPS, + /* 0x14a */ OPT_CMPR_DEFAULT, + /* 0x14b */ OPT_CUT, + /* 0x14c */ OPT_RAW, + /* 0x14d */ OPT_SECTIONS, + /* 0x14e */ 0,0,0,0, 0,0, }; // @@ -4016,6 +4066,7 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_WIDTH, OptionInfo + OPT_MAX_WIDTH, OptionInfo + OPT_NO_PAGER, + OptionInfo + OPT_ZERO, OptionInfo + OPT_QUIET, OptionInfo + OPT_VERBOSE, OptionInfo + OPT_LOGGING, @@ -4079,8 +4130,12 @@ static const InfoOption_t * option_tab_tool[] = OptionInfo + OPT_XYZ, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_NONE, // separator @@ -4430,8 +4485,12 @@ static const InfoOption_t * option_tab_cmd_LIST[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4506,8 +4565,12 @@ static const InfoOption_t * option_tab_cmd_LIST_L[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4582,8 +4645,12 @@ static const InfoOption_t * option_tab_cmd_LIST_LL[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4658,8 +4725,12 @@ static const InfoOption_t * option_tab_cmd_LIST_LLL[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4734,8 +4805,12 @@ static const InfoOption_t * option_tab_cmd_LIST_A[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4810,8 +4885,12 @@ static const InfoOption_t * option_tab_cmd_LIST_LA[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4893,8 +4972,12 @@ static const InfoOption_t * option_tab_cmd_ILIST[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -4966,8 +5049,12 @@ static const InfoOption_t * option_tab_cmd_ILIST_L[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5039,8 +5126,12 @@ static const InfoOption_t * option_tab_cmd_ILIST_LL[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5112,8 +5203,12 @@ static const InfoOption_t * option_tab_cmd_ILIST_A[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5185,8 +5280,12 @@ static const InfoOption_t * option_tab_cmd_ILIST_LA[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5263,8 +5362,12 @@ static const InfoOption_t * option_tab_cmd_MEMORY[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5341,8 +5444,12 @@ static const InfoOption_t * option_tab_cmd_MEMORY_A[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5409,8 +5516,12 @@ static const InfoOption_t * option_tab_cmd_DUMP[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5481,8 +5592,12 @@ static const InfoOption_t * option_tab_cmd_SHA1[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5675,8 +5790,12 @@ static const InfoOption_t * option_tab_cmd_DISTRIBUTION[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5764,8 +5883,12 @@ static const InfoOption_t * option_tab_cmd_CHECK[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -5887,8 +6010,12 @@ static const InfoOption_t * option_tab_cmd_SLOTS[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6052,8 +6179,12 @@ static const InfoOption_t * option_tab_cmd_NORMALIZE[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6163,8 +6294,12 @@ static const InfoOption_t * option_tab_cmd_PATCH[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6275,8 +6410,12 @@ static const InfoOption_t * option_tab_cmd_COPY[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6388,8 +6527,12 @@ static const InfoOption_t * option_tab_cmd_DUPLICATE[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6560,8 +6703,12 @@ static const InfoOption_t * option_tab_cmd_COMPRESS[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -6868,8 +7015,12 @@ static const InfoOption_t * option_tab_cmd_CREATE[] = OptionInfo + OPT_YAZ1, OptionInfo + OPT_BZ, OptionInfo + OPT_BZIP2, + OptionInfo + OPT_CYBZ, + OptionInfo + OPT_YBZ, OptionInfo + OPT_LZ, OptionInfo + OPT_LZMA, + OptionInfo + OPT_CYLZ, + OptionInfo + OPT_YLZ, OptionInfo + OPT_SZS, OptionInfo + OPT_WBZ, OptionInfo + OPT_WLZ, @@ -7875,7 +8026,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " SZS, U8, PACK, BRRES, BREFF and BREFT archives. Additonally, RARC" " archive can be extracted. It is also a wrapper to all other tools.", 0, - 80, + 85, option_tab_tool, 0 }, @@ -8409,7 +8560,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " characters are parsed, see https://szs.wiimm.de/doc/wildcards for" " details.", 0, - 58, + 62, option_tab_cmd_LIST, option_allowed_cmd_LIST }, @@ -8425,7 +8576,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " 'LIST --long'. Wildcards and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 58, + 62, option_tab_cmd_LIST_L, option_allowed_cmd_LIST_L }, @@ -8441,7 +8592,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " short cuts for 'LIST --long --long'. Wildcards and pipe characters" " are parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 58, + 62, option_tab_cmd_LIST_LL, option_allowed_cmd_LIST_LL }, @@ -8458,7 +8609,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 58, + 62, option_tab_cmd_LIST_LLL, option_allowed_cmd_LIST_LLL }, @@ -8474,7 +8625,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " cuts for 'LIST --long --all --all'. Wildcards and pipe characters" " are parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 58, + 62, option_tab_cmd_LIST_A, option_allowed_cmd_LIST_A }, @@ -8491,7 +8642,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 58, + 62, option_tab_cmd_LIST_LA, option_allowed_cmd_LIST_LA }, @@ -8527,7 +8678,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " does it) and listed. Wildcards and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 55, + 59, option_tab_cmd_ILIST, option_allowed_cmd_ILIST }, @@ -8542,7 +8693,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "List all image files with geometry data. 'ILIST-L' and 'ILL' are" " short cuts for 'ILIST --long'.", 0, - 55, + 59, option_tab_cmd_ILIST_L, option_allowed_cmd_ILIST_L }, @@ -8557,7 +8708,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "List all sub files with advanced geometry data. 'ILIST-LL' and 'ILLL'" " are short cuts for 'ILIST --long --long'.", 0, - 55, + 59, option_tab_cmd_ILIST_LL, option_allowed_cmd_ILIST_LL }, @@ -8572,7 +8723,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "List recursive all image files. 'ILIST-A' and 'ILA' are short cuts" " for 'ILIST --all'.", 0, - 55, + 59, option_tab_cmd_ILIST_A, option_allowed_cmd_ILIST_A }, @@ -8587,7 +8738,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "List recursive all image files with geometry data. 'ILIST-LA' and" " 'ILLA' are short cuts for 'ILIST --long --all'.", 0, - 55, + 59, option_tab_cmd_ILIST_LA, option_allowed_cmd_ILIST_LA }, @@ -8603,7 +8754,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " directories) are also supported. Wildcards and pipe characters are" " parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 57, + 61, option_tab_cmd_MEMORY, option_allowed_cmd_MEMORY }, @@ -8618,7 +8769,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = "Dump recursive a memory map of each source file. 'MEMORY-A' and" " 'MEMA' are short cuts for 'MEMORY --all --all'.", 0, - 57, + 61, option_tab_cmd_MEMORY_A, option_allowed_cmd_MEMORY_A }, @@ -8636,7 +8787,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " supported. Wildcards and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 51, + 55, option_tab_cmd_DUMP, option_allowed_cmd_DUMP }, @@ -8653,7 +8804,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " characters are parsed, see https://szs.wiimm.de/doc/wildcards for" " details.", 0, - 59, + 63, option_tab_cmd_SHA1, option_allowed_cmd_SHA1 }, @@ -8755,7 +8906,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " See »welect DISTRIBUTION« for a new and alternative implementation" " of this.", 0, - 55, + 59, option_tab_cmd_DISTRIBUTION, option_allowed_cmd_DISTRIBUTION }, @@ -8792,7 +8943,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " or WBZ file, or an U8 like directory. Wildcards and pipe characters" " are parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 107, + 111, option_tab_cmd_CHECK, option_allowed_cmd_CHECK }, @@ -8811,7 +8962,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " arenas, the keyword ARENA is printed. Wildcards and pipe characters" " are parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 103, + 107, option_tab_cmd_SLOTS, option_allowed_cmd_SLOTS }, @@ -8873,7 +9024,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " https://szs.wiimm.de/doc/wildcards for details.\n" " 'wszst NORMALIZE' is the same as 'wszst PATCH --norm'.", 0, - 89, + 93, option_tab_cmd_NORMALIZE, option_allowed_cmd_NORMALIZE }, @@ -8892,7 +9043,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 91, + 95, option_tab_cmd_PATCH, option_allowed_cmd_PATCH }, @@ -8916,7 +9067,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " https://szs.wiimm.de/doc/wildcards for details. Patching is also" " possible and option --overwrite is set implicitly.", 0, - 91, + 95, option_tab_cmd_COPY, option_allowed_cmd_COPY }, @@ -8941,7 +9092,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " Use command 'wkmpt GAMEMODES' to list all variants and to check them" " beforehand.", 0, - 92, + 96, option_tab_cmd_DUPLICATE, option_allowed_cmd_DUPLICATE }, @@ -8977,7 +9128,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " destination is '%P/%N.szs'. Wildcards and pipe characters are" " parsed, see https://szs.wiimm.de/doc/wildcards for details.", 0, - 90, + 94, option_tab_cmd_COMPRESS, option_allowed_cmd_COMPRESS }, @@ -9028,7 +9179,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = " Wildcards and pipe characters are parsed, see" " https://szs.wiimm.de/doc/wildcards for details.", 0, - 113, + 117, option_tab_cmd_CREATE, option_allowed_cmd_CREATE }, diff --git a/project/src/ui/ui-wszst.h b/project/src/ui/ui-wszst.h index e8774b0..6200428 100644 --- a/project/src/ui/ui-wszst.h +++ b/project/src/ui/ui-wszst.h @@ -219,6 +219,7 @@ typedef enum enumOptions OPT_WIDTH, OPT_MAX_WIDTH, OPT_NO_PAGER, + OPT_ZERO, OPT_QUIET, OPT_VERBOSE, OPT_LOGGING, @@ -283,8 +284,12 @@ typedef enum enumOptions OPT_XYZ, OPT_BZ, OPT_BZIP2, + OPT_CYBZ, + OPT_YBZ, OPT_LZ, OPT_LZMA, + OPT_CYLZ, + OPT_YLZ, OPT_SH, OPT_BASH, OPT_JSON, @@ -299,7 +304,7 @@ typedef enum enumOptions OPT_NEW, OPT_EXTRACT, - OPT__N_TOTAL // == 238 + OPT__N_TOTAL // == 243 } enumOptions; @@ -1240,6 +1245,7 @@ typedef enum enumGetOpt GO_UPDATE = 'u', GO_VERBOSE = 'v', GO_TRANSFORM = 'x', + GO_ZERO = 'z', GO_XHELP = 0x80, GO_CONFIG, @@ -1377,8 +1383,12 @@ typedef enum enumGetOpt GO_XYZ, GO_BZ, GO_BZIP2, + GO_CYBZ, + GO_YBZ, GO_LZ, GO_LZMA, + GO_CYLZ, + GO_YLZ, GO_SH, GO_BASH, GO_JSON, @@ -1457,7 +1467,7 @@ typedef enum enumGetOpt //extern const struct option OptionLong[]; //extern u8 OptionUsed[OPT__N_TOTAL+1]; //extern const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE]; -//UIOPT_INDEX_SIZE := 0x14a = 330 +//UIOPT_INDEX_SIZE := 0x154 = 340 //extern const InfoCommand_t CommandInfo[CMD__N+1]; extern const InfoUI_t InfoUI_wszst; diff --git a/project/src/ui/ui.def b/project/src/ui/ui.def index eced772..a3b76f7 100644 --- a/project/src/ui/ui.def +++ b/project/src/ui/ui.def @@ -621,6 +621,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -1383,12 +1391,12 @@ #:def_opt( "CUP_ICONS", "cup-icons|cupicons", "CP", \ "image", \ - "Load given image, convert it to TPL.CMPR and add the result as" \ + "Load given image, convert it to TPLx.CMPR and add the result as" \ " sub-files 'button/timg/ct_icons.tpl' and as" \ " 'control/timg/ct_icons.tpl' to files 'Channel.szs', 'MenuMulti.szs'" \ " and 'MenuSingle.szs'. Both sub-files are always linked, so that" \ " storage space is saved. The usual size for each single icon is" \ - " 128x128. This can be changed by LPAR setting CUP-ICON-SIZE." ) + " 128x128." ) #:def_opt( "NO_COPY", "no-copy|nocopy", "C", \ "", \ @@ -1714,15 +1722,37 @@ "", \ "If creating a compressed file, create a BZIP2 compatible file." ) +#:def_opt( "CYBZ", "cybz", "G", \ + "", \ + "If creating a compressed file, force YBZ compression (YAZ0 file" \ + " header, but BZIP2 compression), but don't change the payload." ) + +#:def_opt( "YBZ", "ybz", "G", \ + "", \ + "If creating a compressed file, force archive format U8 with YBZ" \ + " compression (YAZ0 file header, but BZIP2 compression). Therefore it" \ + " is a short cut for {--u8 --cybz}." ) + #:def_opt( "LZ", "lz", "G", \ "", \ - "If creating a compressed file, force BZ compression (a YAZ0 like file" \ + "If creating a compressed file, force LZ compression (a YAZ0 like file" \ " format with LZMA compression)." ) #:def_opt( "LZMA", "lzma", "G", \ "", \ "If creating a compressed file, create a LZMA compatible file." ) +#:def_opt( "CYLZ", "cylz", "G", \ + "", \ + "If creating a compressed file, force YLZ compression (YAZ0 file" \ + " header, but LZMA compression), but don't change the payload." ) + +#:def_opt( "YLZ", "ylz", "G", \ + "", \ + "If creating a compressed file, force archive format U8 with YLZ" \ + " compression (YAZ0 file header, but LZMA compression). Therefore it" \ + " is a short cut for {--u8 --cylz}." ) + #:def_opt( "SH", "sh", "G", \ "", \ "Dump info using SH syntax. Use {--var name} as prefix." ) @@ -2023,8 +2053,11 @@ " find the best compression mode with testing the first N modes of 9," \ " 1, 8, 2, 5. @TRY2@ is used for normalizing. For non bz-compression," \ " @TRY*@ are the same as @BEST@.\n" \ + " Do not use compression level >6 for LZMA if the file is intended" \ + " for Mario Kart Wii, as too much memory is required for decoding.\n" \ + "\n" \ " Option {--norm} takes precedence over {--compr} and sets the" \ - " compression level to @TRY2@ (@BEST@).\n" \ + " compression level for bzip2 to @TRY2@ (@BEST@) and for LZMA to 6.\n" \ " For more modes and details type {wszst -C list}. To force colorized" \ " output type {wszst -C clist}." ) @@ -2723,6 +2756,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST", "LZ", \ "", \ "" ) @@ -2731,6 +2772,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST", "SZS", \ "", \ "" ) @@ -2956,6 +3005,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_L", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_L", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_L", "LZ", \ "", \ "" ) @@ -2964,6 +3021,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_L", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_L", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_L", "SZS", \ "", \ "" ) @@ -3189,6 +3254,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LL", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LL", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LL", "LZ", \ "", \ "" ) @@ -3197,6 +3270,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LL", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LL", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LL", "SZS", \ "", \ "" ) @@ -3422,6 +3503,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LLL", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LLL", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LLL", "LZ", \ "", \ "" ) @@ -3430,6 +3519,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LLL", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LLL", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LLL", "SZS", \ "", \ "" ) @@ -3655,6 +3752,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_A", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_A", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_A", "LZ", \ "", \ "" ) @@ -3663,6 +3768,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_A", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_A", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_A", "SZS", \ "", \ "" ) @@ -3888,6 +4001,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LA", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LA", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LA", "LZ", \ "", \ "" ) @@ -3896,6 +4017,14 @@ "", \ "" ) +#:def_cmd_opt( "LIST_LA", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "LIST_LA", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "LIST_LA", "SZS", \ "", \ "" ) @@ -4132,6 +4261,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST", "LZ", \ "", \ "" ) @@ -4140,6 +4277,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST", "SZS", \ "", \ "" ) @@ -4353,6 +4498,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_L", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_L", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_L", "LZ", \ "", \ "" ) @@ -4361,6 +4514,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_L", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_L", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_L", "SZS", \ "", \ "" ) @@ -4574,6 +4735,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_LL", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_LL", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_LL", "LZ", \ "", \ "" ) @@ -4582,6 +4751,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_LL", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_LL", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_LL", "SZS", \ "", \ "" ) @@ -4795,6 +4972,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_A", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_A", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_A", "LZ", \ "", \ "" ) @@ -4803,6 +4988,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_A", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_A", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_A", "SZS", \ "", \ "" ) @@ -5016,6 +5209,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_LA", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_LA", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_LA", "LZ", \ "", \ "" ) @@ -5024,6 +5225,14 @@ "", \ "" ) +#:def_cmd_opt( "ILIST_LA", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "ILIST_LA", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "ILIST_LA", "SZS", \ "", \ "" ) @@ -5245,6 +5454,14 @@ "", \ "" ) +#:def_cmd_opt( "MEMORY", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "MEMORY", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "MEMORY", "LZ", \ "", \ "" ) @@ -5253,6 +5470,14 @@ "", \ "" ) +#:def_cmd_opt( "MEMORY", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "MEMORY", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "MEMORY", "SZS", \ "", \ "" ) @@ -5474,6 +5699,14 @@ "", \ "" ) +#:def_cmd_opt( "MEMORY_A", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "MEMORY_A", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "MEMORY_A", "LZ", \ "", \ "" ) @@ -5482,6 +5715,14 @@ "", \ "" ) +#:def_cmd_opt( "MEMORY_A", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "MEMORY_A", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "MEMORY_A", "SZS", \ "", \ "" ) @@ -5674,6 +5915,14 @@ "", \ "" ) +#:def_cmd_opt( "DUMP", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DUMP", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "DUMP", "LZ", \ "", \ "" ) @@ -5682,6 +5931,14 @@ "", \ "" ) +#:def_cmd_opt( "DUMP", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DUMP", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "DUMP", "SZS", \ "", \ "" ) @@ -5891,6 +6148,14 @@ "", \ "" ) +#:def_cmd_opt( "SHA1", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "SHA1", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "SHA1", "LZ", \ "", \ "" ) @@ -5899,6 +6164,14 @@ "", \ "" ) +#:def_cmd_opt( "SHA1", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "SHA1", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "SHA1", "SZS", \ "", \ "" ) @@ -6395,6 +6668,14 @@ "", \ "" ) +#:def_cmd_opt( "DISTRIBUTION", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DISTRIBUTION", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "DISTRIBUTION", "LZ", \ "", \ "" ) @@ -6403,6 +6684,14 @@ "", \ "" ) +#:def_cmd_opt( "DISTRIBUTION", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DISTRIBUTION", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "DISTRIBUTION", "SZS", \ "", \ "" ) @@ -6663,6 +6952,14 @@ "", \ "" ) +#:def_cmd_opt( "CHECK", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "CHECK", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "CHECK", "LZ", \ "", \ "" ) @@ -6671,6 +6968,14 @@ "", \ "" ) +#:def_cmd_opt( "CHECK", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "CHECK", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "CHECK", "SZS", \ "", \ "" ) @@ -7072,6 +7377,14 @@ "", \ "" ) +#:def_cmd_opt( "SLOTS", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "SLOTS", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "SLOTS", "LZ", \ "", \ "" ) @@ -7080,6 +7393,14 @@ "", \ "" ) +#:def_cmd_opt( "SLOTS", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "SLOTS", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "SLOTS", "SZS", \ "", \ "" ) @@ -7556,6 +7877,14 @@ "", \ "" ) +#:def_cmd_opt( "NORMALIZE", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "NORMALIZE", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "NORMALIZE", "LZ", \ "", \ "" ) @@ -7564,6 +7893,14 @@ "", \ "" ) +#:def_cmd_opt( "NORMALIZE", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "NORMALIZE", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "NORMALIZE", "SZS", \ "", \ "" ) @@ -7916,6 +8253,14 @@ "", \ "" ) +#:def_cmd_opt( "PATCH", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "PATCH", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "PATCH", "LZ", \ "", \ "" ) @@ -7924,6 +8269,14 @@ "", \ "" ) +#:def_cmd_opt( "PATCH", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "PATCH", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "PATCH", "SZS", \ "", \ "" ) @@ -8280,6 +8633,14 @@ "", \ "" ) +#:def_cmd_opt( "COPY", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "COPY", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "COPY", "LZ", \ "", \ "" ) @@ -8288,6 +8649,14 @@ "", \ "" ) +#:def_cmd_opt( "COPY", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "COPY", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "COPY", "SZS", \ "", \ "" ) @@ -8648,6 +9017,14 @@ "", \ "" ) +#:def_cmd_opt( "DUPLICATE", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DUPLICATE", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "DUPLICATE", "LZ", \ "", \ "" ) @@ -8656,6 +9033,14 @@ "", \ "" ) +#:def_cmd_opt( "DUPLICATE", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "DUPLICATE", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "DUPLICATE", "SZS", \ "", \ "" ) @@ -9205,6 +9590,14 @@ "", \ "" ) +#:def_cmd_opt( "COMPRESS", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "COMPRESS", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "COMPRESS", "LZ", \ "", \ "" ) @@ -9213,6 +9606,14 @@ "", \ "" ) +#:def_cmd_opt( "COMPRESS", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "COMPRESS", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "COMPRESS", "SZS", \ "", \ "" ) @@ -10222,6 +10623,14 @@ "", \ "" ) +#:def_cmd_opt( "CREATE", "CYBZ", \ + "", \ + "" ) + +#:def_cmd_opt( "CREATE", "YBZ", \ + "", \ + "" ) + #:def_cmd_opt( "CREATE", "LZ", \ "", \ "" ) @@ -10230,6 +10639,14 @@ "", \ "" ) +#:def_cmd_opt( "CREATE", "CYLZ", \ + "", \ + "" ) + +#:def_cmd_opt( "CREATE", "YLZ", \ + "", \ + "" ) + #:def_cmd_opt( "CREATE", "SZS", \ "", \ "" ) @@ -13496,6 +13913,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -14875,6 +15300,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -15191,8 +15624,7 @@ " separated list of slots (A), slot ranges (A:B) or keywords is" \ " expected. If preceded by a minus sign, the slots are disabled. The" \ " keywords are: @TRACKS@ (slots 0:0x1f), @ARENAS@ (0x20:0x29) and" \ - " @SPECIAL@ (0x36:0x3a). @CTCODE@ is an abbreviation for" \ - " @ARENAS,SPECIAL@.\n" \ + " @SPECIAL@ (0x36:0x3a). @CTCODE@ is a short cut for @ARENAS,SPECIAL@.\n" \ " The default is to enable slot ranges @0x00:0x1f@, @0x2a:0x35@," \ " @0x3b:0x41@ and @0x44:0xfe@." ) @@ -16347,6 +16779,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -17469,6 +17909,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -20145,6 +20593,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -22364,6 +22820,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -24148,6 +24612,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -25515,6 +25987,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ @@ -26220,6 +26700,14 @@ "", \ "Forbid the internal usage of a pager." ) +#:def_opt( "ZERO", "z|zero", "GM", \ + "", \ + "This option affects the exit status of the programs. Instead of an" \ + " exit status, the value 0 is returned for OK. This happens for" \ + " notices ({-v}, status<15), warnings ({-vv}, status<29), errors" \ + " ({-vvv}, status<115) and fatal errors ({-vvvv}). The exit status for" \ + " INTERRUPT (112) is never replaced." ) + #:def_opt( "QUIET", "q|quiet", "GM", \ "", \ "Be quiet and print only error messages. Multiple use is possible." \ -- cgit v1.3.1