tabify

44 files changed, 314 insertions, 315 deletions

diff --git a/lib/libc/arch/alpha/gen/frexp.c b/lib/libc/arch/alpha/gen/frexp.c
index 09c462214d4..bf7eeace05b 100644
--- a/lib/libc/arch/alpha/gen/frexp.c
+++ b/lib/libc/arch/alpha/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.3 1996/11/13 21:20:17 niklas Exp $	*/
+/*	$OpenBSD: frexp.c,v 1.4 1997/07/23 20:55:17 kstailey Exp $	*/
 /*	$NetBSD: frexp.c,v 1.1 1995/02/10 17:50:22 cgd Exp $	*/
 
 /*
@@ -29,7 +29,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: frexp.c,v 1.3 1996/11/13 21:20:17 niklas Exp $";
+static char *rcsid = "$OpenBSD: frexp.c,v 1.4 1997/07/23 20:55:17 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -42,9 +42,9 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union doub {
-                double v;
+		double v;
 		struct ieee_double s;
-        } u;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/arm32/gen/_setjmp.S b/lib/libc/arch/arm32/gen/_setjmp.S
index dd8fa93ebe7..38e6c2e1aae 100644
--- a/lib/libc/arch/arm32/gen/_setjmp.S
+++ b/lib/libc/arch/arm32/gen/_setjmp.S
@@ -34,43 +34,43 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: _setjmp.S,v 1.3 1996/08/19 08:11:29 tholo Exp $"
+	.asciz "$OpenBSD: _setjmp.S,v 1.4 1997/07/23 20:55:18 kstailey Exp $"
 #endif
 
 	.text
 	.align	0
 
 ENTRY(_setjmp)
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__setjmp_l1|
-        STFE    f4,[a1],#12
-        STFE    f5,[a1],#12
-        STFE    f6,[a1],#12
-        STFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__setjmp_l1|
+	STFE	f4,[a1],#12
+	STFE	f5,[a1],#12
+	STFE	f6,[a1],#12
+	STFE	f7,[a1],#12
 |__setjmp_l1|*/
 	add	r0, r0, #48
-        stmia	r0, {r1-r12, r13, r14}
-        mov	r0, #0x00000000
-        mov	r15, r14
+	stmia	r0, {r1-r12, r13, r14}
+	mov	r0, #0x00000000
+	mov	r15, r14
 
 ENTRY(_longjmp)
 	ldr	r2, L_longjmpret
 	str	r1, [r2]
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__longjmp_l1|
-        LDFE    f4,[a1],#12
-        LDFE    f5,[a1],#12
-        LDFE    f6,[a1],#12
-        LDFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__longjmp_l1|
+	LDFE	f4,[a1],#12
+	LDFE	f5,[a1],#12
+	LDFE	f6,[a1],#12
+	LDFE	f7,[a1],#12
 |__longjmp_l1|*/
 	add	r0, r0, #48
-        ldmia	r0, {r1-r12, r13, r14}
+	ldmia	r0, {r1-r12, r13, r14}
 	ldr	r0, L_longjmpret
 	ldr	r0, [r0]
 	teq	r0, #0x00000000
diff --git a/lib/libc/arch/arm32/gen/frexp.c b/lib/libc/arch/arm32/gen/frexp.c
index 1fdd6f887ed..0770b6f8e4e 100644
--- a/lib/libc/arch/arm32/gen/frexp.c
+++ b/lib/libc/arch/arm32/gen/frexp.c
@@ -36,7 +36,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:11:40 tholo Exp $";
+static char *rcsid = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:18 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -53,7 +53,7 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
+		double v;
 		struct ieee_double s;
 	} u;
 
diff --git a/lib/libc/arch/arm32/gen/setjmp.S b/lib/libc/arch/arm32/gen/setjmp.S
index e927645c2db..04e67780dee 100644
--- a/lib/libc/arch/arm32/gen/setjmp.S
+++ b/lib/libc/arch/arm32/gen/setjmp.S
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: setjmp.S,v 1.3 1996/08/19 08:11:45 tholo Exp $"
+	.asciz "$OpenBSD: setjmp.S,v 1.4 1997/07/23 20:55:19 kstailey Exp $"
 #endif
 
 	.text
@@ -51,20 +51,20 @@ ENTRY(setjmp)
 
 	str	r1, [r0], #0x0004
  
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__setjmp_l1|
-        STFE    f4,[a1],#12
-        STFE    f5,[a1],#12
-        STFE    f6,[a1],#12
-        STFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__setjmp_l1|
+	STFE	f4,[a1],#12
+	STFE	f5,[a1],#12
+	STFE	f6,[a1],#12
+	STFE	f7,[a1],#12
 |__setjmp_l1|*/
 	add	r0, r0, #48
-        stmia	r0, {r4-r9, r11, r13, r14}
-        mov	r0, #0x00000000
-        mov	r15, r14
+	stmia	r0, {r4-r9, r11, r13, r14}
+	mov	r0, #0x00000000
+	mov	r15, r14
 
 ENTRY(longjmp)
 	ldr	r2, [r0], #0x0004
@@ -74,18 +74,18 @@ ENTRY(longjmp)
 	bl	_sigsetmask
 
 	ldmfd	r13!, {r0, r1, r14} 
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__longjmp_l1|
-        LDFE    f4,[a1],#12
-        LDFE    f5,[a1],#12
-        LDFE    f6,[a1],#12
-        LDFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__longjmp_l1|
+	LDFE	f4,[a1],#12
+	LDFE	f5,[a1],#12
+	LDFE	f6,[a1],#12
+	LDFE	f7,[a1],#12
 |__longjmp_l1|*/
 	add	r2, r0, #48
-        ldmia	r2, {r4-r9, r11, r13, r14}
+	ldmia	r2, {r4-r9, r11, r13, r14}
 	mov	r0, r1
 	teq	r0, #0x00000000
 	moveq	r0, #0x00000001
