From owner-svn-src-all@FreeBSD.ORG  Mon Nov 26 05:13:57 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C26A66D9;
 Mon, 26 Nov 2012 05:13:57 +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 A57EE8FC0C;
 Mon, 26 Nov 2012 05:13:57 +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 qAQ5DvQp003030;
 Mon, 26 Nov 2012 05:13:57 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAQ5Dvc9003024;
 Mon, 26 Nov 2012 05:13:57 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211260513.qAQ5Dvc9003024@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 26 Nov 2012 05:13:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r243556 - stable/7/bin/mv
X-SVN-Group: stable-7
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: Mon, 26 Nov 2012 05:13:57 -0000

Author: eadler
Date: Mon Nov 26 05:13:57 2012
New Revision: 243556
URL: http://svnweb.freebsd.org/changeset/base/243556

Log:
  MFC r243072:
  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
  Approved by:	cperciva (implicit)

Modified:
  stable/7/bin/mv/mv.c
Directory Properties:
  stable/7/bin/mv/   (props changed)

Modified: stable/7/bin/mv/mv.c
==============================================================================
--- stable/7/bin/mv/mv.c	Mon Nov 26 05:13:57 2012	(r243555)
+++ stable/7/bin/mv/mv.c	Mon Nov 26 05:13:57 2012	(r243556)
@@ -183,7 +183,7 @@ do_move(char *from, 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] == ' ' ? "" : " ",