PERFORCE change 176606 for review

[Garrett Cooper]

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

Change 176606 by gcooper at 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);
-<<<<
     }
 }