Author: markj
Date: Sun Jan 27 05:59:28 2013
New Revision: 245960
URL: http://svnweb.freebsd.org/changeset/base/245960
Log:
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
Modified:
head/bin/cp/utils.c
Modified: head/bin/cp/utils.c
==============================================================================
--- head/bin/cp/utils.c Sun Jan 27 05:45:55 2013 (r245959)
+++ head/bin/cp/utils.c Sun Jan 27 05:59:28 2013 (r245960)
@@ -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 ex
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
