Skip to content

W
wine-cw
Commit f6ec4417 authored by Alexander Farber's avatar Alexander Farber Committed by Alexandre Julliard
Browse files
Options

cmd: Support /-Y and COPYCMD environment variable in the "copy" builtin.

parent fdeb6d5a
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
programs/cmd/builtins.c
View file @ f6ec4417
...@@ -110,7 +110,8 @@ WIN32_FIND_DATA fd; ...@@ -110,7 +110,8 @@ WIN32_FIND_DATA fd;
HANDLE hff; HANDLE hff;
BOOL force, status; BOOL force, status;
static const char overwrite[] = "Overwrite file (Y/N)?"; static const char overwrite[] = "Overwrite file (Y/N)?";
char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile; char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile, copycmd[3];
DWORD len;
if (param1[0] == 0x00) { if (param1[0] == 0x00) {
WCMD_output ("Argument missing\n"); WCMD_output ("Argument missing\n");
...@@ -140,7 +141,16 @@ char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile; ...@@ -140,7 +141,16 @@ char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile;
FindClose (hff); FindClose (hff);
} }
force = (strstr (quals, "/Y") != NULL); /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */
if (strstr (quals, "/-Y"))
force = FALSE;
else if (strstr (quals, "/Y"))
force = TRUE;
else {
len = GetEnvironmentVariable ("COPYCMD", copycmd, sizeof(copycmd));
force = (len && len < sizeof(copycmd) && ! lstrcmpi (copycmd, "/Y"));
}
if (!force) { if (!force) {
hff = FindFirstFile (outpath, &fd); hff = FindFirstFile (outpath, &fd);
if (hff != INVALID_HANDLE_VALUE) { if (hff != INVALID_HANDLE_VALUE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment