Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/include Merge trunk onto branch.
details: https://anonhg.NetBSD.org/src/rev/91560bbd7cda
branches: nathanw_sa
changeset: 504606:91560bbd7cda
user: nathanw <nathanw%NetBSD.org@localhost>
date: Sun Apr 08 20:31:41 2001 +0000
description:
Merge trunk onto branch.
diffstat:
include/Makefile | 4 ++--
include/glob.h | 3 ++-
include/langinfo.h | 4 +++-
include/md2.h | 25 +++++++++++++++++++++++++
include/rpc/Makefile | 4 ++--
include/stdlib.h | 34 ++++++++++++++++++++++------------
include/string.h | 16 ++++++++--------
include/time.h | 20 ++++++++++++++------
include/util.h | 3 ++-
9 files changed, 80 insertions(+), 33 deletions(-)
diffs (295 lines):
diff -r 67805d1a115f -r 91560bbd7cda include/Makefile
--- a/include/Makefile Fri Apr 06 21:00:40 2001 +0000
+++ b/include/Makefile Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95.2.1 2001/03/05 23:33:26 nathanw Exp $
+# $NetBSD: Makefile,v 1.95.2.2 2001/04/08 20:31:41 nathanw Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -10,7 +10,7 @@
getopt.h glob.h grp.h hesiod.h ifaddrs.h \
iso646.h kvm.h langinfo.h libgen.h \
limits.h link.h link_aout.h link_elf.h locale.h \
- login_cap.h lwp.h malloc.h math.h md4.h md5.h \
+ login_cap.h lwp.h malloc.h math.h md2.h md4.h md5.h \
memory.h mpool.h ndbm.h netconfig.h netdb.h netgroup.h nlist.h \
nl_types.h \
nsswitch.h paths.h pwd.h ranlib.h re_comp.h regex.h regexp.h \
diff -r 67805d1a115f -r 91560bbd7cda include/glob.h
--- a/include/glob.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/glob.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.h,v 1.11 1998/06/22 12:01:43 tv Exp $ */
+/* $NetBSD: glob.h,v 1.11.12.1 2001/04/08 20:31:41 nathanw Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -90,6 +90,7 @@
#define GLOB_BRACE 0x0080 /* Expand braces ala csh. */
#define GLOB_MAGCHAR 0x0100 /* Pattern had globbing characters. */
#define GLOB_NOMAGIC 0x0200 /* GLOB_NOCHECK without magic chars (csh). */
+#define GLOB_LIMIT 0x0400 /* Limit memory used by matches to ARG_MAX */
#define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */
#define GLOB_QUOTE 0 /* source compatibility */
diff -r 67805d1a115f -r 91560bbd7cda include/langinfo.h
--- a/include/langinfo.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/langinfo.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: langinfo.h,v 1.4 1999/09/05 09:17:14 kleink Exp $ */
+/* $NetBSD: langinfo.h,v 1.4.10.1 2001/04/08 20:31:41 nathanw Exp $ */
/*
* Written by J.T. Conklin <jtc%netbsd.org@localhost>
@@ -68,6 +68,8 @@
#define NOEXPR 49 /* Negative response for yes/no queries */
#define CRNCYSTR 50 /* Currency symbol */
+#define CODESET 51 /* codeset name */
+
__BEGIN_DECLS
char *nl_langinfo __P((nl_item));
__END_DECLS
diff -r 67805d1a115f -r 91560bbd7cda include/md2.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/md2.h Sun Apr 08 20:31:41 2001 +0000
@@ -0,0 +1,25 @@
+/* $NetBSD: md2.h,v 1.1.2.2 2001/04/08 20:31:41 nathanw Exp $ */
+
+#ifndef _MD2_H_
+#define _MD2_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+/* MD2 context. */
+typedef struct MD2Context {
+ u_int32_t i;
+ unsigned char C[16]; /* checksum */
+ unsigned char X[48]; /* input buffer */
+} MD2_CTX;
+
+__BEGIN_DECLS
+void MD2Init __P((MD2_CTX *));
+void MD2Update __P((MD2_CTX *, const unsigned char *, unsigned int));
+void MD2Final __P((unsigned char[16], MD2_CTX *));
+char *MD2End __P((MD2_CTX *, char *));
+char *MD2File __P((const char *, char *));
+char *MD2Data __P((const unsigned char *, unsigned int, char *));
+__END_DECLS
+
+#endif /* _MD2_H_ */
diff -r 67805d1a115f -r 91560bbd7cda include/rpc/Makefile
--- a/include/rpc/Makefile Fri Apr 06 21:00:40 2001 +0000
+++ b/include/rpc/Makefile Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/01/16 02:42:39 cgd Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2001/04/08 20:31:42 nathanw Exp $
#
INCS= auth.h auth_unix.h clnt.h clnt_soc.h nettype.h \
@@ -14,7 +14,7 @@
@set -- X `type ${RPCGEN}` && shift `expr $$# - 1` && echo "$$1"
rpcb_prot.h:: rpcb_prot.x ${XRPCGEN}
- ${RPCGEN} -h ${.CURDIR}/rpcb_prot.x -o ${.TARGET}
+ ${RPCGEN} -C -h ${.CURDIR}/rpcb_prot.x -o ${.TARGET}
CLEANFILES+= rpcb_prot.h
diff -r 67805d1a115f -r 91560bbd7cda include/stdlib.h
--- a/include/stdlib.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/stdlib.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.52 2001/02/19 22:12:41 cgd Exp $ */
+/* $NetBSD: stdlib.h,v 1.52.2.1 2001/04/08 20:31:41 nathanw Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -125,18 +125,18 @@
int rand __P((void));
void *realloc __P((void *, size_t));
void srand __P((unsigned));
-double strtod __P((const char *, char **));
-long strtol __P((const char *, char **, int));
+double strtod __P((const char * __restrict, char ** __restrict));
+long strtol __P((const char * __restrict, char ** __restrict, int));
unsigned long
- strtoul __P((const char *, char **, int));
+ strtoul __P((const char * __restrict, char ** __restrict, int));
int system __P((const char *));
/* These are currently just stubs. */
int mblen __P((const char *, size_t));
-size_t mbstowcs __P((wchar_t *, const char *, size_t));
+size_t mbstowcs __P((wchar_t * __restrict, const char * __restrict, size_t));
int wctomb __P((char *, wchar_t));
-int mbtowc __P((wchar_t *, const char *, size_t));
-size_t wcstombs __P((char *, const wchar_t *, size_t));
+int mbtowc __P((wchar_t * __restrict, const char * __restrict, size_t));
+size_t wcstombs __P((char * __restrict, const wchar_t * __restrict, size_t));
#if !defined(_ANSI_SOURCE)
@@ -212,9 +212,11 @@
/* LONGLONG */
lldiv_t lldiv __P((long long int, long long int));
/* LONGLONG */
-long long int strtoll __P((const char *, char **, int));
+long long int strtoll __P((const char * __restrict, char ** __restrict, int));
/* LONGLONG */
-unsigned long long int strtoull __P((const char *, char **, int));
+unsigned long long int
+ strtoull __P((const char * __restrict, char ** __restrict,
+ int));
#endif
/*
@@ -262,13 +264,21 @@
void setprogname __P((const char *));
quad_t qabs __P((quad_t));
-qdiv_t qdiv __P((quad_t, quad_t));
-quad_t strtoq __P((const char *, char **, int));
-u_quad_t strtouq __P((const char *, char **, int));
+quad_t strtoq __P((const char * __restrict, char ** __restrict, int));
+u_quad_t strtouq __P((const char * __restrict, char ** __restrict, int));
int l64a_r __P((long, char *, int));
+
+size_t shquote __P((const char *arg, char *buf, size_t bufsize));
+size_t shquotev __P((int argc, char * const * argv, char *buf,
+ size_t bufsize));
#endif /* !_POSIX_C_SOURCE && !_XOPEN_SOURCE */
#endif /* !_ANSI_SOURCE */
+
+#if !defined(_ANSI_SOURCE) && !defined(_ISOC99_SOURCE) && \
+ !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
+qdiv_t qdiv __P((quad_t, quad_t));
+#endif
__END_DECLS
#endif /* !_STDLIB_H_ */
diff -r 67805d1a115f -r 91560bbd7cda include/string.h
--- a/include/string.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/string.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.22 2000/01/10 16:58:38 kleink Exp $ */
+/* $NetBSD: string.h,v 1.22.6.1 2001/04/08 20:31:41 nathanw Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -52,31 +52,31 @@
__BEGIN_DECLS
void *memchr __P((const void *, int, size_t));
int memcmp __P((const void *, const void *, size_t));
-void *memcpy __P((void *, const void *, size_t));
+void *memcpy __P((void * __restrict, const void * __restrict, size_t));
void *memmove __P((void *, const void *, size_t));
void *memset __P((void *, int, size_t));
-char *strcat __P((char *, const char *));
+char *strcat __P((char * __restrict, const char * __restrict));
char *strchr __P((const char *, int));
int strcmp __P((const char *, const char *));
int strcoll __P((const char *, const char *));
-char *strcpy __P((char *, const char *));
+char *strcpy __P((char * __restrict, const char * __restrict));
size_t strcspn __P((const char *, const char *));
__aconst char *strerror __P((int));
size_t strlen __P((const char *));
-char *strncat __P((char *, const char *, size_t));
+char *strncat __P((char * __restrict, const char * __restrict, size_t));
int strncmp __P((const char *, const char *, size_t));
-char *strncpy __P((char *, const char *, size_t));
+char *strncpy __P((char * __restrict, const char * __restrict, size_t));
char *strpbrk __P((const char *, const char *));
char *strrchr __P((const char *, int));
size_t strspn __P((const char *, const char *));
char *strstr __P((const char *, const char *));
-char *strtok __P((char *, const char *));
+char *strtok __P((char * __restrict, const char * __restrict));
#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
!defined(_XOPEN_SOURCE)) || defined(_REENTRANT) || \
(_POSIX_C_SOURCE - 0 >= 199506L) || (_XOPEN_SOURCE - 0 >= 500)
char *strtok_r __P((char *, const char *, char **));
#endif /* !defined(_ANSI_SOURCE) || defined(_REENTRANT) || ... */
-size_t strxfrm __P((char *, const char *, size_t));
+size_t strxfrm __P((char * __restrict, const char * __restrict, size_t));
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \
defined(_XOPEN_SOURCE)
diff -r 67805d1a115f -r 91560bbd7cda include/time.h
--- a/include/time.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/time.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.25 2000/07/06 12:46:48 hubertf Exp $ */
+/* $NetBSD: time.h,v 1.25.2.1 2001/04/08 20:31:41 nathanw Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -99,7 +99,8 @@
struct tm *gmtime __P((const time_t *));
struct tm *localtime __P((const time_t *));
time_t mktime __P((struct tm *));
-size_t strftime __P((char *, size_t, const char *, const struct tm *));
+size_t strftime __P((char * __restrict, size_t, const char * __restrict,
+ const struct tm * __restrict));
time_t time __P((time_t *));
#if !defined(_ANSI_SOURCE)
@@ -112,7 +113,12 @@
*/
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
(_XOPEN_SOURCE - 0) >= 4
-char *strptime __P((const char *, const char *, struct tm *));
+extern int daylight;
+#ifndef __LIBC12_SOURCE__
+extern long int timezone __RENAME(__timezone13);
+#endif
+char *strptime __P((const char * __restrict, const char * __restrict,
+ struct tm * __restrict));
#endif
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
@@ -135,10 +141,10 @@
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
(_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
defined(_REENTRANT)
-char *asctime_r __P((const struct tm *, char *));
+char *asctime_r __P((const struct tm * __restrict, char * __restrict));
char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
+struct tm *gmtime_r __P((const time_t * __restrict, struct tm * __restrict));
+struct tm *localtime_r __P((const time_t * __restrict, struct tm * __restrict));
#endif
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
@@ -147,7 +153,9 @@
time_t timegm __P((struct tm *const));
time_t timeoff __P((struct tm *const, const long));
time_t timelocal __P((struct tm *const));
+#ifdef __LIBC12_SOURCE__
char *timezone __P((int, int));
+#endif
void tzsetwall __P((void));
struct tm *offtime __P((const time_t *const, const long));
#endif /* !_POSIX_C_SOURCE && !_XOPEN_SOURCE */
diff -r 67805d1a115f -r 91560bbd7cda include/util.h
--- a/include/util.h Fri Apr 06 21:00:40 2001 +0000
+++ b/include/util.h Sun Apr 08 20:31:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.19 2000/12/06 13:47:10 tron Exp $ */
+/* $NetBSD: util.h,v 1.19.2.1 2001/04/08 20:31:41 nathanw Exp $ */
/*-
* Copyright (c) 1995
@@ -62,6 +62,7 @@
pid_t forkpty(int *, char *, struct termios *, struct winsize *);
char *fparseln(FILE *, size_t *, size_t *, const char[3], int);
+const char *getbootfile(void);
int getmaxpartitions(void);
int getrawpartition(void);
void login(const struct utmp *);
Home |
Main Index |
Thread Index |
Old Index