aboutsummaryrefslogtreecommitdiff
path: root/project/src/ui/ui-wbmgt.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--project/src/ui/ui-wbmgt.c164
1 files changed, 106 insertions, 58 deletions
diff --git a/project/src/ui/ui-wbmgt.c b/project/src/ui/ui-wbmgt.c
index 598864e..1ab1049 100644
--- a/project/src/ui/ui-wbmgt.c
+++ b/project/src/ui/ui-wbmgt.c
@@ -313,6 +313,15 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] =
" commands included. Exit after printing."
},
+ { OPT_CONFIG, false, false, false, false, false, 0, "config",
+ "file",
+ "Define a configuration file or a directory as source. In later case,"
+ " file 'wiimms-szs-tools.conf' is searched.\n"
+ " If option is not not set, then file 'wiimms-szs-tools.conf' is"
+ " searched in different directories. Use command 'wszst CONFIG' to get"
+ " more details."
+ },
+
{ OPT_ALLOW_ALL, false, false, false, false, false, 0, "allow-all",
0,
"Usually commands accept only options with impact to the command. All"
@@ -522,7 +531,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 == 62
+ {0,0,0,0,0,0,0,0,0,0} // OPT__N_TOTAL == 63
};
@@ -544,6 +553,12 @@ 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_LONG =
+ { OPT_LONG, false, false, false, false, false, 'l', "long",
+ 0,
+ "If set, print the search list too."
+ };
+
static const InfoOption_t option_cmd_COLORS_LONG =
{ OPT_LONG, false, false, false, false, false, 'l', "long",
0,
@@ -607,6 +622,7 @@ static const KeywordTab_t CommandTab[] =
{ CMD_VERSION, "VERSION", 0, 0 },
{ CMD_HELP, "HELP", "H", 0 },
{ CMD_HELP, "?", 0, 0 },
+ { CMD_CONFIG, "CONFIG", 0, 0 },
{ CMD_ARGTEST, "ARGTEST", 0, 0 },
{ CMD_TEST, "TEST", 0, 0 },
{ CMD_COLORS, "COLORS", 0, 0 },
@@ -644,6 +660,7 @@ static const struct option OptionLong[] =
{ "version", 0, 0, 'V' },
{ "help", 0, 0, 'h' },
{ "xhelp", 0, 0, GO_XHELP },
+ { "config", 1, 0, GO_CONFIG },
{ "allow-all", 0, 0, GO_ALLOW_ALL },
{ "allowall", 0, 0, GO_ALLOW_ALL },
{ "compatible", 1, 0, GO_COMPATIBLE },
@@ -800,43 +817,44 @@ static const OptionIndex_t OptionIndex[UIOPT_INDEX_SIZE] =
/* 0x076 v */ OPT_VERBOSE,
/* 0x077 */ 0,0,0,0, 0,0,0,0, 0,
/* 0x080 */ OPT_XHELP,
- /* 0x081 */ OPT_ALLOW_ALL,
- /* 0x082 */ OPT_COMPATIBLE,
- /* 0x083 */ OPT_WIDTH,
- /* 0x084 */ OPT_MAX_WIDTH,
- /* 0x085 */ OPT_DE,
- /* 0x086 */ OPT_COLORS,
- /* 0x087 */ OPT_NO_COLORS,
- /* 0x088 */ OPT_CT_CODE,
- /* 0x089 */ OPT_LE_CODE,
- /* 0x08a */ OPT_CHDIR,
- /* 0x08b */ OPT_POINTS,
- /* 0x08c */ OPT_UTF_8,
- /* 0x08d */ OPT_NO_UTF_8,
- /* 0x08e */ OPT_FORCE,
- /* 0x08f */ OPT_REPAIR_MAGICS,
- /* 0x090 */ OPT_OLD,
- /* 0x091 */ OPT_STD,
- /* 0x092 */ OPT_NEW,
- /* 0x093 */ OPT_EXTRACT,
- /* 0x094 */ OPT_NUMBER,
- /* 0x095 */ OPT_ALIGN,
- /* 0x096 */ OPT_MACRO_BMG,
- /* 0x097 */ OPT_FILTER_BMG,
- /* 0x098 */ OPT_BMG_ENDIAN,
- /* 0x099 */ OPT_BMG_ENCODING,
- /* 0x09a */ OPT_BMG_INF_SIZE,
- /* 0x09b */ OPT_BMG_MID,
- /* 0x09c */ OPT_FORCE_ATTRIB,
- /* 0x09d */ OPT_DEF_ATTRIB,
- /* 0x09e */ OPT_NO_ATTRIB,
- /* 0x09f */ OPT_X_ESCAPES,
- /* 0x0a0 */ OPT_OLD_ESCAPES,
- /* 0x0a1 */ OPT_NO_BMG_COLORS,
- /* 0x0a2 */ OPT_BMG_COLORS,
- /* 0x0a3 */ OPT_NO_BMG_INLINE,
- /* 0x0a4 */ OPT_SECTIONS,
- /* 0x0a5 */ 0,0,0,0, 0,0,0,0, 0,0,0,
+ /* 0x081 */ OPT_CONFIG,
+ /* 0x082 */ OPT_ALLOW_ALL,
+ /* 0x083 */ OPT_COMPATIBLE,
+ /* 0x084 */ OPT_WIDTH,
+ /* 0x085 */ OPT_MAX_WIDTH,
+ /* 0x086 */ OPT_DE,
+ /* 0x087 */ OPT_COLORS,
+ /* 0x088 */ OPT_NO_COLORS,
+ /* 0x089 */ OPT_CT_CODE,
+ /* 0x08a */ OPT_LE_CODE,
+ /* 0x08b */ OPT_CHDIR,
+ /* 0x08c */ OPT_POINTS,
+ /* 0x08d */ OPT_UTF_8,
+ /* 0x08e */ OPT_NO_UTF_8,
+ /* 0x08f */ OPT_FORCE,
+ /* 0x090 */ OPT_REPAIR_MAGICS,
+ /* 0x091 */ OPT_OLD,
+ /* 0x092 */ OPT_STD,
+ /* 0x093 */ OPT_NEW,
+ /* 0x094 */ OPT_EXTRACT,
+ /* 0x095 */ OPT_NUMBER,
+ /* 0x096 */ OPT_ALIGN,
+ /* 0x097 */ OPT_MACRO_BMG,
+ /* 0x098 */ OPT_FILTER_BMG,
+ /* 0x099 */ OPT_BMG_ENDIAN,
+ /* 0x09a */ OPT_BMG_ENCODING,
+ /* 0x09b */ OPT_BMG_INF_SIZE,
+ /* 0x09c */ OPT_BMG_MID,
+ /* 0x09d */ OPT_FORCE_ATTRIB,
+ /* 0x09e */ OPT_DEF_ATTRIB,
+ /* 0x09f */ OPT_NO_ATTRIB,
+ /* 0x0a0 */ OPT_X_ESCAPES,
+ /* 0x0a1 */ OPT_OLD_ESCAPES,
+ /* 0x0a2 */ OPT_NO_BMG_COLORS,
+ /* 0x0a3 */ OPT_BMG_COLORS,
+ /* 0x0a4 */ OPT_NO_BMG_INLINE,
+ /* 0x0a5 */ OPT_SECTIONS,
+ /* 0x0a6 */ 0,0,0,0, 0,0,0,0, 0,0,
/* 0x0b0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
/* 0x0c0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
/* 0x0d0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
@@ -865,115 +883,121 @@ static u8 option_allowed_cmd_HELP[32] = // cmd #2
1,1
};
-static u8 option_allowed_cmd_ARGTEST[32] = // cmd #3
+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,0
+};
+
+static u8 option_allowed_cmd_ARGTEST[32] = // 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
};
-static u8 option_allowed_cmd_TEST[32] = // cmd #4
+static u8 option_allowed_cmd_TEST[32] = // 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
};
-static u8 option_allowed_cmd_COLORS[32] = // cmd #5
+static u8 option_allowed_cmd_COLORS[32] = // cmd #6
{
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
};
-static u8 option_allowed_cmd_ERROR[32] = // cmd #6
+static u8 option_allowed_cmd_ERROR[32] = // 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,
0,1
};
-static u8 option_allowed_cmd_FILETYPE[32] = // cmd #7
+static u8 option_allowed_cmd_FILETYPE[32] = // cmd #8
{
0,1,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
};
-static u8 option_allowed_cmd_FILEATTRIB[32] = // cmd #8
+static u8 option_allowed_cmd_FILEATTRIB[32] = // cmd #9
{
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
};
-static u8 option_allowed_cmd_POINTS[32] = // cmd #9
+static u8 option_allowed_cmd_POINTS[32] = // cmd #10
{
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
};
-static u8 option_allowed_cmd_REGEXP[32] = // cmd #10
+static u8 option_allowed_cmd_REGEXP[32] = // 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
};
-static u8 option_allowed_cmd_EXTRACT[32] = // cmd #11
+static u8 option_allowed_cmd_EXTRACT[32] = // cmd #12
{
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
};
-static u8 option_allowed_cmd_SECTIONS[32] = // cmd #12
+static u8 option_allowed_cmd_SECTIONS[32] = // cmd #13
{
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
};
-static u8 option_allowed_cmd_LIST[32] = // cmd #13
+static u8 option_allowed_cmd_LIST[32] = // cmd #14
{
0,0,0,0,0, 0,0,0,0,0, 0,0,1,0,1, 1,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0
};
-static u8 option_allowed_cmd_SLOTS[32] = // cmd #14
+static u8 option_allowed_cmd_SLOTS[32] = // cmd #15
{
0,0,0,0,0, 0,0,0,0,0, 0,0,1,0,1, 1,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0,
0,0
};
-static u8 option_allowed_cmd_DIFF[32] = // cmd #15
+static u8 option_allowed_cmd_DIFF[32] = // cmd #16
{
0,0,0,0,1, 0,1,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
};
-static u8 option_allowed_cmd_CAT[32] = // cmd #16
+static u8 option_allowed_cmd_CAT[32] = // cmd #17
{
0,1,1,1,0, 0,0,0,0,0, 0,0,1,0,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1,
1,0
};
-static u8 option_allowed_cmd_MIX[32] = // cmd #17
+static u8 option_allowed_cmd_MIX[32] = // cmd #18
{
0,1,1,1,0, 0,0,0,0,0, 0,0,1,0,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1,
1,0
};
-static u8 option_allowed_cmd_IDENTIFIER[32] = // cmd #18
+static u8 option_allowed_cmd_IDENTIFIER[32] = // cmd #19
{
0,1,1,1,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,0
};
-static u8 option_allowed_cmd_DECODE[32] = // cmd #19
+static u8 option_allowed_cmd_DECODE[32] = // cmd #20
{
0,1,1,1,1, 1,1,1,1,1, 1,1,1,0,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1,
1,0
};
-static u8 option_allowed_cmd_ENCODE[32] = // cmd #20
+static u8 option_allowed_cmd_ENCODE[32] = // cmd #21
{
0,0,0,0,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
};
-static u8 option_allowed_cmd_PATCH[32] = // cmd #21
+static u8 option_allowed_cmd_PATCH[32] = // cmd #22
{
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,0
@@ -990,6 +1014,7 @@ static const InfoOption_t * option_tab_tool[] =
OptionInfo + OPT_VERSION,
OptionInfo + OPT_HELP,
OptionInfo + OPT_XHELP,
+ OptionInfo + OPT_CONFIG,
OptionInfo + OPT_ALLOW_ALL,
OptionInfo + OPT_COMPATIBLE,
OptionInfo + OPT_WIDTH,
@@ -1035,6 +1060,14 @@ static const InfoOption_t * option_tab_cmd_HELP[] =
0
};
+static const InfoOption_t * option_tab_cmd_CONFIG[] =
+{
+ OptionInfo + OPT_CONFIG,
+ &option_cmd_CONFIG_LONG,
+
+ 0
+};
+
static const InfoOption_t * option_tab_cmd_ARGTEST[] =
{
@@ -1369,7 +1402,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,
- 24,
+ 25,
option_tab_tool,
0
},
@@ -1412,6 +1445,21 @@ static const InfoCommand_t CommandInfo[CMD__N+1] =
option_allowed_cmd_HELP
},
+ { CMD_CONFIG,
+ false,
+ false,
+ false,
+ "CONFIG",
+ 0,
+ "wbmgt CONFIG [options]...",
+ "Show all information about the search for the configuration file and"
+ " its content.",
+ 0,
+ 2,
+ option_tab_cmd_CONFIG,
+ option_allowed_cmd_CONFIG
+ },
+
{ CMD_ARGTEST,
false,
false,