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

cmd: Fix copy option handling in batch mode.

This commit is contained in:
Andrew Nguyen 2009-10-03 17:00:59 -05:00 committed by Alexandre Julliard
parent 95eb435a33
commit 203c538aaa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/cmd/builtins.c
View File

@ -171,7 +171,7 @@ void WCMD_copy (void) {
WIN32_FIND_DATA fd; WIN32_FIND_DATA fd;
HANDLE hff; HANDLE hff;
BOOL force, status; BOOL force, status;
WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[3]; WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[4];
DWORD len; DWORD len;
static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'};
BOOL copyToDir = FALSE; BOOL copyToDir = FALSE;
@ -238,8 +238,20 @@ void WCMD_copy (void) {
else if (strstrW (quals, parmY)) else if (strstrW (quals, parmY))
force = TRUE; force = TRUE;
else { else {
/* By default, we will force the overwrite in batch mode and ask for
* confirmation in interactive mode. */
force = !!context;
/* If COPYCMD is set, then we force the overwrite with /Y and ask for
* confirmation with /-Y. If COPYCMD is neither of those, then we use the
* default behavior. */
len = GetEnvironmentVariable (copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); len = GetEnvironmentVariable (copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR));
force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) && ! lstrcmpiW (copycmd, parmY)); if (len && len < (sizeof(copycmd)/sizeof(WCHAR))) {
if (!lstrcmpiW (copycmd, parmY))
force = TRUE;
else if (!lstrcmpiW (copycmd, parmNoY))
force = FALSE;
}
} }
/* Loop through all source files */ /* Loop through all source files */