From: deraadt <deraadt@openbsd.org>
Date: Thu, 14 Dec 1995 05:37:15 +0000 (+0000)
Subject: update from netbsd
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=39a9fd12d718eeb4a1e7e26feafee4141c0b7f30;p=openbsd

update from netbsd
---

diff --git a/lib/libc/arch/m68k/string/Makefile.inc b/lib/libc/arch/m68k/string/Makefile.inc
index 8ed076485f3..e06c0d02828 100644
--- a/lib/libc/arch/m68k/string/Makefile.inc
+++ b/lib/libc/arch/m68k/string/Makefile.inc
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.1 1995/03/20 14:45:45 mycroft Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1995/10/21 20:24:48 jtc Exp $
 
 SRCS+=	bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.S memset.S \
-	rindex.S strcat.c strcmp.S strcpy.S strcspn.c strlen.S \
+	rindex.S strcat.S strcmp.S strcpy.S strcspn.c strlen.S \
 	strncat.c strncmp.S strncpy.S strpbrk.c strsep.c \
 	strspn.c strstr.c swab.S
 SRCS+=	memcpy.S memmove.S strchr.S strrchr.S
diff --git a/lib/libc/arch/m68k/string/bcmp.S b/lib/libc/arch/m68k/string/bcmp.S
index 3dd70a24d2c..d58ee470836 100644
--- a/lib/libc/arch/m68k/string/bcmp.S
+++ b/lib/libc/arch/m68k/string/bcmp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: bcmp.S,v 1.4 1995/11/28 23:40:47 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,16 +37,18 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: bcmp.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: bcmp.S,v 1.4 1995/11/28 23:40:47 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /* bcmp(s1, s2, n) */
 
-#include "DEFS.h"
-
 /*
  * This is probably not the best we can do, but it is still 2-10 times
  * faster than the C version in the portable gen directory.
diff --git a/lib/libc/arch/m68k/string/bcopy.S b/lib/libc/arch/m68k/string/bcopy.S
index a0326f20aa6..f26682e85f5 100644
--- a/lib/libc/arch/m68k/string/bcopy.S
+++ b/lib/libc/arch/m68k/string/bcopy.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: bcopy.S,v 1.8 1995/11/28 23:40:49 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)bcopy.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: bcopy.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)bcopy.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: bcopy.S,v 1.8 1995/11/28 23:40:49 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 /*
  * This is probably not the best we can do, but it is still 2-10 times
  * faster than the C version in the portable gen directory.
diff --git a/lib/libc/arch/m68k/string/bzero.S b/lib/libc/arch/m68k/string/bzero.S
index d1cfefffb8c..816b5553a28 100644
--- a/lib/libc/arch/m68k/string/bzero.S
+++ b/lib/libc/arch/m68k/string/bzero.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: bzero.S,v 1.4 1995/11/28 23:40:50 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)bzero.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: bzero.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)bzero.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: bzero.S,v 1.4 1995/11/28 23:40:50 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 /*
  * This is probably not the best we can do, but it is still much
  * faster than the C version in the portable gen directory.
diff --git a/lib/libc/arch/m68k/string/ffs.S b/lib/libc/arch/m68k/string/ffs.S
index 0db3c3b6f6c..273f4541440 100644
--- a/lib/libc/arch/m68k/string/ffs.S
+++ b/lib/libc/arch/m68k/string/ffs.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: ffs.S,v 1.5 1995/11/28 23:40:52 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,16 +37,18 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)ffs.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: ffs.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)ffs.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: ffs.S,v 1.5 1995/11/28 23:40:52 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /* bit = ffs(value) */
 
-#include "DEFS.h"
-
 ENTRY(ffs)
 	movl	sp@(4),d0
 	movl	d0,d1
diff --git a/lib/libc/arch/m68k/string/index.S b/lib/libc/arch/m68k/string/index.S
index 60bc143eb90..d40ab74e351 100644
--- a/lib/libc/arch/m68k/string/index.S
+++ b/lib/libc/arch/m68k/string/index.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: index.S,v 1.5 1995/11/28 23:40:53 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)index.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: index.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)index.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: index.S,v 1.5 1995/11/28 23:40:53 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 #ifdef STRCHR
 ENTRY(strchr)
 #else
