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

reg: Move duplicate sane_path() calls to wmain. 

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-03 05:24:12 +00:00 committed by Alexandre Julliard
parent 2864105ef5
commit d57ad7b054
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
programs/reg/reg.c
View File

@ -351,9 +351,6 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
LPWSTR p; LPWSTR p;
HKEY root,subkey; HKEY root,subkey;
if (!sane_path(key_name))
return 1;
p = strchrW(key_name,'\\'); p = strchrW(key_name,'\\');
if (p) p++; if (p) p++;
@ -431,9 +428,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
LPWSTR p; LPWSTR p;
HKEY root,subkey; HKEY root,subkey;
if (!sane_path(key_name))
return 1;
p = strchrW(key_name,'\\'); p = strchrW(key_name,'\\');
if (p) p++; if (p) p++;
@ -836,9 +830,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL
WCHAR newlineW[] = {'\n',0}; WCHAR newlineW[] = {'\n',0};
int ret; int ret;
if (!sane_path(key_name))
return 1;
if (value_name && value_empty) if (value_name && value_empty)
{ {
output_message(STRING_INVALID_CMDLINE); output_message(STRING_INVALID_CMDLINE);
@ -917,6 +908,7 @@ 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;
static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashDW[] = {'/','d',0};
static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashFW[] = {'/','f',0};
static const WCHAR slashSW[] = {'/','s',0}; static const WCHAR slashSW[] = {'/','s',0};
@ -967,12 +959,16 @@ int wmain(int argc, WCHAR *argvW[])
return 0; return 0;
} }
key_name = argvW[2];
if (!sane_path(key_name))
return 1;
if (op == REG_ADD) if (op == REG_ADD)
{ {
WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL;
BOOL value_empty = FALSE, force = FALSE; BOOL value_empty = FALSE, force = FALSE;
key_name = argvW[2];
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if (!lstrcmpiW(argvW[i], slashVW)) if (!lstrcmpiW(argvW[i], slashVW))
@ -1014,10 +1010,9 @@ int wmain(int argc, WCHAR *argvW[])
} }
else if (op == REG_DELETE) else if (op == REG_DELETE)
{ {
WCHAR *key_name, *value_name = NULL; WCHAR *value_name = NULL;
BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE;
key_name = argvW[2];
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if (!lstrcmpiW(argvW[i], slashVW)) if (!lstrcmpiW(argvW[i], slashVW))
@ -1039,10 +1034,9 @@ int wmain(int argc, WCHAR *argvW[])
} }
else if (op == REG_QUERY) else if (op == REG_QUERY)
{ {
WCHAR *key_name, *value_name = NULL; WCHAR *value_name = NULL;
BOOL value_empty = FALSE, recurse = FALSE; BOOL value_empty = FALSE, recurse = FALSE;
key_name = argvW[2];
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if (!lstrcmpiW(argvW[i], slashVW)) if (!lstrcmpiW(argvW[i], slashVW))