system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cp: Further simplify the core logic.

Browse source 
If the destination file exists but we decide unlink it, set the dne
flag.  This means we don't need to re-check the conditions that would
have caused us to delete the file when we later need to decide whether
to create or replace it.

MFC after:	1 week
Sponsored by:	Klara, Inc.
Reviewed by:	kevans
Differential Revision:	https://reviews.freebsd.org/D43064
This commit is contained in:
Dag-Erling Smørgrav 2023-12-14 17:07:04 +01:00
parent 0f4467ce44
commit 3850927066
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/cp/utils.c
View file

@ -145,6 +145,7 @@ copy_file(const FTSENT *entp, int dne)
if (fflag) {
/* remove existing destination file */
(void)unlink(to.p_path);
dne = 1;
}
}
@ -166,7 +167,7 @@ copy_file(const FTSENT *entp, int dne)
goto done;
}
if (!dne && !fflag) {
if (!dne) {
/* overwrite existing destination file */
to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
} else {