[src/netbsd-1-5]: src/usr.sbin/pkg_install/add Pull up revision 1.23 (request...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6f361f1d6d3c
branches:  netbsd-1-5
changeset: 492826:6f361f1d6d3c
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 23 17:58:04 2002 +0000

description:
Pull up revision 1.23 (requested by seb):
  Synchronize with recent developments:
   o Use full path name to tar; fixes PR#14072

diffstat:

 usr.sbin/pkg_install/add/extract.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r dbdfe49cf9a4 -r 6f361f1d6d3c usr.sbin/pkg_install/add/extract.c
--- a/usr.sbin/pkg_install/add/extract.c        Sat Feb 23 17:57:16 2002 +0000
+++ b/usr.sbin/pkg_install/add/extract.c        Sat Feb 23 17:58:04 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: extract.c,v 1.21.2.1 2000/07/24 23:05:08 dmcmahill Exp $       */
+/*     $NetBSD: extract.c,v 1.21.2.2 2002/02/23 17:58:04 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
 #else
-__RCSID("$NetBSD: extract.c,v 1.21.2.1 2000/07/24 23:05:08 dmcmahill Exp $");
+__RCSID("$NetBSD: extract.c,v 1.21.2.2 2002/02/23 17:58:04 he Exp $");
 #endif
 #endif
 
@@ -34,7 +34,7 @@
 #include "add.h"
 
 #define TAR_ARGS       " cf - "
-#define TARX_CMD       "|" TAR_CMD " xf - -C "
+#define TARX_CMD       "|" TAR_FULLPATHNAME " xf - -C "
 
 /* 
  * This macro is used to determine if the 'where_args'  buffer is big enough to add the
@@ -50,16 +50,16 @@
                || (strlen(str) + 3 + perm_count >= maxargs))
 
 #define PUSHOUT(todir) /* push out string */                           \
-        if (where_count > sizeof(TAR_CMD) + sizeof(TAR_ARGS)-1) {      \
+        if (where_count > sizeof(TAR_FULLPATHNAME) + sizeof(TAR_ARGS)-1) {     \
                    strcat(where_args, TARX_CMD);                       \
                    strcat(where_args, todir);                          \
                    if (system(where_args)) {                           \
                        cleanup(0);                                     \
                        errx(2, "can not invoke %lu byte %s pipeline: %s", \
-                               (u_long)strlen(where_args), TAR_CMD,    \
+                               (u_long)strlen(where_args), TAR_FULLPATHNAME,   \
                                where_args);                            \
                    }                                                   \
-                   strcpy(where_args, TAR_CMD TAR_ARGS);               \
+                   strcpy(where_args, TAR_FULLPATHNAME TAR_ARGS);      \
                    where_count = strlen(where_args);                   \
        }                                                               \
        if (perm_count) {                                               \
@@ -118,7 +118,7 @@
                cleanup(0);
                errx(2, "can't get argument list space");
        }
-       strcpy(where_args, TAR_CMD TAR_ARGS);
+       strcpy(where_args, TAR_FULLPATHNAME TAR_ARGS);
        /*
         * we keep track of how many characters are stored in 'where_args' with 'where_count'.
         * Note this doesn't include the trailing null character.