Hugh McMaster : reg: Simplify basic syntax checks.
Alexandre Julliard
julliard at winehq.org
Thu Mar 18 16:43:54 CDT 2021
Module: wine
Branch: master
Commit: 8801118e384b7388a0fa5c43b5540bfd7f257ab6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8801118e384b7388a0fa5c43b5540bfd7f257ab6
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Thu Mar 18 22:36:50 2021 +1100
reg: Simplify basic syntax checks.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/reg/reg.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 354ece86f61..533a9378f92 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -349,7 +349,6 @@ static enum operations get_operation(const WCHAR *str, int *op_help)
int __cdecl wmain(int argc, WCHAR *argvW[])
{
int i, op, op_help, ret;
- BOOL show_op_help = FALSE;
static const WCHAR switchVAW[] = {'v','a',0};
static const WCHAR switchVEW[] = {'v','e',0};
WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0';
@@ -377,22 +376,26 @@ int __cdecl wmain(int argc, WCHAR *argvW[])
output_message(STRING_REG_HELP);
return 1;
}
-
- if (argc > 2)
- show_op_help = is_help_switch(argvW[2]);
-
- if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3))
+ else if (argc == 2) /* Valid operation, no arguments supplied */
{
output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1;
}
- else if (show_op_help)
+
+ if (is_help_switch(argvW[2]))
{
output_message(op_help);
return 0;
}
+ if (op == REG_IMPORT && argc > 3)
+ {
+ output_message(STRING_INVALID_SYNTAX);
+ output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
+ return 1;
+ }
+
if (op == REG_IMPORT)
return reg_import(argvW[2]);
More information about the wine-cvs
mailing list