cmd: Support /-Y and COPYCMD environment variable in the "copy" builtin.
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 3c93231..c44b929 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -110,7 +110,8 @@
HANDLE hff;
BOOL force, status;
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) {
WCMD_output ("Argument missing\n");
@@ -140,7 +141,16 @@
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) {
hff = FindFirstFile (outpath, &fd);
if (hff != INVALID_HANDLE_VALUE) {