Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always use NetBSD's fts(3) in compat builds. Some systems (notably

Browse Source 
Red Hat 7.3, at least) do not have fts(3) implementations that work
correctly with -D_FILE_OFFSET_BITS=64.
This commit is contained in:
briggs 2002-09-16 04:10:36 +00:00
parent b3ac19283d
commit a94d82e6f9
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/gen/__fts13.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __fts13.c,v 1.39 2002/02/26 22:29:40 tv Exp $ */
/* $NetBSD: __fts13.c,v 1.40 2002/09/16 04:10:36 briggs Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
__RCSID("$NetBSD: __fts13.c,v 1.39 2002/02/26 22:29:40 tv Exp $");
__RCSID("$NetBSD: __fts13.c,v 1.40 2002/09/16 04:10:36 briggs Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -93,7 +93,6 @@ __warn_references(fts_set,
" include <fts.h> for correct reference")
#endif
#if !HAVE_FTS_H
static FTSENT *fts_alloc __P((FTS *, const char *, size_t));
static FTSENT *fts_build __P((FTS *, int));
static void fts_lfree __P((FTSENT *));
@ -1207,4 +1206,3 @@ bail:
}
return ret;
}
#endif /* !HAVE_FTS_H */

3
tools/compat/config.h.in
View File

@ -1,4 +1,4 @@
/* $NetBSD: config.h.in,v 1.21 2002/09/14 04:30:27 thorpej Exp $ */
/* $NetBSD: config.h.in,v 1.22 2002/09/16 04:10:36 briggs Exp $ */
#ifndef __NETBSD_COMPAT_CONFIG_H__
#define __NETBSD_COMPAT_CONFIG_H__
@ -11,7 +11,6 @@
#undef HAVE_DIRENT_H
#undef HAVE_ERR_H
#undef HAVE_FEATURES_H
#undef HAVE_FTS_H
#undef HAVE_INTTYPES_H
#undef HAVE_LIBGEN_H
#undef HAVE_NDIR_H

2
tools/compat/configure vendored
View File

@ -2613,7 +2613,7 @@ else
fi
done
for ac_header in rpc/types.h fts.h getopt.h netconfig.h
for ac_header in rpc/types.h getopt.h netconfig.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:2619: checking for $ac_header" >&5

4
tools/compat/configure.ac
View File

@ -1,4 +1,4 @@
# $NetBSD: configure.ac,v 1.23 2002/09/14 04:30:27 thorpej Exp $
# $NetBSD: configure.ac,v 1.24 2002/09/16 04:10:37 briggs Exp $
#
# Autoconf definition file for libnbcompat.
#
@ -41,7 +41,7 @@ AC_CHECK_HEADERS(sys/sysmacros.h sys/syslimits.h \
AC_CHECK_HEADERS(machine/bswap.h sys/cdefs.h sys/endian.h sys/featuretest.h \
err.h inttypes.h libgen.h paths.h stdint.h util.h,,
[test -f include/$ac_header || touch include/$ac_header])
AC_CHECK_HEADERS(rpc/types.h fts.h getopt.h netconfig.h,,
AC_CHECK_HEADERS(rpc/types.h getopt.h netconfig.h,,
[echo '#include "config.h"' >include/$ac_header.new
echo '#include "'$srcdir/../../include/$ac_header'"' >>include/$ac_header.new
if cmp include/$ac_header.new include/$ac_header >/dev/null 2>&1; then

5
tools/compat/fts.h Normal file
View File

@ -0,0 +1,5 @@
/* $NetBSD: fts.h,v 1.1 2002/09/16 04:10:37 briggs Exp $ */
/* We unconditionally use the NetBSD fts(3) in libnbcompat. */
#include "config.h"
#include "../../include/fts.h"