Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/bin/pax Pull up revision 1.76 (requested by jmc in tick...



details:   https://anonhg.NetBSD.org/src/rev/66eff8125986
branches:  netbsd-2-0
changeset: 561540:66eff8125986
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:28:58 2004 +0000

description:
Pull up revision 1.76 (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/options.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 93346226a72d -r 66eff8125986 bin/pax/options.c
--- a/bin/pax/options.c Tue Jun 22 07:28:35 2004 +0000
+++ b/bin/pax/options.c Tue Jun 22 07:28:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.73 2004/02/20 05:16:54 uebayasi Exp $    */
+/*     $NetBSD: options.c,v 1.73.2.1 2004/06/22 07:28:58 tron Exp $    */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.73 2004/02/20 05:16:54 uebayasi Exp $");
+__RCSID("$NetBSD: options.c,v 1.73.2.1 2004/06/22 07:28:58 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,11 @@
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>



Home | Main Index | Thread Index | Old Index