19 files changed, 186 insertions, 278 deletions

diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 81d8621..47150f1 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
-#	$Id$
+#	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
+#	$Id: Makefile.inc,v 1.22 1997/02/22 15:03:35 peter Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE}/sys ${.CURDIR}/sys
@@ -34,7 +34,7 @@ ASM=	accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \
 	setsid.o setsockopt.o settimeofday.o setuid.o shmsys.o shutdown.o \
 	sigaction.o sigaltstack.o socket.o socketpair.o stat.o statfs.o \
 	swapon.o symlink.o sync.o sysarch.o \
-	umask.o unlink.o unmount.o utimes.o utrace.o \
+	umask.o undelete.o unlink.o unmount.o utimes.o utrace.o \
 	vadvise.o wait4.o write.o writev.o __syscall.o __sysctl.o
 
 PSEUDO=	_exit.o _getlogin.o
@@ -105,7 +105,7 @@ MAN2+=	sys/accept.2 sys/access.2 sys/acct.2 sys/adjtime.2 sys/bind.2 \
 	sys/sigaltstack.2 sys/sigstack.2 sys/sigsuspend.2 sys/socket.2 \
 	sys/socketpair.2 sys/stat.2 sys/statfs.2 sys/swapon.2 sys/symlink.2 \
 	sys/sync.2 sys/syscall.2 sys/truncate.2 sys/umask.2 sys/unlink.2 \
-	sys/utimes.2 sys/vfork.2 sys/wait.2 sys/write.2
+	sys/undelete.2 sys/utimes.2 sys/vfork.2 sys/wait.2 sys/write.2
 
 MLINKS+=brk.2 sbrk.2
 MLINKS+=dup.2 dup2.2
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 6867fcb..df11e1f 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)brk.2	8.2 (Berkeley) 12/11/93
+.\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
 .\"
-.Dd December 11, 1993
+.Dd May 1, 1995
 .Dt BRK 2
 .Os BSD 4
 .Sh NAME
@@ -96,7 +96,7 @@ beyond the
 value returned from a call to
 .Xr getrlimit 2 ,
 e.g.