diff --git a/lib/libc/arch/m68k/string/memcmp.S b/lib/libc/arch/m68k/string/memcmp.S
index 292f5063bb0..9799eb8604e 100644
--- a/lib/libc/arch/m68k/string/memcmp.S
+++ b/lib/libc/arch/m68k/string/memcmp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: memcmp.S,v 1.7 1995/11/28 23:40:55 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,16 +37,18 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: memcmp.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: memcmp.S,v 1.7 1995/11/28 23:40:55 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /* memcmp(s1, s2, n) */
 
-#include "DEFS.h"
-
 /*
  * This is probably not the best we can do, but it is still 2-10 times
  * faster than the C version in the portable gen directory.
diff --git a/lib/libc/arch/m68k/string/memset.S b/lib/libc/arch/m68k/string/memset.S
index e34c5a36b19..78d484ed9b3 100644
--- a/lib/libc/arch/m68k/string/memset.S
+++ b/lib/libc/arch/m68k/string/memset.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: memset.S,v 1.6 1995/11/28 23:40:56 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)bzero.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: memset.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)bzero.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: memset.S,v 1.6 1995/11/28 23:40:56 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 /*
  * This is probably not the best we can do, but it is still much
  * faster than the C version in the portable gen directory.
diff --git a/lib/libc/arch/m68k/string/rindex.S b/lib/libc/arch/m68k/string/rindex.S
index d66c446ea7c..1e6fa839bb6 100644
--- a/lib/libc/arch/m68k/string/rindex.S
+++ b/lib/libc/arch/m68k/string/rindex.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: rindex.S,v 1.5 1995/11/28 23:40:57 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)rindex.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: rindex.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)rindex.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: rindex.S,v 1.5 1995/11/28 23:40:57 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 #ifdef STRRCHR
 ENTRY(strrchr)
 #else
diff --git a/lib/libc/arch/m68k/string/strcat.S b/lib/libc/arch/m68k/string/strcat.S
new file mode 100644
index 00000000000..10af7391c1a
--- /dev/null
+++ b/lib/libc/arch/m68k/string/strcat.S
@@ -0,0 +1,61 @@
+/*	$NetBSD: strcat.S,v 1.4 1995/11/28 23:40:59 thorpej Exp $	*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "DEFS.h"
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strcat.S,v 1.4 1995/11/28 23:40:59 thorpej Exp $")
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+ENTRY(strcat)
+	movl	sp@(8),a0		| a0 = fromaddr
+	movl	sp@(4),d0		| return value is toaddr
+	movl	d0,a1			| a1 = toaddr
+slloop:
+	tstb	a1@+			| null?
+	bne	slloop			| no, keep going
+	subql	#1,a1
+scloop:
+	movb	a0@+,a1@+		| copy a byte
+	bne	scloop			| copied non-null, keep going
+	rts
diff --git a/lib/libc/arch/m68k/string/strcmp.S b/lib/libc/arch/m68k/string/strcmp.S
index c8fb51f47eb..71f27188332 100644
--- a/lib/libc/arch/m68k/string/strcmp.S
+++ b/lib/libc/arch/m68k/string/strcmp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: strcmp.S,v 1.5 1995/11/28 23:41:00 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)strcmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: strcmp.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)strcmp.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strcmp.S,v 1.5 1995/11/28 23:41:00 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 /*
  * NOTE: this guy returns result compatible with the VAX assembly version.
  * The C version on the portable gen directory returns different results
diff --git a/lib/libc/arch/m68k/string/strcpy.S b/lib/libc/arch/m68k/string/strcpy.S
index 74b2006aa02..3652625340c 100644
--- a/lib/libc/arch/m68k/string/strcpy.S
+++ b/lib/libc/arch/m68k/string/strcpy.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: strcpy.S,v 1.4 1995/11/28 23:41:01 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: strcpy.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strcpy.S,v 1.4 1995/11/28 23:41:01 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 ENTRY(strcpy)
 	movl	sp@(8),a0		| a0 = fromaddr
 	movl	sp@(4),d0		| return value is toaddr
diff --git a/lib/libc/arch/m68k/string/strlen.S b/lib/libc/arch/m68k/string/strlen.S
index af00fc2dce0..7302c8768ae 100644
--- a/lib/libc/arch/m68k/string/strlen.S
+++ b/lib/libc/arch/m68k/string/strlen.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: strlen.S,v 1.5 1995/11/28 23:41:03 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,19 +37,22 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)strlen.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: strlen.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)strlen.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strlen.S,v 1.5 1995/11/28 23:41:03 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 ENTRY(strlen)
-	moveq	#-1,d0
 	movl	sp@(4),a0		| string
+	movl	a0,d0
+	notl	d0
 slloop:
-	addql	#1,d0			| increment count
 	tstb	a0@+			| null?
 	bne	slloop			| no, keep going
+	addl	a0,d0
 	rts
diff --git a/lib/libc/arch/m68k/string/strncmp.S b/lib/libc/arch/m68k/string/strncmp.S
index f65035c2678..e53367f7d15 100644
--- a/lib/libc/arch/m68k/string/strncmp.S
+++ b/lib/libc/arch/m68k/string/strncmp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: strncmp.S,v 1.4 1995/11/28 23:41:04 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)strncmp.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: strncmp.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)strncmp.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strncmp.S,v 1.4 1995/11/28 23:41:04 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 /*
  * NOTE: this guy returns result compatible with the VAX assembly version.
  * The C version on the portable gen directory returns different results
diff --git a/lib/libc/arch/m68k/string/strncpy.S b/lib/libc/arch/m68k/string/strncpy.S
index 135d1ea2bb9..be708e185d7 100644
--- a/lib/libc/arch/m68k/string/strncpy.S
+++ b/lib/libc/arch/m68k/string/strncpy.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: strncpy.S,v 1.4 1995/11/28 23:41:05 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,14 +37,16 @@
  * SUCH DAMAGE.
  */
 
