Skip to content

/-Y and COPYCMD=/-Y: prompt before overwriting instead of skipping #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
314TeR wants to merge 1 commit into
base: master
Choose a base branch
from
Open

/-Y and COPYCMD=/-Y: prompt before overwriting instead of skipping #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/move.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,16 +599,23 @@ int main(int argc, char *argv[])
atexit(exit_fn);

/* Read COPYCMD to set confirmation. */
strncpy(environ,getenv("COPYCMD"),sizeof(environ));
ptr = getenv("COPYCMD");
environ[0] = '\0';
if (ptr != NULL)
{
strncpy(environ, ptr, sizeof(environ) - 1);
environ[sizeof(environ) - 1] = '\0';
}
if (environ[0] != '\0')
{
strupr(environ);
if ((environ[0] == '/') || (environ[0] == switchch))
{
if ((environ[1] == 'Y') && (environ[2] == '\0'))
opt_prompt = OVERWRITE; /* Overwrite existing files. */
else if (((environ[1] == 'N') && (environ[2] == '\0')) ||
((environ[1] == '-') && (environ[2] == 'Y') && (environ[3] == '\0')))
else if ((environ[1] == '-') && (environ[2] == 'Y') && (environ[3] == '\0'))
opt_prompt = ASK; /* Prompt before overwriting. */
else if ((environ[1] == 'N') && (environ[2] == '\0'))
opt_prompt = SKIP; /* Skip existing files. */
}
} /* end if. */
Expand All @@ -633,7 +640,7 @@ int main(int argc, char *argv[])
else if (stricmp(option, "y") == 0)
opt_prompt=OVERWRITE;
else if (stricmp(option, "-y") == 0)
opt_prompt=SKIP;
opt_prompt=ASK;
else if (stricmp(option, "s") == 0)
movedirs = 1;
else
Expand Down