From owner-p4-projects@FreeBSD.ORG  Wed Apr  7 05:20:42 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D07B71065672; Wed,  7 Apr 2010 05:20:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 94C26106566C
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:20:41 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 685138FC1A
	for <perforce@FreeBSD.org>; Wed,  7 Apr 2010 05:20:41 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o375KfQ1090013
	for <perforce@FreeBSD.org>; Wed, 7 Apr 2010 05:20:41 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o375KfU8090011
	for perforce@freebsd.org; Wed, 7 Apr 2010 05:20:41 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 7 Apr 2010 05:20:41 GMT
Message-Id: <201004070520.o375KfU8090011@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176606 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Apr 2010 05:20:42 -0000

http://p4web.freebsd.org/@@176606?ac=10

Change 176606 by gcooper@gcooper-bayonetta on 2010/04/07 05:20:35

	Fix more collisions...

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#5 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#5 (text+ko) ====

@@ -284,30 +284,12 @@
 void
 move_file(const char *dir, const char *fname, const char *tdir)
 {
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#17
-    char cmd[FILENAME_MAX];
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#18
     char from[FILENAME_MAX];
     char to[FILENAME_MAX];
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/lib/file.c
-    char cmd[ARG_MAX];
-<<<<
 
     if (fname[0] == '/')
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#17
-	snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to);
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#18
 	strncpy(from, fname, FILENAME_MAX);
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/lib/file.c
- 	snprintf(cmd, ARG_MAX, "/bin/mv %s %s", fname, to);
-<<<<
     else
->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#17
-	snprintf(cmd, FILENAME_MAX, "/bin/mv %s/%s %s", dir, fname, to);
-    if (vsystem(cmd)) {
-	cleanup(0);
-	errx(2, "%s: could not perform '%s'", __func__, cmd);
-==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/lib/file.c#18
 	snprintf(from, FILENAME_MAX, "%s/%s", dir, fname);
 
     snprintf(to, FILENAME_MAX, "%s/%s", tdir, fname);
@@ -317,12 +299,6 @@
 	    cleanup(0);
 	    errx(2, "%s: could not move '%s' to '%s'", __func__, from, to);
 	}
-==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/lib/file.c
-	snprintf(cmd, ARG_MAX, "/bin/mv %s/%s %s", dir, fname, to);
-    if (vsystem(cmd) != 0) {
-	cleanup(0);
-	errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd);
-<<<<
     }
 }