+#include "DEFS.h"
+
 #if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)strncpy.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$Id: strncpy.S,v 1.1.1.1 1995/10/18 08:41:31 deraadt Exp $"
+#if 0
+	RCSID("from: @(#)strncpy.s	5.1 (Berkeley) 5/12/90")
+#else
+	RCSID("$NetBSD: strncpy.S,v 1.4 1995/11/28 23:41:05 thorpej Exp $")
+#endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "DEFS.h"
-
 ENTRY(strncpy)
 	movl	sp@(4),d0		| return value is toaddr
 	movl	sp@(12),d1		| count
diff --git a/lib/libc/arch/m68k/string/swab.S b/lib/libc/arch/m68k/string/swab.S
index 80d5d120535..5e430326d8d 100644
--- a/lib/libc/arch/m68k/string/swab.S
+++ b/lib/libc/arch/m68k/string/swab.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: swab.S,v 1.4 1995/11/17 20:21:28 thorpej Exp $	*/
+
 #include "DEFS.h"
 
 ENTRY(swab)
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 4f22c65546a..2c4f00f8742 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysconf.3,v 1.2 1995/02/27 05:52:04 cgd Exp $
+.\"	$NetBSD: sysconf.3,v 1.3 1995/10/12 15:39:31 jtc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,7 +70,7 @@ The maximum bytes of argument to
 .It Li _SC_CHILD_MAX
 The maximum number of simultaneous processes per user id.
 .It Li _SC_CLK_TCK
-Number of micro-seconds per hz tick.
+The number of clock ticks per second.
 .It Li _SC_NGROUPS_MAX
 The maximum number of supplemental groups.
 .It Li _SC_OPEN_MAX
diff --git a/share/man/Makefile b/share/man/Makefile
index 0b7d84d05ae..2cb2c8a1d5d 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.9 (Berkeley) 7/1/91
-#	$Id: Makefile,v 1.1.1.1 1995/10/18 08:44:22 deraadt Exp $
+#	$Id: Makefile,v 1.2 1995/12/14 05:41:23 deraadt Exp $
 
-SUBDIR=	man1 man3 man4 man5 man7 man8
+SUBDIR=	man1 man3 man4 man5 man7 man8 man9
 
 afterinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m 444 makewhatis.sed \
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 7e3aa6c9a83..d303e285b75 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 1995/08/08 20:20:58 gwr Exp $
+#	$NetBSD: Makefile,v 1.20 1995/11/28 08:03:22 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	audio.4 bpf.4 ccd.4 clnp.4 cltp.4 ddb.4 drum.4 esis.4 fd.4 icmp.4 \
@@ -6,7 +6,7 @@ MAN=	audio.4 bpf.4 ccd.4 clnp.4 cltp.4 ddb.4 drum.4 esis.4 fd.4 icmp.4 \
 	null.4 pty.4 route.4 spp.4 tb.4 tcp.4 termios.4 tty.4 tp.4 udp.4 unix.4
 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
 MLINKS+=netintro.4 networking.4
