diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-21 03:28:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-21 03:28:49 +0000 |
| commit | ff44898db4c0b765e4f054b0cf6c29ac6d18d254 (patch) | |
| tree | 5a31626ba82d66abe9e0eb31a61d5759fa1813fa /archivers/pax/files/ftree.c | |
| parent | eaab21e0565c5de8730a1125244a355cfee8d663 (diff) | |
| download | pkgsrc-ff44898db4c0b765e4f054b0cf6c29ac6d18d254.tar.gz | |
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 (limited to 'archivers/pax/files/ftree.c')
| -rw-r--r-- | archivers/pax/files/ftree.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/archivers/pax/files/ftree.c b/archivers/pax/files/ftree.c index 4ebb0232507..2a35a95b878 100644 --- a/archivers/pax/files/ftree.c +++ b/archivers/pax/files/ftree.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftree.c,v 1.6 2004/06/20 10:11:02 grant Exp $ */ +/* $NetBSD: ftree.c,v 1.7 2004/08/21 03:28:56 jlam Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -72,15 +72,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[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: ftree.c,v 1.6 2004/06/20 10:11:02 grant Exp $"); +__RCSID("$NetBSD: ftree.c,v 1.7 2004/08/21 03:28:56 jlam Exp $"); #endif #endif /* not lint */ @@ -398,7 +402,6 @@ ftree_arg(void) if (i == 0) return -1; farray[0][i] = '\0'; - fprintf(stderr, ">%s<\n", farray[0]); } else { /* * the user supplied the file args as arguements to pax @@ -546,7 +549,7 @@ next_file(ARCHD *arcn) statbuf.st_flags = ftnode->st_flags; #endif if (ftnode->flags & F_TIME) -#ifdef BSD4_4 +#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H statbuf.st_mtimespec = ftnode->st_mtimespec; #else statbuf.st_mtime = ftnode->st_mtimespec.tv_sec; @@ -750,6 +753,7 @@ next_file(ARCHD *arcn) arcn->ln_name[cnt] = '\0'; arcn->ln_nlen = cnt; break; +#ifdef S_IFSOCK case S_IFSOCK: /* * under BSD storing a socket is senseless but we will @@ -758,6 +762,7 @@ next_file(ARCHD *arcn) */ arcn->type = PAX_SCK; break; +#endif case S_IFIFO: arcn->type = PAX_FIF; break; |