From owner-svn-src-all@FreeBSD.ORG  Wed Jan 23 02:06:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 422E3D0A;
 Wed, 23 Jan 2013 02:06:21 +0000 (UTC)
 (envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1DA4F1AE;
 Wed, 23 Jan 2013 02:06:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0N26KqN005310;
 Wed, 23 Jan 2013 02:06:20 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0N26Kqm005309;
 Wed, 23 Jan 2013 02:06:20 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201301230206.r0N26Kqm005309@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 23 Jan 2013 02:06:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245832 - head/bin/cp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jan 2013 02:06:21 -0000

Author: obrien
Date: Wed Jan 23 02:06:20 2013
New Revision: 245832
URL: http://svnweb.freebsd.org/changeset/base/245832

Log:
  Return "failure" as we do for 'cp -i' and a "n" answer.
  
  Otherwise with '-v' we print out the file name as if it was copied:
     /tmp/2gb-card/M0132.CTG not overwritten
     /mnt/DCIM/CANONMSC/M0132.CTG -> /tmp/2gb-card/M0132.CTG

Modified:
  head/bin/cp/utils.c

Modified: head/bin/cp/utils.c
==============================================================================
--- head/bin/cp/utils.c	Wed Jan 23 00:49:05 2013	(r245831)
+++ head/bin/cp/utils.c	Wed Jan 23 02:06:20 2013	(r245832)
@@ -104,7 +104,7 @@ copy_file(const FTSENT *entp, int dne)
 			if (vflag)
 				printf("%s not overwritten\n", to.p_path);
 			(void)close(from_fd);
-			return (0);
+			return (1);
 		} else if (iflag) {
 			(void)fprintf(stderr, "overwrite %s? %s", 
 					to.p_path, YESNO);