-SUBDIR=	man4.amiga man4.hp300 man4.i386 man4.mac68k man4.mvme68k man4.pc532 \
+SUBDIR=	man4.amiga man4.atari man4.hp300 man4.i386 man4.mac68k man4.pc532 \
 	man4.sparc man4.sun3 man4.tahoe man4.vax
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.atari/Makefile b/share/man/man4/man4.atari/Makefile
new file mode 100644
index 00000000000..a646ce4ea73
--- /dev/null
+++ b/share/man/man4/man4.atari/Makefile
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.2 1995/11/28 08:03:26 jtc Exp $
+# 	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
+
+MAN=	floppy.4 ms.4
+MLINKS=
+MANSUBDIR=/atari
+
+.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.atari/floppy.4 b/share/man/man4/man4.atari/floppy.4
new file mode 100644
index 00000000000..3de66431461
--- /dev/null
+++ b/share/man/man4/man4.atari/floppy.4
@@ -0,0 +1,64 @@
+.\"	$NetBSD: floppy.4,v 1.2 1995/11/28 08:03:27 jtc Exp $
+.\"
+.\" Copyright (c) 1995 Leo Weppelman
+.\" All rights reserved.
+.\"
+.\" 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 Leo Weppelman.
+.\" 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 AUTHOR ``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 AUTHOR 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.
+.\"
+.\"
+.Dd October 15, 1995
+.Dt FLOPPY 4 Atari
+.Os
+.Sh NAME
+.Nm floppy
+.Nd
+.Tn Atari
+floppy interface
+.Sh SYNOPSIS
+.Cd "fd0 at fdc0 unit 0"
+.Cd "fd1 at fdc0 unit 1"
+.Sh DESCRIPTION
+This is an interface to the buildin and external floppy drives on the Atari.
+Currently, there is no disklabel support for the floppy drives. Instead, the
+floppy interface uses the partition number embedded in the minor device number
+to distinguise between various floppy formats.
+.Pp
+Currently, the following formats are supported:
+.Bl -column header Partition Size sides tracks sectors/track
+.Sy    "Partition   Size   sides  tracks  sectors/track"
+    a       360Kb    1      80          9
+    b       720Kb    2      80          9
+    c      1.44Mb    2      80         18
+.Sh FILES
+.Bl -tag -width /dev/rfd[01][abc] -compact
+.It Pa /dev/fd[01][abc]
+Block files
+.It Pa /dev/rfd[01][abc]
+Raw files
+.El
+.Sh DIAGNOSTICS
+None.
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 59e0c8f057e..c1edb6d873c 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,10 +1,11 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
-#	$Id: Makefile,v 1.3 1995/11/13 04:42:59 deraadt Exp $
+#	$Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
 MAN=	intro.4 aha.4 ahb.4 aic.4 ast.4 autoconf.4 boca.4 bt.4
-MAN+=	com.4 cy.4 ed.4 ep.4 gus.4 lms.4 lpt.4 mcd.4 mem.4 mms.4 ncr.4 npx.4
-MAN+=	pms.4 pss.4 rtfps.4 sea.4 sb.4 speaker.4 uha.4 wd.4 wss.4
+MAN+=	com.4 cy.4 ed.4 ep.4 lms.4 lpt.4 mcd.4 mem.4 mms.4 ncr.4 npx.4 pms.4 
+MAN+=	rtfps.4 sea.4 speaker.4 uha.4 wd.4
 MAN+=	eg.4 el.4 ie.4 le.4 wt.4
+MAN+=	gus.4 pss.4 sb.4 wss.4
 
 MLINKS=	mem.4 kmem.4
 MANSUBDIR=/i386
diff --git a/share/man/man4/man4.i386/gus.4 b/share/man/man4/man4.i386/gus.4
index 61c7c6f23fa..95f880d3a7b 100644
--- a/share/man/man4/man4.i386/gus.4
+++ b/share/man/man4/man4.i386/gus.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: gus.4,v 1.1 1995/11/13 14:39:16 pk Exp $
 .\" Copyright (c) 1995 John T. Kohl
 .\" All rights reserved.
 .\"
