ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reg: Combine duplicate 'for' loops in wmain and parse all remaining arguments. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2016-06-06 05:31:55 +00:00 committed by Alexandre Julliard
parent f1bf0bfbc3
commit 7484c5eba3
1 changed files with 40 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
programs/reg/reg.c
View File

@ -876,7 +876,8 @@ int wmain(int argc, WCHAR *argvW[])
{ {
int i, op; int i, op;
BOOL show_op_help = FALSE; BOOL show_op_help = FALSE;
WCHAR *key_name, *path; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0';
BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE;
HKEY root; HKEY root;
static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashDW[] = {'/','d',0};
static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashFW[] = {'/','f',0};
@ -943,55 +944,7 @@ int wmain(int argc, WCHAR *argvW[])
path = strchrW(key_name, '\\'); path = strchrW(key_name, '\\');
if (path) path++; if (path) path++;
if (op == REG_ADD) for (i = 3; i < argc; i++)
{
WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL;
BOOL value_empty = FALSE, force = FALSE;
for (i = 1; i < argc; i++)
{
if (!lstrcmpiW(argvW[i], slashVW))
{
if (value_name || !(value_name = argvW[++i]))
{
output_message(STRING_INVALID_CMDLINE);
return 1;
}
}
else if (!lstrcmpiW(argvW[i], slashVEW))
value_empty = TRUE;
else if (!lstrcmpiW(argvW[i], slashTW))
type = argvW[++i];
else if (!lstrcmpiW(argvW[i], slashSW))
{
WCHAR *ptr = argvW[++i];
if (!ptr || strlenW(ptr) != 1)
{
output_message(STRING_INVALID_CMDLINE);
return 1;
}
separator = ptr[0];
}
else if (!lstrcmpiW(argvW[i], slashDW))
{
if (!(data = argvW[++i]))
{
output_message(STRING_INVALID_CMDLINE);
return 1;
}
}
else if (!lstrcmpiW(argvW[i], slashFW))
force = TRUE;
}
return reg_add(root, path, value_name, value_empty, type, separator, data, force);
}
else if (op == REG_DELETE)
{
WCHAR *value_name = NULL;
BOOL value_empty = FALSE, value_all = FALSE, force = FALSE;
for (i = 1; i < argc; i++)
{ {
if (!lstrcmpiW(argvW[i], slashVW)) if (!lstrcmpiW(argvW[i], slashVW))
{ {
@ -1005,33 +958,44 @@ int wmain(int argc, WCHAR *argvW[])
value_empty = TRUE; value_empty = TRUE;
else if (!lstrcmpiW(argvW[i], slashVAW)) else if (!lstrcmpiW(argvW[i], slashVAW))
value_all = TRUE; value_all = TRUE;
else if (!lstrcmpiW(argvW[i], slashFW)) else if (!lstrcmpiW(argvW[i], slashTW))
force = TRUE; type = argvW[++i];
} else if (!lstrcmpiW(argvW[i], slashDW))
return reg_delete(root, path, key_name, value_name, value_empty, value_all, force);
}
else if (op == REG_QUERY)
{ {
WCHAR *value_name = NULL; if (!(data = argvW[++i]))
BOOL value_empty = FALSE, recurse = FALSE;
for (i = 1; i < argc; i++)
{
if (!lstrcmpiW(argvW[i], slashVW))
{
if (value_name || !(value_name = argvW[++i]))
{ {
output_message(STRING_INVALID_CMDLINE); output_message(STRING_INVALID_CMDLINE);
return 1; return 1;
} }
} }
else if (!lstrcmpiW(argvW[i], slashVEW))
value_empty = TRUE;
else if (!lstrcmpiW(argvW[i], slashSW)) else if (!lstrcmpiW(argvW[i], slashSW))
{
WCHAR *ptr;
if (op == REG_QUERY)
{
recurse = TRUE; recurse = TRUE;
continue;
} }
ptr = argvW[++i];
if (!ptr || strlenW(ptr) != 1)
{
output_message(STRING_INVALID_CMDLINE);
return 1;
}
separator = ptr[0];
}
else if (!lstrcmpiW(argvW[i], slashFW))
force = TRUE;
}
if (op == REG_ADD)
return reg_add(root, path, value_name, value_empty, type, separator, data, force);
else if (op == REG_DELETE)
return reg_delete(root, path, key_name, value_name, value_empty, value_all, force);
else if (op == REG_QUERY)
return reg_query(root, path, key_name, value_name, value_empty, recurse); return reg_query(root, path, key_name, value_name, value_empty, recurse);
}
else else
{ {
output_message(STRING_INVALID_OPTION, argvW[1]); output_message(STRING_INVALID_OPTION, argvW[1]);