diff --git a/lib/libc/arch/arm32/gen/sigsetjmp.S b/lib/libc/arch/arm32/gen/sigsetjmp.S
index 74cfc5f8822..6744c63e49e 100644
--- a/lib/libc/arch/arm32/gen/sigsetjmp.S
+++ b/lib/libc/arch/arm32/gen/sigsetjmp.S
@@ -34,43 +34,43 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigsetjmp.S,v 1.3 1996/08/19 08:11:46 tholo Exp $"
+	.asciz "$OpenBSD: sigsetjmp.S,v 1.4 1997/07/23 20:55:19 kstailey Exp $"
 #endif
 
 	.text
 	.align	0
 
 ENTRY(sigsetjmp)
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__sigsetjmp_l1|
-        STFE    f4,[a1],#12
-        STFE    f5,[a1],#12
-        STFE    f6,[a1],#12
-        STFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__sigsetjmp_l1|
+	STFE	f4,[a1],#12
+	STFE	f5,[a1],#12
+	STFE	f6,[a1],#12
+	STFE	f7,[a1],#12
 |__sigsetjmp_l1|*/
 	add	r0, r0, #48
-        stmia	r0, {r1-r12, r13, r14}
-        mov	r0, #0x00000000
-        mov	r15, r14
+	stmia	r0, {r1-r12, r13, r14}
+	mov	r0, #0x00000000
+	mov	r15, r14
 
 ENTRY(siglongjmp)
 	ldr	r2, L_siglongjmpret
 	str	r1, [r2]
-/*        LDR     a4,[pc,#|__fpflag_ptr|-.-8]
-        LDR     a4,[a4,#0]
-        CMP     a4,#0
-        ADDEQ   a1,a1,#48
-        BEQ     |__siglongjmp_l1|
-        LDFE    f4,[a1],#12
-        LDFE    f5,[a1],#12
-        LDFE    f6,[a1],#12
-        LDFE    f7,[a1],#12
+/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
+	LDR	a4,[a4,#0]
+	CMP	a4,#0
+	ADDEQ	a1,a1,#48
+	BEQ	|__siglongjmp_l1|
+	LDFE	f4,[a1],#12
+	LDFE	f5,[a1],#12
+	LDFE	f6,[a1],#12
+	LDFE	f7,[a1],#12
 |__siglongjmp_l1|*/
 	add	r0, r0, #48
-        ldmia	r0, {r1-r12, r13, r14}
+	ldmia	r0, {r1-r12, r13, r14}
 	ldr	r0, L_siglongjmpret
 	ldr	r0, [r0]
 	teq	r0, #0x00000000
diff --git a/lib/libc/arch/i386/gen/frexp.c b/lib/libc/arch/i386/gen/frexp.c
index f277a5456c4..4da4eac1f31 100644
--- a/lib/libc/arch/i386/gen/frexp.c
+++ b/lib/libc/arch/i386/gen/frexp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:12:29 tholo Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:20 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,14 +44,14 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
-                struct {
+		double v;
+		struct {
 			u_int u_mant2 : 32;
 			u_int u_mant1 : 20;
 			u_int   u_exp : 11;
-                        u_int  u_sign :  1;
-                } s;
-        } u;
+			u_int  u_sign :	 1;
+		} s;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/i386/stdlib/div.S b/lib/libc/arch/i386/stdlib/div.S
index 77ea153f0d4..29fef17d0c8 100644
--- a/lib/libc/arch/i386/stdlib/div.S
+++ b/lib/libc/arch/i386/stdlib/div.S
@@ -7,14 +7,14 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: div.S,v 1.2 1996/08/19 08:12:46 tholo Exp $"
+	.asciz "$OpenBSD: div.S,v 1.3 1997/07/23 20:55:20 kstailey Exp $"
 #endif
 
 ENTRY(div)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
-        ret
+	movl	4(%esp),%eax
+	movl	8(%esp),%ecx
+	cdq
+	idiv	%ecx
+	movl	%eax,4(%esp)
+	movl	%edx,8(%esp)
+	ret
diff --git a/lib/libc/arch/i386/stdlib/ldiv.S b/lib/libc/arch/i386/stdlib/ldiv.S
index 4d6d2623de8..2cedafa783f 100644
--- a/lib/libc/arch/i386/stdlib/ldiv.S
+++ b/lib/libc/arch/i386/stdlib/ldiv.S
@@ -7,14 +7,14 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: ldiv.S,v 1.2 1996/08/19 08:12:48 tholo Exp $"
+	.asciz "$OpenBSD: ldiv.S,v 1.3 1997/07/23 20:55:21 kstailey Exp $"
 #endif
 
 ENTRY(ldiv)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
-        ret
+	movl	4(%esp),%eax
+	movl	8(%esp),%ecx
+	cdq
+	idiv	%ecx
+	movl	%eax,4(%esp)
+	movl	%edx,8(%esp)
+	ret
diff --git a/lib/libc/arch/i386/string/memcmp.S b/lib/libc/arch/i386/string/memcmp.S
index 1c7938044f4..fdd49c948ce 100644
--- a/lib/libc/arch/i386/string/memcmp.S
+++ b/lib/libc/arch/i386/string/memcmp.S
@@ -7,7 +7,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: memcmp.S,v 1.2 1996/08/19 08:13:03 tholo Exp $"
+	.asciz "$OpenBSD: memcmp.S,v 1.3 1997/07/23 20:55:21 kstailey Exp $"
 #endif
 
 ENTRY(memcmp)
@@ -40,8 +40,8 @@ L5:	movl	$4,%ecx			/* We know that one of the next	*/
 	repe
 	cmpsb
 L6:	movzbl  -1(%edi),%eax		/* Perform unsigned comparison	*/
-        movzbl  -1(%esi),%edx
-        subl    %edx,%eax
+	movzbl	-1(%esi),%edx
+	subl	%edx,%eax
 	popl	%esi
 	popl	%edi
 	ret
diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S
index b8426aacba5..1cbafaae322 100644
--- a/lib/libc/arch/i386/sys/sbrk.S
+++ b/lib/libc/arch/i386/sys/sbrk.S
@@ -37,8 +37,8 @@
 #include "SYS.h"
 
 #if defined(SYSLIBC_SCCS)