-.Dq qetext + rlp\(->rlim_max.
+.Dq etext + rlp\(->rlim_max.
 (see
 .Xr end 3
 for the definition of
@@ -114,7 +114,9 @@ otherwise -1 with
 .Va errno
 set to indicate why the allocation failed.
 .Sh ERRORS
-.Fn Sbrk
+.Fn Brk
+or
+.Fn sbrk
 will fail and no additional memory will be allocated if
 one of the following are true:
 .Bl -tag -width [ENOMEM]
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index da3b285..94b744c 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)chflags.2	8.1 (Berkeley) 6/9/93
+.\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
 .\"
-.Dd June 9, 1993
+.Dd May 2, 1995
 .Dt CHFLAGS 2
 .Os
 .Sh NAME
@@ -65,6 +65,8 @@ Do not dump the file.
 The file may not be changed.
 .It UF_APPEND
 The file may only be appended to.
+.It UF_OPAQUE
+The directory is opaque when viewed through a union stack.
 .\".It ARCHIVED
 .\"File is archived.
 .It SF_IMMUTABLE
@@ -84,7 +86,9 @@ The
 and
 .Dq SF_APPEND
 flags may only be set or unset by the super-user.
-They may be set at any time, but normally may only be unset when
+Attempts by the non-super-user to set the super-user only flags
+are silently ignored.
+These flags may be set at any time, but normally may only be unset when
 the system is in single-user mode.
 (See
 .Xr init 8
@@ -143,7 +147,8 @@ error occurred while reading from or writing to the file system.
 .El
 .Sh SEE ALSO
 .Xr chflags 1 ,
-.Xr init 8
+.Xr init 8 ,
+.Xr mount_union 8
 .Sh HISTORY
 The
 .Nm chflags
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index b9fb131..06d01d8 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)execve.2	8.3 (Berkeley) 1/24/94
+.\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
 .\"
-.Dd January 24, 1994
+.Dd June 1, 1994
 .Dt EXECVE 2
 .Os BSD 4
 .Sh NAME
@@ -66,9 +66,11 @@ An interpreter file begins with a line of the form:
 .Ed
 .Pp
 When an interpreter file is
-.Fn execve Ap d ,
+.\" was .Fn execve Ap d ,
+\fBexecve\fP'd,
 the system
-.Fn execve Ap s
+.\" was .Fn execve Ap s
+\fBexecve\fP's
 runs the specified
 .Em interpreter .
 If the optional
@@ -76,13 +78,16 @@ If the optional
 is specified, it becomes the first argument to the
 .Em interpreter ,
 and the name of the originally
-.Fn execve Ap d
+.\" was .Fn execve Ap d
+\fBexecve\fP'd
 file becomes the second argument;
 otherwise, the name of the originally
-.Fn execve Ap d
+.\" was .Fn execve Ap d
+\fBexecve\fP'd
 file becomes the first argument.  The original arguments are shifted over to
 become the subsequent arguments.  The zeroth argument, normally the name of the
-.Fn execve Ap d
+.\" was .Fn execve Ap d
+\fBexecve\fP'd
 file, is left unchanged.
 .Pp
 The argument
@@ -140,6 +145,7 @@ the effective user ID is recorded as the saved set-user-ID,
 and the effective group ID is recorded as the saved set-group-ID.
 These values may be used in changing the effective IDs later (see
 .Xr setuid 2 ) .
+.ne 1i
 .Pp
 The new process also inherits the following attributes from
 the calling process:
@@ -232,6 +238,7 @@ permission, but has an invalid magic number in its header.
 .It Bq Er ETXTBSY
 The new process file is a pure procedure (shared text)
 file that is currently open for writing or reading by some process.
+.ne 1i
 .It Bq Er ENOMEM
 The new process requires more virtual memory than
 is allowed by the imposed maximum
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 42857bb..0400bc7 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)getdirentries.2	8.1 (Berkeley) 6/9/93
+.\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
 .\"
-.Dd June 9, 1993
+.Dd May 3, 1995
 .Dt GETDIRENTRIES 2
 .Os
 .Sh NAME
@@ -67,7 +67,8 @@ structures each containing the following entries:
 .Bd -literal -offset indent
 unsigned long	d_fileno;
 unsigned short	d_reclen;
-unsigned short	d_namlen;
+unsigned char	d_type;
+unsigned char	d_namlen;
 char    	d_name[MAXNAMELEN + 1]; /* see below */
 .Ed
 .Pp
@@ -83,6 +84,11 @@ The
 .Fa d_reclen
 entry is the length, in bytes, of the directory record.
 The
+.Fa d_type
+entry is the type of the file pointed to by the directory record.
+The file type values are defined in
+.Fa <sys/dirent.h> .
+The
 .Fa d_name
 entry contains a null terminated file name.
 The
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 26363fa..011a815 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)getfsstat.2	8.1 (Berkeley) 6/9/93
+.\"	@(#)getfsstat.2	8.3 (Berkeley) 5/25/95
 .\"
-.Dd June 9, 1993
+.Dd May 25, 1995
 .Dt GETFSSTAT 2
 .Os
 .Sh NAME
@@ -78,32 +78,41 @@ struct statfs {
     char    f_mntonname[MNAMELEN];/* directory on which mounted */
     char    f_mntfromname[MNAMELEN];/* mounted filesystem */
 };
-
-/*
- * File system types.
- */
-#define	MOUNT_NONE	0
-#define	MOUNT_UFS	1	/* Fast Filesystem */
-#define	MOUNT_NFS	2	/* Sun-compatible Network Filesystem */
-#define	MOUNT_MFS	3	/* Memory-based Filesystem */
-#define	MOUNT_MSDOS	4	/* MS/DOS Filesystem */
-#define	MOUNT_LFS	5	/* Log-based Filesystem */
-#define	MOUNT_LOFS	6	/* Loopback Filesystem */
-#define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
-#define	MOUNT_PORTAL	8	/* Portal Filesystem */
-#define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* User/Group Identifier Remapping Filesystem */
-#define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
-#define MOUNT_PROCFS	12	/* /proc Filesystem */
-#define MOUNT_AFS	13	/* Andrew Filesystem */
-#define MOUNT_CD9660	14	/* ISO9660 (aka CDROM) Filesystem */
-#define MOUNT_UNION	15	/* Union (translucent) Filesystem */
-#define MOUNT_DEVFS	16	/* existing device Filesystem */
-#define	MOUNT_EXT2FS	17	/* Linux EXT2FS */
-#define MOUNT_TFS	18	/* Netcon Novell filesystem */
-#define	MOUNT_MAXTYPE	18
 .Ed
 .Pp
