[src/netbsd-1-6]: src/bin/pax Pullup rev 1.31-1.41 (requested by rafal in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/e5d6852a2083
branches:  netbsd-1-6
changeset: 531264:e5d6852a2083
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 07 06:57:32 2004 +0000

description:
Pullup rev 1.31-1.41 (requested by rafal in ticket #1021)

Pullup pax to current version on trunk. Includes many fixes.

diffstat:

 bin/pax/extern.h |  43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diffs (141 lines):

diff -r 4771351e6731 -r e5d6852a2083 bin/pax/extern.h
--- a/bin/pax/extern.h  Wed Apr 07 06:57:29 2004 +0000
+++ b/bin/pax/extern.h  Wed Apr 07 06:57:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.30 2002/01/31 22:43:35 tv Exp $   */
+/*     $NetBSD: extern.h,v 1.30.2.1 2004/04/07 06:57:32 jmc Exp $      */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -54,6 +50,10 @@
 extern const char *gzip_program;
 extern time_t starttime;
 extern int force_one_volume;
+extern char *chdname;
+extern int forcelocal;
+extern int secure;
+
 int ar_open(const char *);
 void ar_close(void);
 void ar_drain(void);
@@ -142,7 +142,8 @@
 /*
  * file_subs.c
  */
-extern char *gnu_hack_string;
+extern char *gnu_name_string, *gnu_link_string;
+extern char *xtmp_name;
 int file_creat(ARCHD *);
 void file_close(ARCHD *, int);
 int lnk_creat(ARCHD *);
@@ -172,13 +173,12 @@
 /*
  * gen_subs.c
  */
-void ls_list(ARCHD *, time_t);
+void ls_list(ARCHD *, time_t, FILE *);
 void ls_tty(ARCHD *);
-void zf_strncpy(char *, const char *, int);
-int l_strncpy(char *, const char *, int);
+void safe_print(const char *, FILE *);
 u_long asc_ul(char *, int, int);
 int ul_asc(u_long, char *, int, int);
-#ifndef NET2_STAT
+#if !defined(NET2_STAT) && !defined(_LP64)
 unsigned long long asc_ull(char *, int, int);
 int ull_asc(unsigned long long, char *, int, int);
 #endif
@@ -195,18 +195,18 @@
  */
 extern FSUB fsub[];
 extern int ford[];
-extern int cpio_mode;
 void options(int, char **);
 OPLIST * opt_next(void);
 int opt_add(const char *);
-int opt_chdir(char *);
 int bad_opt(void);
+int mkpath(char *);
+char *chdname;
 
 /*
  * pat_rep.c
  */
 int rep_add(char *);
-int pat_add(char *, int);
+int pat_add(char *, char *);
 void pat_chk(void);
 int pat_sel(ARCHD *);
 int pat_match(ARCHD *);
@@ -220,8 +220,10 @@
 extern FSUB *frmt;
 extern int Aflag;
 extern int cflag;
+extern int cwdfd;
 extern int dflag;
 extern int iflag;
+extern int jflag;
 extern int kflag;
 extern int lflag;
 extern int nflag;
@@ -239,13 +241,21 @@
 extern int vfpart;
 extern int patime;
 extern int pmtime;
+extern int nodirs;
 extern int pfflags;
 extern int pmode;
 extern int pids;
+extern int rmleadslash;
 extern int exit_val;
 extern int docrc;
+extern int to_stdout;
 extern char *dirptr;
+extern char *ltmfrmt;
 extern char *argv0;
+extern FILE *listf;
+extern char *tempfile;
+extern char *tempbase;
+
 int main(int, char **);
 void sig_cleanup(int);
 
@@ -268,7 +278,7 @@
 int chk_ftime(ARCHD *);
 int name_start(void);
 int add_name(char *, int, char *);
-void sub_name(char *, int *);
+void sub_name(char *, int *, size_t);
 int dev_start(void);
 int add_dev(ARCHD *);
 int map_dev(ARCHD *, u_long, u_long);
@@ -284,7 +294,7 @@
 /*
  * tar.c
  */
-extern int is_oldgnutar;
+extern int is_gnutar;
 int tar_endwr(void);
 off_t tar_endrd(void);
 int tar_trail(char *, int, int *);
@@ -298,6 +308,7 @@
 int ustar_rd(ARCHD *, char *);
 int ustar_wr(ARCHD *);
 int tar_gnutar_X_compat(const char *);
+int tar_gnutar_minus_minus_exclude(const char *);
 
 /*
  * tty_subs.c