-        .text
-        .asciz "$OpenBSD: sbrk.S,v 1.2 1996/08/19 08:13:37 tholo Exp $"
+	.text
+	.asciz "$OpenBSD: sbrk.S,v 1.3 1997/07/23 20:55:22 kstailey Exp $"
 #endif /* SYSLIBC_SCCS */
 
 	.globl	_end
diff --git a/lib/libc/arch/i386/sys/sigprocmask.S b/lib/libc/arch/i386/sys/sigprocmask.S
index 1cfd2c3e2b6..17853ed793d 100644
--- a/lib/libc/arch/i386/sys/sigprocmask.S
+++ b/lib/libc/arch/i386/sys/sigprocmask.S
@@ -37,8 +37,8 @@
 #include "SYS.h"
 
 #if defined(SYSLIBC_SCCS)
-        .text
-        .asciz "$OpenBSD: sigprocmask.S,v 1.2 1996/08/19 08:13:41 tholo Exp $"
+	.text
+	.asciz "$OpenBSD: sigprocmask.S,v 1.3 1997/07/23 20:55:23 kstailey Exp $"
 #endif /* SYSLIBC_SCCS */
 
 ENTRY(sigprocmask)
diff --git a/lib/libc/arch/m68k/gen/frexp.c b/lib/libc/arch/m68k/gen/frexp.c
index 24991d75bc1..0fef1f5b73e 100644
--- a/lib/libc/arch/m68k/gen/frexp.c
+++ b/lib/libc/arch/m68k/gen/frexp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:14:23 tholo Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:23 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,14 +44,14 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
-                struct {
-                        u_int  u_sign :  1;
+		double v;
+		struct {
+			u_int  u_sign :	 1;
 			u_int   u_exp : 11;
 			u_int u_mant1 : 20;
 			u_int u_mant2 : 32;
-                } s;
-        } u;
+		} s;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/m68k/gen/sigsetjmp.S b/lib/libc/arch/m68k/gen/sigsetjmp.S
index 3c869e369b6..d0839066603 100644
--- a/lib/libc/arch/m68k/gen/sigsetjmp.S
+++ b/lib/libc/arch/m68k/gen/sigsetjmp.S
@@ -37,7 +37,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigsetjmp.S,v 1.2 1996/08/19 08:14:41 tholo Exp $"
+	.asciz "$OpenBSD: sigsetjmp.S,v 1.3 1997/07/23 20:55:24 kstailey Exp $"
 #endif /* LIBC_SCCS */
 
 /*
@@ -58,7 +58,7 @@
 
 ENTRY(sigsetjmp)
 	movl	sp@(8),d1	/* grab the mask */
-        movl	sp@(4),a0	/* grab the area pointer */
+	movl	sp@(4),a0	/* grab the area pointer */
 	movl	d1,a0@(_JBLEN * 4 )	/* save at end of area */
 	tstl	d1
 	bne	dosig
diff --git a/lib/libc/arch/mips/gen/frexp.c b/lib/libc/arch/mips/gen/frexp.c
index 04806250ec1..181e1dc735d 100644
--- a/lib/libc/arch/mips/gen/frexp.c
+++ b/lib/libc/arch/mips/gen/frexp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:16:00 tholo Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:24 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -45,21 +45,21 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
-                struct {
+		double v;
+		struct {
 #if BYTE_ORDER == LITTLE_ENDIAN
 			u_int u_mant2 : 32;
 			u_int u_mant1 : 20;
 			u_int   u_exp : 11;
-                        u_int  u_sign :  1;
+			u_int  u_sign :	 1;
 #else
-                        u_int  u_sign :  1;
+			u_int  u_sign :	 1;
 			u_int   u_exp : 11;
 			u_int u_mant1 : 20;
 			u_int u_mant2 : 32;
 #endif
-                } s;
-        } u;
+		} s;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/mips/gen/setjmp.S b/lib/libc/arch/mips/gen/setjmp.S
index b23f9180259..0abfed8948a 100644
--- a/lib/libc/arch/mips/gen/setjmp.S
+++ b/lib/libc/arch/mips/gen/setjmp.S
@@ -39,8 +39,8 @@
 #include <machine/regnum.h>
 
 #if defined(LIBC_SCCS) 