+The flags that may be returned include:
+.Bl -tag -width MNT_ASYNCHRONOUS
+.It Dv MNT_RDONLY
+The filesystem is mounted read-only;
+Even the super-user may not write on it.
+.It Dv MNT_NOEXEC
+Files may not be executed from the filesystem.
+.It Dv MNT_NOSUID
+Setuid and setgid bits on files are not honored when they are executed.
+.It Dv MNT_NODEV
+Special files in the filesystem may not be opened.
+.It Dv MNT_SYNCHRONOUS
+All I/O to the filesystem is done synchronously.
+.It Dv MNT_ASYNCHRONOUS
+No filesystem I/O is done synchronously.
+.It Dv MNT_LOCAL
+The filesystem resides locally.
+.It Dv MNT_QUOTA
+The filesystem has quotas enabled on it.
+.It Dv MNT_ROOTFS
+Identifies the root filesystem.
+.It Dv MNT_EXRDONLY
+The filesystem is exported read-only.
+.It Dv MNT_EXPORTED
+The filesystem is exported for both reading and writing.
+.It Dv MNT_DEFEXPORTED
+The filesystem is exported for both reading and writing to any Internet host.
+.It Dv MNT_EXPORTANON
+The filesystem maps all remote accesses to the anonymous user.
+.It Dv MNT_EXKERB
+The filesystem is exported with Kerberos uid mapping.
+.El
+.Pp
 Fields that are undefined for a particular filesystem are set to -1.
 The buffer is filled with an array of
 .Fa fsstat
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index d4534af..2337641 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)getitimer.2	8.2 (Berkeley) 12/11/93
+.\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
 .\"
-.Dd December 11, 1993
+.Dd May 16, 1995
 .Dt GETITIMER 2
 .Os BSD 4.2
 .Sh NAME
@@ -132,8 +132,7 @@ sets a time value to zero,
 .Fa timerisset
 tests if a time value is non-zero, and
 .Fa timercmp
-compares two time values (beware that >= and <= do not
-work with this macro).
+compares two time values.
 .Sh RETURN VALUES
 If the calls succeed, a value of 0 is returned.  If an error occurs,
 the value -1 is returned, and a more precise error code is placed
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index ba5e6f8..ff9ca90 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)getsockopt.2	8.3 (Berkeley) 4/19/94
-.\"	$Id$
+.\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
+.\"	$Id: getsockopt.2,v 1.8 1997/02/22 15:03:53 peter Exp $
 .\"
-.Dd November 3, 1995
+.Dd May 2, 1995
 .Dt GETSOCKOPT 2
 .Os BSD 4.3r
 .Sh NAME
@@ -193,7 +193,7 @@ the system will block the process on the
 .Xr close 2
 attempt until it is able to transmit the data or until it decides it
 is unable to deliver the information (a timeout period, termed the
-linger interval, is specified in the
+linger interval, is specified in seconds in the
 .Fn setsockopt
 call when
 .Dv SO_LINGER
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index bc3fa0b..5805fdb 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)gettimeofday.2	8.1 (Berkeley) 6/4/93
+.\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
 .\"
-.Dd June 4, 1993
+.Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
 .Os BSD 4
 .Sh NAME
@@ -93,6 +93,14 @@ Daylight Saving time applies locally during
 the appropriate part of the year.
 .Pp
 Only the super-user may set the time of day or time zone.
