Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Don't double-quote an already double-quoted argument

Browse source 
- Properly increment the fmt pointer

svn path=/trunk/; revision=11375
This commit is contained in:
Gé van Geldorp 2004-10-21 18:30:36 +00:00
parent 69b98bb582
commit b3e27217fd
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/shell32/shlexec.c
View file

@ -142,8 +142,10 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
else
cmd = lpFile;
/* Add double quotation marks unless we already have them (e.g.: "file://%1" %* for exefile) */
if (res == out || *(fmt + 1) != '"')
/* Add double quotation marks unless we already have them
(e.g.: "file://%1" %* for exefile) or unless the arg is already
enclosed in double quotation marks */
if ((res == out || *(fmt + 1) != '"') && *cmd != '"')
{
*res++ = '"';
strcpyW(res, cmd);
@ -207,10 +209,14 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
strcpyW( res, tmpEnvBuff );
res += strlenW(res);
}
fmt++;
done = TRUE;
break;
}
/* Don't skip past terminator (catch a single '%' at the end) */
if (*fmt != '\0')
{
fmt++;
}
}
else
*res++ = *fmt++;