[src/netbsd-2-0]: src Pull up revision 1.20 (requested by jmc in ticket #527):

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e70a1b9f684
branches:  netbsd-2-0
changeset: 561531:6e70a1b9f684
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:25:39 2004 +0000

description:
Pull up revision 1.20 (requested by jmc in ticket #527):
Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')
Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).
Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.
Fixes PR's: PR#17762 PR#25944

diffstat:

 bin/pax/getoldopt.c       |   8 ++++++--
 usr.bin/cksum/cksum.c     |   8 ++++++--
 usr.bin/msgc/msgdb.c      |   8 ++++++--
 usr.bin/rpcgen/rpc_hout.c |   8 ++++++--
 usr.sbin/makefs/makefs.c  |  10 +++++++---
 5 files changed, 31 insertions(+), 11 deletions(-)

diffs (139 lines):

diff -r cf2405f72f0e -r 6e70a1b9f684 bin/pax/getoldopt.c
--- a/bin/pax/getoldopt.c       Tue Jun 22 07:25:17 2004 +0000
+++ b/bin/pax/getoldopt.c       Tue Jun 22 07:25:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $     */
+/*     $NetBSD: getoldopt.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $  */
 
 /*
  * Plug-compatible replacement for getopt() for parsing tar-like
@@ -15,10 +15,14 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $");
+__RCSID("$NetBSD: getoldopt.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $");
 #endif /* not lint */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff -r cf2405f72f0e -r 6e70a1b9f684 usr.bin/cksum/cksum.c
--- a/usr.bin/cksum/cksum.c     Tue Jun 22 07:25:17 2004 +0000
+++ b/usr.bin/cksum/cksum.c     Tue Jun 22 07:25:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $        */
+/*     $NetBSD: cksum.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -67,6 +67,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -77,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)cksum.c    8.2 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff -r cf2405f72f0e -r 6e70a1b9f684 usr.bin/msgc/msgdb.c
--- a/usr.bin/msgc/msgdb.c      Tue Jun 22 07:25:17 2004 +0000
+++ b/usr.bin/msgc/msgdb.c      Tue Jun 22 07:25:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $   */
+/*     $NetBSD: msgdb.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* mdb.c - message database manipulation */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $");
+__RCSID("$NetBSD: msgdb.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $");
 #endif
 
 
diff -r cf2405f72f0e -r 6e70a1b9f684 usr.bin/rpcgen/rpc_hout.c
--- a/usr.bin/rpcgen/rpc_hout.c Tue Jun 22 07:25:17 2004 +0000
+++ b/usr.bin/rpcgen/rpc_hout.c Tue Jun 22 07:25:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $     */
+/*     $NetBSD: rpc_hout.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $   */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $");
+__RCSID("$NetBSD: rpc_hout.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $");
 #endif
 #endif
 
diff -r cf2405f72f0e -r 6e70a1b9f684 usr.sbin/makefs/makefs.c
--- a/usr.sbin/makefs/makefs.c  Tue Jun 22 07:25:17 2004 +0000
+++ b/usr.sbin/makefs/makefs.c  Tue Jun 22 07:25:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makefs.c,v 1.19 2004/01/05 23:23:38 jmmv Exp $ */
+/*     $NetBSD: makefs.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $     */
 
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -35,9 +35,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: makefs.c,v 1.19 2004/01/05 23:23:38 jmmv Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.19.2.1 2004/06/22 07:25:39 tron Exp $");
 #endif /* !__lint */
 
 #include <assert.h>
@@ -67,7 +71,7 @@
        { NULL  },
 };
 
-uint           debug;
+u_int          debug;
 struct timespec        start_time;
 
 static fstype_t *get_fstype(const char *);