@@ -24,7 +25,6 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"	
-.\"	$Id: gus.4,v 1.1 1995/11/13 04:41:16 deraadt Exp $
 .\"
 .Dd November 4, 1995
 .Dt GUS 4 i386
@@ -81,4 +81,5 @@ published by Advanced Gravis and Forte Technologies.
 .Sh HISTORY
 The
 .Nm gus
-device driver appeared in NetBSD 1.1.
+device driver appeared in
+.Nx 1.1 .
diff --git a/share/man/man4/man4.i386/pss.4 b/share/man/man4/man4.i386/pss.4
index 927261ee220..d6f274ddebe 100644
--- a/share/man/man4/man4.i386/pss.4
+++ b/share/man/man4/man4.i386/pss.4
@@ -1,4 +1,4 @@
-.\"   $NetBSD$
+.\"   $NetBSD: pss.4,v 1.1 1995/11/13 09:44:15 pk Exp $
 .\"
 .\" Copyright (c) 1995 Michael Long.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 1d344e98784..847821a0d4b 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: sb.4,v 1.1 1995/11/13 14:39:15 pk Exp $
 .\" Copyright (c) 1995 John T. Kohl
 .\" All rights reserved.
 .\"
@@ -24,7 +25,6 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"	
-.\"	$Id: sb.4,v 1.1 1995/11/13 04:41:16 deraadt Exp $
 .\"
 .Dd November 4, 1995
 .Dt SB 4 i386
@@ -61,3 +61,8 @@ SoundBlaster 16, or newer cards.
 The FM synthesizer, joystick and MIDI port interfaces are not supported.
 .Sh SEE ALSO
 .Xr audio 4
+.Sh HISTORY
+The
+.Nm gus
+device driver appeared in
+.Nx 1.1 .
diff --git a/share/man/man4/man4.i386/wss.4 b/share/man/man4/man4.i386/wss.4
index 2d60c2b99fa..4b82a747395 100644
--- a/share/man/man4/man4.i386/wss.4
+++ b/share/man/man4/man4.i386/wss.4
@@ -1,4 +1,4 @@
-.\"   $NetBSD$
+.\"   $NetBSD: wss.4,v 1.1 1995/11/13 09:44:14 pk Exp $
 .\"
 .\" Copyright (c) 1995 Michael Long.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.pc532/lpt.4 b/share/man/man4/man4.pc532/lpt.4
index f9a5cff6b50..edccc6731b5 100644
--- a/share/man/man4/man4.pc532/lpt.4
+++ b/share/man/man4/man4.pc532/lpt.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lpt.4,v 1.1 1995/06/22 04:45:43 phil Exp $
+.\"	$NetBSD: lpt.4,v 1.2 1995/11/28 08:03:29 jtc Exp $
 .\"
 .\" Copyright (c) 1994 Matthias Pfaller.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: lpt.4,v 1.1.1.1 1995/10/18 08:44:30 deraadt Exp $
+.\"	$Id: lpt.4,v 1.2 1995/12/14 05:41:45 deraadt Exp $
 .\"
 .Dd December 1, 1994
 .Dt LPT 4 pc532
@@ -37,14 +37,13 @@
 .Nm lpt
 .Nd Parallel port driver
 .Sh SYNOPSIS
-.Cd "lpt0 at membus? iomem ? irq ?"
-.Cd "lpt1 at membus? iomem ? irq ?"
+.Cd "lpt0 at membus? addr ? irq ?"
+.Cd "lpt1 at membus? addr ? irq ?"
 .Sh DESCRIPTION
 This driver provides access to centronics ports. Bit 6 in the minor number
-selects wether to omit pulling PRIME low on opens or not. If the minor has
+selects wether to omit pulling /PRIME low on opens or not. If the minor has
 bit 5 set, AUTOLINEFEED will be asserted when transfering data to the printer.
-Iomem defaults to 0xffc80030 for lpt0 and to 0xffc80034 for lpt1. 
-Irq defaults to 7 for lpt0 and to 6 for lpt1.
+Addr and Irq default to 0xffc80030,7 for lpt0 and to 0xffc80034,6 for lpt1. 
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /dev/lpt0
@@ -66,4 +65,17 @@ signal.
 The printer asserted the
 .Em /Error
 signal.
