summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2013-01-27 05:59:28 +0000
committermarkj <markj@FreeBSD.org>2013-01-27 05:59:28 +0000
commit9d3fe418801a25c3c0be6e919a641d3f2a35e512 (patch)
treee5c3cd7dd8071774f29c9c3ff8a90453c7e5fb04 /bin
parent5d55975eb2305796623c72048ac32393232fc9b2 (diff)
downloadFreeBSD-src-9d3fe418801a25c3c0be6e919a641d3f2a35e512.zip
FreeBSD-src-9d3fe418801a25c3c0be6e919a641d3f2a35e512.tar.gz
Return with an error from copy_link(), copy_fifo() and copy_special() if
the -n option is specified and the destination file exists. PR: bin/174489 Approved by: rstone (co-mentor) MFC after: 2 weeks
Diffstat (limited to 'bin')
-rw-r--r--bin/cp/utils.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index aa424f8..ad9695c 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -266,6 +266,11 @@ copy_link(const FTSENT *p, int exists)
int len;
char llink[PATH_MAX];
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if ((len = readlink(p->fts_path, llink, sizeof(llink) - 1)) == -1) {
warn("readlink: %s", p->fts_path);
return (1);
@@ -285,6 +290,12 @@ copy_link(const FTSENT *p, int exists)
int
copy_fifo(struct stat *from_stat, int exists)
{
+
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if (exists && unlink(to.p_path)) {
warn("unlink: %s", to.p_path);
return (1);
@@ -299,6 +310,12 @@ copy_fifo(struct stat *from_stat, int exists)
int
copy_special(struct stat *from_stat, int exists)
{
+
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if (exists && unlink(to.p_path)) {
warn("unlink: %s", to.p_path);
return (1);
OpenPOWER on IntegriCloud