From owner-svn-src-projects@FreeBSD.ORG  Tue Jan  8 22:51:49 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 83EA7242;
 Tue,  8 Jan 2013 22:51:49 +0000 (UTC)
 (envelope-from brooks@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 7687BF4;
 Tue,  8 Jan 2013 22:51:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08MpnaE036526;
 Tue, 8 Jan 2013 22:51:49 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08MpncG036525;
 Tue, 8 Jan 2013 22:51:49 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301082251.r08MpncG036525@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 8 Jan 2013 22:51:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245191 - projects/mtree/usr.bin/xinstall
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jan 2013 22:51:49 -0000

Author: brooks
Date: Tue Jan  8 22:51:48 2013
New Revision: 245191
URL: http://svnweb.freebsd.org/changeset/base/245191

Log:
  Don't check that the src and dest are the same files if we're going to link
  them.

Modified:
  projects/mtree/usr.bin/xinstall/xinstall.c

Modified: projects/mtree/usr.bin/xinstall/xinstall.c
==============================================================================
--- projects/mtree/usr.bin/xinstall/xinstall.c	Tue Jan  8 22:42:15 2013	(r245190)
+++ projects/mtree/usr.bin/xinstall/xinstall.c	Tue Jan  8 22:51:48 2013	(r245191)
@@ -357,7 +357,7 @@ main(int argc, char *argv[])
 			errno = EFTYPE;
 			err(EX_OSERR, "%s", to_name);
 		}
-		if (to_sb.st_dev == from_sb.st_dev &&
+		if (!dolink && to_sb.st_dev == from_sb.st_dev &&
 		    to_sb.st_ino == from_sb.st_ino)
 			errx(EX_USAGE, 
 			    "%s and %s are the same file", *argv, to_name);