+.It "lpt?: NACK low"
+The printer didn't release the
+.Em /Ack
+signal.
+.It "lpt?: NBUSY low"
+The printer didn't release the
+.Em Busy
+signal.
 .El
+.Sh SEE ALSO
+.Xr plip 4
+.sp
+Contact Matthias Pfaller (leo@dachau.marco.de) to get instructions on building
+a centronics interface for your PC532.
diff --git a/share/man/man4/man4.pc532/plip.4 b/share/man/man4/man4.pc532/plip.4
index ac721e1e1a0..0c29d9e1e18 100644
--- a/share/man/man4/man4.pc532/plip.4
+++ b/share/man/man4/man4.pc532/plip.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: plip.4,v 1.2 1995/06/27 18:11:07 phil Exp $
+.\"	$NetBSD: plip.4,v 1.3 1995/11/28 08:03:31 jtc Exp $
 .\"
 .\" Copyright (c) 1994 Matthias Pfaller.
 .\" All rights reserved.
@@ -38,6 +38,7 @@
 .Sh SYNOPSIS
 .Cd "options PLIP"
 .Cd "options COMPAT_PLIP10"
+.Cd "options COMPAT_PLIP11"
 .Sh DESCRIPTION
 The
 .Nm
@@ -48,6 +49,10 @@ the link0 flag with
 .Xr ifconfig 8
 or in your /etc/hostname.plip? file. In order to use the 1.0 protocol
 the kernel has to be compiled with COMPAT_PLIP10.
+.br
+The COMPAT_PLIP11 option selects a default MTU of 1486 bytes. This is
+necessary to work around a bug that is present in the plip code for
+Linux 1.1.x and Linux 1.2.x.
 .Sh NOTES
 To connect two computers a "Laplink parallel cabel" is used:
 .sp
@@ -88,5 +93,5 @@ PLIPMXERRS (20) packets caused receive errors in sequence.
 .It "plip?: checksum error"
 A packet with a bad checksum was received.
 .It "plip?: packet > MTU"
-A bogus packet longer then MTU was received.
+A bogus packet longer then the MTU was received.
 .El
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 062104385e4..4bb317e826e 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: netintro.4,v 1.3 1994/11/30 16:22:24 jtc Exp $
+.\"	$NetBSD: netintro.4,v 1.4 1995/10/19 08:03:40 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -190,7 +190,7 @@ structure as its parameter.  This structure has the form
 .Bd -literal
 struct	ifreq {
 #define    IFNAMSIZ    16
-    char    ifr_name[IFNAMSIZE];        /* if name, e.g. "en0" */
+    char    ifr_name[IFNAMSIZ];         /* if name, e.g. "en0" */
     union {
         struct    sockaddr ifru_addr;
         struct    sockaddr ifru_dstaddr;
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 2cea4a35ebc..64745330bff 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: acct.5,v 1.3 1994/11/30 19:31:10 jtc Exp $
+.\"	$NetBSD: acct.5,v 1.4 1995/10/22 01:40:10 ghudson Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -103,7 +103,9 @@ and
 .Dv ASIG .
 .Sh SEE ALSO
 .Xr acct 2 ,
+.Xr accton 8 ,
 .Xr execve 2 ,
+.Xr lastcomm 1 ,
 .Xr sa 8
 .Sh HISTORY
 A
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index ceec398683c..62da3f5f6c8 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.11 1995/08/08 20:24:08 gwr Exp $
+#	$NetBSD: Makefile,v 1.12 1995/11/28 08:03:34 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 MAN=	adduser.8 compat_linux.8 compat_sunos.8 diskless.8 intro.8 rc.8 \
 	sticky.8 yp.8
-SUBDIR=	man8.amiga man8.hp300 man8.i386 man8.mac68k man8.sparc \
+SUBDIR=	man8.amiga man8.atari man8.hp300 man8.i386 man8.mac68k man8.sparc \
 	man8.sun3 man8.tahoe man8.vax
 
 .include <bsd.prog.mk>
diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8
index 22dc17be36c..dd6ed7d4c57 100644
--- a/share/man/man8/compat_linux.8
+++ b/share/man/man8/compat_linux.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: compat_linux.8,v 1.1.2.1 1995/10/16 20:20:13 fvdl Exp $
+.\"	$NetBSD: compat_linux.8,v 1.2 1995/10/16 20:17:59 fvdl Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
 .\" All rights reserved.