-        .text
-        .asciz "$OpenBSD: setjmp.S,v 1.5 1996/08/19 08:16:05 tholo Exp $"
+	.text
+	.asciz "$OpenBSD: setjmp.S,v 1.6 1997/07/23 20:55:25 kstailey Exp $"
 #endif /* LIBC_SCCS */
 
 /*
diff --git a/lib/libc/arch/mvme88k/gen/frexp.c b/lib/libc/arch/mvme88k/gen/frexp.c
index 721515ec8f7..f69aa240a57 100644
--- a/lib/libc/arch/mvme88k/gen/frexp.c
+++ b/lib/libc/arch/mvme88k/gen/frexp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  * from: Header: frexp.c,v 1.1 91/07/07 04:45:01 torek Exp
- * $Id: frexp.c,v 1.1 1997/03/25 17:07:01 rahnds Exp $
+ * $Id: frexp.c,v 1.2 1997/07/23 20:55:26 kstailey Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -56,7 +56,7 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
+		double v;
 		struct ieee_double s;
 	} u;
 
diff --git a/lib/libc/arch/mvme88k/gen/modf.c b/lib/libc/arch/mvme88k/gen/modf.c
index ea2be134ba9..e90dcdb59da 100644
--- a/lib/libc/arch/mvme88k/gen/modf.c
+++ b/lib/libc/arch/mvme88k/gen/modf.c
@@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $";
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $Id: modf.c,v 1.1 1997/03/25 17:07:05 rahnds Exp $
+ * $Id: modf.c,v 1.2 1997/07/23 20:55:26 kstailey Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
@@ -272,7 +272,7 @@ static double one = 1.0;
 	j0 = ((i0>>20)&0x7ff)-0x3ff;	/* exponent of x */
 	if(j0<20) {			/* integer part in high x */
 	    if(j0<0) {			/* |x|<1 */
-	        INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
+		INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
 		return x;
 	    } else {
 		i = (0x000fffff)>>j0;
@@ -296,13 +296,13 @@ static double one = 1.0;
 	} else {			/* fraction part in low x */
 	    i = ((u_int32_t)(0xffffffff))>>(j0-20);
 	    if((i1&i)==0) { 		/* x is integral */
-	        u_int32_t high;
+		u_int32_t high;
 		*iptr = x;
 		GET_HIGH_WORD(high,x);
 		INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
 		return x;
 	    } else {
-	        INSERT_WORDS(*iptr,i0,i1&(~i));
+		INSERT_WORDS(*iptr,i0,i1&(~i));
 		return x - *iptr;
 	    }
 	}
diff --git a/lib/libc/arch/ns32k/sys/setlogin.S b/lib/libc/arch/ns32k/sys/setlogin.S
index bd8caf62b86..aa1c5ba82f0 100644
--- a/lib/libc/arch/ns32k/sys/setlogin.S
+++ b/lib/libc/arch/ns32k/sys/setlogin.S
@@ -18,10 +18,10 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: setlogin.S,v 1.2 1996/08/19 08:17:13 tholo Exp $"
+	.asciz "$OpenBSD: setlogin.S,v 1.3 1997/07/23 20:55:27 kstailey Exp $"
 #endif /* SYSLIBC_SCCS */
 
-	.globl  ___logname_valid         /* in getlogin() */
+	.globl	___logname_valid	 /* in getlogin() */
 
 SYSCALL(setlogin)
 	PIC_PROLOGUE
diff --git a/lib/libc/arch/powerpc/gen/frexp.c b/lib/libc/arch/powerpc/gen/frexp.c
index 213524cdd68..2297cf7dbb2 100644
--- a/lib/libc/arch/powerpc/gen/frexp.c
+++ b/lib/libc/arch/powerpc/gen/frexp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.1 1997/01/17 21:39:20 rahnds Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1997/07/23 20:55:27 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,14 +44,14 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
-                struct {
-                        u_int  u_sign :  1;
+		double v;
+		struct {
+			u_int  u_sign :	 1;
 			u_int   u_exp : 11;
 			u_int u_mant1 : 20;
 			u_int u_mant2 : 32;
-                } s;
-        } u;
+		} s;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/powerpc/gen/modf.c b/lib/libc/arch/powerpc/gen/modf.c
index 396cf912540..0366bf9f565 100644
--- a/lib/libc/arch/powerpc/gen/modf.c
+++ b/lib/libc/arch/powerpc/gen/modf.c
@@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $";
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $Id: modf.c,v 1.2 1997/01/02 03:12:07 rahnds Exp $
+ * $Id: modf.c,v 1.3 1997/07/23 20:55:28 kstailey Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
@@ -272,7 +272,7 @@ static double one = 1.0;
 	j0 = ((i0>>20)&0x7ff)-0x3ff;	/* exponent of x */
 	if(j0<20) {			/* integer part in high x */
 	    if(j0<0) {			/* |x|<1 */
-	        INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
+		INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
 		return x;
 	    } else {
 		i = (0x000fffff)>>j0;
@@ -296,13 +296,13 @@ static double one = 1.0;
 	} else {			/* fraction part in low x */
 	    i = ((u_int32_t)(0xffffffff))>>(j0-20);
 	    if((i1&i)==0) { 		/* x is integral */
-	        u_int32_t high;
+		u_int32_t high;
 		*iptr = x;
 		GET_HIGH_WORD(high,x);
 		INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
 		return x;
 	    } else {
-	        INSERT_WORDS(*iptr,i0,i1&(~i));
+		INSERT_WORDS(*iptr,i0,i1&(~i));
 		return x - *iptr;
 	    }
 	}
diff --git a/lib/libc/arch/powerpc/sys/syscall.S b/lib/libc/arch/powerpc/sys/syscall.S
index 2bfd18dcfb2..bfdb00c7092 100644
--- a/lib/libc/arch/powerpc/sys/syscall.S
+++ b/lib/libc/arch/powerpc/sys/syscall.S
@@ -2,8 +2,8 @@
  * COPYRIGHT
  */
 #if defined(SYSLIBC_SCCS)
-        .text
-        .asciz "$OpenBSD: syscall.S,v 1.1.1.1 1996/12/21 20:42:24 rahnds Exp $"
+	.text
+	.asciz "$OpenBSD: syscall.S,v 1.2 1997/07/23 20:55:29 kstailey Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
diff --git a/lib/libc/arch/sparc/gen/fixunsdfsi.S b/lib/libc/arch/sparc/gen/fixunsdfsi.S
index cd7471d0055..a8b7b0574cf 100644
--- a/lib/libc/arch/sparc/gen/fixunsdfsi.S
+++ b/lib/libc/arch/sparc/gen/fixunsdfsi.S
@@ -37,7 +37,7 @@
 
 #if defined(LIBC_SCCS) 
 	.text
-	.asciz "$OpenBSD: fixunsdfsi.S,v 1.2 1996/08/19 08:17:27 tholo Exp $"
+	.asciz "$OpenBSD: fixunsdfsi.S,v 1.3 1997/07/23 20:55:29 kstailey Exp $"
 #endif /* LIBC_SCCS */
 
 /*
@@ -68,7 +68,7 @@ ENTRY(__fixunsdfsi)
 	fcmped	%f0, %f2		! d < 2^31, or NaN, or -Inf?
 	nop				! (fpop2 delay)
 	fbul,a	1f			! if so, use fdtoi to convert to int
-	fdtoi	%f0, %f0		!        (this includes negatives!)
+	fdtoi	%f0, %f0		!	 (this includes negatives!)
 
 	! d does not fit in an int, so subtract 2^31, convert,
 	! and add 2^31 again (sigh).  Just hope the intermediate
diff --git a/lib/libc/arch/sparc/gen/frexp.c b/lib/libc/arch/sparc/gen/frexp.c
index 125cf252bd0..2dcc0300fc9 100644
--- a/lib/libc/arch/sparc/gen/frexp.c
+++ b/lib/libc/arch/sparc/gen/frexp.c
@@ -36,7 +36,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:17:36 tholo Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:30 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -53,7 +53,7 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
+		double v;
 		struct ieee_double s;
 	} u;
 
diff --git a/lib/libc/arch/vax/gen/frexp.c b/lib/libc/arch/vax/gen/frexp.c
index 3d8747445f1..f35e0118151 100644
--- a/lib/libc/arch/vax/gen/frexp.c
+++ b/lib/libc/arch/vax/gen/frexp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 1996/08/19 08:18:24 tholo Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:31 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,15 +44,15 @@ frexp(value, eptr)
 	int *eptr;
 {
 	union {
-                double v;
-                struct {
+		double v;
+		struct {
 			u_int u_mant1 :  7;
 			u_int   u_exp :  8;
 			u_int  u_sign :  1;
 			u_int u_mant2 : 16;
 			u_int u_mant3 : 32;
-                } s;
-        } u;
+		} s;
+	} u;
 
 	if (value) {
 		u.v = value;
diff --git a/lib/libc/arch/vax/string/Makefile.inc b/lib/libc/arch/vax/string/Makefile.inc
index 0714508b2e0..fc67fc6c438 100644
--- a/lib/libc/arch/vax/string/Makefile.inc
+++ b/lib/libc/arch/vax/string/Makefile.inc
@@ -1,7 +1,7 @@
-#       $OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:18:43 tholo Exp $
+#       $OpenBSD: Makefile.inc,v 1.4 1997/07/23 20:55:31 kstailey Exp $
 
 SRCS+=  bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.S memset.S \
-        rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlen.c \
-        strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
-        strspn.c strstr.c swab.c
+	rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlen.c \
+	strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
+	strspn.c strstr.c swab.c
 SRCS+=	memcpy.S memmove.S
diff --git a/lib/libc/compat-43/sigvec.3 b/lib/libc/compat-43/sigvec.3
index b3918c42e76..bf329210fbe 100644
--- a/lib/libc/compat-43/sigvec.3
+++ b/lib/libc/compat-43/sigvec.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigvec.3,v 1.2 1996/08/19 08:19:44 tholo Exp $
+.\"	$OpenBSD: sigvec.3,v 1.3 1997/07/23 20:58:26 kstailey Exp $
 .\"
 .Dd April 29, 1991
 .Dt SIGVEC 3
@@ -41,7 +41,7 @@
 .Fd #include <signal.h>
 .Bd -literal
 struct sigvec {
-        void     (*sv_handler)();
+	void	 (*sv_handler)();
 	sigset_t sv_mask;
 	int      sv_flags;
 };
@@ -134,7 +134,7 @@ The following is a list of all signals
 with names as in the include file
 .Aq Pa signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "  NAME  " "	  Default Action  " "	              Description"
+.It Sy "  NAME	" "	  Default Action  " "		      Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
 .It Dv SIGINT No "	terminate process" "	interrupt program"
 .It Dv SIGQUIT No "	create core image" "	quit program"
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index 6f78afdddfe..42418767eea 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcrypt.c,v 1.7 1997/07/09 01:08:18 millert Exp $	*/
+/*	$OpenBSD: bcrypt.c,v 1.8 1997/07/23 20:58:26 kstailey Exp $	*/
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -218,17 +218,17 @@ bcrypt(key, salt)
 
 	/* Check for minor versions */
 	if (salt[1] != '$') {
-	         switch(salt[1]) {
+		 switch(salt[1]) {
 		 case 'a':
-		         /* 'ab' should not yield the same as 'abab' */
-		         minor = salt[1];
+			 /* 'ab' should not yield the same as 'abab' */
+			 minor = salt[1];
 			 salt++;
 			 break;
 		 default:
-		         return error;
+			 return error;
 		 }
 	} else
-	         minor = 0;
+		 minor = 0;
 
 	/* Discard version + "$" identifier */
 	salt += 2;
@@ -282,7 +282,7 @@ bcrypt(key, salt)
 	encrypted[i++] = '$';
 	encrypted[i++] = BCRYPT_VERSION;
 	if (minor)
-	        encrypted[i++] = minor;
+		encrypted[i++] = minor;
 	encrypted[i++] = '$';
 
 	snprintf(encrypted + i, 4, "%2.2u$", logr);
diff --git a/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c
index 46568d23188..b9cd41f960f 100644
--- a/lib/libc/crypt/blowfish.c
+++ b/lib/libc/crypt/blowfish.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: blowfish.c,v 1.4 1997/04/30 05:57:05 tholo Exp $ */
+/* $OpenBSD: blowfish.c,v 1.5 1997/07/23 20:58:27 kstailey Exp $ */
 /*
  * Blowfish block cipher for OpenBSD
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -429,13 +429,13 @@ Blowfish_initstate(c)
 			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
 		0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
 	},
-        {
-                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-                0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-                0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-                0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-                0x9216d5d9, 0x8979fb1b
-        } };
+	{
+		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+		0x9216d5d9, 0x8979fb1b
+	} };
 
 	*c = initstate;
 
@@ -475,44 +475,43 @@ Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
 #else
 void
 Blowfish_expand0state(c, key, keybytes)
-        blf_ctx *c;
-        const u_int8_t *key;
-        u_int16_t keybytes;
+	blf_ctx *c;
+	const u_int8_t *key;
+	u_int16_t keybytes;
 #endif
 {
-        u_int16_t i;
-        u_int16_t j;
-        u_int16_t k;
-        u_int32_t temp;
-        u_int32_t datal;
-        u_int32_t datar;
- 
-        j = 0;
-        for (i = 0; i < BLF_N + 2; i++) {
-                /* Extract 4 int8 to 1 int32 from keystream */
-                temp = Blowfish_stream2word(key, keybytes, &j);
-                c->P[i] = c->P[i] ^ temp;
-        }
- 
-        j = 0;
-        datal = 0x00000000;
-        datar = 0x00000000;
-        for (i = 0; i < BLF_N + 2; i += 2) {
-                Blowfish_encipher(c, &datal, &datar);
- 
-                c->P[i] = datal;
-                c->P[i + 1] = datar;
-        }
- 
-        for (i = 0; i < 4; i++) {
-                for (k = 0; k < 256; k += 2) {
-                        Blowfish_encipher(c, &datal, &datar);
- 
-                        c->S[i][k] = datal;
-                        c->S[i][k + 1] = datar;
-                }
-        }
- 
+	u_int16_t i;
+	u_int16_t j;
+	u_int16_t k;
+	u_int32_t temp;
+	u_int32_t datal;
+	u_int32_t datar;
+
+	j = 0;
+	for (i = 0; i < BLF_N + 2; i++) {
+		/* Extract 4 int8 to 1 int32 from keystream */
+		temp = Blowfish_stream2word(key, keybytes, &j);
+		c->P[i] = c->P[i] ^ temp;
+	}
+
+	j = 0;
+	datal = 0x00000000;
+	datar = 0x00000000;
+	for (i = 0; i < BLF_N + 2; i += 2) {
+		Blowfish_encipher(c, &datal, &datar);
+
+		c->P[i] = datal;
+		c->P[i + 1] = datar;
+	}
+
+	for (i = 0; i < 4; i++) {
+		for (k = 0; k < 256; k += 2) {
+			Blowfish_encipher(c, &datal, &datar);
+
+			c->S[i][k] = datal;
+			c->S[i][k + 1] = datar;
+		}
+	}
 }
 
 
diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c
index 318626a2e64..7ec60f38e0c 100644
--- a/lib/libc/crypt/md5crypt.c
+++ b/lib/libc/crypt/md5crypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5crypt.c,v 1.8 1997/06/29 05:48:02 deraadt Exp $	*/
+/*	$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -13,7 +13,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.8 1997/06/29 05:48:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
@@ -146,7 +146,7 @@ md5crypt(pw, salt)
 	l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
 	l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
 	l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
-	l =                    final[11]                ; to64(p,l,2); p += 2;
+	l =		       final[11]		; to64(p,l,2); p += 2;
 	*p = '\0';
 
 	/* Don't leave anything around in vm they could use. */
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index fecc36c4000..7fb01943bb1 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: bt_open.c,v 1.4 1996/08/26 00:17:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: bt_open.c,v 1.5 1997/07/23 21:00:25 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -424,7 +424,7 @@ byteorder()
 
 int
 __bt_fd(dbp)
-        const DB *dbp;
+	const DB *dbp;
 {
 	BTREE *t;
 
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index 7851f199660..6615bd79196 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: bt_put.c,v 1.3 1996/08/19 08:20:11 tholo Exp $";
+static char rcsid[] = "$OpenBSD: bt_put.c,v 1.4 1997/07/23 21:00:26 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -105,7 +105,7 @@ __bt_put(dbp, key, data, flags)
 		 */
 		if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
 		    !F_ISSET(&t->bt_cursor,
-		        CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
+			CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
 			break;
 		/* FALLTHROUGH */
 	default:
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index e762e5ff5f3..05653547a25 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: hash.c,v 1.4 1996/09/15 09:30:47 tholo Exp $";
+static char rcsid[] = "$OpenBSD: hash.c,v 1.5 1997/07/23 21:00:27 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -224,8 +224,8 @@ __hash_open(file, flags, mode, info, dflags)
 	    "LAST FREED      ", hashp->LAST_FREED,
 	    "HIGH MASK       ", hashp->HIGH_MASK,
 	    "LOW  MASK       ", hashp->LOW_MASK,
-	    "NSEGS           ", hashp->nsegs,
-	    "NKEYS           ", hashp->NKEYS);
+	    "NSEGS	     ", hashp->nsegs,
+	    "NKEYS	     ", hashp->NKEYS);
 #endif
 #ifdef HASH_STATISTICS
 	hash_overflows = hash_accesses = hash_collisions = hash_expansions = 0;
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 90704cbba66..54831fc0d89 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: page.h,v 1.3 1996/08/19 08:20:43 tholo Exp $
+ *	$OpenBSD: page.h,v 1.4 1997/07/23 21:00:28 kstailey Exp $
  */
 
 /*
@@ -51,7 +51,7 @@
  *	+--------+---------------------+
  *	|	 F R E E A R E A       |
  *	+--------------+---------------+
- *	|  <---- - - - | data          |
+ *	|  <---- - - - | data	       |
  *	+--------+-----+----+----------+
  *	|  key   | data     | key      |
  *	+--------+----------+----------+
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index 0ab2cd9349a..b29adb671e1 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rec_open.c,v 1.3 1996/08/19 08:21:05 tholo Exp $";
+static char rcsid[] = "$OpenBSD: rec_open.c,v 1.4 1997/07/23 21:00:29 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -205,7 +205,7 @@ slow:			if ((t->bt_rfp = fdopen(rfd, "r")) == NULL)
 	if (openinfo && openinfo->flags & R_SNAPSHOT &&
 	    !F_ISSET(t, R_EOF | R_INMEM) &&
 	    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-                goto err;
+		goto err;
 	return (dbp);
 
 einval:	errno = EINVAL;
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index c2c0d8c7f08..d554bb673a6 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rec_search.c,v 1.3 1996/08/19 08:21:08 tholo Exp $";
+static char rcsid[] = "$OpenBSD: rec_search.c,v 1.4 1997/07/23 21:00:30 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -119,8 +119,8 @@ err:	sverrno = errno;
 				--GETRINTERNAL(h, parent->index)->nrecs;
 			else
 				++GETRINTERNAL(h, parent->index)->nrecs;
-                        mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-                }
+			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
+		}
 	errno = sverrno;
 	return (NULL);
 }
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 93c71eccb9b..2bb130fe089 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 1997/02/03 00:10:08 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 1997/07/23 21:04:03 kstailey Exp $
 
 # gen sources
 .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -61,7 +61,7 @@ MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
 	directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \
 	directory.3 telldir.3
 MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \
-        err.3 warnx.3 err.3 vwarnx.3
+	err.3 warnx.3 err.3 vwarnx.3
 MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \
 	exec.3 execv.3 exec.3 execvp.3
 MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 8b81c83f10a..56d6f081820 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.3 1996/09/15 09:30:58 tholo Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.4 1997/07/23 21:04:04 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -91,7 +91,7 @@ getdiskbyname(name)
 		dp->d_flags |= D_BADSECT;
 
 #define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
+	{ long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
 #define	getnum(field, dname) \
 	{ long f; cgetnum(buf, dname, &f); field = f; }
 
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index 607b7375792..e3833211cbe 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getcap.c,v 1.5 1997/06/10 21:44:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: getcap.c,v 1.6 1997/07/23 21:04:04 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -80,18 +80,18 @@ cgetset(ent)
 	if (ent == NULL) {
 		if (toprec)
 			free(toprec);
-                toprec = NULL;
-                topreclen = 0;
-                return (0);
-        }
-        topreclen = strlen(ent);
-        if ((toprec = malloc (topreclen + 1)) == NULL) {
+		toprec = NULL;
+		topreclen = 0;
+		return (0);
+	}
+	topreclen = strlen(ent);
+	if ((toprec = malloc (topreclen + 1)) == NULL) {
 		errno = ENOMEM;
-                return (-1);
+		return (-1);
 	}
 	gottoprec = 0;
-        (void)strcpy(toprec, ent);
-        return (0);
+	(void)strcpy(toprec, ent);
+	return (0);
 }
 
 /*
@@ -207,7 +207,7 @@ getent(cap, len, db_array, fd, name, depth, nfield)
 
 	/*
 	 * Check if we have a top record from cgetset().
-         */
+	 */
 	if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) {
 		if ((record = malloc (topreclen + BFRAG)) == NULL) {
 			errno = ENOMEM;
@@ -643,7 +643,7 @@ cgetclose()
  */
 int
 cgetnext(bp, db_array)
-        register char **bp;
+	register char **bp;
 	char **db_array;
 {
 	size_t len;
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 91675c0e4e5..153f5521c0d 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetgrent.c,v 1.5 1997/02/03 00:10:08 millert Exp $	*/
+/*	$OpenBSD: getnetgrent.c,v 1.6 1997/07/23 21:04:05 kstailey Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.5 1997/02/03 00:10:08 millert Exp $";
+static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.6 1997/07/23 21:04:05 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -77,7 +77,7 @@ static int		 in_find __P((char *, struct stringlist *,
 static char		*in_lookup1 __P((const char *, const char *,
 					 const char *, int));
 static int		 in_lookup __P((const char *, const char *,
-				        const char *, const char *, int));
+					const char *, const char *, int));
 
 /*
  * _ng_sl_init(): Initialize a string list
@@ -253,8 +253,8 @@ lookup(ypdom, name, line, bywhat)
 	int		  bywhat;
 {
 #ifdef YP
-	int             i;
-	char           *map = NULL;
+	int		i;
+	char	       *map = NULL;
 #endif
 
 	if (_ng_db) {
@@ -344,8 +344,8 @@ _ng_parse(p, name, ng)
 			}
 			return _NG_GROUP;
 		} else {
-			char           *np;
-			int             i;
+			char	       *np;
+			int		i;
 
 			for (np = *p; **p && !_NG_ISSPACE(**p); (*p)++)
 				continue;
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 12aeeb618e0..854e02acea5 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,7 +33,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.10 1997/04/18 18:55:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getpwent.c,v 1.11 1997/07/23 21:04:06 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -797,7 +797,7 @@ pwuid_netgrp:
 							    free(__ypcurrent);
 							__ypcurrent = NULL;
 							/*
-                                                         * just because this
+							 * just because this
 							 * user is bad, doesn't
 							 * mean they all are.
 							 */
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 0d2e28dc5f5..90bd795ff34 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.20 1997/07/01 05:59:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.21 1997/07/23 21:04:06 kstailey Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -294,49 +294,49 @@ __elf_fdnlist(fd, list)
 	Elf32_Sym *s;
 	Elf32_Ehdr ehdr;
 	Elf32_Shdr *shdr = NULL;
-        Elf32_Word shdr_size;
+	Elf32_Word shdr_size;
 	struct stat st;
 
-        /* Make sure obj is OK */
+	/* Make sure obj is OK */
 	if (lseek(fd, (off_t)0, SEEK_SET) == -1 ||
 	    read(fd, &ehdr, sizeof(Elf32_Ehdr)) != sizeof(Elf32_Ehdr) ||
 	    !__elf_is_okay__(&ehdr) ||
 	    fstat(fd, &st) < 0)
 		return (-1);
 
-        /* calculate section header table size */
-        shdr_size = ehdr.e_shentsize * ehdr.e_shnum;
+	/* calculate section header table size */
+	shdr_size = ehdr.e_shentsize * ehdr.e_shnum;
 
-        /* Make sure it's not too big to mmap */
+	/* Make sure it's not too big to mmap */
 	if (shdr_size > SIZE_T_MAX) {
 		errno = EFBIG;
 		return (-1);
 	}
 
-        /* mmap section header table */
+	/* mmap section header table */
 	shdr = (Elf32_Shdr *)mmap(NULL, (size_t)shdr_size,
-                                  PROT_READ, 0, fd, (off_t) ehdr.e_shoff);
+				  PROT_READ, 0, fd, (off_t) ehdr.e_shoff);
 	if (shdr == (Elf32_Shdr *)-1)
 		return (-1);
 
-        /*
-         * Find the symbol table entry and it's corresponding
-         * string table entry.  Version 1.1 of the ABI states
-         * that there is only one symbol table but that this
-         * could change in the future.
-         */
-        for (i = 0; i < ehdr.e_shnum; i++) {
-                if (shdr[i].sh_type == SHT_SYMTAB) {
-                        symoff = shdr[i].sh_offset;
-                        symsize = shdr[i].sh_size;
-                        symstroff = shdr[shdr[i].sh_link].sh_offset;
-                        symstrsize = shdr[shdr[i].sh_link].sh_size;
-                        break;
-                }
-        }
-
-        /* Flush the section header table */
-        munmap((caddr_t)shdr, shdr_size);
+	/*
+	 * Find the symbol table entry and it's corresponding
+	 * string table entry.	Version 1.1 of the ABI states
+	 * that there is only one symbol table but that this
+	 * could change in the future.
+	 */
+	for (i = 0; i < ehdr.e_shnum; i++) {
+		if (shdr[i].sh_type == SHT_SYMTAB) {
+			symoff = shdr[i].sh_offset;
+			symsize = shdr[i].sh_size;
+			symstroff = shdr[shdr[i].sh_link].sh_offset;
+			symstrsize = shdr[shdr[i].sh_link].sh_size;
+			break;
+		}
+	}
+
+	/* Flush the section header table */
+	munmap((caddr_t)shdr, shdr_size);
 
 	/* Check for files too large to mmap. */
 	/* XXX is this really possible? */
@@ -372,16 +372,16 @@ __elf_fdnlist(fd, list)
 		++nent;
 	}
 
-        /* Don't process any further if object is stripped. */
-        /* ELFism - dunno if stripped by looking at header */
-        if (symoff == 0)
-                goto done;
-                
+	/* Don't process any further if object is stripped. */
+	/* ELFism - dunno if stripped by looking at header */
+	if (symoff == 0)
+		goto done;
+		
 	if (lseek(fd, (off_t) symoff, SEEK_SET) == -1) {
-                nent = -1;
-                goto done;
-        }
-        
+		nent = -1;
+		goto done;
+	}
+
 	while (symsize > 0) {
 		cc = MIN(symsize, sizeof(sbuf));
 		if (read(fd, sbuf, cc) != cc)
@@ -393,36 +393,36 @@ __elf_fdnlist(fd, list)
 			if (soff == 0)
 				continue;
 			for (p = list; !ISLAST(p); p++) {
-                                /*
-                                 * XXX - ABI crap, they
-                                 * really fucked this up
-                                 * for MIPS and PowerPC
-                                 */
+				/*
+				 * XXX - ABI crap, they
+				 * really fucked this up
+				 * for MIPS and PowerPC
+				 */
 				if (!strcmp(&strtab[soff],
 				    ((ehdr.e_machine == EM_MIPS) ||
-				     (ehdr.e_machine == EM_PPC)) ? 
+				     (ehdr.e_machine == EM_PPC)) ?
 				    p->n_un.n_name+1 :
 				    p->n_un.n_name)) {
 					p->n_value = s->st_value;
 
-                                        /* XXX - type conversion */
-                                        /*       is pretty rude. */
+					/* XXX - type conversion */
+					/*	 is pretty rude. */
 					switch(ELF32_ST_TYPE(s->st_info)) {
-                                                case STT_NOTYPE:
-                                                        p->n_type = N_UNDF;
-                                                        break;
-                                                case STT_OBJECT:
-                                                        p->n_type = N_DATA;
-                                                        break;
-                                                case STT_FUNC:
-                                                        p->n_type = N_TEXT;
-                                                        break;
-                                                case STT_FILE:
-                                                        p->n_type = N_FN;
-                                                        break;
+						case STT_NOTYPE:
+							p->n_type = N_UNDF;
+							break;
+						case STT_OBJECT:
+							p->n_type = N_DATA;
+							break;
+						case STT_FUNC:
+							p->n_type = N_TEXT;
+							break;
+						case STT_FILE:
+							p->n_type = N_FN;
+							break;
 					}
 					if (ELF32_ST_BIND(s->st_info) ==
-                                            STB_LOCAL)
+					    STB_LOCAL)
 						p->n_type = N_EXT;
 					p->n_desc = 0;
 					p->n_other = 0;
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index bbf50532836..f5f41277202 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setmode.c,v 1.5 1997/03/07 02:15:18 millert Exp $	*/
+/*	$OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $	*/
 /*	$NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: setmode.c,v 1.5 1997/03/07 02:15:18 millert Exp $";
+static char rcsid[] = "$OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -195,10 +195,10 @@ setmode(p)
 	 * as best we can.
 	 */
 	sigfillset(&sigset);
-        (void)sigprocmask(SIG_BLOCK, &sigset, &sigoset);
+	(void)sigprocmask(SIG_BLOCK, &sigset, &sigoset);
 	(void)umask(mask = umask(0));
 	mask = ~mask;
-        (void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
+	(void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
 
 	setlen = SET_LEN + 2;
 	
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 390c92e2bb4..8da05c559ef 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: signal.3,v 1.4 1996/12/13 21:24:12 michaels Exp $
+.\"	$OpenBSD: signal.3,v 1.5 1997/07/23 21:04:07 kstailey Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -83,7 +83,7 @@ an interrupt.
 These signals are defined in the file
 .Aq Pa signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "  Name  " "	  Default Action  " "	              Description"
+.It Sy "  Name	" "	  Default Action  " "		      Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
 .It Dv SIGINT No "	terminate process" "	interrupt program"
 .It Dv SIGQUIT No "	create core image" "	quit program"
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 9f72ecbb554..6c3284fb563 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utime.3,v 1.2 1996/08/19 08:27:22 tholo Exp $
+.\"	$OpenBSD: utime.3,v 1.3 1997/07/23 21:04:08 kstailey Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -68,8 +68,8 @@ is assumed to be a pointer to a utimbuf structure, as defined in
 .Aq Pa utime.h :
 .Bd -literal -offset indent
 struct utimbuf {
-	time_t actime;          /* Access time */
-	time_t modtime;         /* Modification time */
+	time_t actime;		/* Access time */
+	time_t modtime;		/* Modification time */
 } ;
 .Ed
 .Pp