Update pkgtools/libnbcompat to 20040822. Changes from version 20040814

include:

* Rework the way that poll() is detected so that it more closely
  follows how the rest of the replacement functions are detected.

* Split err*() and warn*() functions into separate err.c and warn.c
  files so that we can more finely isolate the objects files pulled
  in by the linker.  This should fix building textproc/nbsed on Solaris.

* Move more definitions from nbcompat.h into nbcompat/*.h.  This makes
  it more clear which NetBSD headers are expected to provide which
  function declarations and macro definitions.

* Clean out nbconfig.h by moving all of the relevant definitions into
  the correct nbcompat/*.h files.

* Update all of the library functions to the latest from src HEAD.
  Also change the way that sources are modified when imported -- we
  now include <nbcompat.h> before the first system header, include
  <nbcompat/*.h> versions of headers instead of system ones where
  available, and "#if 0" the sections that make no sense when being
  built outside of the NetBSD source tree.  This should make future
  updates from src HEAD, e.g. for security updates or bug fixes,
  easier.

* Move all private headers into a subdirectory and include the headers
  from the private directory.  This avoids any nameclashes with system
  headers with the same name.

1 files changed, 45 insertions, 2 deletions

diff --git a/pkgtools/libnbcompat/files/fparseln.c b/pkgtools/libnbcompat/files/fparseln.c
index 380e85798b9..95a37811312 100644
--- a/pkgtools/libnbcompat/files/fparseln.c
+++ b/pkgtools/libnbcompat/files/fparseln.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fparseln.c,v 1.2 2003/09/06 23:03:02 grant Exp $	*/
+/*	$NetBSD: fparseln.c,v 1.3 2004/08/23 03:32:12 jlam Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@@ -29,7 +29,49 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "nbcompat.h"
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fparseln.c,v 1.3 2004/08/23 03:32:12 jlam Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#if 0
+#include "namespace.h"
+#endif
+
+#include <nbcompat/assert.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <nbcompat/stdio.h>
+#include <nbcompat/string.h>
+#include <nbcompat/stdlib.h>
+
+#if 0
+#ifdef __weak_alias
+__weak_alias(fparseln,_fparseln)
+#endif
+#endif
+
+#if ! HAVE_FPARSELN
+
+#if 0
+#ifndef HAVE_NBTOOL_CONFIG_H
+#include "reentrant.h"
+#include "local.h"
+#else
+#define FLOCKFILE(fp)
+#define FUNLOCKFILE(fp)
+#endif
+#endif
+
+#if 0
+#if defined(_REENTRANT) && !HAVE_NBTOOL_CONFIG_H
+#define __fgetln(f, l) __fgetstr(f, l, '\n')
+#else
+#define __fgetln(f, l) fgetln(f, l)
+#endif
+#endif
 
 static int isescaped(const char *, const char *, int);
 
@@ -204,3 +246,4 @@ line 6
 */
 
 #endif /* TEST */
+#endif	/* ! HAVE_FPARSELN */