+If the system is running in secure mode (see
+.Xr init 8 ),
+the time may only be advanced.
+This limitation is imposed to prevent a malicious super-user
+from setting arbitrary time stamps on files.
+The system time can still be adjusted backwards using the
+.Xr adjtime 2
+system call even when the system is secure.
 .Sh RETURN
 A 0 return value indicates that the call succeeded.
 A -1 return value indicates an error occurred, and in this
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 665bca6..c9fb3fa 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1993, 1980198319861991
+.\" Copyright (c) 1980, 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)intro.2	8.3 (Berkeley) 12/11/93
+.\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
 .\"
-.Dd December 11, 1993
+.Dd February 27, 1995
 .Dt INTRO 2
 .Os BSD 4
 .Sh NAME
@@ -157,6 +157,7 @@ executable file.
 A file descriptor argument was out of range, referred to no open file,
 or a read (write) request was made to a file that was only open for
 writing (reading).
+.sp
 .It Er 10 ECHILD Em "\&No child processes" .
 A
 .Xr wait 2
@@ -324,6 +325,7 @@ addresses with
 Internet protocols.
 .It Er 48 EADDRINUSE Em "Address already in use" .
 Only one usage of each address is normally permitted.
+.sp
 .It Er 49 EADDRNOTAVAIL Em "Cannot assign requested address" .
 Normally results from an attempt to create a socket with an
 address not on this machine.
@@ -404,6 +406,7 @@ entry failed because the user's quota of disk blocks was
 exhausted, or the allocation of an inode for a newly
 created file failed because the user's quota of inodes
 was exhausted.
+.ne 1i
 .It Er 70 ESTALE Em "Stale NFS file handle" .
 An attempt was made to access an open file (on an
 .Tn NFS
@@ -476,6 +479,7 @@ A session leader with a controlling terminal is a controlling process.
 .It Controlling terminal
 A terminal that is associated with a session is known as the controlling
 terminal for that session and its members.
+.ne 1i
 .It  "Terminal Process Group ID"
 A terminal may be acquired by a session leader as its controlling terminal.
 Once a terminal is associated with a session, any of the process groups
@@ -553,6 +557,7 @@ for the super-user.)
 A process is recognized as a
 .Em super-user
 process and is granted special privileges if its effective user ID is 0.
+.ne 1i
 .It  Special Processes
 The processes with process IDs of 0, 1, and 2 are special.
 Process 0 is the scheduler.  Process 1 is the initialization process
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 855a032..f66a13e 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)mmap.2	8.1 (Berkeley) 6/4/93
+.\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\"
-.Dd "June 4, 1993"
+.Dd "May 11, 1995"
 .Dt MMAP 2
 .Os BSD 4
 .Sh NAME
@@ -54,11 +54,10 @@ bytes to be mapped from the object described by
 starting at byte offset
 .Fa offset .
 If
-.Fa offset
-or
 .Fa len
 is not a multiple of the pagesize, the mapped region may extend past the
 specified range.
+Any such extension beyond the end of the mapped object will be zero-filled.
 .Pp
 If
 .Fa addr
@@ -104,9 +103,10 @@ the following values:
 Map anonymous memory not associated with any specific file.
 The file descriptor used for creating
 .Dv MAP_ANON
-regions is used only for
-naming, and may be specified as \-1 if no name is associated with the
-region.
+must be \-1.
+The
+.Fa offset
+parameter is ignored.
 .\".It Dv MAP_FILE
 .\"Mapped from a regular file or character-special device memory.
 .It Dv MAP_FIXED
@@ -165,12 +165,10 @@ parameter and
 .Fa fd
 was not open for reading.
 The flags
-.Dv PROT_WRITE ,
 .Dv MAP_SHARED
 and
-.Dv MAP_WRITE
-were specified as part
-of the
+.Dv PROT_WRITE
+were specified as part of the
 .Fa flags
 and
 .Fa prot
@@ -183,7 +181,6 @@ is not a valid open file descriptor.
 .It Bq Er EINVAL
 .Dv MAP_FIXED
 was specified and the
-.Fa addr
 parameter was not page aligned, or part of the desired address space
 resides out of the valid address space for a user process.
 .It Bq Er EINVAL
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 4ee86a6..41948b8 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)mount.2	8.2 (Berkeley) 12/11/93
+.\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
 .\"
