aboutsummaryrefslogtreecommitdiff
path: root/project/src/ui
diff options
context:
space:
mode:
authorWiimm <wiimm@wiimm.de>2021-05-08 11:35:32 +0200
committerWiimm <wiimm@wiimm.de>2021-05-08 11:35:32 +0200
commit9ae8841ec4720e74173e2f72fac33f0848bbf435 (patch)
treecdce547c82e5f4e0078e908ad1b86a152bd24c45 /project/src/ui
parentf33ad95520f6c6bb8f192c8bcd1c17cf40ba6b6b (diff)
SZS v2.26a
Diffstat (limited to 'project/src/ui')
-rw-r--r--project/src/ui/gen-ui.c7
-rw-r--r--project/src/ui/tab-wbmgt.inc4
-rw-r--r--project/src/ui/tab-wctct.inc4
-rw-r--r--project/src/ui/tab-wimgt.inc4
-rw-r--r--project/src/ui/tab-wkclt.inc4
-rw-r--r--project/src/ui/tab-wkmpt.inc4
-rw-r--r--project/src/ui/tab-wlect.inc4
-rw-r--r--project/src/ui/tab-wmdlt.inc4
-rw-r--r--project/src/ui/tab-wpatt.inc4
-rw-r--r--project/src/ui/tab-wstrt.inc45
-rw-r--r--project/src/ui/tab-wszst.inc19
-rw-r--r--project/src/ui/ui-wbmgt.c14
-rw-r--r--project/src/ui/ui-wbmgt.h3
-rw-r--r--project/src/ui/ui-wctct.c14
-rw-r--r--project/src/ui/ui-wctct.h3
-rw-r--r--project/src/ui/ui-wimgt.c14
-rw-r--r--project/src/ui/ui-wimgt.h3
-rw-r--r--project/src/ui/ui-wkclt.c14
-rw-r--r--project/src/ui/ui-wkclt.h3
-rw-r--r--project/src/ui/ui-wkmpt.c14
-rw-r--r--project/src/ui/ui-wkmpt.h3
-rw-r--r--project/src/ui/ui-wlect.c14
-rw-r--r--project/src/ui/ui-wlect.h3
-rw-r--r--project/src/ui/ui-wmdlt.c14
-rw-r--r--project/src/ui/ui-wmdlt.h3
-rw-r--r--project/src/ui/ui-wpatt.c14
-rw-r--r--project/src/ui/ui-wpatt.h3
-rw-r--r--project/src/ui/ui-wstrt.c256
-rw-r--r--project/src/ui/ui-wstrt.h25
-rw-r--r--project/src/ui/ui-wszst.c194
-rw-r--r--project/src/ui/ui-wszst.h9
-rw-r--r--project/src/ui/ui.def135
32 files changed, 569 insertions, 289 deletions
diff --git a/project/src/ui/gen-ui.c b/project/src/ui/gen-ui.c
index 3e072cf..7563642 100644
--- a/project/src/ui/gen-ui.c
+++ b/project/src/ui/gen-ui.c
@@ -154,6 +154,13 @@ bool DefineIntVar ( VarMap_t * vm, ccp varname, int value ) { return false; }
"Show all information about the search" \
" for the configuration file and its content."
+#define CONFIG_BRIEF \
+ " Suppress configuration search list."
+
+#define CONFIG_LONG \
+ "If set, print the global search list too." \
+ " If set twice, print the auto-add search list too."
+
//
///////////////////////////////////////////////////////////////////////////////
/////////////// the info table ///////////////
diff --git a/project/src/ui/tab-wbmgt.inc b/project/src/ui/tab-wbmgt.inc
index 86cb2c7..40a02fa 100644
--- a/project/src/ui/tab-wbmgt.inc
+++ b/project/src/ui/tab-wbmgt.inc
@@ -462,8 +462,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wbmgt ARGTEST ----------
diff --git a/project/src/ui/tab-wctct.inc b/project/src/ui/tab-wctct.inc
index b4f72bc..33e5203 100644
--- a/project/src/ui/tab-wctct.inc
+++ b/project/src/ui/tab-wctct.inc
@@ -580,8 +580,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wctct ARGTEST ----------
diff --git a/project/src/ui/tab-wimgt.inc b/project/src/ui/tab-wimgt.inc
index c41c210..6c572fc 100644
--- a/project/src/ui/tab-wimgt.inc
+++ b/project/src/ui/tab-wimgt.inc
@@ -410,8 +410,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wimgt ARGTEST ----------
diff --git a/project/src/ui/tab-wkclt.inc b/project/src/ui/tab-wkclt.inc
index 9842709..682dd7b 100644
--- a/project/src/ui/tab-wkclt.inc
+++ b/project/src/ui/tab-wkclt.inc
@@ -551,8 +551,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wkclt ARGTEST ----------
diff --git a/project/src/ui/tab-wkmpt.inc b/project/src/ui/tab-wkmpt.inc
index 8fce206..ace5125 100644
--- a/project/src/ui/tab-wkmpt.inc
+++ b/project/src/ui/tab-wkmpt.inc
@@ -676,8 +676,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wkmpt ARGTEST ----------
diff --git a/project/src/ui/tab-wlect.inc b/project/src/ui/tab-wlect.inc
index ae427ea..1aba6e5 100644
--- a/project/src/ui/tab-wlect.inc
+++ b/project/src/ui/tab-wlect.inc
@@ -705,8 +705,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wlect ARGTEST ----------
diff --git a/project/src/ui/tab-wmdlt.inc b/project/src/ui/tab-wmdlt.inc
index d95afd1..ced4e6a 100644
--- a/project/src/ui/tab-wmdlt.inc
+++ b/project/src/ui/tab-wmdlt.inc
@@ -448,8 +448,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wmdlt ARGTEST ----------
diff --git a/project/src/ui/tab-wpatt.inc b/project/src/ui/tab-wpatt.inc
index e8b2693..5b7e71a 100644
--- a/project/src/ui/tab-wpatt.inc
+++ b/project/src/ui/tab-wpatt.inc
@@ -346,8 +346,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wpatt ARGTEST ----------
diff --git a/project/src/ui/tab-wstrt.inc b/project/src/ui/tab-wstrt.inc
index e6d0d22..3bef0fb 100644
--- a/project/src/ui/tab-wstrt.inc
+++ b/project/src/ui/tab-wstrt.inc
@@ -97,13 +97,12 @@
{ T_DEF_CMD, "DUMP", "DUMP",
"wstrt DUMP file...",
- "Dump the structure of 'StaticR.rel' (in development)"
- " and of DOL files as text." },
+ "Dump the structure of REL files (e.g. @StaticR.rel@)"
+ " and of DOL files (e.g. @main.dol@) as text." },
{ H_DEF_CMD, "CDUMP", "_CDUMP",
"wstrt _CDUMP file...",
- "Dump the structure of 'StaticR.rel' (in development)"
- " and of DOL files as C source fragments." },
+ "Dump the structure of of DOL files as C source fragments." },
{ T_DEF_CMD, "HEXDUMP", "HEXDUMP|XDUMP",
"wstrt HEXDUMP file...",
@@ -114,9 +113,9 @@
{ T_DEF_CMD, "PORT", "PORT",
"wstrt PORT param...",
"The command expects a list of keywords or hex numbers."
- " Keywords are @PAL@ (default), @USA@, @JAP@, @KOR@, or any abbreviation of them."
- " They select the region for the next numeric input values."
- " The hex numbers are interpreted as addresses."
+ " Keywords are @PAL@ (default), @USA@, @JAPAN@, @KOREA@, or any abbreviation of them."
+ " They select the region for the following addresses."
+ " The hex numbers (with or without @0x@ prefix) are interpreted as addresses."
" If possible, they are ported to all other regions."
" The result is printed as colorized table."
"\n"
@@ -127,7 +126,10 @@
"A list of addresses in hex format is expected as input."
" The segments in which the specified addresses"
" are located is calculated for each region."
- " The result is output as a human and machine readable table." },
+ " The result is output as a human and machine readable table."
+ "\n "
+ " This command is well suited to converting addresses"
+ " into file offsets and vice versa." },
{ H_DEF_CMD, "HTTPS", "_HTTPS",
"wstrt _HTTPS file...",
@@ -136,8 +138,7 @@
{ T_DEF_CMD, "EXTRACT", "EXTRACT|X",
"wstrt EXTRACT dol...",
- "Extract the sections of a DOL file into a directory."
- " StaticR.rel files are ignored." },
+ "Extract the sections of a DOL or a REL file into a directory." },
{ T_SEP_CMD, 0,0,0,0 }, //----- separator -----
@@ -645,13 +646,22 @@
{ T_OPT_C, "SECTIONS", "sections",
0, 0 /* copy of wszst */ },
+ { T_OPT_CP, "PORT_DB", "port-db|portdb",
+ "file",
+ "Load the specified update file and replace the internal porting database."
+ " If not set, then file @port-db.bin@ is searched in the share path." },
+
{ T_OPT_CP, "ORDER", "order",
"pujk",
- "The parameter is scanend for the first appearance of letters P (for PAL),"
+ "The parameter is scanned for the first appearance of letters P (for PAL),"
" U (USA), J (JAPAN) and K (KOREA) to define the order of the output."
" Case is ignored. Missing letters are added automatically."
" The default is @'PUJK'@." },
-
+
+ { T_OPT_C, "NO_0X", "0|no-0x|no0x",
+ 0,
+ "Suppress 0x prefix of hex numbers." },
+
{ T_SEP_OPT, 0,0,0,0 }, //----- separator -----
{ T_OPT_CP, "VADDR", "vaddr|va",
@@ -896,8 +906,8 @@
{ T_CMD_BEG, "CONFIG", 0,0,0 },
{ T_COPT, "CONFIG", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too." },
+ { T_COPT, "BRIEF", 0,0, CONFIG_BRIEF },
+ { T_COPT, "LONG", 0,0, CONFIG_LONG },
//---------- COMMAND wstrt ARGTEST ----------
@@ -982,22 +992,29 @@
//---------- COMMAND wstrt PORT ----------
{ T_CMD_BEG, "PORT", 0,0,0 },
+ { T_COPT, "PORT_DB", 0,0,0 },
{ T_COPT, "ORDER", 0,0,0 },
+ { T_COPT, "NO_0X", 0,0,0 },
{ T_COPT, "NO_HEADER", 0,0,
"Suppress the table header and footer and output exactly 1 line for"
" each specified address. This makes the output more machine-readable." },
{ T_COPT, "BRIEF", 0,0,
" Same as {--no-header}." },
+ { T_COPT, "LONG", 0,0,
+ "Print file offsets too." },
//---------- COMMAND wstrt WHERE ----------
{ T_CMD_BEG, "WHERE", 0,0,0 },
{ T_COPT, "ORDER", 0,0,0 },
+ { T_COPT, "NO_0X", 0,0,0 },
{ T_COPT, "NO_HEADER", 0,0,
"Suppress the table header and footer and output exactly 1 line for"
" each specified address. This makes the output more machine-readable." },
{ T_COPT, "BRIEF", 0,0,
" Same as {--no-header}." },
+ { T_COPT, "LONG", 0,0,
+ "Print file offsets too." },
//---------- COMMAND wstrt HTTPS ----------
diff --git a/project/src/ui/tab-wszst.inc b/project/src/ui/tab-wszst.inc
index c36da8c..8220457 100644
--- a/project/src/ui/tab-wszst.inc
+++ b/project/src/ui/tab-wszst.inc
@@ -81,6 +81,11 @@
" The command can also export the settings for scripts"
" or can create or update configuration files." },
+ { T_DEF_CMD, "INSTALL", "INSTALL",
+ "wszst INSTALL [file]...",
+ "Install files to the shared directory."
+ " Use {wszst CONFIG} to list related pathes." },
+
{ T_DEF_CMD, "ARGTEST", "ARGTEST",
"wszst ARGTEST ...",
"This debug command accepts all kinds of parameters"
@@ -2607,14 +2612,18 @@
{ T_COPT, "CONFIG", 0,0,0 },
{ T_COPT, "INSTALL", 0,0,0 },
{ T_COPT, "AUTOADD_PATH", 0,0,0 },
- { T_COPT, "LONG", 0,0,
- "If set, print the search list too."
- " If set twice, print the auto-add search list too."
+ { T_COPT, "BRIEF", 0,0,
+ "If printed as sections, exclude all comments."
+ " Otherwise suppress configuration search list." },
+ { T_COPT, "LONG", 0,0,
+ CONFIG_LONG
" This option is ignored, if any script output is enabled." },
{ T_SEP_OPT, 0,0,0,0 },
{ T_COPY_GRP, "SCRIPT", 0,0,0 },
- { T_COPT, "BRIEF", 0,0,
- "If printed as sections, exclude all comments." },
+
+ //---------- COMMAND wszst INSTALL ----------
+
+ { T_CMD_BEG, "INSTALL", 0,0,0 },
//---------- COMMAND wszst ARGTEST ----------
diff --git a/project/src/ui/ui-wbmgt.c b/project/src/ui/ui-wbmgt.c
index 1ab1049..29ef8b5 100644
--- a/project/src/ui/ui-wbmgt.c
+++ b/project/src/ui/ui-wbmgt.c
@@ -553,10 +553,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -885,7 +892,7 @@ static u8 option_allowed_cmd_HELP[32] = // cmd #2
static u8 option_allowed_cmd_CONFIG[32] = // cmd #3
{
- 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,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
};
@@ -1063,6 +1070,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1455,7 +1463,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wbmgt.h b/project/src/ui/ui-wbmgt.h
index f828bab..e957987 100644
--- a/project/src/ui/ui-wbmgt.h
+++ b/project/src/ui/ui-wbmgt.h
@@ -206,7 +206,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wctct.c b/project/src/ui/ui-wctct.c
index 2edbaab..10469ab 100644
--- a/project/src/ui/ui-wctct.c
+++ b/project/src/ui/ui-wctct.c
@@ -690,10 +690,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -1120,7 +1127,7 @@ static u8 option_allowed_cmd_HELP[47] = // cmd #2
static u8 option_allowed_cmd_CONFIG[47] = // cmd #3
{
- 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,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
};
@@ -1303,6 +1310,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1687,7 +1695,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wctct.h b/project/src/ui/ui-wctct.h
index 624b94a..f943d52 100644
--- a/project/src/ui/ui-wctct.h
+++ b/project/src/ui/ui-wctct.h
@@ -242,7 +242,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wimgt.c b/project/src/ui/ui-wimgt.c
index b2742d6..367da79 100644
--- a/project/src/ui/ui-wimgt.c
+++ b/project/src/ui/ui-wimgt.c
@@ -504,10 +504,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -802,7 +809,7 @@ static u8 option_allowed_cmd_HELP[26] = // cmd #2
static u8 option_allowed_cmd_CONFIG[26] = // cmd #3
{
- 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,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
};
static u8 option_allowed_cmd_ARGTEST[26] = // cmd #4
@@ -927,6 +934,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1220,7 +1228,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wimgt.h b/project/src/ui/ui-wimgt.h
index e7cfe21..93bb369 100644
--- a/project/src/ui/ui-wimgt.h
+++ b/project/src/ui/ui-wimgt.h
@@ -187,7 +187,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wkclt.c b/project/src/ui/ui-wkclt.c
index 5918bdc..9670bbd 100644
--- a/project/src/ui/ui-wkclt.c
+++ b/project/src/ui/ui-wkclt.c
@@ -670,10 +670,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_TEST_VERBOSE =
@@ -1129,7 +1136,7 @@ static u8 option_allowed_cmd_HELP[37] = // cmd #2
static u8 option_allowed_cmd_CONFIG[37] = // cmd #3
{
- 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,1,0,1,0, 0,0,0,0,0,
0,0,0,0,0, 0,0
};
@@ -1356,6 +1363,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -2055,7 +2063,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wkclt.h b/project/src/ui/ui-wkclt.h
index 9d389d4..a23e0d9 100644
--- a/project/src/ui/ui-wkclt.h
+++ b/project/src/ui/ui-wkclt.h
@@ -226,7 +226,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wkmpt.c b/project/src/ui/ui-wkmpt.c
index a8c041e..3227bcd 100644
--- a/project/src/ui/ui-wkmpt.c
+++ b/project/src/ui/ui-wkmpt.c
@@ -895,10 +895,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_TEST_VERBOSE =
@@ -1438,7 +1445,7 @@ static u8 option_allowed_cmd_HELP[49] = // cmd #2
static u8 option_allowed_cmd_CONFIG[49] = // cmd #3
{
0,0,0,0,0, 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,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
static u8 option_allowed_cmd_ARGTEST[49] = // cmd #4
@@ -1673,6 +1680,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -2229,7 +2237,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wkmpt.h b/project/src/ui/ui-wkmpt.h
index af16b9e..7c0fbe2 100644
--- a/project/src/ui/ui-wkmpt.h
+++ b/project/src/ui/ui-wkmpt.h
@@ -261,7 +261,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wlect.c b/project/src/ui/ui-wlect.c
index ea96afd..ef0a3e4 100644
--- a/project/src/ui/ui-wlect.c
+++ b/project/src/ui/ui-wlect.c
@@ -623,10 +623,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -1013,7 +1020,7 @@ static u8 option_allowed_cmd_HELP[43] = // cmd #2
static u8 option_allowed_cmd_CONFIG[43] = // cmd #3
{
- 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,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
};
@@ -1214,6 +1221,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1618,7 +1626,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wlect.h b/project/src/ui/ui-wlect.h
index 6298234..15ffb62 100644
--- a/project/src/ui/ui-wlect.h
+++ b/project/src/ui/ui-wlect.h
@@ -239,7 +239,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wmdlt.c b/project/src/ui/ui-wmdlt.c
index d5822de..712ab1e 100644
--- a/project/src/ui/ui-wmdlt.c
+++ b/project/src/ui/ui-wmdlt.c
@@ -590,10 +590,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_TEST_VERBOSE =
@@ -926,7 +933,7 @@ static u8 option_allowed_cmd_HELP[33] = // cmd #2
static u8 option_allowed_cmd_CONFIG[33] = // cmd #3
{
- 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,1,0,1, 0,0,0,0,0, 0,0,0,0,0,
0,0,0
};
@@ -1097,6 +1104,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1484,7 +1492,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wmdlt.h b/project/src/ui/ui-wmdlt.h
index f3a6a45..80b7b9b 100644
--- a/project/src/ui/ui-wmdlt.h
+++ b/project/src/ui/ui-wmdlt.h
@@ -211,7 +211,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wpatt.c b/project/src/ui/ui-wpatt.c
index 72d6cc8..3e4d23a 100644
--- a/project/src/ui/ui-wpatt.c
+++ b/project/src/ui/ui-wpatt.c
@@ -421,10 +421,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -688,7 +695,7 @@ static u8 option_allowed_cmd_HELP[18] = // cmd #2
static u8 option_allowed_cmd_CONFIG[18] = // cmd #3
{
- 0,0,1,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0
+ 0,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0, 0,0,0
};
static u8 option_allowed_cmd_ARGTEST[18] = // cmd #4
@@ -819,6 +826,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1032,7 +1040,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
diff --git a/project/src/ui/ui-wpatt.h b/project/src/ui/ui-wpatt.h
index 4f510dc..06cf1ed 100644
--- a/project/src/ui/ui-wpatt.h
+++ b/project/src/ui/ui-wpatt.h
@@ -164,7 +164,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
diff --git a/project/src/ui/ui-wstrt.c b/project/src/ui/ui-wstrt.c
index e317089..32cace8 100644
--- a/project/src/ui/ui-wstrt.c
+++ b/project/src/ui/ui-wstrt.c
@@ -289,14 +289,26 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
"Print in machine readable sections and parameter lines."
},
+ { OPT_PORT_DB, false, false, false, false, false, 0, "port-db",
+ "file",
+ "Load the specified update file and replace the internal porting"
+ " database. If not set, then file port-db.bin is searched in the share"
+ " path."
+ },
+
{ OPT_ORDER, false, false, false, false, false, 0, "order",
"pujk",
- "The parameter is scanend for the first appearance of letters P (for"
+ "The parameter is scanned for the first appearance of letters P (for"
" PAL), U (USA), J (JAPAN) and K (KOREA) to define the order of the"
" output. Case is ignored. Missing letters are added automatically."
" The default is 'PUJK'."
},
+ { OPT_NO_0X, false, false, false, false, false, '0', "no-0x",
+ 0,
+ "Suppress 0x prefix of hex numbers."
+ },
+
{ OPT_VADDR, false, false, false, false, true, 0, "vaddr",
"RANGE",
"Comma separated list of virtual addresses to select the hex-dump"
@@ -467,7 +479,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
" dependent (multiple of format size)."
},
- {0,0,0,0,0,0,0,0,0,0}, // OPT__N_SPECIFIC == 63
+ {0,0,0,0,0,0,0,0,0,0}, // OPT__N_SPECIFIC == 65
//----- global options -----
@@ -857,7 +869,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
" directory."
},
- {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 114
+ {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 116
};
@@ -879,10 +891,17 @@ static const InfoOption_t option_cmd_VERSION_LONG =
"Print in long format. Ignored if option --sections is set."
};
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+ 0,
+ " Suppress configuration search list."
+ };
+
static const InfoOption_t option_cmd_CONFIG_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If set, print the search list too."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too."
};
static const InfoOption_t option_cmd_COLORS_LONG =
@@ -938,6 +957,12 @@ static const InfoOption_t option_cmd_PORT_BRIEF =
" Same as --no-header."
};
+static const InfoOption_t option_cmd_PORT_LONG =
+ { OPT_LONG, false, false, false, false, false, 'l', "long",
+ 0,
+ "Print file offsets too."
+ };
+
static const InfoOption_t option_cmd_WHERE_NO_HEADER =
{ OPT_NO_HEADER, false, false, false, false, false, 'H', "no-header",
0,
@@ -951,6 +976,12 @@ static const InfoOption_t option_cmd_WHERE_BRIEF =
" Same as --no-header."
};
+static const InfoOption_t option_cmd_WHERE_LONG =
+ { OPT_LONG, false, false, false, false, false, 'l', "long",
+ 0,
+ "Print file offsets too."
+ };
+
static const InfoOption_t option_cmd_HTTPS_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
@@ -1048,7 +1079,7 @@ static const KeywordTab_t CommandTab[] =
/////////////// OptionShort & OptionLong ///////////////
///////////////////////////////////////////////////////////////////////////////
-static const char OptionShort[] = "Vh@qvLc:lBHT:A:R:td:D:E:orupi";
+static const char OptionShort[] = "Vh@qvLc:lBHT:A:R:td:D:E:orupi0";
static const struct option OptionLong[] =
{
@@ -1174,7 +1205,11 @@ static const struct option OptionLong[] =
{ "cs", 1, 0, GO_CREATE_SECT },
{ "wpf", 1, 0, GO_WPF },
{ "sections", 0, 0, GO_SECTIONS },
+ { "port-db", 1, 0, GO_PORT_DB },
+ { "portdb", 1, 0, GO_PORT_DB },
{ "order", 1, 0, GO_ORDER },
+ { "no-0x", 0, 0, '0' },
+ { "no0x", 0, 0, '0' },
{ "vaddr", 1, 0, GO_VADDR },
{ "va", 1, 0, GO_VADDR },
{ "faddr", 1, 0, GO_FADDR },
@@ -1230,7 +1265,8 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
/* 0x000 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
/* 0x010 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
/* 0x020 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
- /* 0x030 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+ /* 0x030 0 */ OPT_NO_0X,
+ /* 0x031 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,
/* 0x040 @ */ OPT_AT_DUMMY,
/* 0x041 A */ OPT_ARENAS,
/* 0x042 B */ OPT_BRIEF,
@@ -1324,39 +1360,40 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
/* 0x0b8 */ OPT_CREATE_SECT,
/* 0x0b9 */ OPT_WPF,
/* 0x0ba */ OPT_SECTIONS,
- /* 0x0bb */ OPT_ORDER,
- /* 0x0bc */ OPT_VADDR,
- /* 0x0bd */ OPT_FADDR,
- /* 0x0be */ OPT_SNAME,
- /* 0x0bf */ OPT_INT1,
- /* 0x0c0 */ OPT_INT2,
- /* 0x0c1 */ OPT_INT3,
- /* 0x0c2 */ OPT_INT4,
- /* 0x0c3 */ OPT_INT5,
- /* 0x0c4 */ OPT_INT6,
- /* 0x0c5 */ OPT_INT7,
- /* 0x0c6 */ OPT_INT8,
- /* 0x0c7 */ OPT_FLOAT,
- /* 0x0c8 */ OPT_DOUBLE,
- /* 0x0c9 */ OPT_LE,
- /* 0x0ca */ OPT_BE,
- /* 0x0cb */ OPT_ZEROS,
- /* 0x0cc */ OPT_HEX,
- /* 0x0cd */ OPT_DEC,
- /* 0x0ce */ OPT_C_SYNTAX,
- /* 0x0cf */ OPT_ADDR,
- /* 0x0d0 */ OPT_ALIGN,
- /* 0x0d1 */ OPT_TRIGGER,
- /* 0x0d2 */ OPT_NO_ADDR,
- /* 0x0d3 */ OPT_NO_NUMBERS,
- /* 0x0d4 */ OPT_NO_TEXT,
- /* 0x0d5 */ OPT_FORMAT,
- /* 0x0d6 */ OPT_NO_NULL,
- /* 0x0d7 */ OPT_NARROW,
- /* 0x0d8 */ OPT_SMALL,
- /* 0x0d9 */ OPT_WIDE,
- /* 0x0da */ OPT_BYTES,
- /* 0x0db */ 0,0,0,0, 0,
+ /* 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,
/* 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,
@@ -1370,172 +1407,172 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
/////////////// opt_allowed_cmd_* ///////////////
///////////////////////////////////////////////////////////////////////////////
-static u8 option_allowed_cmd_VERSION[63] = // cmd #1
+static u8 option_allowed_cmd_VERSION[65] = // cmd #1
{
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,
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
};
-static u8 option_allowed_cmd_HELP[63] = // cmd #2
+static u8 option_allowed_cmd_HELP[65] = // cmd #2
{
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,1,1
};
-static u8 option_allowed_cmd_CONFIG[63] = // cmd #3
+static u8 option_allowed_cmd_CONFIG[65] = // cmd #3
{
- 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,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,0,0
};
-static u8 option_allowed_cmd_ARGTEST[63] = // cmd #4
+static u8 option_allowed_cmd_ARGTEST[65] = // cmd #4
{
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,1,1
};
-static u8 option_allowed_cmd_TEST[63] = // cmd #5
+static u8 option_allowed_cmd_TEST[65] = // 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,1,1
};
-static u8 option_allowed_cmd_COLORS[63] = // cmd #6
+static u8 option_allowed_cmd_COLORS[65] = // cmd #6
{
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,0,0
};
-static u8 option_allowed_cmd_ERROR[63] = // cmd #7
+static u8 option_allowed_cmd_ERROR[65] = // cmd #7
{
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,0,0
};
-static u8 option_allowed_cmd_FILETYPE[63] = // cmd #8
+static u8 option_allowed_cmd_FILETYPE[65] = // cmd #8
{
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,0,0
};
-static u8 option_allowed_cmd_FILEATTRIB[63] = // cmd #9
+static u8 option_allowed_cmd_FILEATTRIB[65] = // cmd #9
{
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,0,0
};
-static u8 option_allowed_cmd_RAWDUMP[63] = // cmd #10
+static u8 option_allowed_cmd_RAWDUMP[65] = // cmd #10
{
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,0,0
};
-static u8 option_allowed_cmd_DUMP[63] = // cmd #11
+static u8 option_allowed_cmd_DUMP[65] = // cmd #11
{
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,0,0
};
-static u8 option_allowed_cmd_CDUMP[63] = // cmd #12
+static u8 option_allowed_cmd_CDUMP[65] = // cmd #12
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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[63] = // cmd #13
+static u8 option_allowed_cmd_HEXDUMP[65] = // 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,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
+ 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[63] = // cmd #14
+static u8 option_allowed_cmd_PORT[65] = // cmd #14
{
- 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,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,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,0, 0,0,0,0,0, 0,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[63] = // cmd #15
+static u8 option_allowed_cmd_WHERE[65] = // 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,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,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
};
-static u8 option_allowed_cmd_HTTPS[63] = // cmd #16
+static u8 option_allowed_cmd_HTTPS[65] = // cmd #16
{
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,0,0
};
-static u8 option_allowed_cmd_EXTRACT[63] = // cmd #17
+static u8 option_allowed_cmd_EXTRACT[65] = // cmd #17
{
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,0,0
};
-static u8 option_allowed_cmd_TRACKS[63] = // cmd #18
+static u8 option_allowed_cmd_TRACKS[65] = // cmd #18
{
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,0,0
};
-static u8 option_allowed_cmd_ARENAS[63] = // cmd #19
+static u8 option_allowed_cmd_ARENAS[65] = // 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,0,0
};
-static u8 option_allowed_cmd_FILES[63] = // cmd #20
+static u8 option_allowed_cmd_FILES[65] = // cmd #20
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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[63] = // cmd #21
+static u8 option_allowed_cmd_FIND[65] = // cmd #21
{
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,0,0
};
-static u8 option_allowed_cmd_POINTS[63] = // cmd #22
+static u8 option_allowed_cmd_POINTS[65] = // cmd #22
{
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,0,0
};
-static u8 option_allowed_cmd_ANALYZE[63] = // cmd #23
+static u8 option_allowed_cmd_ANALYZE[65] = // cmd #23
{
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,0,0
};
-static u8 option_allowed_cmd_PATCH[63] = // cmd #24
+static u8 option_allowed_cmd_PATCH[65] = // cmd #24
{
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,
- 0,0,0
+ 0,0,0,0,0
};
@@ -1615,6 +1652,7 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
static const InfoOption_t * option_tab_cmd_CONFIG[] =
{
OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
0
@@ -1731,9 +1769,12 @@ static const InfoOption_t * option_tab_cmd_HEXDUMP[] =
static const InfoOption_t * option_tab_cmd_PORT[] =
{
+ OptionInfo + OPT_PORT_DB,
OptionInfo + OPT_ORDER,
+ OptionInfo + OPT_NO_0X,
&option_cmd_PORT_NO_HEADER,
&option_cmd_PORT_BRIEF,
+ &option_cmd_PORT_LONG,
0
};
@@ -1741,8 +1782,10 @@ static const InfoOption_t * option_tab_cmd_PORT[] =
static const InfoOption_t * option_tab_cmd_WHERE[] =
{
OptionInfo + OPT_ORDER,
+ OptionInfo + OPT_NO_0X,
&option_cmd_WHERE_NO_HEADER,
&option_cmd_WHERE_BRIEF,
+ &option_cmd_WHERE_LONG,
0
};
@@ -2007,7 +2050,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"Show all information about the search for the configuration file and"
" its content.",
0,
- 2,
+ 3,
option_tab_cmd_CONFIG,
option_allowed_cmd_CONFIG
},
@@ -2127,8 +2170,8 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"DUMP",
0,
"wstrt DUMP file...",
- "Dump the structure of 'StaticR.rel' (in development) and of DOL files"
- " as text.",
+ "Dump the structure of REL files (e.g. StaticR.rel) and of DOL files"
+ " (e.g. main.dol) as text.",
0,
1,
option_tab_cmd_DUMP,
@@ -2142,8 +2185,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"_CDUMP",
0,
"wstrt _CDUMP file...",
- "Dump the structure of 'StaticR.rel' (in development) and of DOL files"
- " as C source fragments.",
+ "Dump the structure of of DOL files as C source fragments.",
0,
0,
option_tab_cmd_CDUMP,
@@ -2174,13 +2216,14 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
0,
"wstrt PORT param...",
"The command expects a list of keywords or hex numbers. Keywords are"
- " PAL (default), USA, JAP, KOR, or any abbreviation of them. They"
- " select the region for the next numeric input values. The hex numbers"
- " are interpreted as addresses. If possible, they are ported to all"
- " other regions. The result is printed as colorized table.\n"
+ " PAL (default), USA, JAPAN, KOREA, or any abbreviation of them. They"
+ " select the region for the following addresses. The hex numbers (with"
+ " or without 0x prefix) are interpreted as addresses. If possible,"
+ " they are ported to all other regions. The result is printed as"
+ " colorized table.\n"
" This address porting is EXPERIMENTAL!",
0,
- 3,
+ 6,
option_tab_cmd_PORT,
option_allowed_cmd_PORT
},
@@ -2194,9 +2237,11 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"wstrt WHERE address...",
"A list of addresses in hex format is expected as input. The segments"
" in which the specified addresses are located is calculated for each"
- " region. The result is output as a human and machine readable table.",
+ " region. The result is output as a human and machine readable table.\n"
+ " This command is well suited to converting addresses into file"
+ " offsets and vice versa.",
0,
- 3,
+ 5,
option_tab_cmd_WHERE,
option_allowed_cmd_WHERE
},
@@ -2223,8 +2268,7 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
"EXTRACT",
"X",
"wstrt EXTRACT dol...",
- "Extract the sections of a DOL file into a directory. StaticR.rel"
- " files are ignored.",
+ "Extract the sections of a DOL or a REL file into a directory.",
0,
3,
option_tab_cmd_EXTRACT,
diff --git a/project/src/ui/ui-wstrt.h b/project/src/ui/ui-wstrt.h
index 4662318..f3ca5e2 100644
--- a/project/src/ui/ui-wstrt.h
+++ b/project/src/ui/ui-wstrt.h
@@ -86,7 +86,9 @@ typedef enum enumOptions
OPT_CREATE_SECT,
OPT_WPF,
OPT_SECTIONS,
+ OPT_PORT_DB,
OPT_ORDER,
+ OPT_NO_0X,
OPT_VADDR,
OPT_FADDR,
OPT_SNAME,
@@ -119,7 +121,7 @@ typedef enum enumOptions
OPT_WIDE,
OPT_BYTES,
- OPT__N_SPECIFIC, // == 63
+ OPT__N_SPECIFIC, // == 65
//----- global options -----
@@ -175,7 +177,7 @@ typedef enum enumOptions
OPT_CLEAN_DOL,
OPT_CT_DIR,
- OPT__N_TOTAL // == 114
+ OPT__N_TOTAL // == 116
} enumOptions;
@@ -220,7 +222,9 @@ typedef enum enumOptions
// OB_CREATE_SECT = 1llu << OPT_CREATE_SECT,
// OB_WPF = 1llu << OPT_WPF,
// OB_SECTIONS = 1llu << OPT_SECTIONS,
+// OB_PORT_DB = 1llu << OPT_PORT_DB,
// OB_ORDER = 1llu << OPT_ORDER,
+// OB_NO_0X = 1llu << OPT_NO_0X,
// OB_VADDR = 1llu << OPT_VADDR,
// OB_FADDR = 1llu << OPT_FADDR,
// OB_SNAME = 1llu << OPT_SNAME,
@@ -301,7 +305,8 @@ typedef enum enumOptions
//
// OB_CMD_HELP = ~(u64)0,
//
-// OB_CMD_CONFIG = OB_LONG,
+// OB_CMD_CONFIG = OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
@@ -332,13 +337,18 @@ typedef enum enumOptions
// | OB_SNAME
// | OB_GRP_HEXDUMP,
//
-// OB_CMD_PORT = OB_ORDER
+// OB_CMD_PORT = OB_PORT_DB
+// | OB_ORDER
+// | OB_NO_0X
// | OB_NO_HEADER
-// | OB_BRIEF,
+// | OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_WHERE = OB_ORDER
+// | OB_NO_0X
// | OB_NO_HEADER
-// | OB_BRIEF,
+// | OB_BRIEF
+// | OB_LONG,
//
// OB_CMD_HTTPS = OB_LONG,
//
@@ -435,6 +445,8 @@ typedef enum enumCommands
typedef enum enumGetOpt
{
+ GO_NO_0X = '0',
+
GO__ERR = '?',
GO_AT_DUMMY = '@',
@@ -521,6 +533,7 @@ typedef enum enumGetOpt
GO_CREATE_SECT,
GO_WPF,
GO_SECTIONS,
+ GO_PORT_DB,
GO_ORDER,
GO_VADDR,
GO_FADDR,
diff --git a/project/src/ui/ui-wszst.c b/project/src/ui/ui-wszst.c
index 4504bc0..124c1ea 100644
--- a/project/src/ui/ui-wszst.c
+++ b/project/src/ui/ui-wszst.c
@@ -1803,18 +1803,19 @@ static const InfoOption_t option_cmd_VERSION_LONG =
" twice, append developing settings."
};
-static const InfoOption_t option_cmd_CONFIG_LONG =
- { OPT_LONG, false, false, false, false, false, 'l', "long",
+static const InfoOption_t option_cmd_CONFIG_BRIEF =
+ { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
0,
- "If set, print the search list too. If set twice, print the auto-add"
- " search list too. This option is ignored, if any script output is"
- " enabled."
+ "If printed as sections, exclude all comments. Otherwise suppress"
+ " configuration search list."
};
-static const InfoOption_t option_cmd_CONFIG_BRIEF =
- { OPT_BRIEF, false, false, false, false, false, 'B', "brief",
+static const InfoOption_t option_cmd_CONFIG_LONG =
+ { OPT_LONG, false, false, false, false, false, 'l', "long",
0,
- "If printed as sections, exclude all comments."
+ "If set, print the global search list too. If set twice, print the"
+ " auto-add search list too. This option is ignored, if any script"
+ " output is enabled."
};
static const InfoOption_t option_cmd_TEST_VERBOSE =
@@ -2238,6 +2239,7 @@ static const KeywordTab_t CommandTab[] =
{ CMD_HELP, "HELP", "H", 0 },
{ CMD_HELP, "?", 0, 0 },
{ CMD_CONFIG, "CONFIG", 0, 0 },
+ { CMD_INSTALL, "INSTALL", 0, 0 },
{ CMD_ARGTEST, "ARGTEST", 0, 0 },
{ CMD_TEST, "TEST", 0, 0 },
{ CMD_COLORS, "COLORS", 0, 0 },
@@ -2955,7 +2957,16 @@ static u8 option_allowed_cmd_CONFIG[134] = // cmd #3
0,0,0,0,0, 0,0,0,0,0, 0,0,0,1
};
-static u8 option_allowed_cmd_ARGTEST[134] = // cmd #4
+static u8 option_allowed_cmd_INSTALL[134] = // cmd #4
+{
+ 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
+ 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
+ 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
+ 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 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_ARGTEST[134] = // 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,
@@ -2964,7 +2975,7 @@ static u8 option_allowed_cmd_ARGTEST[134] = // cmd #4
1,1,1,1,1, 1,1,1,1,1, 1,1,1,1
};
-static u8 option_allowed_cmd_TEST[134] = // cmd #5
+static u8 option_allowed_cmd_TEST[134] = // 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,
@@ -2973,7 +2984,7 @@ static u8 option_allowed_cmd_TEST[134] = // cmd #5
1,1,1,1,1, 1,1,1,1,1, 1,1,1,1
};
-static u8 option_allowed_cmd_COLORS[134] = // cmd #6
+static u8 option_allowed_cmd_COLORS[134] = // cmd #7
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -2982,7 +2993,7 @@ static u8 option_allowed_cmd_COLORS[134] = // cmd #6
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_ERROR[134] = // cmd #7
+static u8 option_allowed_cmd_ERROR[134] = // cmd #8
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,
@@ -2991,7 +3002,7 @@ static u8 option_allowed_cmd_ERROR[134] = // cmd #7
0,0,0,0,0, 0,0,0,0,0, 0,0,0,1
};
-static u8 option_allowed_cmd_FILETYPE[134] = // cmd #8
+static u8 option_allowed_cmd_FILETYPE[134] = // cmd #9
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3000,7 +3011,7 @@ static u8 option_allowed_cmd_FILETYPE[134] = // cmd #8
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_FILEATTRIB[134] = // cmd #9
+static u8 option_allowed_cmd_FILEATTRIB[134] = // cmd #10
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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,
@@ -3009,7 +3020,7 @@ static u8 option_allowed_cmd_FILEATTRIB[134] = // cmd #9
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_BRSUB[134] = // cmd #10
+static u8 option_allowed_cmd_BRSUB[134] = // cmd #11
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3018,7 +3029,7 @@ static u8 option_allowed_cmd_BRSUB[134] = // cmd #10
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_SYMBOLS[134] = // cmd #11
+static u8 option_allowed_cmd_SYMBOLS[134] = // cmd #12
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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,
@@ -3027,7 +3038,7 @@ static u8 option_allowed_cmd_SYMBOLS[134] = // cmd #11
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_FUNCTIONS[134] = // cmd #12
+static u8 option_allowed_cmd_FUNCTIONS[134] = // 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,1,1,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3036,7 +3047,7 @@ static u8 option_allowed_cmd_FUNCTIONS[134] = // cmd #12
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_CALCULATE[134] = // cmd #13
+static u8 option_allowed_cmd_CALCULATE[134] = // 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, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3045,7 +3056,7 @@ static u8 option_allowed_cmd_CALCULATE[134] = // cmd #13
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_MATRIX[134] = // cmd #14
+static u8 option_allowed_cmd_MATRIX[134] = // cmd #15
{
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,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3054,7 +3065,7 @@ static u8 option_allowed_cmd_MATRIX[134] = // cmd #14
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_FLOAT[134] = // cmd #15
+static u8 option_allowed_cmd_FLOAT[134] = // cmd #16
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,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,
@@ -3063,7 +3074,7 @@ static u8 option_allowed_cmd_FLOAT[134] = // cmd #15
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_VR_CALC[134] = // cmd #16
+static u8 option_allowed_cmd_VR_CALC[134] = // cmd #17
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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, 0,0,0,0,0, 0,0,0,0,0,
@@ -3072,7 +3083,7 @@ static u8 option_allowed_cmd_VR_CALC[134] = // cmd #16
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_VR_RACE[134] = // cmd #17
+static u8 option_allowed_cmd_VR_RACE[134] = // cmd #18
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,
@@ -3081,7 +3092,7 @@ static u8 option_allowed_cmd_VR_RACE[134] = // cmd #17
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_AUTOADD[134] = // cmd #18
+static u8 option_allowed_cmd_AUTOADD[134] = // cmd #19
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3090,7 +3101,7 @@ static u8 option_allowed_cmd_AUTOADD[134] = // cmd #18
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_TRACKS[134] = // cmd #19
+static u8 option_allowed_cmd_TRACKS[134] = // cmd #20
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1,0,0, 1,0,0,0,0, 0,0,0,0,0,
@@ -3099,7 +3110,7 @@ static u8 option_allowed_cmd_TRACKS[134] = // cmd #19
0,0,0,0,0, 0,0,0,0,0, 0,1,0,0
};
-static u8 option_allowed_cmd_SCANCACHE[134] = // cmd #20
+static u8 option_allowed_cmd_SCANCACHE[134] = // 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,
@@ -3108,7 +3119,7 @@ static u8 option_allowed_cmd_SCANCACHE[134] = // cmd #20
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_EXPORT[134] = // cmd #21
+static u8 option_allowed_cmd_EXPORT[134] = // cmd #22
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3117,7 +3128,7 @@ static u8 option_allowed_cmd_EXPORT[134] = // cmd #21
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_CODE[134] = // cmd #22
+static u8 option_allowed_cmd_CODE[134] = // cmd #23
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3126,7 +3137,7 @@ static u8 option_allowed_cmd_CODE[134] = // cmd #22
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_RECODE[134] = // cmd #23
+static u8 option_allowed_cmd_RECODE[134] = // cmd #24
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3135,7 +3146,7 @@ static u8 option_allowed_cmd_RECODE[134] = // cmd #23
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_SUBFILE[134] = // cmd #24
+static u8 option_allowed_cmd_SUBFILE[134] = // cmd #25
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3144,7 +3155,7 @@ static u8 option_allowed_cmd_SUBFILE[134] = // cmd #24
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_TESTNORM[134] = // cmd #25
+static u8 option_allowed_cmd_TESTNORM[134] = // cmd #26
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3153,7 +3164,7 @@ static u8 option_allowed_cmd_TESTNORM[134] = // cmd #25
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_LIST[134] = // cmd #26
+static u8 option_allowed_cmd_LIST[134] = // cmd #27
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3162,7 +3173,7 @@ static u8 option_allowed_cmd_LIST[134] = // cmd #26
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_LIST_L[134] = // cmd #27
+static u8 option_allowed_cmd_LIST_L[134] = // cmd #28
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3171,7 +3182,7 @@ static u8 option_allowed_cmd_LIST_L[134] = // cmd #27
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_LIST_LL[134] = // cmd #28
+static u8 option_allowed_cmd_LIST_LL[134] = // cmd #29
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3180,7 +3191,7 @@ static u8 option_allowed_cmd_LIST_LL[134] = // cmd #28
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_LIST_LLL[134] = // cmd #29
+static u8 option_allowed_cmd_LIST_LLL[134] = // cmd #30
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3189,7 +3200,7 @@ static u8 option_allowed_cmd_LIST_LLL[134] = // cmd #29
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_LIST_A[134] = // cmd #30
+static u8 option_allowed_cmd_LIST_A[134] = // cmd #31
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3198,7 +3209,7 @@ static u8 option_allowed_cmd_LIST_A[134] = // cmd #30
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_LIST_LA[134] = // cmd #31
+static u8 option_allowed_cmd_LIST_LA[134] = // cmd #32
{
0,0,0,0,0, 0,0,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,1,1,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3207,7 +3218,7 @@ static u8 option_allowed_cmd_LIST_LA[134] = // cmd #31
1,1,0,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_NAME_REF[134] = // cmd #32
+static u8 option_allowed_cmd_NAME_REF[134] = // cmd #33
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3216,7 +3227,7 @@ static u8 option_allowed_cmd_NAME_REF[134] = // cmd #32
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_ILIST[134] = // cmd #33
+static u8 option_allowed_cmd_ILIST[134] = // cmd #34
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3225,7 +3236,7 @@ static u8 option_allowed_cmd_ILIST[134] = // cmd #33
1,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_ILIST_L[134] = // cmd #34
+static u8 option_allowed_cmd_ILIST_L[134] = // cmd #35
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3234,7 +3245,7 @@ static u8 option_allowed_cmd_ILIST_L[134] = // cmd #34
1,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_ILIST_LL[134] = // cmd #35
+static u8 option_allowed_cmd_ILIST_LL[134] = // cmd #36
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3243,7 +3254,7 @@ static u8 option_allowed_cmd_ILIST_LL[134] = // cmd #35
1,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_ILIST_A[134] = // cmd #36
+static u8 option_allowed_cmd_ILIST_A[134] = // cmd #37
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3252,7 +3263,7 @@ static u8 option_allowed_cmd_ILIST_A[134] = // cmd #36
1,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_ILIST_LA[134] = // cmd #37
+static u8 option_allowed_cmd_ILIST_LA[134] = // cmd #38
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3261,7 +3272,7 @@ static u8 option_allowed_cmd_ILIST_LA[134] = // cmd #37
1,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_MEMORY[134] = // cmd #38
+static u8 option_allowed_cmd_MEMORY[134] = // cmd #39
{
0,0,0,0,0, 0,0,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,1,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3270,7 +3281,7 @@ static u8 option_allowed_cmd_MEMORY[134] = // cmd #38
1,1,1,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_MEMORY_A[134] = // cmd #39
+static u8 option_allowed_cmd_MEMORY_A[134] = // cmd #40
{
0,0,0,0,0, 0,0,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,1,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3279,7 +3290,7 @@ static u8 option_allowed_cmd_MEMORY_A[134] = // cmd #39
1,1,1,1,1, 1,1,1,1,1, 1,1,0,0
};
-static u8 option_allowed_cmd_DUMP[134] = // cmd #40
+static u8 option_allowed_cmd_DUMP[134] = // cmd #41
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3288,7 +3299,7 @@ static u8 option_allowed_cmd_DUMP[134] = // cmd #40
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_SHA1[134] = // cmd #41
+static u8 option_allowed_cmd_SHA1[134] = // cmd #42
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,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,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3297,7 +3308,7 @@ static u8 option_allowed_cmd_SHA1[134] = // cmd #41
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_ANALYZE[134] = // cmd #42
+static u8 option_allowed_cmd_ANALYZE[134] = // cmd #43
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,
@@ -3306,7 +3317,7 @@ static u8 option_allowed_cmd_ANALYZE[134] = // cmd #42
0,0,0,0,0, 0,0,0,0,0, 0,0,0,1
};
-static u8 option_allowed_cmd_FEATURES[134] = // cmd #43
+static u8 option_allowed_cmd_FEATURES[134] = // cmd #44
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3315,7 +3326,7 @@ static u8 option_allowed_cmd_FEATURES[134] = // cmd #43
0,0,0,0,0, 0,0,0,0,0, 0,0,0,1
};
-static u8 option_allowed_cmd_DISTRIBUTION[134] = // cmd #44
+static u8 option_allowed_cmd_DISTRIBUTION[134] = // cmd #45
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,
@@ -3324,7 +3335,7 @@ static u8 option_allowed_cmd_DISTRIBUTION[134] = // cmd #44
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_DIFF[134] = // cmd #45
+static u8 option_allowed_cmd_DIFF[134] = // cmd #46
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3333,7 +3344,7 @@ static u8 option_allowed_cmd_DIFF[134] = // cmd #45
1,0,0,0,0, 0,0,0,0,0, 1,1,0,0
};
-static u8 option_allowed_cmd_CHECK[134] = // cmd #46
+static u8 option_allowed_cmd_CHECK[134] = // cmd #47
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3342,7 +3353,7 @@ static u8 option_allowed_cmd_CHECK[134] = // cmd #46
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_SLOTS[134] = // cmd #47
+static u8 option_allowed_cmd_SLOTS[134] = // cmd #48
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3351,7 +3362,7 @@ static u8 option_allowed_cmd_SLOTS[134] = // cmd #47
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_STGI[134] = // cmd #48
+static u8 option_allowed_cmd_STGI[134] = // cmd #49
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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,
@@ -3360,7 +3371,7 @@ static u8 option_allowed_cmd_STGI[134] = // cmd #48
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_ISARENA[134] = // cmd #49
+static u8 option_allowed_cmd_ISARENA[134] = // cmd #50
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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, 0,0,0,0,0, 0,0,0,0,0,
@@ -3369,7 +3380,7 @@ static u8 option_allowed_cmd_ISARENA[134] = // cmd #49
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_NORMALIZE[134] = // cmd #50
+static u8 option_allowed_cmd_NORMALIZE[134] = // cmd #51
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3378,7 +3389,7 @@ static u8 option_allowed_cmd_NORMALIZE[134] = // cmd #50
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_PATCH[134] = // cmd #51
+static u8 option_allowed_cmd_PATCH[134] = // cmd #52
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3387,7 +3398,7 @@ static u8 option_allowed_cmd_PATCH[134] = // cmd #51
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_COPY[134] = // cmd #52
+static u8 option_allowed_cmd_COPY[134] = // cmd #53
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3396,7 +3407,7 @@ static u8 option_allowed_cmd_COPY[134] = // cmd #52
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_DUPLICATE[134] = // cmd #53
+static u8 option_allowed_cmd_DUPLICATE[134] = // cmd #54
{
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,0, 1,1,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3405,7 +3416,7 @@ static u8 option_allowed_cmd_DUPLICATE[134] = // cmd #53
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_MINIMAP[134] = // cmd #54
+static u8 option_allowed_cmd_MINIMAP[134] = // cmd #55
{
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,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,
@@ -3414,7 +3425,7 @@ static u8 option_allowed_cmd_MINIMAP[134] = // cmd #54
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_COMPRESS[134] = // cmd #55
+static u8 option_allowed_cmd_COMPRESS[134] = // cmd #56
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3423,7 +3434,7 @@ static u8 option_allowed_cmd_COMPRESS[134] = // cmd #55
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_DECOMPRESS[134] = // cmd #56
+static u8 option_allowed_cmd_DECOMPRESS[134] = // cmd #57
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3432,7 +3443,7 @@ static u8 option_allowed_cmd_DECOMPRESS[134] = // cmd #56
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_ENCODE[134] = // cmd #57
+static u8 option_allowed_cmd_ENCODE[134] = // cmd #58
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3441,7 +3452,7 @@ static u8 option_allowed_cmd_ENCODE[134] = // cmd #57
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_CREATE[134] = // cmd #58
+static u8 option_allowed_cmd_CREATE[134] = // cmd #59
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3450,7 +3461,7 @@ static u8 option_allowed_cmd_CREATE[134] = // cmd #58
0,0,0,1,1, 1,1,1,1,1, 0,1,0,0
};
-static u8 option_allowed_cmd_UPDATE[134] = // cmd #59
+static u8 option_allowed_cmd_UPDATE[134] = // cmd #60
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3459,7 +3470,7 @@ static u8 option_allowed_cmd_UPDATE[134] = // cmd #59
1,0,0,0,0, 0,0,0,0,0, 0,1,0,0
};
-static u8 option_allowed_cmd_EXTRACT[134] = // cmd #60
+static u8 option_allowed_cmd_EXTRACT[134] = // cmd #61
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,1,1,0,0, 0,0,0,0,0,
@@ -3468,7 +3479,7 @@ static u8 option_allowed_cmd_EXTRACT[134] = // cmd #60
1,1,1,1,1, 0,0,0,1,1, 1,1,1,0
};
-static u8 option_allowed_cmd_XDECODE[134] = // cmd #61
+static u8 option_allowed_cmd_XDECODE[134] = // cmd #62
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,1,1,0,0, 0,0,0,0,0,
@@ -3477,7 +3488,7 @@ static u8 option_allowed_cmd_XDECODE[134] = // cmd #61
1,1,1,1,1, 0,0,0,1,1, 1,1,1,0
};
-static u8 option_allowed_cmd_XEXPORT[134] = // cmd #62
+static u8 option_allowed_cmd_XEXPORT[134] = // cmd #63
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,1,1,0,0, 0,0,0,0,0,
@@ -3486,7 +3497,7 @@ static u8 option_allowed_cmd_XEXPORT[134] = // cmd #62
1,1,1,1,1, 0,0,0,1,1, 1,1,1,0
};
-static u8 option_allowed_cmd_XALL[134] = // cmd #63
+static u8 option_allowed_cmd_XALL[134] = // cmd #64
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,1,1,0,0, 0,0,0,0,0,
@@ -3495,7 +3506,7 @@ static u8 option_allowed_cmd_XALL[134] = // cmd #63
1,1,1,1,1, 0,0,0,1,1, 1,1,1,0
};
-static u8 option_allowed_cmd_XCOMMON[134] = // cmd #64
+static u8 option_allowed_cmd_XCOMMON[134] = // cmd #65
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3504,7 +3515,7 @@ static u8 option_allowed_cmd_XCOMMON[134] = // cmd #64
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_BINARY[134] = // cmd #65
+static u8 option_allowed_cmd_BINARY[134] = // cmd #66
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3513,7 +3524,7 @@ static u8 option_allowed_cmd_BINARY[134] = // cmd #65
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_TEXT[134] = // cmd #66
+static u8 option_allowed_cmd_TEXT[134] = // cmd #67
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1,1,0,1, 1,1,1,1,1,
@@ -3522,7 +3533,7 @@ static u8 option_allowed_cmd_TEXT[134] = // cmd #66
0,0,1,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_CAT[134] = // cmd #67
+static u8 option_allowed_cmd_CAT[134] = // cmd #68
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1,1,0,1, 1,1,1,1,1,
@@ -3531,7 +3542,7 @@ static u8 option_allowed_cmd_CAT[134] = // cmd #67
0,0,1,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_BMG[134] = // cmd #68
+static u8 option_allowed_cmd_BMG[134] = // cmd #69
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,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,1, 1,1,1,1,1,
@@ -3540,7 +3551,7 @@ static u8 option_allowed_cmd_BMG[134] = // cmd #68
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_KCL[134] = // cmd #69
+static u8 option_allowed_cmd_KCL[134] = // cmd #70
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3549,7 +3560,7 @@ static u8 option_allowed_cmd_KCL[134] = // cmd #69
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_KMP[134] = // cmd #70
+static u8 option_allowed_cmd_KMP[134] = // cmd #71
{
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,0, 1,0,0,1,1, 1,0,0,0,0, 0,0,0,1,1, 0,0,0,0,0, 0,0,0,0,0,
@@ -3558,7 +3569,7 @@ static u8 option_allowed_cmd_KMP[134] = // cmd #70
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_LEX[134] = // cmd #71
+static u8 option_allowed_cmd_LEX[134] = // cmd #72
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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, 0,0,0,0,0, 0,0,0,0,0,
@@ -3567,7 +3578,7 @@ static u8 option_allowed_cmd_LEX[134] = // cmd #71
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_INFO[134] = // cmd #72
+static u8 option_allowed_cmd_INFO[134] = // cmd #73
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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,
@@ -3576,7 +3587,7 @@ static u8 option_allowed_cmd_INFO[134] = // cmd #72
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_GHOST[134] = // cmd #73
+static u8 option_allowed_cmd_GHOST[134] = // cmd #74
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,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,
@@ -3585,7 +3596,7 @@ static u8 option_allowed_cmd_GHOST[134] = // cmd #73
0,0,0,0,0, 0,0,0,0,0, 0,0,0,1
};
-static u8 option_allowed_cmd_YAZDUMP[134] = // cmd #74
+static u8 option_allowed_cmd_YAZDUMP[134] = // cmd #75
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
@@ -3594,7 +3605,7 @@ static u8 option_allowed_cmd_YAZDUMP[134] = // cmd #74
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0
};
-static u8 option_allowed_cmd_VEHICLE[134] = // cmd #75
+static u8 option_allowed_cmd_VEHICLE[134] = // cmd #76
{
0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 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,
@@ -3709,6 +3720,7 @@ static const InfoOption_t * option_tab_cmd_CONFIG[] =
OptionInfo + OPT_CONFIG,
OptionInfo + OPT_INSTALL,
OptionInfo + OPT_AUTOADD_PATH,
+ &option_cmd_CONFIG_BRIEF,
&option_cmd_CONFIG_LONG,
OptionInfo + OPT_NONE, // separator
@@ -3723,7 +3735,12 @@ static const InfoOption_t * option_tab_cmd_CONFIG[] =
OptionInfo + OPT_ARRAY,
OptionInfo + OPT_AVAR,
OptionInfo + OPT_CASE,
- &option_cmd_CONFIG_BRIEF,
+
+ 0
+};
+
+static const InfoOption_t * option_tab_cmd_INSTALL[] =
+{
0
};
@@ -6867,6 +6884,21 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
option_allowed_cmd_CONFIG
},
+ { CMD_INSTALL,
+ false,
+ false,
+ false,
+ "INSTALL",
+ 0,
+ "wszst INSTALL [file]...",
+ "Install files to the shared directory. Use 'wszst CONFIG' to list"
+ " related pathes.",
+ 0,
+ 0,
+ option_tab_cmd_INSTALL,
+ option_allowed_cmd_INSTALL
+ },
+
{ CMD_ARGTEST,
false,
false,
diff --git a/project/src/ui/ui-wszst.h b/project/src/ui/ui-wszst.h
index bcbc993..997abfe 100644
--- a/project/src/ui/ui-wszst.h
+++ b/project/src/ui/ui-wszst.h
@@ -562,9 +562,11 @@ typedef enum enumOptions
// OB_CMD_HELP = ~(u64)0,
//
// OB_CMD_CONFIG = OB_INSTALL
+// | OB_BRIEF
// | OB_LONG
-// | OB_GRP_SCRIPT
-// | OB_BRIEF,
+// | OB_GRP_SCRIPT,
+//
+// OB_CMD_INSTALL = 0,
//
// OB_CMD_ARGTEST = ~(u64)0,
//
@@ -934,6 +936,7 @@ typedef enum enumCommands
CMD_VERSION,
CMD_HELP,
CMD_CONFIG,
+ CMD_INSTALL,
CMD_ARGTEST,
CMD_TEST,
CMD_COLORS,
@@ -1015,7 +1018,7 @@ typedef enum enumCommands
CMD_VEHICLE,
- CMD__N // == 76
+ CMD__N // == 77
} enumCommands;
diff --git a/project/src/ui/ui.def b/project/src/ui/ui.def
index 0570f46..4631580 100644
--- a/project/src/ui/ui.def
+++ b/project/src/ui/ui.def
@@ -35,6 +35,11 @@
" its content. The command can also export the settings for scripts or" \
" can create or update configuration files." )
+#:def_cmd( "INSTALL", "INSTALL", \
+ "wszst INSTALL [file]...", \
+ "Install files to the shared directory. Use {wszst CONFIG} to list" \
+ " related pathes." )
+
#:def_cmd( "ARGTEST", "ARGTEST", \
"wszst ARGTEST ...", \
"This debug command accepts all kinds of parameters and prints one" \
@@ -1912,11 +1917,16 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ "If printed as sections, exclude all comments. Otherwise suppress" \
+ " configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too. If set twice, print the auto-add" \
- " search list too. This option is ignored, if any script output is" \
- " enabled." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too. This option is ignored, if any script" \
+ " output is enabled." )
#:def_cmd_opt( "CONFIG", "SECTIONS", \
"", \
@@ -1959,10 +1969,6 @@
"", \
"" )
-#:def_cmd_opt( "CONFIG", "BRIEF", \
- "", \
- "If printed as sections, exclude all comments." )
-
#:def_cmd_opt( "TEST", "VERBOSE", \
"", \
"Print the matrices of transformations." )
@@ -11703,9 +11709,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -13035,9 +13046,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -14241,9 +14257,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -15362,9 +15383,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "TEST", "VERBOSE", \
"", \
@@ -17916,9 +17942,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "TEST", "VERBOSE", \
"", \
@@ -19735,9 +19766,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -20954,9 +20990,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "TEST", "VERBOSE", \
"", \
@@ -22052,9 +22093,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -22323,8 +22369,8 @@
#:def_cmd( "DUMP", "DUMP", \
"wstrt DUMP file...", \
- "Dump the structure of 'StaticR.rel' (in development) and of DOL files" \
- " as text." )
+ "Dump the structure of REL files (e.g. @StaticR.rel@) and of DOL files" \
+ " (e.g. @main.dol@) as text." )
#:def_cmd( "HEXDUMP", "HEXDUMP|XDUMP", \
"wstrt HEXDUMP file...", \
@@ -22335,22 +22381,24 @@
#:def_cmd( "PORT", "PORT", \
"wstrt PORT param...", \
"The command expects a list of keywords or hex numbers. Keywords are" \
- " @PAL@ (default), @USA@, @JAP@, @KOR@, or any abbreviation of them." \
- " They select the region for the next numeric input values. The hex" \
- " numbers are interpreted as addresses. If possible, they are ported" \
- " to all other regions. The result is printed as colorized table.\n" \
+ " @PAL@ (default), @USA@, @JAPAN@, @KOREA@, or any abbreviation of" \
+ " them. They select the region for the following addresses. The hex" \
+ " numbers (with or without @0x@ prefix) are interpreted as addresses." \
+ " If possible, they are ported to all other regions. The result is" \
+ " printed as colorized table.\n" \
" This address porting is EXPERIMENTAL!" )
#:def_cmd( "WHERE", "WHERE", \
"wstrt WHERE address...", \
"A list of addresses in hex format is expected as input. The segments" \
" in which the specified addresses are located is calculated for each" \
- " region. The result is output as a human and machine readable table." )
+ " region. The result is output as a human and machine readable table.\n" \
+ " This command is well suited to converting addresses into file" \
+ " offsets and vice versa." )
#:def_cmd( "EXTRACT", "EXTRACT|X", \
"wstrt EXTRACT dol...", \
- "Extract the sections of a DOL file into a directory. StaticR.rel" \
- " files are ignored." )
+ "Extract the sections of a DOL or a REL file into a directory." )
#:def_cmd( "TRACKS", "TRACKS", \
"wstrt TRACKS [file]...", \
@@ -22804,13 +22852,23 @@
"", \
"Print in machine readable sections and parameter lines." )
+#:def_opt( "PORT_DB", "port-db|portdb", "CP", \
+ "file", \
+ "Load the specified update file and replace the internal porting" \
+ " database. If not set, then file @port-db.bin@ is searched in the" \
+ " share path." )
+
#:def_opt( "ORDER", "order", "CP", \
"pujk", \
- "The parameter is scanend for the first appearance of letters P (for" \
+ "The parameter is scanned for the first appearance of letters P (for" \
" PAL), U (USA), J (JAPAN) and K (KOREA) to define the order of the" \
" output. Case is ignored. Missing letters are added automatically." \
" The default is @'PUJK'@." )
+#:def_opt( "NO_0X", "0|no-0x|no0x", "C", \
+ "", \
+ "Suppress 0x prefix of hex numbers." )
+
#:def_opt( "VADDR", "vaddr|va", "CP", \
"RANGE", \
"Comma separated list of virtual addresses to select the hex-dump" \
@@ -22976,9 +23034,14 @@
"", \
"" )
+#:def_cmd_opt( "CONFIG", "BRIEF", \
+ "", \
+ " Suppress configuration search list." )
+
#:def_cmd_opt( "CONFIG", "LONG", \
"", \
- "If set, print the search list too." )
+ "If set, print the global search list too. If set twice, print the" \
+ " auto-add search list too." )
#:def_cmd_opt( "COLORS", "COLORS", \
"", \
@@ -23168,10 +23231,18 @@
"", \
"" )
+#:def_cmd_opt( "PORT", "PORT_DB", \
+ "", \
+ "" )
+
#:def_cmd_opt( "PORT", "ORDER", \
"", \
"" )
+#:def_cmd_opt( "PORT", "NO_0X", \
+ "", \
+ "" )
+
#:def_cmd_opt( "PORT", "NO_HEADER", \
"", \
"Suppress the table header and footer and output exactly 1 line for" \
@@ -23181,10 +23252,18 @@
"", \
" Same as {--no-header}." )
+#:def_cmd_opt( "PORT", "LONG", \
+ "", \
+ "Print file offsets too." )
+
#:def_cmd_opt( "WHERE", "ORDER", \
"", \
"" )
+#:def_cmd_opt( "WHERE", "NO_0X", \
+ "", \
+ "" )
+
#:def_cmd_opt( "WHERE", "NO_HEADER", \
"", \
"Suppress the table header and footer and output exactly 1 line for" \
@@ -23194,6 +23273,10 @@
"", \
" Same as {--no-header}." )
+#:def_cmd_opt( "WHERE", "LONG", \
+ "", \
+ "Print file offsets too." )
+
#:def_cmd_opt( "HTTPS", "LONG", \
"", \
" Print output a C source" )