Overhaul how `build.sh tools' are used:

*	Rename "config.h" to "nbtool_config.h" and
	HAVE_CONFIG_H to HAVE_NBTOOL_CONFIG_H.
	This makes in more obvious in the source when we're using
	tools/compat/config.h versus "standard autoconf" config.h

    *	Consistently move the inclusion of nbtool_config.h to before
    	<sys/cdefs.h> so that the former can provide __RCSID() (et al),
    	and there's no need to protect those macros any more.

These changes should make it easier to "tool-ify" a program by adding:
	#if HAVE_NBTOOL_CONFIG_H
	#include "nbtool_config.h"
	#endif
to the top of the source files (for the general case).
This commit is contained in:
lukem 2003-10-27 00:12:41 +00:00
parent 5976f8aa56
commit 171d653219
149 changed files with 734 additions and 700 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: cat.c,v 1.41 2003/09/14 19:20:16 jschauma Exp $ */
/* $NetBSD: cat.c,v 1.42 2003/10/27 00:12:41 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@ -32,25 +32,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT(
"@(#) Copyright (c) 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else
__RCSID("$NetBSD: cat.c,v 1.41 2003/09/14 19:20:16 jschauma Exp $");
__RCSID("$NetBSD: cat.c,v 1.42 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/param.h>
#include <sys/stat.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: stat_flags.c,v 1.17 2003/08/13 03:29:07 itojun Exp $ */
/* $NetBSD: stat_flags.c,v 1.18 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,21 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)stat_flags.c 8.2 (Berkeley) 7/28/94";
#else
__RCSID("$NetBSD: stat_flags.c,v 1.17 2003/08/13 03:29:07 itojun Exp $");
#endif
#endif /* not lint */
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#else
#define HAVE_STRUCT_STAT_ST_FLAGS 1
#endif
#include <sys/cdefs.h>
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)stat_flags.c 8.2 (Berkeley) 7/28/94";
#else
__RCSID("$NetBSD: stat_flags.c,v 1.18 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */
#include <sys/types.h>
#include <sys/stat.h>
#include <fts.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: ar_io.c,v 1.38 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: ar_io.c,v 1.39 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#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.38 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: ar_io.c,v 1.39 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ar_subs.c,v 1.28 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: ar_subs.c,v 1.29 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#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.28 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: ar_subs.c,v 1.29 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: buf_subs.c,v 1.22 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: buf_subs.c,v 1.23 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#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.22 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: buf_subs.c,v 1.23 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpio.c,v 1.16 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: cpio.c,v 1.17 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: cpio.c,v 1.16 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: cpio.c,v 1.17 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: file_subs.c,v 1.35 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: file_subs.c,v 1.36 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: file_subs.c,v 1.35 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: file_subs.c,v 1.36 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ftree.c,v 1.28 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: ftree.c,v 1.29 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -69,12 +69,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#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.28 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: ftree.c,v 1.29 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: gen_subs.c,v 1.31 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: gen_subs.c,v 1.32 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: gen_subs.c,v 1.31 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: gen_subs.c,v 1.32 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: getoldopt.c,v 1.18 2003/06/24 16:23:31 christos Exp $ */
/* $NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $ */
/*
* Plug-compatible replacement for getopt() for parsing tar-like
@ -9,9 +9,13 @@
* in the Public Domain for your edification and enjoyment.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: getoldopt.c,v 1.18 2003/06/24 16:23:31 christos Exp $");
#if !defined(lint)
__RCSID("$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $");
#endif /* not lint */
#include <getopt.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: options.c,v 1.68 2003/10/21 02:08:14 fvdl Exp $ */
/* $NetBSD: options.c,v 1.69 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: options.c,v 1.68 2003/10/21 02:08:14 fvdl Exp $");
__RCSID("$NetBSD: options.c,v 1.69 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: pat_rep.c,v 1.20 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: pat_rep.c,v 1.21 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: pat_rep.c,v 1.20 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: pat_rep.c,v 1.21 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: pax.c,v 1.30 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: pax.c,v 1.31 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,17 +33,18 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: pax.c,v 1.30 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: pax.c,v 1.31 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: pax.h,v 1.21 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: pax.h,v 1.22 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -35,9 +35,7 @@
* @(#)pax.h 8.2 (Berkeley) 4/18/94
*/
#if HAVE_CONFIG_H
#include "config.h"
#else
#if ! HAVE_NBTOOL_CONFIG_H
#define HAVE_LUTIMES 1
#define HAVE_STRUCT_STAT_ST_FLAGS 1
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: sel_subs.c,v 1.18 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: sel_subs.c,v 1.19 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: sel_subs.c,v 1.18 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: sel_subs.c,v 1.19 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: tables.c,v 1.22 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: tables.c,v 1.23 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: tables.c,v 1.22 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: tables.c,v 1.23 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: tar.c,v 1.44 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: tar.c,v 1.45 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: tar.c,v 1.44 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: tar.c,v 1.45 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: tty_subs.c,v 1.15 2003/10/13 07:41:22 agc Exp $ */
/* $NetBSD: tty_subs.c,v 1.16 2003/10/27 00:12:41 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -33,12 +33,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
#else
__RCSID("$NetBSD: tty_subs.c,v 1.15 2003/10/13 07:41:22 agc Exp $");
__RCSID("$NetBSD: tty_subs.c,v 1.16 2003/10/27 00:12:41 lukem Exp $");
#endif
#endif /* not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: dbsym.c,v 1.6 2003/03/06 00:26:10 thorpej Exp $ */
/* $NetBSD: dbsym.c,v 1.7 2003/10/27 00:12:41 lukem Exp $ */
/*
* Copyright (c) 2001 Simon Burge (for Wasabi Systems)
@ -30,21 +30,18 @@
* <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT(
"@(#) Copyright (c) 1996 Christopher G. Demetriou, 2001 Simon Burge.\
All rights reserved.\n");
__RCSID("$NetBSD: dbsym.c,v 1.7 2003/10/27 00:12:41 lukem Exp $");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: dbsym.c,v 1.6 2003/03/06 00:26:10 thorpej Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: mdsetimage.c,v 1.13 2003/03/06 00:31:41 thorpej Exp $ */
/* $NetBSD: mdsetimage.c,v 1.14 2003/10/27 00:12:42 lukem Exp $ */
/* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
/*
@ -30,21 +30,18 @@
* <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT(
"@(#) Copyright (c) 1996 Christopher G. Demetriou.\
All rights reserved.\n");
__RCSID("$NetBSD: mdsetimage.c,v 1.14 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: mdsetimage.c,v 1.13 2003/03/06 00:31:41 thorpej Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_bcs.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $ */
/* $NetBSD: citrus_bcs.c,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -26,13 +26,13 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_bcs.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $");
__RCSID("$NetBSD: citrus_bcs.c,v 1.3 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef HOSTPROG

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_db_factory.c,v 1.5 2003/06/30 12:32:21 tshiozak Exp $ */
/* $NetBSD: citrus_db_factory.c,v 1.6 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -26,13 +26,13 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_db_factory.c,v 1.5 2003/06/30 12:32:21 tshiozak Exp $");
__RCSID("$NetBSD: citrus_db_factory.c,v 1.6 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_db_hash.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $ */
/* $NetBSD: citrus_db_hash.c,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -26,13 +26,13 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_db_hash.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $");
__RCSID("$NetBSD: citrus_db_hash.c,v 1.3 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef HOSTPROG

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_lookup_factory.c,v 1.3 2003/06/30 12:32:21 tshiozak Exp $ */
/* $NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -26,13 +26,13 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_lookup_factory.c,v 1.3 2003/06/30 12:32:21 tshiozak Exp $");
__RCSID("$NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_pivot_factory.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $ */
/* $NetBSD: citrus_pivot_factory.c,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -26,13 +26,13 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_pivot_factory.c,v 1.2 2003/06/30 12:32:21 tshiozak Exp $");
__RCSID("$NetBSD: citrus_pivot_factory.c,v 1.3 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_region.h,v 1.3 2003/07/21 07:10:28 thorpej Exp $ */
/* $NetBSD: citrus_region.h,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -30,8 +30,8 @@
#ifndef _CITRUS_REGION_H_
#define _CITRUS_REGION_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
struct _citrus_region {

View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_types.h,v 1.2 2003/07/21 07:10:28 thorpej Exp $ */
/* $NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -29,8 +29,8 @@
#ifndef _CITRUS_TYPES_H_
#define _CITRUS_TYPES_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
typedef uint32_t _citrus_wc_t;

View File

@ -1,4 +1,4 @@
/* $NetBSD: btree.h,v 1.13 2003/08/07 16:42:41 agc Exp $ */
/* $NetBSD: btree.h,v 1.14 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -34,8 +34,8 @@
* @(#)btree.h 8.11 (Berkeley) 8/17/94
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
/* Macros to set/clear/test flags. */

View File

@ -1,4 +1,4 @@
/* $NetBSD: hash.h,v 1.12 2003/08/07 16:42:42 agc Exp $ */
/* $NetBSD: hash.h,v 1.13 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -34,8 +34,8 @@
* @(#)hash.h 8.3 (Berkeley) 5/31/94
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
/* Operations */

View File

@ -1,4 +1,4 @@
/* $NetBSD: __fts13.c,v 1.41 2003/08/07 16:42:45 agc Exp $ */
/* $NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
__RCSID("$NetBSD: __fts13.c,v 1.41 2003/08/07 16:42:45 agc Exp $");
__RCSID("$NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -51,7 +51,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.41 2003/08/07 16:42:45 agc Exp $");
#include <string.h>
#include <unistd.h>
#if !HAVE_CONFIG_H
#if ! HAVE_NBTOOL_CONFIG_H
#define HAVE_STRUCT_DIRENT_D_NAMLEN 1
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: err.c,v 1.22 2003/08/07 16:42:47 agc Exp $ */
/* $NetBSD: err.c,v 1.23 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: err.c,v 1.22 2003/08/07 16:42:47 agc Exp $");
__RCSID("$NetBSD: err.c,v 1.23 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: errx.c,v 1.10 2003/08/07 16:42:47 agc Exp $ */
/* $NetBSD: errx.c,v 1.11 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: errx.c,v 1.10 2003/08/07 16:42:47 agc Exp $");
__RCSID("$NetBSD: errx.c,v 1.11 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: getcap.c,v 1.38 2003/08/07 16:42:49 agc Exp $ */
/* $NetBSD: getcap.c,v 1.39 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
__RCSID("$NetBSD: getcap.c,v 1.38 2003/08/07 16:42:49 agc Exp $");
__RCSID("$NetBSD: getcap.c,v 1.39 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */

View File

@ -1,4 +1,4 @@
/* $NetBSD: pw_scan.c,v 1.12 2003/08/07 16:42:55 agc Exp $ */
/* $NetBSD: pw_scan.c,v 1.13 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@ -29,13 +29,14 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#include "compat_pwd.h"
#else
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: pw_scan.c,v 1.12 2003/08/07 16:42:55 agc Exp $");
__RCSID("$NetBSD: pw_scan.c,v 1.13 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(_LIBC)
@ -55,7 +56,7 @@ __RCSID("$NetBSD: pw_scan.c,v 1.12 2003/08/07 16:42:55 agc Exp $");
#ifdef _LIBC
#include "pw_private.h"
#endif
#endif /* !HAVE_CONFIG_H */
#endif /* ! HAVE_NBTOOL_CONFIG_H */
int
#ifdef _LIBC
@ -140,7 +141,7 @@ pw_scan(bp, pw, flags)
if (!(pw->pw_shell = strsep(&bp, ":"))) /* shell */
goto fmt;
#if !HAVE_CONFIG_H
#if ! HAVE_NBTOOL_CONFIG_H
p = pw->pw_shell;
if (root && *p) /* empty == /bin/sh */
for (setusershell();;) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: verrx.c,v 1.11 2003/08/07 16:43:00 agc Exp $ */
/* $NetBSD: verrx.c,v 1.12 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: verrx.c,v 1.11 2003/08/07 16:43:00 agc Exp $");
__RCSID("$NetBSD: verrx.c,v 1.12 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>
#include <stdio.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: vwarn.c,v 1.11 2003/08/07 16:43:00 agc Exp $ */
/* $NetBSD: vwarn.c,v 1.12 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: vwarn.c,v 1.11 2003/08/07 16:43:00 agc Exp $");
__RCSID("$NetBSD: vwarn.c,v 1.12 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <errno.h>
#include <stdarg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: vwarnx.c,v 1.11 2003/08/07 16:43:00 agc Exp $ */
/* $NetBSD: vwarnx.c,v 1.12 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: vwarnx.c,v 1.11 2003/08/07 16:43:00 agc Exp $");
__RCSID("$NetBSD: vwarnx.c,v 1.12 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>
#include <stdio.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: warn.c,v 1.10 2003/08/07 16:43:01 agc Exp $ */
/* $NetBSD: warn.c,v 1.11 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: warn.c,v 1.10 2003/08/07 16:43:01 agc Exp $");
__RCSID("$NetBSD: warn.c,v 1.11 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: warnx.c,v 1.9 2003/08/07 16:43:01 agc Exp $ */
/* $NetBSD: warnx.c,v 1.10 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1993
@ -29,21 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: warnx.c,v 1.9 2003/08/07 16:43:01 agc Exp $");
__RCSID("$NetBSD: warnx.c,v 1.10 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#ifndef __NO_NAMESPACE_H /* XXX */
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <err.h>
#include <stdarg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: rmd160.c,v 1.7 2002/03/31 13:55:14 bjh21 Exp $ */
/* $NetBSD: rmd160.c,v 1.8 2003/10/27 00:12:42 lukem Exp $ */
/********************************************************************\
*
@ -18,14 +18,14 @@
*
\********************************************************************/
#if HAVE_CONFIG_H
#include "config.h"
#else
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rmd160.c,v 1.7 2002/03/31 13:55:14 bjh21 Exp $");
__RCSID("$NetBSD: rmd160.c,v 1.8 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#endif
/* header files */
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: rmd160hl.c,v 1.7 2002/03/31 13:55:14 bjh21 Exp $ */
/* $NetBSD: rmd160hl.c,v 1.8 2003/10/27 00:12:42 lukem Exp $ */
/* rmd160hl.c
* ----------------------------------------------------------------------------
@ -11,14 +11,14 @@
* from OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $
*/
#if HAVE_CONFIG_H
#include "config.h"
#else
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rmd160hl.c,v 1.7 2002/03/31 13:55:14 bjh21 Exp $");
__RCSID("$NetBSD: rmd160hl.c,v 1.8 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#endif
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: sha1.c,v 1.11 2003/09/21 17:15:36 martin Exp $ */
/* $NetBSD: sha1.c,v 1.12 2003/10/27 00:12:42 lukem Exp $ */
/* $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $ */
/*
@ -30,8 +30,8 @@
#include <string.h>
#endif
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_SHA1_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: sha1hl.c,v 1.8 2002/03/31 14:17:19 bjh21 Exp $ */
/* $NetBSD: sha1hl.c,v 1.9 2003/10/27 00:12:42 lukem Exp $ */
/* sha1hl.c
* ----------------------------------------------------------------------------
@ -23,14 +23,14 @@
#include <stdlib.h>
#include <unistd.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_SHA1_H
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: sha1hl.c,v 1.8 2002/03/31 14:17:19 bjh21 Exp $");
__RCSID("$NetBSD: sha1hl.c,v 1.9 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(__weak_alias)

View File

@ -1,4 +1,4 @@
/* $NetBSD: md2c.c,v 1.3 2002/03/31 12:58:56 bjh21 Exp $ */
/* $NetBSD: md2c.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -44,8 +44,8 @@
#include <md2.h>
#include <string.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD2_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: md2hl.c,v 1.3 2003/07/26 19:24:47 salo Exp $ */
/* $NetBSD: md2hl.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*
* Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
@ -10,8 +10,8 @@
#include "namespace.h"
#include <md2.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD2_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: md4c.c,v 1.10 2002/03/31 12:58:56 bjh21 Exp $ */
/* $NetBSD: md4c.c,v 1.11 2003/10/27 00:12:42 lukem Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD4 Message-Digest
@ -36,8 +36,8 @@
#include <md4.h>
#include <string.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD4_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: md4hl.c,v 1.4 2003/07/26 19:24:47 salo Exp $ */
/* $NetBSD: md4hl.c,v 1.5 2003/10/27 00:12:42 lukem Exp $ */
/*
* Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
@ -10,8 +10,8 @@
#include "namespace.h"
#include <md4.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD4_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: md5c.c,v 1.17 2002/03/31 12:58:56 bjh21 Exp $ */
/* $NetBSD: md5c.c,v 1.18 2003/10/27 00:12:42 lukem Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@ -42,8 +42,8 @@
#include <md5.h>
#endif /* _KERNEL || _STANDALONE */
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD5_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: md5hl.c,v 1.4 2003/07/26 19:24:47 salo Exp $ */
/* $NetBSD: md5hl.c,v 1.5 2003/10/27 00:12:42 lukem Exp $ */
/*
* Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
@ -10,8 +10,8 @@
#include "namespace.h"
#include <md5.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_MD5_H

View File

@ -1,4 +1,4 @@
/* $NetBSD: gettemp.c,v 1.11 2003/10/23 20:06:16 jmc Exp $ */
/* $NetBSD: gettemp.c,v 1.12 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -29,18 +29,18 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP
#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: gettemp.c,v 1.11 2003/10/23 20:06:16 jmc Exp $");
__RCSID("$NetBSD: gettemp.c,v 1.12 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -55,7 +55,7 @@ __RCSID("$NetBSD: gettemp.c,v 1.11 2003/10/23 20:06:16 jmc Exp $");
#include <stdlib.h>
#include <unistd.h>
#if HAVE_CONFIG_H
#if HAVE_NBTOOL_CONFIG_H
#define GETTEMP gettemp
#else
#include "reentrant.h"
@ -167,4 +167,4 @@ GETTEMP(path, doopen, domkdir)
/*NOTREACHED*/
}
#endif /* !HAVE_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP */
#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP */

View File

@ -1,4 +1,4 @@
/* $NetBSD: mkdtemp.c,v 1.8 2003/08/07 16:43:28 agc Exp $ */
/* $NetBSD: mkdtemp.c,v 1.9 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -29,22 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_CONFIG_H || !HAVE_MKDTEMP
#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: mkdtemp.c,v 1.8 2003/08/07 16:43:28 agc Exp $");
__RCSID("$NetBSD: mkdtemp.c,v 1.9 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#if HAVE_CONFIG_H
#if HAVE_NBTOOL_CONFIG_H
#define GETTEMP gettemp
#else
#include <assert.h>
@ -66,4 +66,4 @@ mkdtemp(path)
return (GETTEMP(path, (int *)NULL, 1) ? path : (char *)NULL);
}
#endif /* !HAVE_CONFIG_H || !HAVE_MKDTEMP */
#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP */

View File

@ -1,4 +1,4 @@
/* $NetBSD: mkstemp.c,v 1.7 2003/08/07 16:43:28 agc Exp $ */
/* $NetBSD: mkstemp.c,v 1.8 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -29,22 +29,22 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if !HAVE_CONFIG_H || !HAVE_MKSTEMP
#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: mkstemp.c,v 1.7 2003/08/07 16:43:28 agc Exp $");
__RCSID("$NetBSD: mkstemp.c,v 1.8 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#if HAVE_CONFIG_H
#if HAVE_NBTOOL_CONFIG_H
#define GETTEMP gettemp
#else
#include <assert.h>
@ -68,4 +68,4 @@ mkstemp(path)
return (GETTEMP(path, &fd, 0) ? fd : -1);
}
#endif /* !HAVE_CONFIG_H || !HAVE_MKSTEMP */
#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP */

View File

@ -1,4 +1,4 @@
/* $NetBSD: atoll.c,v 1.4 2003/08/07 16:43:38 agc Exp $ */
/* $NetBSD: atoll.c,v 1.5 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@ -29,12 +29,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "from: @(#)atol.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: atoll.c,v 1.4 2003/08/07 16:43:38 agc Exp $");
__RCSID("$NetBSD: atoll.c,v 1.5 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -50,10 +54,6 @@ __weak_alias(atoll, _atoll)
#endif
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if !HAVE_ATOLL
/* LONGLONG */
long long int

View File

@ -1,4 +1,4 @@
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/* $NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $");
__RCSID("$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -50,7 +50,7 @@ __RCSID("$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $");
#include <stdlib.h>
#include <string.h>
#if HAVE_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
#if HAVE_NBTOOL_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
#define REPLACE_GETOPT
#endif
@ -63,7 +63,7 @@ int optind = 1; /* index into parent argv vector */
int optopt = '?'; /* character checked for validity */
int optreset; /* reset getopt */
char *optarg; /* argument associated with option */
#elif HAVE_CONFIG_H && !HAVE_DECL_OPTRESET
#elif HAVE_NBTOOL_CONFIG_H && !HAVE_DECL_OPTRESET
static int optreset;
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: strsuftoll.c,v 1.3 2003/08/07 16:43:44 agc Exp $ */
/* $NetBSD: strsuftoll.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
* All rights reserved.
@ -67,20 +67,20 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: strsuftoll.c,v 1.3 2003/08/07 16:43:44 agc Exp $");
__RCSID("$NetBSD: strsuftoll.c,v 1.4 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef _LIBC
#include "namespace.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#if !HAVE_STRSUFTOLL
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: strtoll.c,v 1.5 2003/08/07 16:43:44 agc Exp $ */
/* $NetBSD: strtoll.c,v 1.6 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -29,12 +29,16 @@
* SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "from: @(#)strtoq.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: strtoll.c,v 1.5 2003/08/07 16:43:44 agc Exp $");
__RCSID("$NetBSD: strtoll.c,v 1.6 2003/10/27 00:12:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -54,10 +58,6 @@ __weak_alias(strtoll, _strtoll)
#endif
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if !HAVE_STRTOLL
/*
* Convert a string to a long long integer.

View File

@ -1,4 +1,4 @@
/* $NetBSD: strlcat.c,v 1.15 2003/05/15 15:02:52 itojun Exp $ */
/* $NetBSD: strlcat.c,v 1.16 2003/10/27 00:12:42 lukem Exp $ */
/* $OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $ */
/*
@ -17,9 +17,13 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: strlcat.c,v 1.15 2003/05/15 15:02:52 itojun Exp $");
__RCSID("$NetBSD: strlcat.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef _LIBC
@ -35,10 +39,6 @@ __weak_alias(strlcat, _strlcat)
# endif
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if !HAVE_STRLCAT
/*
* Appends src to string dst of size siz (unlike strncat, siz is the

View File

@ -1,4 +1,4 @@
/* $NetBSD: strlcpy.c,v 1.13 2003/05/15 15:02:52 itojun Exp $ */
/* $NetBSD: strlcpy.c,v 1.14 2003/10/27 00:12:42 lukem Exp $ */
/* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */
/*
@ -17,9 +17,13 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: strlcpy.c,v 1.13 2003/05/15 15:02:52 itojun Exp $");
__RCSID("$NetBSD: strlcpy.c,v 1.14 2003/10/27 00:12:42 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef _LIBC
@ -35,10 +39,6 @@ __weak_alias(strlcpy, _strlcpy)
# endif
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if !HAVE_STRLCPY
/*
* Copy src to string dst of size siz. At most siz-1 characters

View File

@ -1,4 +1,4 @@
/* $NetBSD: private.h,v 1.22 2002/05/26 11:49:58 wiz Exp $ */
/* $NetBSD: private.h,v 1.23 2003/10/27 00:12:42 lukem Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@ -10,8 +10,8 @@
#define HAVE_LONG_DOUBLE 1
/* For when we build zic as a host tool. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: snprintb.c,v 1.2 2002/09/20 21:11:11 christos Exp $ */
/* $NetBSD: snprintb.c,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -33,13 +33,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#else
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: snprintb.c,v 1.2 2002/09/20 21:11:11 christos Exp $");
#endif
__RCSID("$NetBSD: snprintb.c,v 1.3 2003/10/27 00:12:42 lukem Exp $");
#endif
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: makewhatis.c,v 1.29 2003/07/13 12:04:45 itojun Exp $ */
/* $NetBSD: makewhatis.c,v 1.30 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -36,20 +36,17 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\n\
All rights reserved.\n");
__RCSID("$NetBSD: makewhatis.c,v 1.30 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: makewhatis.c,v 1.29 2003/07/13 12:04:45 itojun Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/types.h>
#include <sys/param.h>
#include <sys/queue.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: mknod.c,v 1.27 2003/05/08 13:29:39 christos Exp $ */
/* $NetBSD: mknod.c,v 1.28 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -36,10 +36,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.\n");
__RCSID("$NetBSD: mknod.c,v 1.27 2003/05/08 13:29:39 christos Exp $");
__RCSID("$NetBSD: mknod.c,v 1.28 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: pack_dev.c,v 1.5 2003/05/08 13:29:39 christos Exp $ */
/* $NetBSD: pack_dev.c,v 1.6 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -36,9 +36,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: pack_dev.c,v 1.5 2003/05/08 13:29:39 christos Exp $");
#if !defined(lint)
__RCSID("$NetBSD: pack_dev.c,v 1.6 2003/10/27 00:12:42 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -51,10 +55,6 @@ __RCSID("$NetBSD: pack_dev.c,v 1.5 2003/05/08 13:29:39 christos Exp $");
#include <string.h>
#include <unistd.h>
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include "pack_dev.h"
static pack_t pack_netbsd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: mkbootimage.c,v 1.7 2003/10/19 11:34:27 he Exp $ */
/* $NetBSD: mkbootimage.c,v 1.8 2003/10/27 00:12:42 lukem Exp $ */
/*-
* Copyright (C) 1999, 2000 NONAKA Kimihiro (nonaka@netbsd.org)
@ -43,8 +43,8 @@
#include <sys/types.h>
#include <sys/uio.h>
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#include "../../sys/sys/bootblock.h"
#else
#include <sys/bootblock.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_bswap.c,v 1.21 2003/10/05 17:48:50 bouyer Exp $ */
/* $NetBSD: ffs_bswap.c,v 1.22 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@ -30,14 +30,12 @@
*
*/
#include <sys/cdefs.h>
#if defined(__KERNEL_RCSID)
__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.21 2003/10/05 17:48:50 bouyer Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.22 2003/10/27 00:12:42 lukem Exp $");
#include <sys/param.h>
#if defined(_KERNEL)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_subr.c,v 1.29 2003/08/07 16:34:30 agc Exp $ */
/* $NetBSD: ffs_subr.c,v 1.30 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -31,14 +31,12 @@
* @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95
*/
#include <sys/cdefs.h>
#if defined(__KERNEL_RCSID)
__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.29 2003/08/07 16:34:30 agc Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.30 2003/10/27 00:12:42 lukem Exp $");
#include <sys/param.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_tables.c,v 1.6 2003/08/07 16:34:31 agc Exp $ */
/* $NetBSD: ffs_tables.c,v 1.7 2003/10/27 00:12:42 lukem Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -31,14 +31,12 @@
* @(#)ffs_tables.c 8.1 (Berkeley) 6/11/93
*/
#include <sys/cdefs.h>
#if defined(__KERNEL_RCSID)
__KERNEL_RCSID(0, "$NetBSD: ffs_tables.c,v 1.6 2003/08/07 16:34:31 agc Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_tables.c,v 1.7 2003/10/27 00:12:42 lukem Exp $");
#include <sys/param.h>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2003/10/26 07:25:38 lukem Exp $
# $NetBSD: Makefile,v 1.28 2003/10/27 00:12:42 lukem Exp $
HOSTLIB= nbcompat
@ -26,7 +26,7 @@ CPPFLAGS+= -no-cpp-precomp
# -D_NETBSD_SOURCE is necessary for some of the NetBSD headers that we
# also use on the host system.
CPPFLAGS+= -I. -I./include -I${.CURDIR} -DHAVE_CONFIG_H \
CPPFLAGS+= -I. -I./include -I${.CURDIR} -DHAVE_NBTOOL_CONFIG_H=1 \
-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
.PATH: ${.CURDIR}/../../lib/libc/gen \
@ -49,7 +49,7 @@ _CURDIR:= ${.CURDIR}
SRCS:= ${SRCS:Nndbm.c}
config.cache: include/.stamp configure config.h.in defs.mk.in
config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in
rm -f ${.TARGET}
CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \
${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
@ -68,7 +68,7 @@ include/.stamp:
cleandir: compat.clean
compat.clean:
-rm -r -f include
-rm -f config.cache config.h
-rm -f config.cache nbtool_config.h
HOST_CPPFLAGS:= ${CPPFLAGS}
CPPFLAGS:= # empty

View File

@ -1,4 +1,4 @@
/* $NetBSD: compat_defs.h,v 1.30 2003/08/27 18:33:26 uwe Exp $ */
/* $NetBSD: compat_defs.h,v 1.31 2003/10/27 00:12:42 lukem Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@ -322,16 +322,21 @@ void *setmode(const char *);
#undef _DIAGASSERT
#define _DIAGASSERT(x)
/* Various sources use this */
#undef __RCSID
#define __RCSID(x)
#undef __SCCSID
#define __SCCSID(x)
#undef __COPYRIGHT
#define __COPYRIGHT(x)
#undef __KERNEL_RCSID
#define __KERNEL_RCSID(x,y)
/* Heimdal expects this one. */
#undef RCSID
#define RCSID(x)
/* pwd_mkdb expects this one. */
#undef __SCCSID
#define __SCCSID(x)
/* Some definitions not available on all systems. */
/* <errno.h> */

View File

@ -1265,7 +1265,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
ac_config_headers="$ac_config_headers nbtool_config.h"
ac_config_files="$ac_config_files defs.mk"
@ -3980,7 +3980,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
else
echo '#include "config.h"' >include/$ac_header.new
echo '#include "nbtool_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
rm -f include/$ac_header.new
@ -7476,7 +7476,7 @@ do
case "$ac_config_target" in
# Handling of arguments.
"defs.mk" ) CONFIG_FILES="$CONFIG_FILES defs.mk" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"nbtool_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS nbtool_config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;

View File

@ -1,10 +1,10 @@
# $NetBSD: configure.ac,v 1.40 2003/07/26 20:24:00 salo Exp $
# $NetBSD: configure.ac,v 1.41 2003/10/27 00:12:43 lukem Exp $
#
# Autoconf definition file for libnbcompat.
#
AC_INIT([libnbcompat], [noversion], [lib-bug-people@NetBSD.org])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_HEADERS(nbtool_config.h)
AC_CONFIG_FILES(defs.mk)
AC_PATH_PROG(BSHELL, sh, )
@ -42,7 +42,7 @@ 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 getopt.h netconfig.h,,
[echo '#include "config.h"' >include/$ac_header.new
[echo '#include "nbtool_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
rm -f include/$ac_header.new

View File

@ -1,5 +1,5 @@
/* $NetBSD: db.h,v 1.2 2002/01/29 10:20:32 tv Exp $ */
/* $NetBSD: db.h,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
#include "config.h"
#include "nbtool_config.h"
#define __BIT_TYPES_DEFINED__
#include "../../include/db.h"

View File

@ -1,4 +1,4 @@
# $NetBSD: defs.mk.in,v 1.7 2003/04/28 23:16:11 bjh21 Exp $
# $NetBSD: defs.mk.in,v 1.8 2003/10/27 00:12:43 lukem Exp $
COMPATOBJ:= ${.PARSEDIR}
HOSTEXEEXT= @EXEEXT@
@ -13,7 +13,7 @@ HOST_CPPFLAGS+= -no-cpp-precomp
.endif
HOST_CPPFLAGS+= -I${COMPATOBJ} -I${COMPATOBJ}/include \
-I${.CURDIR}/../compat -DHAVE_CONFIG_H \
-I${.CURDIR}/../compat -DHAVE_NBTOOL_CONFIG_H=1 \
-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
DPADD+= ${COMPATOBJ}/libnbcompat.a

View File

@ -1,4 +1,4 @@
/* $NetBSD: fgetln.c,v 1.4 2003/07/26 20:24:00 salo Exp $ */
/* $NetBSD: fgetln.c,v 1.5 2003/10/27 00:12:43 lukem Exp $ */
/*
* Copyright 1999 Luke Mewburn <lukem@NetBSD.org>.
@ -27,7 +27,7 @@
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_FGETLN
#include <stdlib.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: flock.c,v 1.4 2002/06/07 21:13:55 mason Exp $ */
/* $NetBSD: flock.c,v 1.5 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
* Otherwise, don't do locking; just pretend success.
*/
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_FLOCK
#include <errno.h>

View File

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

View File

@ -1,4 +1,4 @@
/* $NetBSD: getmode.c,v 1.2 2002/01/31 19:23:14 tv Exp $ */
/* $NetBSD: getmode.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "nbtool_config.h"
#include <stdlib.h>
void *setmode(const char *str) {

View File

@ -1,5 +1,5 @@
/* $NetBSD: glob.h,v 1.1 2002/09/13 19:07:01 thorpej Exp $ */
/* $NetBSD: glob.h,v 1.2 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD glob(3) in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../include/glob.h"

View File

@ -1,11 +1,11 @@
/* $NetBSD: issetugid.c,v 1.1 2002/04/18 15:31:53 bjh21 Exp $ */
/* $NetBSD: issetugid.c,v 1.2 2003/10/27 00:12:43 lukem Exp $ */
/*
* Written by Ben Harris, 2002
* This file is in the Public Domain
*/
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_ISSETUGID
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: lchflags.c,v 1.2 2003/03/19 09:26:38 grant Exp $ */
/* $NetBSD: lchflags.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
/* Emulate lchflags(2), checking path with lstat(2) first to ensure that
* it's not a symlink, and then call chflags(2) */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_LCHFLAGS && HAVE_STRUCT_STAT_ST_FLAGS
#include <sys/stat.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: lchmod.c,v 1.2 2003/03/19 09:26:38 grant Exp $ */
/* $NetBSD: lchmod.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
/* Emulate lchmod(2), checking path with lstat(2) first to ensure that
* it's not a symlink, and then call chmod(2) */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_LCHMOD
#include <sys/stat.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: lchown.c,v 1.2 2003/03/19 09:26:38 grant Exp $ */
/* $NetBSD: lchown.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
/* Emulate lchown(2), checking path with lstat(2) first to ensure that
* it's not a symlink, and then call chown(2) */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_LCHOWN
#include <sys/stat.h>

View File

@ -1,5 +1,5 @@
/* $NetBSD: md2.h,v 1.1 2002/09/13 19:07:01 thorpej Exp $ */
/* $NetBSD: md2.h,v 1.2 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD MD2 in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../include/md2.h"

View File

@ -1,5 +1,5 @@
/* $NetBSD: md4.h,v 1.2 2003/10/01 11:59:06 seb Exp $ */
/* $NetBSD: md4.h,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD MD4 in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../sys/sys/md4.h"

View File

@ -1,5 +1,5 @@
/* $NetBSD: md5.h,v 1.2 2003/10/01 11:59:06 seb Exp $ */
/* $NetBSD: md5.h,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD MD5 in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../sys/sys/md5.h"

View File

@ -1,12 +1,12 @@
/* $NetBSD: namespace.h,v 1.2 2002/01/31 19:20:14 tv Exp $ */
/* $NetBSD: namespace.h,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*
* Mainly empty header to make reachover bits of libc happy.
*
* Since all reachover bits will include this, it's a good place to pull
* in config.h.
* in nbtool_config.h.
*/
#include "config.h"
#include "nbtool_config.h"
/* No aliases in reachover-based libc sources. */
#undef __indr_reference

View File

@ -1,4 +1,4 @@
/* $NetBSD: pread.c,v 1.2 2002/01/31 19:23:14 tv Exp $ */
/* $NetBSD: pread.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
/* Emulate pread() with lseek()/read()/lseek(). Not thread-safe, of course. */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_PREAD
#include <unistd.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: putc_unlocked.c,v 1.2 2003/03/21 14:40:26 pooka Exp $ */
/* $NetBSD: putc_unlocked.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
/* Emulate putc_unlocked(). */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_PUTC_UNLOCKED
#include <stdio.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: pwrite.c,v 1.2 2002/01/31 19:23:14 tv Exp $ */
/* $NetBSD: pwrite.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
/* Emulate pwrite() with lseek()/write()/lseek(). Not thread-safe, of course. */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_PWRITE
#include <unistd.h>

View File

@ -1,5 +1,5 @@
/* $NetBSD: rmd160.h,v 1.1 2002/09/13 19:07:02 thorpej Exp $ */
/* $NetBSD: rmd160.h,v 1.2 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD RMD160 in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../include/rmd160.h"

View File

@ -1,4 +1,4 @@
/* $NetBSD: setenv.c,v 1.2 2002/01/31 19:23:14 tv Exp $ */
/* $NetBSD: setenv.c,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
/* Emulate setenv() with getenv()/malloc()/putenv(). */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_SETENV
int setenv(const char *name, const char *value, int overwrite) {

View File

@ -1,6 +1,6 @@
/* $NetBSD: setgroupent.c,v 1.3 2002/02/26 22:29:39 tv Exp $ */
/* $NetBSD: setgroupent.c,v 1.4 2003/10/27 00:12:43 lukem Exp $ */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_SETGROUPENT || !HAVE_DECL_SETGROUPENT
#include <grp.h>

View File

@ -1,6 +1,6 @@
/* $NetBSD: setpassent.c,v 1.3 2002/02/26 22:29:39 tv Exp $ */
/* $NetBSD: setpassent.c,v 1.4 2003/10/27 00:12:43 lukem Exp $ */
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_SETPASSENT || !HAVE_DECL_SETPASSENT
#include <pwd.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: setprogname.c,v 1.3 2002/01/31 19:21:58 tv Exp $ */
/* $NetBSD: setprogname.c,v 1.4 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "nbtool_config.h"
#if !HAVE_SETPROGNAME
#include <string.h>

View File

@ -1,5 +1,5 @@
/* $NetBSD: sha1.h,v 1.2 2003/10/01 11:59:06 seb Exp $ */
/* $NetBSD: sha1.h,v 1.3 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD SHA1 in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../sys/sys/sha1.h"

View File

@ -33,11 +33,12 @@
/* From heimdal lib/roken/snprintf.c. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#if 0
RCSID("$Id: snprintf.c,v 1.2 2002/01/31 19:23:14 tv Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if 0
RCSID("$Id: snprintf.c,v 1.3 2003/10/27 00:12:43 lukem Exp $");
#endif
#include <stdio.h>
#include <stdarg.h>

View File

@ -1,5 +1,5 @@
/* $NetBSD: vis.h,v 1.1 2002/09/13 19:07:02 thorpej Exp $ */
/* $NetBSD: vis.h,v 1.2 2003/10/27 00:12:43 lukem Exp $ */
/* We unconditionally use the NetBSD vis(3) in libnbcompat. */
#include "config.h"
#include "nbtool_config.h"
#include "../../include/vis.h"

View File

@ -1,4 +1,4 @@
/* $NetBSD: cap_mkdb.c,v 1.19 2003/10/16 06:43:52 itojun Exp $ */
/* $NetBSD: cap_mkdb.c,v 1.20 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -29,21 +29,18 @@
* SUCH DAMAGE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
#if defined(__COPYRIGHT) && !defined(lint)
#if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
The Regents of the University of California. All rights reserved.\n");
#endif /* not lint */
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
__RCSID("$NetBSD: cap_mkdb.c,v 1.19 2003/10/16 06:43:52 itojun Exp $");
__RCSID("$NetBSD: cap_mkdb.c,v 1.20 2003/10/27 00:12:43 lukem Exp $");
#endif /* not lint */
#include <sys/param.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.11 2003/08/07 11:13:20 agc Exp $ */
/* $NetBSD: extern.h,v 1.12 2003/10/27 00:12:43 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -31,8 +31,8 @@
* @(#)extern.h 8.1 (Berkeley) 6/6/93
*/
#if HAVE_CONFIG_H
#include "config.h"
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: crunchgen.c,v 1.50 2003/10/07 07:08:20 lukem Exp $ */
/* $NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@ -31,13 +31,14 @@
* Generates a Makefile and main C file for a crunched executable,
* from specs given in a .conf file.
*/
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: crunchgen.c,v 1.50 2003/10/07 07:08:20 lukem Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $");
#endif
#include <stdlib.h>

Some files were not shown because too many files have changed in this diff Show More