-.Dd December 11, 1993
+.Dd May 24, 1995
 .Dt MOUNT 2
 .Os BSD 4
 .Sh NAME
@@ -116,160 +116,27 @@ the specified already mounted filesystem.
 .Pp
 The
 .Fa type
-argument defines the type of the filesystem.
-The types of filesystems known to the system are defined in
-.Aq Pa sys/mount.h .
+argument names the filesystem.
+The types of filesystems known to the system can be obtained with
+.Xr sysctl 8
+by using the command:
+.Bd -literal -offset indent
+sysctl vfs
+.Ed
+.Pp
 .Fa Data
 is a pointer to a structure that contains the type
 specific arguments to mount.
-The currently supported types of filesystems and
-their type specific data are:
-.Pp
-.Bd -literal -compact
-/*
- * Export arguments for local filesystem mount calls.
- */
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	ucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	int	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	int	ex_masklen;		/* and the smask length */
-};
-.Ed
-.Pp
-.Dv MOUNT_UFS
-.Pp
-.Bd -literal -compact
-/*
- * Arguments to mount UFS-bases filesystems
- */
-struct ufs_args {
-      char	*fspec;               /* Block special file to mount */
-      struct	export_args export;   /* network export information */
-};
-.Ed
-.Pp
-.Dv MOUNT_NFS
-.Pp
-.Bd -literal -compact
-#ifdef NFS
-/*
- * Arguments to mount NFS
- */
-
-#define NFS_ARGSVERSION	3		/* change when nfs_args changes */
-struct nfs_args {
-	int		version;	/* args structure version number */
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retries */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define	NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define	NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_INTERNAL		0xfffc0000  /* Bits set internally */
-#define NFSMNT_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSMNT_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
-#define NFSMNT_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSMNT_MNTD		0x00200000  /* Mnt server for mnt point */
-#define	NFSMNT_DISMINPROG	0x00400000  /* Dismount in progress */
-#define	NFSMNT_DISMNT		0x00800000  /* Dismounted */
-#define	NFSMNT_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSMNT_WANTSND		0x02000000  /* Want above */
-#define	NFSMNT_RCVLOCK		0x04000000  /* Rcv socket lock */
-#define	NFSMNT_WANTRCV		0x08000000  /* Want above */
-#define	NFSMNT_WAITAUTH		0x10000000  /* Wait for authentication */
-#define	NFSMNT_HASAUTH		0x20000000  /* Has authenticator */
-#define	NFSMNT_WANTAUTH		0x40000000  /* Wants an authenticator */
-#define	NFSMNT_AUTHERR		0x80000000  /* Authentication error */
-#endif /* NFS */
-.Ed
-.Pp
-.Dv MOUNT_MFS
-.Pp
-.Bd -literal -compact
-/*
- * Arguments to mount MFS
- */
-struct mfs_args {
-      char	*fspec; /* name to export for statfs */
-      struct	export_args export; /* if exported MFSes are supported */
-      caddr_t	base;   /* base of file system in memory */
-      u_long	size;   /* size of file system */
-};
-.Ed
-.Pp
-.Dv MOUNT_MSDOSFS
-.Pp
-.Bd -literal -compact
-#ifdef MSDOSFS
-/*
- *  Arguments to mount MSDOS filesystems.
- */
-struct msdosfs_args {
-	char	*fspec;		/* blocks special holding the fs to mount */
-	struct	export_args export;	/* network export information */
-	uid_t	uid;		/* uid that owns msdosfs files */
-	gid_t	gid;		/* gid that owns msdosfs files */
-	mode_t	mask;		/* mask to be applied for msdosfs perms */
-};
-#endif
-.Ed
-.Pp
-.Dv MOUNT_CD9660
-.Pp
-.Bd -literal -compact
-#ifdef CD9660
-/*
- * Arguments to mount ISO 9660 filesystems.
- */
-struct iso_args {
-	char *fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export info */
-	int flags;			/* mounting flags, see below */
-
-};
-#define ISOFSMNT_NORRIP	0x00000001 /* disable Rock Ridge Ext.*/
-#define ISOFSMNT_GENS	0x00000002 /* enable generation numbers */
-#define ISOFSMNT_EXTATT	0x00000004 /* enable extended attributes */
-#endif /* CD9660 */
-.Ed
+The format for these argument structures is described in the
+manual page for each filesystem.
+By convention filesystem manual pages are named
+by prefixing ``mount_'' to the name of the filesystem as returned by
+.Xr sysctl 8 .
+Thus the
+.Nm NFS
+filesystem is described by the
+.Xr mount_nfs 8
+manual page.
 .Pp
 The
 .Fn umount
@@ -435,6 +302,7 @@ mounted.
 .Sh SEE ALSO
 .Xr mfs 8 ,
 .Xr mount 8 ,
+.Xr sysctl 8 ,
 .Xr umount 8
 .Sh BUGS
 Some of the error codes need translation to more obvious messages.
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index f21ff29..425a507 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)msync.2	8.1 (Berkeley) 6/9/93
+.\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
 .\"
