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

extrac32: Enhance command-line parsing.

This commit is contained in:
Andrey Turkin 2010-02-28 17:50:16 +03:00 committed by Alexandre Julliard
parent b4173d7d40
commit 9939fd6012
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
programs/extrac32/extrac32.c
View File

@ -105,10 +105,14 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho
for(i = 0; i < argc; i++)
{
/* Get cabfile */
if ((argv[i][0] != '/') && !cabfile)
if (argv[i][0] != '/')
{
cabfile = argv[i];
continue;
if (!cabfile)
{
cabfile = argv[i];
continue;
} else
break;
}
/* Get parameters for commands */
check = toupperW( argv[i][1] );
@ -127,11 +131,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho
break;
case 'C':
if (cmd) return 0;
if ((i + 2) >= argc) return 0;
cmd = check;
cabfile = argv[++i];
if (!GetFullPathNameW(argv[++i], MAX_PATH, path, NULL))
return 0;
break;
case 'E':
case 'D':
@ -146,6 +146,13 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho
if (!cabfile)
return 0;
if (cmd == 'C')
{
if ((i + 1) != argc) return 0;
if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL))
return 0;
}
if (!path[0])
GetCurrentDirectoryW(MAX_PATH, path);