update to reality; netbsd

1 files changed, 76 insertions, 52 deletions

diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index e0df03eb5c8..f1112eae98e 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: types.5,v 1.4 1998/11/26 04:25:59 aaron Exp $
-.\"	$NetBSD: types.5,v 1.3 1994/11/30 19:31:34 jtc Exp $
+.\"	$OpenBSD: types.5,v 1.5 1999/02/11 02:19:57 millert Exp $
+.\"	$NetBSD: types.5,v 1.4 1997/07/10 06:56:38 mikel Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,86 +44,106 @@
 .Fd #include <sys/types.h>
 .Sh DESCRIPTION
 The file
-.Aq Pa sys/types.h
+.Pa Aq sys/types.h
 contains the defined data types used in the kernel (most are
 used throughout the system).
 .Bd -literal
-#ifndef _TYPES_H_
-#define	_TYPES_H_
-
-typedef	int32_t		dev_t;
-#ifndef _POSIX_SOURCE
-					/* major part of a device */
-#define	major(x)	((int)(((unsigned)(x)>>8)&0377))
-					/* minor part of a device */
-#define	minor(x)	((int)((x)&0377))
-					/* make a device number */
-#define	makedev(x,y)	((dev_t)(((x)<<8) | (y)))
-#endif
+#ifndef _SYS_TYPES_H_
+#define	_SYS_TYPES_H_
+
+/* Machine type dependent parameters. */
+#include <machine/types.h>
+
+#include <machine/ansi.h>
+#include <machine/endian.h>
 
+#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 typedef	unsigned char	u_char;
 typedef	unsigned short	u_short;
 typedef	unsigned int	u_int;
 typedef	unsigned long	u_long;
+
+typedef unsigned char	unchar;		/* Sys V compatibility */
 typedef	unsigned short	ushort;		/* Sys V compatibility */
+typedef	unsigned int	uint;		/* Sys V compatibility */
+typedef unsigned long	ulong;		/* Sys V compatibility */
+#endif
 
-#include <machine/ansi.h>
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-#include <machine/types.h>
+typedef	u_int64_t	u_quad_t;	/* quads */
+typedef	int64_t		quad_t;
+typedef	quad_t *	qaddr_t;
+
+typedef	char *		caddr_t;	/* core address */
+typedef	int32_t		daddr_t;	/* disk address */
+typedef	int32_t		dev_t;		/* device number */
+typedef	u_int32_t	fixpt_t;	/* fixed point number */
+typedef	u_int32_t	gid_t;		/* group id */
+typedef	u_int32_t	ino_t;		/* inode number */
+typedef	long		key_t;		/* IPC key (for Sys V IPC) */
+typedef	u_int16_t	mode_t;		/* permissions */
+typedef	u_int16_t	nlink_t;	/* link count */
+typedef	quad_t		off_t;		/* file offset */
+typedef	int32_t		pid_t;		/* process id */
+typedef quad_t		rlim_t;		/* resource limit */
+typedef	int32_t		segsz_t;	/* segment size */
+typedef	int32_t		swblk_t;	/* swap offset */
+typedef	u_int32_t	uid_t;		/* user id */
+
+#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
+/* Major, minor numbers, dev_t's. */
+#define	major(x)	((int32_t)(((u_int32_t)(x) >> 8) & 0xff))
+#define	minor(x)	((int32_t)((x) & 0xff))
+#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))
+#endif
+
+#ifdef	_BSD_CLOCK_T_
+typedef	_BSD_CLOCK_T_	clock_t;
+#undef	_BSD_CLOCK_T_
+#endif
+
+#ifdef	_BSD_SIZE_T_
+typedef	_BSD_SIZE_T_	size_t;
+#undef	_BSD_SIZE_T_
 #endif
 
-#ifdef	_CLOCK_T_
-typedef	_CLOCK_T_	clock_t;
-#undef	_CLOCK_T_
+#ifdef	_BSD_SSIZE_T_
+typedef	_BSD_SSIZE_T_	ssize_t;
+#undef	_BSD_SSIZE_T_
 #endif
 
-#ifdef	_SIZE_T_
-typedef	_SIZE_T_	size_t;
-#undef	_SIZE_T_
+#ifdef	_BSD_TIME_T_
+typedef	_BSD_TIME_T_	time_t;
+#undef	_BSD_TIME_T_
 #endif
 
-#ifdef	_TIME_T_
-typedef	_TIME_T_	time_t;
-#undef	_TIME_T_
+#ifdef	_BSD_CLOCKID_T_
+typedef	_BSD_CLOCKID_T_	clockid_t;
+#undef	_BSD_CLOCKID_T_
 #endif
 
-#ifndef _POSIX_SOURCE
-typedef	struct	_uquad { unsigned long val[2]; } u_quad;
-typedef	struct	_quad { long val[2]; } quad;
+#ifdef	_BSD_TIMER_T_
+typedef	_BSD_TIMER_T_	timer_t;
+#undef	_BSD_TIMER_T_
 #endif
-typedef	quad_t * qaddr_t;	/* should be typedef quad * qaddr_t; */
-
-typedef	int	daddr_t;
-typedef	char *	caddr_t;
-typedef	u_int	ino_t;
-typedef	int	swblk_t;
-typedef	int	segsz_t;
-typedef	quad_t	off_t;
-typedef	u_int	uid_t;
-typedef	u_int	gid_t;
-typedef	int	pid_t;
-typedef	u_short	nlink_t;
-typedef	u_short	mode_t;
-typedef u_int	fixpt_t;
-
-#ifndef _POSIX_SOURCE
+
+#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	NBBY	8		/* number of bits in a byte */
 
 /*
  * Select uses bit masks of file descriptors in longs.  These macros
  * manipulate such bit fields (the filesystem macros use chars).
  * FD_SETSIZE may be defined by the user, but the default here should
- * be >= NOFILE (param.h).
+ * be enough for most uses.
  */
 #ifndef	FD_SETSIZE
 #define	FD_SETSIZE	256
 #endif
 
-typedef int	fd_mask;
+typedef int32_t	fd_mask;
 #define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask */
 
 #ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
+#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
 #endif
 
 typedef	struct fd_set {
@@ -133,13 +153,17 @@ typedef	struct fd_set {
 #define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
 #define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
 #define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#define	FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
+#define	FD_COPY(f, t)	memcpy(t, f, sizeof(*(f)))
+#define	FD_ZERO(p)	memset(p, 0, sizeof(*(p)))
 
-#endif /* !_POSIX_SOURCE */
-#endif /* !_TYPES_H_ */
+#endif /* !defined(_POSIX_SOURCE) ... */
+#endif /* !_SYS_TYPES_H_ */
 .Ed
 .Sh SEE ALSO
 .Xr lseek 2 ,
+.Xr select 2 ,
+.Xr truncate 2 ,
+.Xr byteorder 3 ,
 .Xr time 3 ,
 .Xr fs 5
 .Sh HISTORY