-.Dd June 9, 1993
+.Dd June 21, 1994
 .Dt MSYNC 2
 .Os
 .Sh NAME
@@ -83,6 +83,8 @@ is too large or negative.
 .It Bq Er EINVAL
 .Fa flags
 was both MS_ASYNC and MS_INVALIDATE. Only one of these flags is allowed.
+.It Bq Er EIO
+An I/O error occured while writing to the file system.
 .Sh SEE ALSO
 .Xr madvise 2 ,
 .Xr mincore 2 ,
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 208dc0b..ffa2371 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)munmap.2	8.2 (Berkeley) 4/15/94
+.\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
 .\"
-.Dd April 15, 1994
+.Dd May 27, 1994
 .Dt MUNMAP 2
 .Os
 .Sh NAME
@@ -66,8 +66,8 @@ The
 parameter was not page aligned, the
 .Fa len
 parameter was negative, or
-some part of the region being unmapped is not part of the currently
-valid address space.
+some part of the region being unmapped is outside the
+valid address range for a process.
 .Sh "SEE ALSO"
 .Xr madvise 2 ,
 .Xr mincore 2 ,
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index f09e2d23..c75c78f 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -32,9 +32,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)quotactl.2	8.1 (Berkeley) 6/4/93
+.\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
 .\"
-.Dd June 4, 1993
+.Dd March 10, 1995
 .Dt QUOTACTL 2
 .Os
 .Sh NAME
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 5e8815d..cecd888 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)sigaltstack.2	8.1 (Berkeley) 6/4/93
+.\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
 .\"
-.Dd June 4, 1993
+.Dd May 1, 1995
 .Dt SIGALTSTACK 2
 .Os BSD 4.2
 .Sh NAME
@@ -42,7 +42,7 @@
 .Fd #include <signal.h>
 .Bd -literal
 struct sigaltstack {
-	caddr_t ss_sp;
+	caddr_t ss_base;
 	long	ss_size;
 	int     ss_flags;
 };
@@ -74,7 +74,7 @@ If
 .Dv SS_DISABLE
 is set in
 .Fa ss_flags ,
-.Fa ss_sp
+.Fa ss_base
 and
 .Fa ss_size
 are ignored and the signal stack will be disabled.
@@ -106,7 +106,7 @@ is defined to be the number of bytes/chars that would be used to cover
 the usual case when allocating an alternate stack area.
 The following code fragment is typically used to allocate an alternate stack.
 .Bd -literal -offset indent
-if ((sigstk.ss_sp = malloc(SIGSTKSZ)) == NULL)
+if ((sigstk.ss_base = malloc(SIGSTKSZ)) == NULL)
 	/* error return */
 sigstk.ss_size = SIGSTKSZ;
 sigstk.ss_flags = 0;
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index 0c77bcb..e5489df 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)sigsuspend.2	8.1 (Berkeley) 6/4/93
+.\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
 .\"
-.Dd June 4, 1993
+.Dd May 16, 1995
 .Dt SIGSUSPEND 2
 .Os
 .Sh NAME
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 24fc4e4..7b92113 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)stat.2	8.3 (Berkeley) 4/19/94
-.\"	$Id$
+.\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
+.\"	$Id: stat.2,v 1.11 1997/02/22 15:04:29 peter Exp $
 .\"
