From owner-svn-src-head@FreeBSD.ORG  Thu Nov 15 15:05:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C6B6D163;
 Thu, 15 Nov 2012 15:05:51 +0000 (UTC)
 (envelope-from eadler@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 ABA2B8FC14;
 Thu, 15 Nov 2012 15:05:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFF5pj3003660;
 Thu, 15 Nov 2012 15:05:51 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFF5pVc003659;
 Thu, 15 Nov 2012 15:05:51 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211151505.qAFF5pVc003659@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 15 Nov 2012 15:05:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243072 - head/bin/mv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 15:05:51 -0000

Author: eadler
Date: Thu Nov 15 15:05:51 2012
New Revision: 243072
URL: http://svnweb.freebsd.org/changeset/base/243072

Log:
  Follow the behavior as specified in POSIX:
  
  if (exists AND (NOT f_option) AND
  	((not_writable AND input_is_terminal) OR i_option))
  		prompt
  
  in particular, add the test for input_is_terminal
  
  PR:		bin/173039
  Submitted by:	Mark Johnston <markjdb@gmail.com>
  Approved by:	cperciva
  MFC after:	3 days

Modified:
  head/bin/mv/mv.c

Modified: head/bin/mv/mv.c
==============================================================================
--- head/bin/mv/mv.c	Thu Nov 15 15:05:47 2012	(r243071)
+++ head/bin/mv/mv.c	Thu Nov 15 15:05:51 2012	(r243072)
@@ -199,7 +199,7 @@ do_move(const char *from, const char *to
 		} else if (iflg) {
 			(void)fprintf(stderr, "overwrite %s? %s", to, YESNO);
 			ask = 1;
-		} else if (access(to, W_OK) && !stat(to, &sb)) {
+		} else if (access(to, W_OK) && !stat(to, &sb) && isatty(STDIN_FILENO)) {
 			strmode(sb.st_mode, modep);
 			(void)fprintf(stderr, "override %s%s%s/%s for %s? %s",
 			    modep + 1, modep[9] == ' ' ? "" : " ",