pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc Update archivers/pax to 20040802 (latest version o...
details: https://anonhg.NetBSD.org/pkgsrc/rev/de9c127a33b9
branches: trunk
changeset: 479694:de9c127a33b9
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Aug 21 03:28:49 2004 +0000
description:
Update archivers/pax to 20040802 (latest version on src HEAD). Changes
from previous include:
- include a pax2nbcompat script to ease importing from src HEAD
into pkgsrc.
* for copy mode, show more meaningful information on SIGINFO.
diffstat:
archivers/pax/Makefile | 4 +-
archivers/pax/files/ar_io.c | 54 ++++++---
archivers/pax/files/ar_subs.c | 10 +-
archivers/pax/files/buf_subs.c | 10 +-
archivers/pax/files/config.h.in | 6 +
archivers/pax/files/configure | 214 +++++++++++++++++++++++++++++++++++++
archivers/pax/files/configure.ac | 2 +
archivers/pax/files/cpio.c | 10 +-
archivers/pax/files/dumptar.c | 143 ++++++++++++++++++++++++
archivers/pax/files/file_subs.c | 12 +-
archivers/pax/files/ftree.c | 15 +-
archivers/pax/files/gen_subs.c | 10 +-
archivers/pax/files/getid.c | 6 +-
archivers/pax/files/getoldopt.c | 14 +-
archivers/pax/files/misc.c | 12 +-
archivers/pax/files/mtree.h | 3 +-
archivers/pax/files/mtree_extern.h | 13 +-
archivers/pax/files/options.c | 14 +-
archivers/pax/files/pack_dev.c | 110 +++++++++---------
archivers/pax/files/pack_dev.h | 4 +-
archivers/pax/files/pat_rep.c | 10 +-
archivers/pax/files/pax.c | 41 +++++-
archivers/pax/files/pax.h | 8 +-
archivers/pax/files/pax2nbcompat | 62 ++++++++++
archivers/pax/files/sel_subs.c | 10 +-
archivers/pax/files/spec.c | 78 +++++++++++--
archivers/pax/files/stat_flags.c | 20 +-
archivers/pax/files/tables.c | 10 +-
archivers/pax/files/tar.c | 14 +-
archivers/pax/files/tty_subs.c | 10 +-
doc/CHANGES | 3 +-
31 files changed, 761 insertions(+), 171 deletions(-)
diffs (truncated from 1869 to 300 lines):
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/Makefile
--- a/archivers/pax/Makefile Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/Makefile Sat Aug 21 03:28:49 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/08/14 02:33:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/08/21 03:28:56 jlam Exp $
#
-DISTNAME= pax-20040703
+DISTNAME= pax-20040802
CATEGORIES= archivers pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/files/ar_io.c
--- a/archivers/pax/files/ar_io.c Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/files/ar_io.c Sat Aug 21 03:28:49 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_io.c,v 1.7 2004/06/20 10:11:02 grant Exp $ */
+/* $NetBSD: ar_io.c,v 1.8 2004/08/21 03:28:56 jlam Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -36,15 +36,19 @@
#if HAVE_CONFIG_H
#include "config.h"
#endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <nbcompat.h>
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-#if defined(__RCSID) && !defined(lint)
+#if !defined(lint)
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.7 2004/06/20 10:11:02 grant Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.8 2004/08/21 03:28:56 jlam Exp $");
#endif
#endif /* not lint */
@@ -140,7 +144,7 @@
#endif /* SUPPORT_TAPE */
extern sigset_t s_mask;
static void ar_start_gzip(int, const char *, int);
-static const char *timefmt(char *, size_t, off_t, time_t);
+static const char *timefmt(char *, size_t, off_t, time_t, const char *);
static const char *sizefmt(char *, size_t, off_t);
#ifdef SUPPORT_RMT
@@ -234,8 +238,10 @@
return(-1);
if (chdname != NULL)
- if (chdir(chdname) != 0)
+ if (chdir(chdname) != 0) {
syswarn(1, errno, "Failed chdir to %s", chdname);
+ return(-1);
+ }
/*
* set up is based on device type
*/
@@ -818,7 +824,7 @@
return(res);
}
break;
-#endif
+#endif /* SUPPORT_TAPE */
case ISREG:
case ISBLK:
case ISCHR:
@@ -908,8 +914,12 @@
/*
* if file is out of space, handle it like a return of 0
*/
- if ((errno == ENOSPC) || (errno == EFBIG) || (errno == EDQUOT))
+ if ((errno == ENOSPC) || (errno == EFBIG))
res = lstrval = 0;
+#ifdef EDQUOT
+ if (errno == EDQUOT)
+ res = lstrval = 0;
+#endif
break;
#ifdef SUPPORT_TAPE
case ISTAPE:
@@ -1661,14 +1671,15 @@
}
static const char *
-timefmt(buf, size, sz, tm)
+timefmt(buf, size, sz, tm, unitstr)
char *buf;
size_t size;
off_t sz;
time_t tm;
+ const char *unitstr;
{
- (void)snprintf(buf, size, "%lu secs (" OFFT_F " bytes/sec)",
- (unsigned long)tm, (OFFT_T)(sz / tm));
+ (void)snprintf(buf, size, "%lu secs (" OFFT_F " %s/sec)",
+ (unsigned long)tm, (OFFT_T)(sz / tm), unitstr);
return buf;
}
@@ -1711,11 +1722,11 @@
* we have skipped over looking for a header to id. there is no way we
* could have written anything yet.
*/
- if (frmt == NULL) {
+ if (frmt == NULL && act != COPY) {
len = snprintf(buf, sizeof(buf),
"unknown format, %s skipped in %s\n",
sizefmt(s1buf, sizeof(s1buf), rdcnt),
- timefmt(tbuf, sizeof(tbuf), rdcnt, secs));
+ timefmt(tbuf, sizeof(tbuf), rdcnt, secs, "bytes"));
if (n == 0)
(void)fprintf(outf, "%s: %s", argv0, buf);
else
@@ -1731,12 +1742,19 @@
}
- len = snprintf(buf, sizeof(buf),
- "%s vol %d, %lu files, %s read, %s written in %s\n",
- frmt->name, arvol-1, (unsigned long)flcnt,
- sizefmt(s1buf, sizeof(s1buf), rdcnt),
- sizefmt(s2buf, sizeof(s2buf), wrcnt),
- timefmt(tbuf, sizeof(tbuf), rdcnt + wrcnt, secs));
+ if (act == COPY) {
+ len = snprintf(buf, sizeof(buf),
+ "%lu files in %s\n",
+ (unsigned long)flcnt,
+ timefmt(tbuf, sizeof(tbuf), flcnt, secs, "files"));
+ } else {
+ len = snprintf(buf, sizeof(buf),
+ "%s vol %d, %lu files, %s read, %s written in %s\n",
+ frmt->name, arvol-1, (unsigned long)flcnt,
+ sizefmt(s1buf, sizeof(s1buf), rdcnt),
+ sizefmt(s2buf, sizeof(s2buf), wrcnt),
+ timefmt(tbuf, sizeof(tbuf), rdcnt + wrcnt, secs, "bytes"));
+ }
if (n == 0)
(void)fprintf(outf, "%s: %s", argv0, buf);
else
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/files/ar_subs.c
--- a/archivers/pax/files/ar_subs.c Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/files/ar_subs.c Sat Aug 21 03:28:49 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_subs.c,v 1.6 2004/06/20 10:11:02 grant Exp $ */
+/* $NetBSD: ar_subs.c,v 1.7 2004/08/21 03:28:56 jlam Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -36,15 +36,19 @@
#if HAVE_CONFIG_H
#include "config.h"
#endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <nbcompat.h>
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-#if defined(__RCSID) && !defined(lint)
+#if !defined(lint)
#if 0
static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_subs.c,v 1.6 2004/06/20 10:11:02 grant Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.7 2004/08/21 03:28:56 jlam Exp $");
#endif
#endif /* not lint */
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/files/buf_subs.c
--- a/archivers/pax/files/buf_subs.c Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/files/buf_subs.c Sat Aug 21 03:28:49 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf_subs.c,v 1.4 2004/06/20 10:11:02 grant Exp $ */
+/* $NetBSD: buf_subs.c,v 1.5 2004/08/21 03:28:56 jlam Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -36,15 +36,19 @@
#if HAVE_CONFIG_H
#include "config.h"
#endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <nbcompat.h>
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-#if defined(__RCSID) && !defined(lint)
+#if !defined(lint)
#if 0
static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: buf_subs.c,v 1.4 2004/06/20 10:11:02 grant Exp $");
+__RCSID("$NetBSD: buf_subs.c,v 1.5 2004/08/21 03:28:56 jlam Exp $");
#endif
#endif /* not lint */
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/files/config.h.in
--- a/archivers/pax/files/config.h.in Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/files/config.h.in Sat Aug 21 03:28:49 2004 +0000
@@ -33,6 +33,9 @@
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
+/* Define to 1 if you have the `lutimes' function. */
+#undef HAVE_LUTIMES
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -81,6 +84,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if `st_flags' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_FLAGS
+
/* Define to 1 if you have the <sys/cdefs.h> header file. */
#undef HAVE_SYS_CDEFS_H
diff -r 63f07a1cfc2e -r de9c127a33b9 archivers/pax/files/configure
--- a/archivers/pax/files/configure Sat Aug 21 00:49:30 2004 +0000
+++ b/archivers/pax/files/configure Sat Aug 21 03:28:49 2004 +0000
@@ -3256,9 +3256,223 @@
done
+echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5
+echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6
+if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/stat.h>
+
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_flags)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_member_struct_stat_st_flags=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/stat.h>
+
+int
+main ()
+{
Home |
Main Index |
Thread Index |
Old Index