diff options
| author | jlam <jlam> | 2004-08-21 04:10:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-21 04:10:40 +0000 |
| commit | ae8fa517e828bfdf8e6bbf4e4e6e27389d2871f0 (patch) | |
| tree | 0dde80fc1ed503e4d4ea35cd178735a3dac7d33b /pkgtools/mtree/files/create.c | |
| parent | cfe8e7f827cee5b55ad2dc65f51f602212425a55 (diff) | |
| download | pkgsrc-ae8fa517e828bfdf8e6bbf4e4e6e27389d2871f0.tar.gz | |
Update pkgtools/mtree to 20040722 (the latest on src HEAD). Changes
from the previous version include:
- Add a mtree2nbcompat script to ease importing from src HEAD into
pkgsrc.
* Implement -M to "merge" entries, even with different types. This
can be used in /etc/security to allow special.local to override
types of entries in special (e.g, replacing a dir with a link).
* Rename Wflag to mtree_Wflag, to be more "external namespace" friendly.
Diffstat (limited to 'pkgtools/mtree/files/create.c')
| -rw-r--r-- | pkgtools/mtree/files/create.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/mtree/files/create.c b/pkgtools/mtree/files/create.c index 86990f93d8d..1a3f693b5e7 100644 --- a/pkgtools/mtree/files/create.c +++ b/pkgtools/mtree/files/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.3 2004/04/16 23:43:36 heinz Exp $ */ +/* $NetBSD: create.c,v 1.4 2004/08/21 04:10:45 jlam Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -32,6 +32,10 @@ #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> @@ -40,7 +44,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.3 2004/04/16 23:43:36 heinz Exp $"); +__RCSID("$NetBSD: create.c,v 1.4 2004/08/21 04:10:45 jlam Exp $"); #endif #endif /* not lint */ @@ -51,7 +55,7 @@ __RCSID("$NetBSD: create.c,v 1.3 2004/04/16 23:43:36 heinz Exp $"); #include <sys/stat.h> #endif -#if !HAVE_CONFIG_H +#if ! HAVE_NBTOOL_CONFIG_H #if HAVE_DIRENT_H #include <dirent.h> #endif @@ -218,7 +222,7 @@ statf(FTSENT *p) output(&indent, "nlink=%u", p->fts_statp->st_nlink); if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode)) output(&indent, "size=%lld", (long long)p->fts_statp->st_size); -#ifdef BSD4_4 +#if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H) if (keys & F_TIME) output(&indent, "time=%ld.%ld", (long)p->fts_statp->st_mtimespec.tv_sec, @@ -412,4 +416,3 @@ output(int *offset, const char *fmt, ...) } *offset += printf(" %s", buf) + 1; } - |