-.Dd April 19, 1994
+.Dd May 1, 1995
 .Dt STAT 2
 .Os BSD 4
 .Sh NAME
@@ -259,16 +259,6 @@ points to an invalid address.
 .It Bq Er EIO
 An I/O error occurred while reading from or writing to the file system.
 .El
-.Sh CAVEAT
-The fields in the stat structure currently marked
-.Fa st_spare1 ,
-.Fa st_spare2 ,
-and
-.Fa st_spare3
-are present in preparation for inode time stamps expanding
-to 64 bits.  This, however, can break certain programs that
-depend on the time stamps being contiguous (in calls to
-.Xr utimes 2 ) .
 .Sh SEE ALSO
 .Xr chmod 2 ,
 .Xr chown 2 ,
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index f5641a59..80164d0 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)statfs.2	8.3 (Berkeley) 2/11/94
+.\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
 .\"
-.Dd February 11, 1994
+.Dd May 24, 1995
 .Dt STATFS 2
 .Os
 .Sh NAME
@@ -81,29 +81,39 @@ char	f_fstypename[MFSNAMELEN];/* fs type name */
 char	f_mntonname[MNAMELEN];	  /* mount point */
 char	f_mntfromname[MNAMELEN];  /* mounted filesystem */
 };
-/*
-* File system types.
-*/
-#define	MOUNT_UFS	1	/* Fast Filesystem */
-#define	MOUNT_NFS	2	/* Sun-compatible Network Filesystem */
-#define	MOUNT_MFS	3	/* Memory-based Filesystem */
-#define	MOUNT_MSDOS	4	/* MS/DOS Filesystem */
-#define	MOUNT_LFS	5	/* Log-based Filesystem */
-#define	MOUNT_LOFS	6	/* Loopback Filesystem */
-#define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
-#define	MOUNT_PORTAL	8	/* Portal Filesystem */
-#define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* Uid/Gid Remapping Filesystem */
-#define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
-#define MOUNT_PROCFS	12	/* /proc Filesystem */
-#define MOUNT_AFS	13	/* Andrew Filesystem */
-#define MOUNT_CD9660	14	/* ISO9660 (aka CDROM) Filesystem */
-#define MOUNT_UNION	15	/* Union (translucent) Filesystem */
-#define MOUNT_DEVFS	16	/* existing device Filesystem */
-#define MOUNT_EXT2FS	17	/* Linux EXT2FS */
-#define MOUNT_TFS	18	/* Netcon Novell filesystem */
-#define MOUNT_MAXTYPE	18
 .Ed
+The flags that may be returned include:
+.Bl -tag -width MNT_ASYNCHRONOUS
+.It Dv MNT_RDONLY
+The filesystem is mounted read-only;
+Even the super-user may not write on it.
+.It Dv MNT_NOEXEC
+Files may not be executed from the filesystem.
+.It Dv MNT_NOSUID
+Setuid and setgid bits on files are not honored when they are executed.
+.It Dv MNT_NODEV
+Special files in the filesystem may not be opened.
+.It Dv MNT_SYNCHRONOUS
+All I/O to the filesystem is done synchronously.
+.It Dv MNT_ASYNCHRONOUS
+No filesystem I/O is done synchronously.
+.It Dv MNT_LOCAL
+The filesystem resides locally.
+.It Dv MNT_QUOTA
+The filesystem has quotas enabled on it.
+.It Dv MNT_ROOTFS
+Identifies the root filesystem.
+.It Dv MNT_EXRDONLY
+The filesystem is exported read-only.
+.It Dv MNT_EXPORTED
+The filesystem is exported for both reading and writing.
+.It Dv MNT_DEFEXPORTED
+The filesystem is exported for both reading and writing to any Internet host.
+.It Dv MNT_EXPORTANON
+The filesystem maps all remote accesses to the anonymous user.
+.It Dv MNT_EXKERB
+The filesystem is exported with Kerberos uid mapping.
+.El
 .Pp
 Fields that are undefined for a particular file system are set to -1.
 .Fn Fstatfs