summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>1998-02-02 21:07:13 +0000
committerperry <perry@NetBSD.org>1998-02-02 21:07:13 +0000
commitb7b7322c685652bb1eb4174bee118b0e41887f12 (patch)
tree14e377d760e7367d2dbc88737b9a82c62cc08fe4 /include
parent2d33c2a97cdf897740dcf2b458a7731d89e5de32 (diff)
merge lite-2
Diffstat (limited to 'include')
-rw-r--r--include/Makefile6
-rw-r--r--include/a.out.h8
-rw-r--r--include/bitstring.h55
-rw-r--r--include/disktab.h8
-rw-r--r--include/fstab.h8
-rw-r--r--include/limits.h16
-rw-r--r--include/locale.h8
-rw-r--r--include/memory.h8
-rw-r--r--include/netdb.h35
-rw-r--r--include/ranlib.h8
-rw-r--r--include/regex.h4
-rw-r--r--include/regexp.h8
-rw-r--r--include/resolv.h30
-rw-r--r--include/sgtty.h8
-rw-r--r--include/stab.h8
-rw-r--r--include/stdio.h17
-rw-r--r--include/stdlib.h33
-rw-r--r--include/string.h8
-rw-r--r--include/struct.h8
-rw-r--r--include/sysexits.h8
-rw-r--r--include/time.h11
-rw-r--r--include/ttyent.h8
-rw-r--r--include/tzfile.h8
-rw-r--r--include/unistd.h32
-rw-r--r--include/utime.h8
-rw-r--r--include/vis.h8
26 files changed, 186 insertions, 181 deletions
diff --git a/include/Makefile b/include/Makefile
index bf5b2db800b..28f5c51bc03 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.70 1997/11/02 16:34:21 kleink Exp $
-# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
+# $NetBSD: Makefile,v 1.71 1998/02/02 21:07:13 perry Exp $
+# @(#)Makefile 8.2 (Berkeley) 1/4/94
+
+# Doing a make includes builds /usr/include
# Missing: mp.h
diff --git a/include/a.out.h b/include/a.out.h
index b556657c565..193750b6551 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -1,9 +1,9 @@
-/* $NetBSD: a.out.h,v 1.15 1994/10/26 00:55:42 cgd Exp $ */
+/* $NetBSD: a.out.h,v 1.16 1998/02/02 21:07:17 perry Exp $ */
/*-
* Copyright (c) 1993 Theo de Raadt
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)a.out.h 5.6 (Berkeley) 4/30/91
+ * @(#)a.out.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _AOUT_H_
diff --git a/include/bitstring.h b/include/bitstring.h
index 6bce7cd662e..22353009630 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,29 +1,45 @@
-/* $NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $ */
+/* $NetBSD: bitstring.h,v 1.6 1998/02/02 21:07:19 perry Exp $ */
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Paul Vixie.
*
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
*
- * @(#)bitstring.h 5.2 (Berkeley) 4/4/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)bitstring.h 8.1 (Berkeley) 7/19/93
*/
#ifndef _BITSTRING_H_
-#define _BITSTRING_H_
+#define _BITSTRING_H_
/* modified for SV/AT and bitstring bugfix by M.R.Murphy, 11oct91
* bitstr_size changed gratuitously, but shorter
@@ -32,6 +48,13 @@
* work, but are no longer as efficient :-)
* bit_nclear, bit_nset, bit_ffc, bit_ffs
*/
+/*
+ * The comment above may or may not bear any resemblance to reality.
+ * This code has been maintained in a confusing way, with little
+ * information available on the provenance of much of it. "At least it
+ * works."
+ * /s/ Perry E. Metzger, 2 Feb 98
+ */
typedef unsigned char bitstr_t;
/* internal macros */
diff --git a/include/disktab.h b/include/disktab.h
index 364c4a0c3d9..f58e09b292f 100644
--- a/include/disktab.h
+++ b/include/disktab.h
@@ -1,8 +1,8 @@
-/* $NetBSD: disktab.h,v 1.3 1994/10/26 00:55:51 cgd Exp $ */
+/* $NetBSD: disktab.h,v 1.4 1998/02/02 21:07:22 perry Exp $ */
/*
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)disktab.h 5.6 (Berkeley) 4/20/91
+ * @(#)disktab.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _DISKTAB_H_
diff --git a/include/fstab.h b/include/fstab.h
index 60b3e80d93e..169083ae3f5 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -1,8 +1,8 @@
-/* $NetBSD: fstab.h,v 1.4 1997/01/27 22:08:46 perry Exp $ */
+/* $NetBSD: fstab.h,v 1.5 1998/02/02 21:07:24 perry Exp $ */
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)fstab.h 5.12 (Berkeley) 4/3/91
+ * @(#)fstab.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _FSTAB_H_
diff --git a/include/limits.h b/include/limits.h
index 831ad86e021..54b20e723c7 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,8 +1,8 @@
-/* $NetBSD: limits.h,v 1.8 1996/10/21 05:10:50 jtc Exp $ */
+/* $NetBSD: limits.h,v 1.9 1998/02/02 21:07:27 perry Exp $ */
/*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)limits.h 5.9 (Berkeley) 4/3/91
+ * @(#)limits.h 8.2 (Berkeley) 1/4/94
*/
#ifndef _LIMITS_H_
@@ -48,10 +48,10 @@
#define _POSIX_NGROUPS_MAX 0
#define _POSIX_OPEN_MAX 16
#define _POSIX_PATH_MAX 255
-#define _POSIX_PIPE_BUF 512
-#define _POSIX_SSIZE_MAX 32767
-#define _POSIX_STREAM_MAX 8
-#define _POSIX_TZNAME_MAX 3
+#define _POSIX_PIPE_BUF 512
+#define _POSIX_SSIZE_MAX 32767
+#define _POSIX_STREAM_MAX 8
+#define _POSIX_TZNAME_MAX 3
#define _POSIX2_BC_BASE_MAX 99
#define _POSIX2_BC_DIM_MAX 2048
diff --git a/include/locale.h b/include/locale.h
index 4d68b26da61..c7e976b73a0 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,8 +1,8 @@
-/* $NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $ */
+/* $NetBSD: locale.h,v 1.7 1998/02/02 21:07:29 perry Exp $ */
/*
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)locale.h 5.2 (Berkeley) 2/24/91
+ * @(#)locale.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _LOCALE_H_
diff --git a/include/memory.h b/include/memory.h
index cfd1fdb70e4..4971441fb8a 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,8 +1,8 @@
-/* $NetBSD: memory.h,v 1.3 1994/10/26 00:56:06 cgd Exp $ */
+/* $NetBSD: memory.h,v 1.4 1998/02/02 21:07:32 perry Exp $ */
/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)memory.h 5.5 (Berkeley) 6/1/90
+ * @(#)memory.h 8.1 (Berkeley) 6/2/93
*/
#include <string.h>
diff --git a/include/netdb.h b/include/netdb.h
index 0c46c8a54a1..abb3ab930c1 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,6 +1,6 @@
-/*
- * ++Copyright++ 1980, 1983, 1988, 1993
- * -
+/* $NetBSD: netdb.h,v 1.9 1998/02/02 21:07:35 perry Exp $ */
+
+/*-
* Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -31,16 +31,19 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * @(#)netdb.h 8.1 (Berkeley) 6/2/93
+ * $Id: netdb.h,v 1.9 1998/02/02 21:07:35 perry Exp $
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without
* specific, written prior permission.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -53,18 +56,10 @@
* --Copyright--
*/
-/*
- * @(#)netdb.h 8.1 (Berkeley) 6/2/93
- * $NetBSD: netdb.h,v 1.8 1997/10/13 09:26:06 lukem Exp $
- */
-
#ifndef _NETDB_H_
#define _NETDB_H_
#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#endif
#include <sys/cdefs.h>
#define _PATH_HEQUIV "/etc/hosts.equiv"
@@ -153,18 +148,4 @@ void setprotoent __P((int));
void setservent __P((int));
__END_DECLS
-/* This is nec'y to make this include file properly replace the sun version. */
-#ifdef sun
-#ifdef __GNU_LIBRARY__
-#include <rpc/netdb.h>
-#else
-struct rpcent {
- char *r_name; /* name of server for this rpc program */
- char **r_aliases; /* alias list */
- int r_number; /* rpc program number */
-};
-struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent();
-#endif /* __GNU_LIBRARY__ */
-#endif /* sun */
-
#endif /* !_NETDB_H_ */
diff --git a/include/ranlib.h b/include/ranlib.h
index 894def33f7f..8a71a917016 100644
--- a/include/ranlib.h
+++ b/include/ranlib.h
@@ -1,8 +1,8 @@
-/* $NetBSD: ranlib.h,v 1.4 1994/10/26 00:56:14 cgd Exp $ */
+/* $NetBSD: ranlib.h,v 1.5 1998/02/02 21:07:37 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)ranlib.h 5.2 (Berkeley) 4/3/91
+ * @(#)ranlib.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _RANLIB_H_
diff --git a/include/regex.h b/include/regex.h
index 0024b8f92a4..1f78ec46ad9 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,4 +1,4 @@
-/* $NetBSD: regex.h,v 1.5 1996/06/10 18:55:04 explorer Exp $ */
+/* $NetBSD: regex.h,v 1.6 1998/02/02 21:07:41 perry Exp $ */
/*-
* Copyright (c) 1992 Henry Spencer.
@@ -36,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)regex.h 8.1 (Berkeley) 6/2/93
+ * @(#)regex.h 8.2 (Berkeley) 1/3/94
*/
#ifndef _REGEX_H_
diff --git a/include/regexp.h b/include/regexp.h
index c1b6c3a1634..84d97dacbca 100644
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -1,9 +1,9 @@
-/* $NetBSD: regexp.h,v 1.3 1994/10/26 00:56:15 cgd Exp $ */
+/* $NetBSD: regexp.h,v 1.4 1998/02/02 21:07:43 perry Exp $ */
/*
* Copyright (c) 1986 by University of Toronto.
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley
* by Henry Spencer.
@@ -36,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)regexp.h 5.2 (Berkeley) 4/3/91
+ * @(#)regexp.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _REGEXP_H_
diff --git a/include/resolv.h b/include/resolv.h
index 0a5b11a97e7..db3bc91d585 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,9 +1,9 @@
-/*
- * ++Copyright++ 1983, 1987, 1989, 1993
- * -
+/* $NetBSD: resolv.h,v 1.12 1998/02/02 21:07:45 perry Exp $ */
+
+/*-
* Copyright (c) 1983, 1987, 1989, 1993
- * The Regents of the University of California. All rights reserved.
- *
+ * The Regents of the University of California. All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -14,12 +14,12 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,6 +31,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * @(#)resolv.h 8.1 (Berkeley) 6/2/93
+ * $Id: resolv.h,v 1.12 1998/02/02 21:07:45 perry Exp $
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
*
@@ -53,20 +56,11 @@
* --Copyright--
*/
-/*
- * @(#)resolv.h 8.1 (Berkeley) 6/2/93
- * $NetBSD: resolv.h,v 1.11 1997/10/13 09:26:07 lukem Exp $
- */
-
#ifndef _RESOLV_H_
#define _RESOLV_H_
#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
#include <sys/cdefs.h>
#include <stdio.h>
diff --git a/include/sgtty.h b/include/sgtty.h
index a37e0db4da9..47350cec8e9 100644
--- a/include/sgtty.h
+++ b/include/sgtty.h
@@ -1,8 +1,8 @@
-/* $NetBSD: sgtty.h,v 1.4 1995/06/05 19:40:33 pk Exp $ */
+/* $NetBSD: sgtty.h,v 1.5 1998/02/02 21:07:48 perry Exp $ */
/*
- * Copyright (c) 1985 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1985, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)sgtty.h 5.2 (Berkeley) 6/26/91
+ * @(#)sgtty.h 8.1 (Berkeley) 6/2/93
*/
#ifndef USE_OLD_TTY
diff --git a/include/stab.h b/include/stab.h
index 6b9cb01b172..dd259640cbd 100644
--- a/include/stab.h
+++ b/include/stab.h
@@ -1,8 +1,8 @@
-/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */
+/* $NetBSD: stab.h,v 1.5 1998/02/02 21:07:50 perry Exp $ */
/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)stab.h 5.2 (Berkeley) 4/4/91
+ * @(#)stab.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _STAB_H_
diff --git a/include/stdio.h b/include/stdio.h
index 2b98df5d72a..df84b2227a5 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,8 +1,8 @@
-/* $NetBSD: stdio.h,v 1.19 1998/01/19 07:35:06 jtc Exp $ */
+/* $NetBSD: stdio.h,v 1.20 1998/02/02 21:07:52 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Chris Torek.
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)stdio.h 5.17 (Berkeley) 6/3/91
+ * @(#)stdio.h 8.5 (Berkeley) 4/29/95
*/
#ifndef _STDIO_H_
@@ -107,6 +107,8 @@ struct __sbuf {
* that does not match the previous one in _bf. When this happens,
* _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
* _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * NB: see WARNING above before changing the layout of this structure!
*/
typedef struct __sFILE {
unsigned char *_p; /* current position in (some) buffer */
@@ -178,10 +180,11 @@ __END_DECLS
#define EOF (-1)
/*
- * FOPEN_MAX is a minimum maximum, and should be the number of descriptors
- * that the kernel can provide without allocation of a resource that can
- * fail without the process sleeping. Do not use this for anything.
+ * FOPEN_MAX is a minimum maximum, and is the number of streams that
+ * stdio can provide without attempting to allocate further resources
+ * (which could fail). Do not use this for anything.
*/
+ /* must be == _POSIX_STREAM_MAX <limits.h> */
#define FOPEN_MAX 20 /* must be <= OPEN_MAX <sys/syslimits.h> */
#define FILENAME_MAX 1024 /* must be <= PATH_MAX <sys/syslimits.h> */
diff --git a/include/stdlib.h b/include/stdlib.h
index 223a8a462d9..b1bf4bb3fc9 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,8 +1,8 @@
-/* $NetBSD: stdlib.h,v 1.29 1998/01/31 20:36:47 thorpej Exp $ */
+/* $NetBSD: stdlib.h,v 1.30 1998/02/02 21:07:55 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,17 +32,18 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)stdlib.h 5.13 (Berkeley) 6/4/91
+ * @(#)stdlib.h 8.5 (Berkeley) 5/19/95
*/
#ifndef _STDLIB_H_
#define _STDLIB_H_
-#include <machine/ansi.h>
#if !defined(_ANSI_SOURCE) /* for quad_t, etc. */
#include <sys/types.h>
#endif
+#include <machine/ansi.h>
+
#ifdef _BSD_SIZE_T_
typedef _BSD_SIZE_T_ size_t;
#undef _BSD_SIZE_T_
@@ -80,14 +81,20 @@ typedef struct {
#define RAND_MAX 0x7fffffff
+#if 0 /* no wide char stuff (yet) */
+extern int __mb_cur_max;
+#define MB_CUR_MAX __mb_cur_max
+#else
#define MB_CUR_MAX 1 /* XXX */
+#endif
#include <sys/cdefs.h>
__BEGIN_DECLS
__dead void
abort __P((void));
-int abs __P((int));
+__pure int
+ abs __P((int));
int atexit __P((void (*)(void)));
double atof __P((const char *));
int atoi __P((const char *));
@@ -100,7 +107,8 @@ __dead void
exit __P((int));
void free __P((void *));
char *getenv __P((const char *));
-long labs __P((long));
+__pure long
+ labs __P((long));
ldiv_t ldiv __P((long, long));
void *malloc __P((size_t));
void qsort __P((void *, size_t, size_t,
@@ -115,7 +123,7 @@ unsigned long
strtoul __P((const char *, char **, int));
int system __P((const char *));
-/* these are currently just stubs */
+/* These are currently just stubs. */
int mblen __P((const char *, size_t));
size_t mbstowcs __P((wchar_t *, const char *, size_t));
int wctomb __P((char *, wchar_t));
@@ -150,15 +158,6 @@ char *l64a __P((long));
void cfree __P((void *));
-int getopt __P((int, char * const *, const char *));
-extern char *optarg; /* getopt(3) external variables */
-extern int opterr;
-extern int optind;
-extern int optopt;
-extern int optreset;
-int getsubopt __P((char **, char * const *, char **));
-extern char *suboptarg; /* getsubopt(3) external variable */
-
int heapsort __P((void *, size_t, size_t,
int (*)(const void *, const void *)));
int mergesort __P((void *, size_t, size_t,
diff --git a/include/string.h b/include/string.h
index 7d92012041f..6417ec651e6 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,8 +1,8 @@
-/* $NetBSD: string.h,v 1.10 1998/02/02 16:15:07 kleink Exp $ */
+/* $NetBSD: string.h,v 1.11 1998/02/02 21:07:57 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)string.h 5.10 (Berkeley) 3/9/91
+ * @(#)string.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _STRING_H_
diff --git a/include/struct.h b/include/struct.h
index 0a23b4a4605..8f99736f8eb 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1,8 +1,8 @@
-/* $NetBSD: struct.h,v 1.3 1994/10/26 00:56:32 cgd Exp $ */
+/* $NetBSD: struct.h,v 1.4 1998/02/02 21:08:00 perry Exp $ */
/*-
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)struct.h 5.2 (Berkeley) 4/3/91
+ * @(#)struct.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _STRUCT_H_
diff --git a/include/sysexits.h b/include/sysexits.h
index c4f522e2576..13ead0cc964 100644
--- a/include/sysexits.h
+++ b/include/sysexits.h
@@ -1,8 +1,8 @@
-/* $NetBSD: sysexits.h,v 1.4 1994/10/26 00:56:33 cgd Exp $ */
+/* $NetBSD: sysexits.h,v 1.5 1998/02/02 21:08:02 perry Exp $ */
/*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)sysexits.h 4.8 (Berkeley) 4/3/91
+ * @(#)sysexits.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _SYSEXITS_H_
diff --git a/include/time.h b/include/time.h
index 0eb62850135..603c6c9891c 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,9 +1,8 @@
-/* $NetBSD: time.h,v 1.14 1997/11/02 18:31:38 kleink Exp $ */
+/* $NetBSD: time.h,v 1.15 1998/02/02 21:08:05 perry Exp $ */
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
* All or some portions of this file are derived from material licensed
* to the University of California by American Telephone and Telegraph
@@ -38,7 +37,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)time.h 5.12 (Berkeley) 3/9/91
+ * @(#)time.h 8.3 (Berkeley) 1/21/94
*/
#ifndef _TIME_H_
@@ -91,6 +90,8 @@ struct tm {
char *tm_zone; /* timezone abbreviation */
};
+#include <machine/limits.h> /* Include file containing CLK_TCK. */
+
#include <sys/cdefs.h>
__BEGIN_DECLS
diff --git a/include/ttyent.h b/include/ttyent.h
index 5a733d8b4e7..9df90668b94 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -1,8 +1,8 @@
-/* $NetBSD: ttyent.h,v 1.6 1997/10/20 08:04:23 scottr Exp $ */
+/* $NetBSD: ttyent.h,v 1.7 1998/02/02 21:08:07 perry Exp $ */
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)ttyent.h 5.7 (Berkeley) 4/3/91
+ * @(#)ttyent.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _TTYENT_H_
diff --git a/include/tzfile.h b/include/tzfile.h
index b5cf986ed7f..498f3646327 100644
--- a/include/tzfile.h
+++ b/include/tzfile.h
@@ -1,8 +1,8 @@
-/* $NetBSD: tzfile.h,v 1.4 1997/07/25 05:54:42 mikel Exp $ */
+/* $NetBSD: tzfile.h,v 1.5 1998/02/02 21:08:11 perry Exp $ */
/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Arthur David Olson of the National Cancer Institute.
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)tzfile.h 5.10 (Berkeley) 4/3/91
+ * @(#)tzfile.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _TZFILE_H_
diff --git a/include/unistd.h b/include/unistd.h
index e723ff67484..6cf87d1e335 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,8 +1,8 @@
-/* $NetBSD: unistd.h,v 1.48 1998/01/12 16:05:40 kleink Exp $ */
+/* $NetBSD: unistd.h,v 1.49 1998/02/02 21:08:14 perry Exp $ */
/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993, 1994
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)unistd.h 5.13 (Berkeley) 6/17/91
+ * @(#)unistd.h 8.12 (Berkeley) 4/27/95
*/
#ifndef _UNISTD_H_
@@ -53,7 +53,7 @@
__BEGIN_DECLS
__dead void _exit __P((int)) __attribute__((noreturn));
int access __P((const char *, int));
-unsigned alarm __P((unsigned));
+unsigned int alarm __P((unsigned int));
int chdir __P((const char *));
int chown __P((const char *, uid_t, gid_t));
int close __P((int));
@@ -68,13 +68,13 @@ int execv __P((const char *, char * const *));
int execve __P((const char *, char * const *, char * const *));
int execvp __P((const char *, char * const *));
pid_t fork __P((void));
-long fpathconf __P((int, int)); /* not yet */
+long fpathconf __P((int, int));
char *getcwd __P((char *, size_t));
gid_t getegid __P((void));
uid_t geteuid __P((void));
gid_t getgid __P((void));
int getgrouplist __P((const char *, gid_t, gid_t *, int *));
-int getgroups __P((int, gid_t *));
+int getgroups __P((int, gid_t []));
char *getlogin __P((void));
pid_t getpgrp __P((void));
pid_t getpid __P((void));
@@ -83,7 +83,7 @@ uid_t getuid __P((void));
int isatty __P((int));
int link __P((const char *, const char *));
off_t lseek __P((int, off_t, int));
-long pathconf __P((const char *, int)); /* not yet */
+long pathconf __P((const char *, int));
int pause __P((void));
int pipe __P((int *));
ssize_t read __P((int, void *, size_t));
@@ -92,8 +92,8 @@ int setgid __P((gid_t));
int setpgid __P((pid_t, pid_t));
pid_t setsid __P((void));
int setuid __P((uid_t));
-unsigned sleep __P((unsigned));
-long sysconf __P((int)); /* not yet */
+unsigned int sleep __P((unsigned int));
+long sysconf __P((int));
pid_t tcgetpgrp __P((int));
int tcsetpgrp __P((int, pid_t));
char *ttyname __P((int));
@@ -101,10 +101,9 @@ int unlink __P((const char *));
ssize_t write __P((int, const void *, size_t));
#ifndef _POSIX_SOURCE
-
-/* structure timeval required for select() */
-#include <sys/time.h>
-
+#ifdef __STDC__
+struct timeval; /* select(2) */
+#endif
int acct __P((const char *));
char *brk __P((const char *));
int chroot __P((const char *));
@@ -123,13 +122,15 @@ int getdtablesize __P((void));
long gethostid __P((void));
int gethostname __P((char *, int));
mode_t getmode __P((const void *, mode_t));
-int getpagesize __P((void));
+__pure int
+ getpagesize __P((void));
char *getpass __P((const char *));
char *getusershell __P((void));
char *getwd __P((char *)); /* obsoleted by getcwd() */
int initgroups __P((const char *, gid_t));
int iruserok __P((u_int32_t, int, const char *, const char *));
int lchown __P((const char *, uid_t, gid_t));
+int mknod __P((const char *, mode_t, dev_t));
int mkstemp __P((char *));
char *mktemp __P((char *));
int nfssvc __P((int, void *));
@@ -177,6 +178,7 @@ int ttyslot __P((void));
useconds_t ualarm __P((useconds_t, useconds_t));
int undelete __P((const char *));
int usleep __P((useconds_t));
+int unwhiteout __P((const char *));
void *valloc __P((size_t)); /* obsoleted by malloc() */
#ifdef __LIBC12_SOURCE__
pid_t vfork __P((void));
diff --git a/include/utime.h b/include/utime.h
index fd2b73cc15c..81f54568dbf 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -1,8 +1,8 @@
-/* $NetBSD: utime.h,v 1.4 1996/06/11 02:14:05 jtc Exp $ */
+/* $NetBSD: utime.h,v 1.5 1998/02/02 21:08:16 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)utime.h 5.4 (Berkeley) 4/3/91
+ * @(#)utime.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _UTIME_H_
diff --git a/include/vis.h b/include/vis.h
index 1d5ceedb9ad..8c90cced88f 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -1,8 +1,8 @@
-/* $NetBSD: vis.h,v 1.8 1997/11/04 23:36:25 thorpej Exp $ */
+/* $NetBSD: vis.h,v 1.9 1998/02/02 21:08:19 perry Exp $ */
/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)vis.h 5.9 (Berkeley) 4/3/91
+ * @(#)vis.h 8.1 (Berkeley) 6/2/93
*/
#ifndef _VIS_H_