*** /old/src/bin/as/as17.s	Wed Dec 13 16:43:25 1989
--- /usr/src/bin/as/as17.s	Thu Aug 27 20:41:43 1992
***************
*** 143,149 ****
  exlsh:
  	clr	r5
  	jsr	pc,combin
! 	als	r1,r2
  	br	eoprnd
  
  exmod:
--- 143,149 ----
  exlsh:
  	clr	r5
  	jsr	pc,combin
! 	ash	r1,r2
  	br	eoprnd
  
  exmod:
***************
*** 152,158 ****
  	mov	r1,-(sp)
  	mov	r2,r1
  	clr	r0
! 	dvd	(sp)+,r0
  	mov	r1,r2
  	br	eoprnd
  
--- 152,158 ----
  	mov	r1,-(sp)
  	mov	r2,r1
  	clr	r0
! 	div	(sp)+,r0
  	mov	r1,r2
  	br	eoprnd
  
***************
*** 184,190 ****
  exmul:
  	clr	r5
  	jsr	pc,combin
! 	mpy	r2,r1
  	mov	r1,r2
  	br	eoprnd
  
--- 184,190 ----
  exmul:
  	clr	r5
  	jsr	pc,combin
! 	mul	r2,r1
  	mov	r1,r2
  	br	eoprnd
  
***************
*** 194,200 ****
  	mov	r1,-(sp)
  	mov	r2,r1
  	clr	r0
! 	dvd	(sp)+,r0
  	mov	r0,r2
  	br	eoprnd
  
--- 194,200 ----
  	mov	r1,-(sp)
  	mov	r2,r1
  	clr	r0
! 	div	(sp)+,r0
  	mov	r0,r2
  	br	eoprnd
  
*** /old/src/bin/as/as19.s	Wed Dec 13 16:43:31 1989
--- /usr/src/bin/as/as19.s	Tue Jun 30 22:34:56 1992
***************
*** 3,10 ****
  
  / a9 -- pdp-11 assembler pass 1
  
- eae = 0
- 
  / key to types
  
  /	0	undefined
--- 3,8 ----
***************
*** 57,79 ****
  <sp\0\0\0\0\0\0>;	24;000006
  <pc\0\0\0\0\0\0>;	24;000007
  
- .if eae
- 
- /eae & switches
- 
- <csw\0\0\0\0\0>;	01;177570
- <div\0\0\0\0\0>;	01;177300
- <ac\0\0\0\0\0\0>;	01;177302
- <mq\0\0\0\0\0\0>;	01;177304
- <mul\0\0\0\0\0>;	01;177306
- <sc\0\0\0\0\0\0>;	01;177310
- <sr\0\0\0\0\0\0>;	01;177311
- <nor\0\0\0\0\0>;	01;177312
- <lsh\0\0\0\0\0>;	01;177314
- <ash\0\0\0\0\0>;	01;177316
- 
- .endif
- 
  / double operand
  
  <mov\0\0\0\0\0>;	13;0010000
--- 55,60 ----
***************
*** 168,173 ****
--- 149,157 ----
  <stst\0\0\0\0>;		15;0170300
  <mfps\0\0\0\0>;		15;0106700
  <mtps\0\0\0\0>;		15;0106400
+ <csm\0\0\0\0\0>;	15;0007000
+ <tstset\0\0>;		15;0007200
+ <wrtlck\0\0>;		15;0007300
  
  / jsr
  
***************
*** 235,250 ****
  
  / 11/45 operations
  
- <als\0\0\0\0\0>;	30;072000
- <alsc\0\0\0\0>;		30;073000
- <mpy\0\0\0\0\0>;	30;070000
- .if eae-1
  <mul\0\0\0\0\0>;	30;070000
  <div\0\0\0\0\0>;	30;071000
  <ash\0\0\0\0\0>;	30;072000
  <ashc\0\0\0\0>;		30;073000
- .endif
- <dvd\0\0\0\0\0>;	30;071000
  <xor\0\0\0\0\0>;	07;074000
  <sxt\0\0\0\0\0>;	15;006700
  <mark\0\0\0\0>;		11;006400
--- 219,228 ----
*** /old/src/bin/as/as22.s	Sun Dec 24 16:53:18 1989
--- /usr/src/bin/as/as22.s	Thu Aug 27 20:42:41 1992
***************
*** 144,150 ****
  	mov	$4,r1
  2:
  	clr	r2
! 	dvd	$10.,r2
  	add	$'0,r3
  	movb	r3,-(r0)
  	mov	r2,r3
--- 144,150 ----
  	mov	$4,r1
  2:
  	clr	r2
! 	div	$10.,r2
  	add	$'0,r3
  	movb	r3,-(r0)
  	mov	r2,r3
*** /old/src/bin/as/as27.s	Sun Dec 24 21:29:19 1989
--- /usr/src/bin/as/as27.s	Thu Aug 27 20:43:23 1992
***************
*** 159,165 ****
  exlsh:
  	mov	$relte2,r5
  	jsr	pc,combin
! 	als	r1,r2
  	br	eoprnd
  
  exmod:
--- 159,165 ----
  exlsh:
  	mov	$relte2,r5
  	jsr	pc,combin
! 	ash	r1,r2
  	br	eoprnd
  
  exmod:
***************
*** 168,174 ****
  	mov	r3,r0
  	mov	r2,r3
  	clr	r2
! 	dvd	r1,r2
  	mov	r3,r2
  	mov	r0,r3
  	br	eoprnd
--- 168,174 ----
  	mov	r3,r0
  	mov	r2,r3
  	clr	r2
! 	div	r1,r2
  	mov	r3,r2
  	mov	r0,r3
  	br	eoprnd
***************
*** 201,207 ****
  exmul:
  	mov	$relte2,r5
  	jsr	pc,combin
! 	mpy	r2,r1
  	mov	r1,r2
  	br	eoprnd
  
--- 201,207 ----
  exmul:
  	mov	$relte2,r5
  	jsr	pc,combin
! 	mul	r2,r1
  	mov	r1,r2
  	br	eoprnd
  
***************
*** 211,217 ****
  	mov	r3,r0
  	mov	r2,r3
  	clr	r2
! 	dvd	r1,r2
  	mov	r0,r3
  	br	eoprnd
  
--- 211,217 ----
  	mov	r3,r0
  	mov	r2,r3
  	clr	r2
! 	div	r1,r2
  	mov	r0,r3
  	br	eoprnd
  
***************
*** 258,264 ****
  	clr	maxtyp
  	jsr	pc,maprel
  	mov	r0,r1
! 	mpy	$6,r1
  	mov	r3,r0
  	jsr	pc,maprel
  	add	r5,r0
--- 258,264 ----
  	clr	maxtyp
  	jsr	pc,maprel
  	mov	r0,r1
! 	mul	$6,r1
  	mov	r3,r0
  	jsr	pc,maprel
  	add	r5,r0
*** /old/src/bin/as/as29.s	Sun Dec 24 15:06:33 1989
--- /usr/src/bin/as/as29.s	Tue Jun 30 22:37:56 1992
***************
*** 3,10 ****
  
  / as9 -- PDP-11 assembler pass 2
  
- eae = 0
- 
  	.data
  symtab:
  
--- 3,8 ----
***************
*** 24,46 ****
  24;000006 /sp
  24;000007 /pc
  
- 
- .if eae
- /eae & switches
- 
- 01;177570 /csw
- 01;177300 /div
- 01;177302 /ac
- 01;177304 /mq
- 01;177306 /mul
- 01;177310 /sc
- 01;177311 /sr
- 01;177312 /nor
- 01;177314 /lsh
- 01;177316 /ash
- 
- .endif
- 
  / double operand
  
  13;0010000 /mov
--- 22,27 ----
***************
*** 135,140 ****
--- 116,124 ----
  15;0170300 /stst
  15;0106700 /mfps
  15;0106400 /mtps
+ 15;0007000 /csm
+ 15;0007200 /tstset
+ 15;0007300 /wrtlck
  
  / jsr
  
***************
*** 202,217 ****
  
  / 11/45 operations
  
! 30;072000 /als (ash)
! 30;073000 /alsc (ashc)
! 30;070000 /mpy
! .if eae-1
! 30;070000/ mul
! 30;071000 / div
! 30;072000 / ash
  30;073000 /ashc
- .endif
- 30;071000 /dvd
  07;074000 /xor
  15;006700 /sxt
  11;006400 /mark
--- 186,195 ----
  
  / 11/45 operations
  
! 30;070000 /mul
! 30;071000 /div
! 30;072000 /ash
  30;073000 /ashc
  07;074000 /xor
  15;006700 /sxt
  11;006400 /mark
*** /old/src/bin/csh/alloc.c	Sun Feb  8 14:27:23 1987
--- /usr/src/bin/csh/alloc.c	Sat Aug 31 00:03:00 1991
***************
*** 4,13 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  /* From "@(#)malloc.c	5.5 (Berkeley) 2/25/86"; */
  static char *sccsid = "@(#)alloc.c	5.3 (Berkeley) 3/29/86";
! #endif not lint
  
  /*
   * malloc.c (Caltech) 2/21/82
--- 4,13 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  /* From "@(#)malloc.c	5.5 (Berkeley) 2/25/86"; */
  static char *sccsid = "@(#)alloc.c	5.3 (Berkeley) 3/29/86";
! #endif
  
  /*
   * malloc.c (Caltech) 2/21/82
*** /old/src/bin/csh/alloc11.c	Sun Feb  8 14:27:29 1987
--- /usr/src/bin/csh/alloc11.c	Sat Aug 31 00:03:33 1991
***************
*** 1,4 ****
--- 1,6 ----
+ #if	!defined(lint) && defined(DOSCCS)
  static	char *sccsid = "@(#)alloc.c 4.1 10/9/80";
+ #endif
  
  #include "sh.local.h"
  #ifdef debug
*** /old/src/bin/csh/doprnt.c	Sun Feb  8 14:27:24 1987
--- /usr/src/bin/csh/doprnt.c	Sat Aug 31 00:03:56 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  	.ascii	"@(#)doprnt.c	5.2 (Berkeley) 6/6/85"
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  	.ascii	"@(#)doprnt.c	5.2 (Berkeley) 6/6/85"
  #endif
  
*** /old/src/bin/csh/printf.c	Sun Feb  8 14:27:25 1987
--- /usr/src/bin/csh/printf.c	Sat Aug 31 00:04:20 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)printf.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)printf.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.c	Sun Feb  8 14:27:27 1987
--- /usr/src/bin/csh/sh.c	Sat Aug 31 00:04:45 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.c	5.3 (Berkeley) 3/29/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.c	5.3 (Berkeley) 3/29/86";
  #endif
  
*** /old/src/bin/csh/sh.char.c	Sun Feb  8 14:27:24 1987
--- /usr/src/bin/csh/sh.char.c	Sat Aug 31 00:05:16 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.char.c	5.3 (Berkeley) 3/29/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.char.c	5.3 (Berkeley) 3/29/86";
  #endif
  
*** /old/src/bin/csh/sh.dir.c	Sun Feb  8 14:27:28 1987
--- /usr/src/bin/csh/sh.dir.c	Sat Aug 31 00:05:37 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.dir.c	5.3 (Berkeley) 6/11/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.dir.c	5.3 (Berkeley) 6/11/85";
  #endif
  
*** /old/src/bin/csh/sh.dol.c	Sun Feb  8 14:27:27 1987
--- /usr/src/bin/csh/sh.dol.c	Sat Aug 31 00:05:59 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.dol.c	5.3 (Berkeley) 3/29/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.dol.c	5.3 (Berkeley) 3/29/86";
  #endif
  
*** /old/src/bin/csh/sh.err.c	Sun Feb  8 14:27:25 1987
--- /usr/src/bin/csh/sh.err.c	Sat Aug 31 00:06:19 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.err.c	5.3 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.err.c	5.3 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.exec.c	Sun Dec 25 20:53:38 1988
--- /usr/src/bin/csh/sh.exec.c	Sat Aug 31 00:06:43 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.exec.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.exec.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.exp.c	Sun Feb  8 14:27:25 1987
--- /usr/src/bin/csh/sh.exp.c	Sat Aug 31 00:07:02 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.exp.c	5.3 (Berkeley) 6/23/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.exp.c	5.3 (Berkeley) 6/23/85";
  #endif
  
*** /old/src/bin/csh/sh.file.c	Sun Feb  8 14:27:24 1987
--- /usr/src/bin/csh/sh.file.c	Sat Aug 31 00:07:22 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.file.c	5.6 (Berkeley) 5/18/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.file.c	5.6 (Berkeley) 5/18/86";
  #endif
  
*** /old/src/bin/csh/sh.func.c	Sun Jul 19 12:03:23 1987
--- /usr/src/bin/csh/sh.func.c	Sat Aug 31 00:07:46 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.func.c	5.3 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.func.c	5.3 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.glob.c	Sun Feb  8 14:27:27 1987
--- /usr/src/bin/csh/sh.glob.c	Sat Aug 31 00:08:21 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.glob.c	5.4 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.glob.c	5.4 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.hist.c	Sun Feb  8 14:27:23 1987
--- /usr/src/bin/csh/sh.hist.c	Sat Aug 31 00:08:48 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.hist.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.hist.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.init.c	Sun Feb 15 18:37:11 1987
--- /usr/src/bin/csh/sh.init.c	Sat Aug 31 00:09:14 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.init.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.init.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.lex.c	Wed Jun  6 17:09:06 1990
--- /usr/src/bin/csh/sh.lex.c	Sat Aug 31 00:09:42 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.lex.c	5.4 (Berkeley) 3/29/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.lex.c	5.4 (Berkeley) 3/29/86";
  #endif
  
*** /old/src/bin/csh/sh.misc.c	Sun Feb  8 14:27:25 1987
--- /usr/src/bin/csh/sh.misc.c	Sat Aug 31 00:10:02 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.misc.c	5.3 (Berkeley) 3/29/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.misc.c	5.3 (Berkeley) 3/29/86";
  #endif
  
*** /old/src/bin/csh/sh.parse.c	Sun Feb  8 14:27:26 1987
--- /usr/src/bin/csh/sh.parse.c	Sat Aug 31 00:10:31 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.parse.c	5.3 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.parse.c	5.3 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.print.c	Sun Feb  8 14:27:23 1987
--- /usr/src/bin/csh/sh.print.c	Sat Aug 31 00:10:56 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.print.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.print.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.proc.c	Sun Feb  8 14:27:24 1987
--- /usr/src/bin/csh/sh.proc.c	Sat Aug 31 00:11:22 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.proc.c	5.5 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.proc.c	5.5 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.sem.c	Fri Aug 19 20:52:10 1988
--- /usr/src/bin/csh/sh.sem.c	Sat Aug 31 00:11:45 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.sem.c	5.4 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.sem.c	5.4 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/csh/sh.set.c	Sun Feb  8 14:27:26 1987
--- /usr/src/bin/csh/sh.set.c	Sat Aug 31 00:12:08 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.set.c	5.2 (Berkeley) 6/6/85";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.set.c	5.2 (Berkeley) 6/6/85";
  #endif
  
*** /old/src/bin/csh/sh.time.c	Wed May 20 18:57:14 1987
--- /usr/src/bin/csh/sh.time.c	Sat Aug 31 00:12:32 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sh.time.c	5.4 (Berkeley) 5/13/86";
  #endif
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sh.time.c	5.4 (Berkeley) 5/13/86";
  #endif
  
*** /old/src/bin/dd.c	Sun Feb  8 14:24:49 1987
--- /usr/src/bin/dd.c	Sun Mar 31 00:23:49 1991
***************
*** 313,319 ****
  			perror("read");
  			if((cflag&NERR) == 0) {
  				flsh();
! 				term();
  			}
  			ibc = 0;
  			for(c=0; c<ibs; c++)
--- 313,319 ----
  			perror("read");
  			if((cflag&NERR) == 0) {
  				flsh();
! 				term(1);
  			}
  			ibc = 0;
  			for(c=0; c<ibs; c++)
***************
*** 323,329 ****
  		}
  		if(ibc == 0 && --files<=0) {
  			flsh();
! 			term();
  		}
  		if(ibc != ibs) {
  			nipr++;
--- 323,329 ----
  		}
  		if(ibc == 0 && --files<=0) {
  			flsh();
! 			term(0);
  		}
  		if(ibc != ibs) {
  			nipr++;
***************
*** 365,371 ****
  		c = write(obf, obuf, obc);
  		if(c != obc) {
  			perror("write");
! 			term();
  		}
  		obc = 0;
  	}
--- 365,371 ----
  		c = write(obf, obuf, obc);
  		if(c != obc) {
  			perror("write");
! 			term(1);
  		}
  		obc = 0;
  	}
***************
*** 592,602 ****
  		null(c);
  }
  
! term()
  {
  
  	stats();
! 	exit(0);
  }
  
  stats()
--- 592,603 ----
  		null(c);
  }
  
! term(status)
! int status;
  {
  
  	stats();
! 	exit(status);
  }
  
  stats()
*** /old/src/bin/diff/diff.c	Thu Apr  3 08:15:34 1986
--- /usr/src/bin/diff/diff.c	Tue Nov 12 12:31:26 1991
***************
*** 1,4 ****
--- 1,6 ----
+ #if	!defined(lint) && defined(DOSCCS)
  static	char sccsid[] = "@(#)diff.c 4.6 4/3/86";
+ #endif
  
  #include "diff.h"
  /*
*** /old/src/bin/diff/diffdir.c	Tue Aug 28 16:38:23 1984
--- /usr/src/bin/diff/diffdir.c	Tue Nov 12 12:31:29 1991
***************
*** 1,4 ****
--- 1,6 ----
+ #if	!defined(lint) && defined(DOSCCS)
  static	char *sccsid = "@(#)diffdir.c	4.9 (Berkeley) 8/28/84";
+ #endif
  
  #include "diff.h"
  /*
***************
*** 12,18 ****
  #define	DIRECT	8		/* Directory */
  
  struct dir {
! 	u_long	d_ino;
  	short	d_reclen;
  	short	d_namlen;
  	char	*d_entry;
--- 14,20 ----
  #define	DIRECT	8		/* Directory */
  
  struct dir {
! 	ino_t	d_ino;
  	short	d_reclen;
  	short	d_namlen;
  	char	*d_entry;
***************
*** 181,187 ****
--- 183,197 ----
  		done();
  	}
  	nitems = 0;
+ #ifdef	pdp11
+ 	while (readdir(dirp))
+ 		nitems++;
+ 	rewinddir(dirp);
+ 	dp = (struct dir *)calloc(nitems+1, sizeof (struct dir));
+ 	nitems = 0;
+ #else
  	dp = (struct dir *)malloc(sizeof (struct dir));
+ #endif
  	if (dp == 0) {
  		fprintf(stderr, "diff: ran out of memory\n");
  		done();
***************
*** 200,205 ****
--- 210,216 ----
  			}
  			strcpy(ep->d_entry, rp->d_name);
  		}
+ #ifndef	pdp11
  		dp = (struct dir *)realloc((char *)dp,
  			(nitems + 1) * sizeof (struct dir));
  		if (dp == 0) {
***************
*** 206,211 ****
--- 217,223 ----
  			fprintf(stderr, "diff: ran out of memory\n");
  			done();
  		}
+ #endif
  	}
  	dp[nitems].d_entry = 0;		/* delimiter */
  	closedir(dirp);
*** /old/src/bin/diff/diffh.c	Sat Jan 11 11:43:14 1986
--- /usr/src/bin/diff/diffh.c	Tue Nov 12 12:31:33 1991
***************
*** 1,4 ****
--- 1,6 ----
+ #if	!defined(lint) && defined(DOSCCS)
  static	char sccsid[] = "@(#)diffh.c 4.4 11/27/85";
+ #endif
  
  #include <stdio.h>
  #include <ctype.h>
*** /old/src/bin/diff/diffreg.c	Wed Feb 11 23:09:58 1987
--- /usr/src/bin/diff/diffreg.c	Tue Nov 12 12:31:37 1991
***************
*** 1,4 ****
--- 1,6 ----
+ #if	!defined(lint) && defined(DOSCCS)
  static	char sccsid[] = "@(#)diffreg.c 4.16 3/29/86";
+ #endif
  
  #include "diff.h"
  /*
*** /old/src/bin/make/Makefile	Wed Dec 19 10:25:25 1990
--- /usr/src/bin/make/Makefile	Sat Aug 10 11:49:49 1991
***************
*** 4,27 ****
  OBJECTS=ident.o main.o doname.o misc.o files.o dosys.o gram.o 
  LIBES= 
  LINT=	lint -ps
  # 2.11BSD uses the newer ascii format archives, not the old binary format
  CFLAGS=	-O -DASCARCH -I.
  # CFLAGS=	-O -I.
  SEPFLAG= -i
  
  all:	make
  
! make:	${OBJECTS}
! 	${CC} -o make ${CFLAGS} ${SEPFLAG} ${OBJECTS} ${LIBES}
  
  ${OBJECTS}:  defs
  
  clean:
! 	-rm -f *.o gram.c make a.out errs
  
  install:
  	install -s make ${DESTDIR}/bin/make
  
  lint :  dosys.c doname.c files.c main.c misc.c ident.c gram.c
! 	${LINT} dosys.c doname.c files.c main.c misc.c ident.c gram.c
  	rm -f gram.c
--- 4,46 ----
  OBJECTS=ident.o main.o doname.o misc.o files.o dosys.o gram.o 
  LIBES= 
  LINT=	lint -ps
+ XSTR=   /usr/ucb/xstr
  # 2.11BSD uses the newer ascii format archives, not the old binary format
  CFLAGS=	-O -DASCARCH -I.
  # CFLAGS=	-O -I.
  SEPFLAG= -i
  
+ # Special massaging of C files for sharing of strings
+ .c.o:
+ 	${CC} -E ${CFLAGS} $*.c | ${XSTR} -c -
+ 	${CC} -c ${CFLAGS} x.c 
+ 	mv -f x.o $*.o
+ 	rm -f x.c
+ 
  all:	make
  
! make:	${OBJECTS} strings.o
! 	${CC} -o make ${CFLAGS} ${SEPFLAG} ${OBJECTS} strings.o ${LIBES}
  
  ${OBJECTS}:  defs
  
  clean:
! 	-rm -f *.o gram.c make a.out errs x.c xs.c strings
  
  install:
  	install -s make ${DESTDIR}/bin/make
  
  lint :  dosys.c doname.c files.c main.c misc.c ident.c gram.c
! 	${LINT} -DASCARCH dosys.c doname.c files.c main.c misc.c ident.c gram.c
  	rm -f gram.c
+ 
+ gram.c: gram.y
+ 	yacc gram.y
+ 	fgrep -v "static char yaccpar_sccsid" y.tab.c >gram.c
+ 	rm -f y.tab.c
+ 
+ strings.o: strings
+ 	${XSTR}
+ 	${CC} -c xs.c
+ 	mv -f xs.o strings.o
+ 	rm -f xs.c
*** /old/src/bin/make/defs	Sat Jul  8 16:46:48 1989
--- /usr/src/bin/make/defs	Sun Aug 11 12:04:37 1991
***************
*** 27,34 ****
  #define NLEFTS 80
  #define NCHARS 500
  #define NINTS  250
! #define INMAX 1500
! #define OUTMAX 2500
  #define MAXDIR	10
  #else !BSD2_10
  #define HASHSIZE 1021
--- 27,34 ----
  #define NLEFTS 80
  #define NCHARS 500
  #define NINTS  250
! #define INMAX 1350
! #define OUTMAX 2300
  #define MAXDIR	10
  #else !BSD2_10
  #define HASHSIZE 1021
*** /old/src/bin/make/doname.c	Sat Jul  8 15:04:47 1989
--- /usr/src/bin/make/doname.c	Wed Aug 14 05:32:46 1991
***************
*** 20,27 ****
  TIMETYPE *tval;
  {
  int errstat;
! int okdel1;
! int didwork;
  TIMETYPE td, td1, tdep, ptime, ptime1, prestime();
  register struct depblock *q;
  struct depblock *qtemp, *srchdir(), *suffp, *suffp1;
--- 20,27 ----
  TIMETYPE *tval;
  {
  int errstat;
! u_char okdel1;
! u_char didwork;
  TIMETYPE td, td1, tdep, ptime, ptime1, prestime();
  register struct depblock *q;
  struct depblock *qtemp, *srchdir(), *suffp, *suffp1;
***************
*** 30,36 ****
  register struct lineblock *lp;
  struct lineblock *lp1, *lp2;
  #ifdef BSD2_10
! char sourcename[256], prefix[256], temp[256], concsuff[20];
  #else
  char sourcename[BUFSIZ], prefix[BUFSIZ], temp[BUFSIZ], concsuff[20];
  #endif
--- 30,39 ----
  register struct lineblock *lp;
  struct lineblock *lp1, *lp2;
  #ifdef BSD2_10
! /* temp and sourcename are mutually exclusive - save 254 bytes of stack by
!  * reusing sourcename's buffer
! */
! char sourcename[256], prefix[256], *temp = sourcename, concsuff[20];
  #else
  char sourcename[BUFSIZ], prefix[BUFSIZ], temp[BUFSIZ], concsuff[20];
  #endif
***************
*** 47,65 ****
  	 * was that, while macro expansion got done, the .c files in the
  	 * non-local directories wouldn't be found.
  	 */
! 	struct varblock	*vpath_cp, *varptr();
! 	static int	vpath_first;
! 	char	vpath_exp[INMAX];
  
! 	if (!vpath_first) {
! 		vpath_first = 1;
  		vpath_cp = varptr("VPATH");
  		if (vpath_cp->varval) {
  			subst(vpath_cp->varval, vpath_exp);
! 			setvar("VPATH",vpath_exp);
  		}
  	}
  }
  if(p == 0)
  	{
  	*tval = 0;
--- 50,68 ----
  	 * was that, while macro expansion got done, the .c files in the
  	 * non-local directories wouldn't be found.
  	 */
! 	static struct varblock	*vpath_cp;
! 	struct varblock *varptr();
! 	static char vpath_exp[256];
  
! 	if (!vpath_cp) {
  		vpath_cp = varptr("VPATH");
  		if (vpath_cp->varval) {
  			subst(vpath_cp->varval, vpath_exp);
! 			setvar("VPATH", vpath_exp);
  		}
  	}
  }
+ 
  if(p == 0)
  	{
  	*tval = 0;
***************
*** 160,166 ****
  		if (savenamep)
  			pnamep = ".a";
  
! 		srchdir( concat(prefix,"*",temp) , NO, (struct depblock *) NULL);
  		for(lp1 = sufflist ; lp1 ; lp1 = lp1->nxtlineblock)
  		    for(suffp1=lp1->depp ; suffp1 ; suffp1 = suffp1->nxtdepblock)
  			{
--- 163,169 ----
  		if (savenamep)
  			pnamep = ".a";
  
! 		srchdir( concat(prefix,"*",temp), NO, (struct depblock *) NULL);
  		for(lp1 = sufflist ; lp1 ; lp1 = lp1->nxtlineblock)
  		    for(suffp1=lp1->depp ; suffp1 ; suffp1 = suffp1->nxtdepblock)
  			{
***************
*** 246,254 ****
  docom(q)
  struct shblock *q;
  {
! char *s;
  struct varblock *varptr();
! int ign, nopr;
  char string[OUTMAX];
  char string2[OUTMAX];
  
--- 249,257 ----
  docom(q)
  struct shblock *q;
  {
! register char *s;
  struct varblock *varptr();
! register int ign, nopr;
  char string[OUTMAX];
  char string2[OUTMAX];
  
*** /old/src/bin/make/dosys.c	Sat Jul  8 15:05:19 1989
--- /usr/src/bin/make/dosys.c	Fri Aug  9 14:57:46 1991
***************
*** 92,104 ****
  
  
  
! #define MAXARGV	400
  
  doexec(str)
  register char *str;
  {
  register char *t;
! char *argv[MAXARGV];
  register char **p;
  
  while( *str==' ' || *str=='\t' )
--- 92,104 ----
  
  
  
! #define MAXARGV	254		/* execvp can only handle 254 anyhow */
  
  doexec(str)
  register char *str;
  {
  register char *t;
! static char *argv[MAXARGV];	/* docom() ate most of the stack already */
  register char **p;
  
  while( *str==' ' || *str=='\t' )
*** /old/src/bin/make/files.c	Sat Jul  8 15:07:59 1989
--- /usr/src/bin/make/files.c	Wed Aug 14 05:40:03 1991
***************
*** 194,210 ****
  int mkchain;  /* nonzero if results to be remembered */
  struct depblock *nextdbl;  /* final value for chain */
  {
! DIR *dirf;
! register int i;
! int nread, cldir;
! char *dirname, *dirpref, *endir, *filepat, *p, temp[BUFSIZ];
! char fullname[BUFSIZ], *p1, *p2;
  struct nameblock *q;
  struct depblock *thisdbl;
  struct dirhdr *od;
  struct pattern *patp;
  struct varblock *cp, *varptr();
! char *path, pth[BUFSIZ], *strcpy();
  struct direct *dptr;
  
  
--- 194,209 ----
  int mkchain;  /* nonzero if results to be remembered */
  struct depblock *nextdbl;  /* final value for chain */
  {
! register DIR *dirf;
! int cldir;
! char *dirname, *dirpref, *endir, *filepat, *p, temp[MAXPATHLEN];
! char fullname[MAXPATHLEN], *p1, *p2;
  struct nameblock *q;
  struct depblock *thisdbl;
  struct dirhdr *od;
  struct pattern *patp;
  struct varblock *cp, *varptr();
! char *path, pth[MAXPATHLEN], *strcpy();
  struct direct *dptr;
  
  
***************
*** 606,612 ****
  	{
  	if (fread(&objentry, sizeof(objentry), 1, arfd) != 1)
  		return (0);
! 	if (objentry.n_type == N_EXT | N_TEXT &&
  		!strncmp(objentry.n_name, s, 8))
  			return (1);
  	}
--- 605,611 ----
  	{
  	if (fread(&objentry, sizeof(objentry), 1, arfd) != 1)
  		return (0);
! 	if ((objentry.n_type == (N_EXT | N_TEXT)) &&
  		!strncmp(objentry.n_name, s, 8))
  			return (1);
  	}
***************
*** 696,702 ****
  {
  	register char *r, *q;
  	struct nameblock *pn;
! 	char name[BUFSIZ];
  
  	while (*s) {
  		if (isspace(*s)) *d++ = *s++;
--- 695,701 ----
  {
  	register char *r, *q;
  	struct nameblock *pn;
! 	char name[MAXPATHLEN];
  
  	while (*s) {
  		if (isspace(*s)) *d++ = *s++;
*** /old/src/bin/make/gram.y	Sun Feb  8 14:24:38 1987
--- /usr/src/bin/make/gram.y	Sun Aug 11 12:24:59 1991
***************
*** 1,5 ****
  %{#include "defs"
! static	char *sccsid = "@(#)gram.y	4.1 (Berkeley) 81/02/28";
  %}
  
  %term NAME SHELLINE START MACRODEF COLON DOUBLECOLON GREATER
--- 1,5 ----
  %{#include "defs"
! /* static	char *sccsid = "@(#)gram.y	4.1 (Berkeley) 81/02/28"; */
  %}
  
  %term NAME SHELLINE START MACRODEF COLON DOUBLECOLON GREATER
*** /old/src/bin/make/ident.c	Sat Jul  8 15:08:18 1989
--- /usr/src/bin/make/ident.c	Thu Aug  8 15:19:03 1991
***************
*** 1,4 ****
! char *xxxvers =  "\n@(#) MAKE.  VERSION 2.61     13 AUGUST 1980\n" ;
  /* static	char *sccsid = "@(#)ident.c	4.1 (Berkeley) 81/02/28"; */
  
  /*
--- 1,4 ----
! /* char *xxxvers =  "\n@(#) MAKE.  VERSION 2.61     13 AUGUST 1980\n" ; */
  /* static	char *sccsid = "@(#)ident.c	4.1 (Berkeley) 81/02/28"; */
  
  /*
*** /old/src/bin/make/main.c	Sat Jul  8 15:09:16 1989
--- /usr/src/bin/make/main.c	Sat Aug 10 16:05:36 1991
***************
*** 56,66 ****
  char *argv[];
  {
  register struct nameblock *p;
! int i, j;
  int descset, nfargs;
  TIMETYPE tjunk;
  char c, *s;
! static char onechar[2] = "X";
  #ifdef unix
  int intrupt();
  #endif
--- 56,66 ----
  char *argv[];
  {
  register struct nameblock *p;
! register int i, j;
  int descset, nfargs;
  TIMETYPE tjunk;
  char c, *s;
! static char onechar[2] = 'X';
  #ifdef unix
  int intrupt();
  #endif
*** /old/src/bin/mt.c	Sun Feb  8 14:24:56 1987
--- /usr/src/bin/mt.c	Fri May 10 21:08:47 1991
***************
*** 62,68 ****
  		argv += 2;
  	} else
  		if ((tape = getenv("TAPE")) == NULL)
! 			tape = DEFTAPE;
  	if (argc < 2) {
  		fprintf(stderr, "usage: mt [ -f device ] command [ count ]\n");
  		exit(1);
--- 62,68 ----
  		argv += 2;
  	} else
  		if ((tape = getenv("TAPE")) == NULL)
! 			tape = MT_DEF;
  	if (argc < 2) {
  		fprintf(stderr, "usage: mt [ -f device ] command [ count ]\n");
  		exit(1);
*** /old/src/bin/test.c	Sun Feb  8 14:24:53 1987
--- /usr/src/bin/test.c	Tue Aug 27 06:00:56 1991
***************
*** 19,24 ****
--- 19,25 ----
  char	**av;
  char	*tmp;
  char	*nxtarg();
+ extern	long atol();
  
  main(argc, argv)
  char *argv[];
***************
*** 79,85 ****
  	int p1;
  	register char *a;
  	char *p2;
! 	int int1;
  
  	a=nxtarg(0);
  	if(EQ(a, "(")) {
--- 80,86 ----
  	int p1;
  	register char *a;
  	char *p2;
! 	long int1;
  
  	a=nxtarg(0);
  	if(EQ(a, "(")) {
***************
*** 126,145 ****
  	if(EQ(a, "-l")) {
  		int1=length(p2);
  		p2=nxtarg(0);
! 	} else{	int1=atoi(a);
  	}
  	if(EQ(p2, "-eq"))
! 		return(int1==atoi(nxtarg(0)));
  	if(EQ(p2, "-ne"))
! 		return(int1!=atoi(nxtarg(0)));
  	if(EQ(p2, "-gt"))
! 		return(int1>atoi(nxtarg(0)));
  	if(EQ(p2, "-lt"))
! 		return(int1<atoi(nxtarg(0)));
  	if(EQ(p2, "-ge"))
! 		return(int1>=atoi(nxtarg(0)));
  	if(EQ(p2, "-le"))
! 		return(int1<=atoi(nxtarg(0)));
  
  	--ap;
  	return(!EQ(a,""));
--- 127,146 ----
  	if(EQ(a, "-l")) {
  		int1=length(p2);
  		p2=nxtarg(0);
! 	} else{	int1=atol(a);
  	}
  	if(EQ(p2, "-eq"))
! 		return(int1==atol(nxtarg(0)));
  	if(EQ(p2, "-ne"))
! 		return(int1!=atol(nxtarg(0)));
  	if(EQ(p2, "-gt"))
! 		return(int1>atol(nxtarg(0)));
  	if(EQ(p2, "-lt"))
! 		return(int1<atol(nxtarg(0)));
  	if(EQ(p2, "-ge"))
! 		return(int1>=atol(nxtarg(0)));
  	if(EQ(p2, "-le"))
! 		return(int1<=atol(nxtarg(0)));
  
  	--ap;
  	return(!EQ(a,""));
*** /old/src/etc/XNSrouted/XNSrouted.c	Mon Feb 23 16:04:11 1987
--- /usr/src/etc/XNSrouted/XNSrouted.c	Fri Jan 10 15:25:38 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("XNSrouted hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("XNSrouted hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/arff.c	Sun Feb 15 21:10:34 1987
--- /usr/src/etc/arff.c	Fri Jan 10 15:25:40 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("arff hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("arff hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/config/config.c	Sun Feb 15 21:28:16 1987
--- /usr/src/etc/config/config.c	Fri May 10 20:53:32 1991
***************
*** 1,5 ****
  main()
  {
! 	puts("config hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("config hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/diskpart.c	Sun Feb 15 21:34:30 1987
--- /usr/src/etc/diskpart.c	Fri Jan 10 15:25:46 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("diskpart hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("diskpart hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/dumpfs.c	Sun Feb 15 21:39:43 1987
--- /usr/src/etc/dumpfs.c	Fri Jan 10 15:25:44 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("dumpfs hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("dumpfs hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/flcopy.c	Sun Feb 15 21:46:45 1987
--- /usr/src/etc/flcopy.c	Fri Jan 10 15:25:41 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("flcopy hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("flcopy hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/fsck/pass1.c	Wed Dec 19 10:27:19 1990
--- /usr/src/etc/fsck/pass1.c	Thu Feb 27 08:35:39 1992
***************
*** 20,26 ****
  {
  	register int j;
  	register DINODE *dp;
! 	int ndb;
  	struct inodesc idesc;
  	register ino_t inumber;
  
--- 20,26 ----
  {
  	register int j;
  	register DINODE *dp;
! 	daddr_t ndb, lj;
  	struct inodesc idesc;
  	register ino_t inumber;
  
***************
*** 35,41 ****
  	bzero((char *)&idesc, sizeof(struct inodesc));
  	idesc.id_type = ADDR;
  	idesc.id_func = pass1check;
! 	n_files = n_blks = 0;
  	for (inumber = ROOTINO; inumber < imax; inumber++) {
  		dp = ginode(inumber);
  		if (!ALLOC(dp)) {
--- 35,41 ----
  	bzero((char *)&idesc, sizeof(struct inodesc));
  	idesc.id_type = ADDR;
  	idesc.id_func = pass1check;
! 	n_files = n_blks = n_free = 0;
  	for (inumber = ROOTINO; inumber < imax; inumber++) {
  		dp = ginode(inumber);
  		if (!ALLOC(dp)) {
***************
*** 85,91 ****
  				continue;
  			}
  		}
! 		for (j = ndb; j < NDADDR; j++)
  			if (dp->di_addr[j] != 0) {
  				if (debug)
  					printf("bad direct di_addr[%d]: %ld\n",
--- 85,92 ----
  				continue;
  			}
  		}
! 		for (lj = ndb; lj < NDADDR; lj++) {
! 			j = lj;
  			if (dp->di_addr[j] != 0) {
  				if (debug)
  					printf("bad direct di_addr[%d]: %ld\n",
***************
*** 92,97 ****
--- 93,99 ----
  						j, dp->di_addr[j]);
  				goto unknown;
  			}
+ 		}
  		for (j = 0, ndb -= NDADDR; ndb > 0; j++)
  			ndb /= NINDIR;
  		for (; j < NIADDR; j++)
*** /old/src/etc/icheck.c	Sun Apr 29 18:23:55 1990
--- /usr/src/etc/icheck.c	Sat Apr 20 20:52:37 1991
***************
*** 3,9 ****
  #endif
  
  #include <sys/param.h>
! #	define	NI	8
  #define	NB	10
  #define	BITS	8
  #define	MAXFN	500
--- 3,15 ----
  #endif
  
  #include <sys/param.h>
! 
! #ifdef	STANDALONE
! #define	NI	4
! #else
! #define	NI	8
! #endif
! 
  #define	NB	10
  #define	BITS	8
  #define	MAXFN	500
*** /old/src/etc/implog/implog.c	Mon Feb 23 13:27:07 1987
--- /usr/src/etc/implog/implog.c	Fri Jan 10 15:25:36 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("implog hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("implog hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/implog/implogd.c	Mon Feb 23 13:27:20 1987
--- /usr/src/etc/implog/implogd.c	Fri Jan 10 15:25:37 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("implogd hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("implogd hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/kgmon.c	Sun Feb 15 22:02:35 1987
--- /usr/src/etc/kgmon.c	Fri Jan 10 15:25:45 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("kgmon hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("kgmon hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/etc/named/tools/nslookup/main.c	Thu Sep  8 02:17:37 1988
--- /usr/src/etc/named/tools/nslookup/main.c	Sun Aug 23 21:31:12 1992
***************
*** 67,73 ****
   * the "set root" command.
   */
  
! #define 	ROOT_SERVER "sri-nic.arpa."
  char 		rootServerName[NAME_LEN];
  
  
--- 67,73 ----
   * the "set root" command.
   */
  
! #define 	ROOT_SERVER "ns.nic.ddn.mil."
  char 		rootServerName[NAME_LEN];
  
  
*** /old/src/etc/newfs.c	Tue Aug 21 12:35:59 1990
--- /usr/src/etc/newfs.c	Sat Dec 28 21:43:26 1991
***************
*** 4,18 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char sccsid[] = "@(#)newfs.c	5.2 (Berkeley) 8/18/88";
! #endif not lint
  
  /*
   * newfs: friendly front end to mkfs
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)newfs.c	6.0 (2.11BSD) 12/28/91";
! #endif
  
  /*
   * newfs: friendly front end to mkfs
***************
*** 22,109 ****
  #include <stdio.h>
  #include <disktab.h>
  
- typedef struct indx {
- 	char	*key;
- 	int	value;
- } INDX;
- 
- static INDX disks[] = {
- 	{ "rm02", 0 },
- 	{ "rm03", 1 },
- 	{ "rm05", 2 },
- 	{ "rp04", 3 },	/* RP04/05/06 all have the same m/n numbers */
- 	{ "rp05", 3 },
- 	{ "rp06", 3 },
- 	{ "rk06", 4 },	/* RK06/07 have the same m/n numbers */
- 	{ "rk07", 4 },
- 	{ "rl01", 5 },	/* RL01/02 have the same m/n numbers */
- 	{ "rl02", 5 },
- 	{ "rk05", 6 },
- 	{ "ra60", 7 },
- 	{ "ra80", 8 },
- 	{ "ra81", 9 },
- 	{ "rc25", 10 },
- 	{ "rx50", 11 },
- 	{ "rd51", 12 },
- 	{ "rd52-rqdx2", 13 },	/* for RD52/53 m/n numbers are based on */
- 	{ "rd53-rqdx2", 13 },	/* controller (RQDX2 or RQDX3), not drive */
- 	{ "rd52-rqdx3", 14 },	/* type */
- 	{ "rd53-rqdx3", 14 },
- 	{ "rd54-rqdx3", 14 },
- 	{ "rx02", 15 },
- 	{ "rp03", 16 },
- 	{ "br1538d", 17 },
- 	{ "ra82", 18 },
- 	{ 0, 0 }
- };
- 
- static INDX cpus[] = {
- 	{ "23", 0 },
- 	{ "24", 1 },
- 	{ "34", 2 },
- 	{ "40", 2 },	/* use 11/34 values */
- 	{ "44", 3 },
- 	{ "45", 4 },
- 	{ "53", 3 },	/* use 11/44 values */
- 	{ "55", 4 },	/* use 11/45 values */
- 	{ "60", 4 },	/* use 11/45 values */
- 	{ "70", 5 },
- 	{ "73", 3 },	/* use 11/44 values */
- 	{ "83", 3 },	/* use 11/44 values - "m" a little too high, but ok */
- 	{ "84", 5 },	/* use 11/70 values */
- 	{ "93", 5 },	/* use 11/70 values */
- 	{ "94", 5 },	/* use 11/70 values */
- 	{ 0, 0 }
- };
- 
- #define ASIZE(a)	(sizeof(a)/sizeof(a[0]))
- 
- static struct mn {
- 	int	m, n;
- } mn[ASIZE(disks)][ASIZE(cpus)] = {
- /*		  23	    24	      34/40	44/53	  45/55	    70/84  */
- /*						73/83	  60		   */
- /* RM02 */	{ {11, 80}, {10, 80}, { 8, 80}, { 6, 80}, { 7, 80}, { 5, 80} },
- /* RM03 */	{ {16, 80}, {15, 80}, {12, 80}, { 8, 80}, {11, 80}, { 7, 80} },
- /* RM05 */	{ {16,304}, {15,304}, {12,304}, { 8,304}, {11,304}, { 7,304} },
- /* RP04/05/06 */{ {11,209}, {10,209}, { 8,209}, { 6,209}, { 7,209}, { 5,209} },
- /* RK06/07 */	{ { 8, 33}, { 7, 33}, { 6, 33}, { 4, 33}, { 5, 33}, { 3, 33} },
- /* RL01/02 */	{ { 7, 10}, { 6, 10}, { 6, 10}, { 4, 10}, { 5, 10}, { 3, 10} },
- /* RK05 */	{ { 4, 12}, { 4, 12}, { 3, 12}, { 2, 12}, { 3, 12}, { 2, 12} },
- /* RA60 */	{ {21, 84}, {21, 84}, {17, 84}, {12, 84}, {15, 84}, {10, 84} },
- /* RA80 */	{ {16,217}, {16,217}, {13,217}, { 9,217}, {11,217}, { 7,217} },
- /* RA81 */	{ {26,357}, {26,357}, {21,357}, {14,357}, {18,357}, {12,357} },
- /* RC25 */	{ {15, 31}, {15, 31}, {13, 31}, { 9, 31}, {11, 31}, { 7, 31} },
- /* RX50 */	{ { 1,  5}, { 1,  5}, { 1,  5}, { 1,  5}, { 1,  5}, { 1,  5} },
- /* RD51 */	{ { 1, 36}, { 1, 36}, { 1, 36}, { 1, 36}, { 1, 36}, { 1, 36} },
- /* RQDX2 */	{ { 2, 36}, { 2, 36}, { 2, 36}, { 2, 36}, { 2, 36}, { 2, 36} },
- /* RQDX3 */	{ { 7, 36}, { 7, 36}, { 7, 36}, { 7, 36}, { 7, 36}, { 7, 36} },
- /* RX02 */	{ { 1,  7}, { 1,  7}, { 1,  7}, { 1,  7}, { 1,  7}, { 1,  7} },
- /* RP03 */	{ {16,304}, {15,304}, {12,304}, { 7,304}, {11,304}, { 5,304} },
- /* BR1538D */	{ {16,304}, {15,304}, {12,304}, { 7,304}, {11,304}, { 6,304} },
- /* RA82 */	{ {26,435}, {26,435}, {21,435}, {14,435}, {18,435}, {12,435} },
- };
- 
  main(argc, argv)
  	int	argc;
  	char	**argv;
--- 20,25 ----
***************
*** 112,122 ****
  	extern int	optind;
  	register struct disktab	*dp;
  	register struct partition	*pp;
- 	register INDX	*step;
  	register char	*cp;
  	struct stat	st;
  	long	fssize;
! 	int	disk, cpu, ch, status;
  	int	just_looking, copy_boot;
  	char	*uboot;
  	char	device[MAXPATHLEN], cmd[BUFSIZ],
--- 28,37 ----
  	extern int	optind;
  	register struct disktab	*dp;
  	register struct partition	*pp;
  	register char	*cp;
  	struct stat	st;
  	long	fssize;
! 	int	ch, status, logsec, m;
  	int	just_looking, copy_boot;
  	char	*uboot;
  	char	device[MAXPATHLEN], cmd[BUFSIZ],
***************
*** 124,131 ****
  
  	just_looking = 0;
  	copy_boot = 0;
  	uboot = (char *)0;
! 	while ((ch = getopt(argc,argv,"NvbB:")) != EOF)
  		switch((char)ch) {
  		case 'N':
  		case 'v':
--- 39,47 ----
  
  	just_looking = 0;
  	copy_boot = 0;
+ 	m = 0;
  	uboot = (char *)0;
! 	while ((ch = getopt(argc,argv,"NvbB:m:")) != EOF)
  		switch((char)ch) {
  		case 'N':
  		case 'v':
***************
*** 137,142 ****
--- 53,61 ----
  		case 'b':
  			++copy_boot;
  			break;
+ 		case 'm':
+ 			m = atoi(optarg);
+ 			break;
  		case '?':
  		default:
  			usage();
***************
*** 144,172 ****
  
  	argc -= optind;
  	argv += optind;
! 	if (argc != 3)
  		usage();
  
- 	/* check for legal disk and cpu type, get offsets into M/N array */
- 	for (step = disks; step->key; ++step)
- 		if (!strcmp(argv[1], step->key)) {
- 			disk = step->value;
- 			break;
- 		}
- 	if (!step->key) {
- 		fprintf(stderr, "newfs: unknown disk type %s.\n", argv[1]);
- 		usage();
- 	}
- 	for (step = cpus; step->key; ++step)
- 		if (!strcmp(argv[2], step->key)) {
- 			cpu = step->value;
- 			break;
- 		}
- 	if (!step->key) {
- 		fprintf(stderr, "newfs: unknown cpu type %s.\n", argv[2]);
- 		usage();
- 	}
- 
  	/* figure out device name */
  	cp = rindex(argv[0], '/');
  	if (cp)
--- 63,71 ----
  
  	argc -= optind;
  	argv += optind;
! 	if (argc != 2)
  		usage();
  
  	/* figure out device name */
  	cp = rindex(argv[0], '/');
  	if (cp)
***************
*** 213,223 ****
  	 * Convert from sectors to logical blocks.  Note that sector size
  	 * must evenly devide DEV_BSIZE!!!!!
  	 */
! 	fssize /= DEV_BSIZE/dp->d_secsize;
  
  	/* build command */
! 	sprintf(cmd, "/etc/mkfs %s %ld %d %d",
! 	    device, fssize, mn[disk][cpu].m, mn[disk][cpu].n);
  	printf("newfs: %s\n", cmd);
  	if (just_looking)
  		exit(0);
--- 112,125 ----
  	 * Convert from sectors to logical blocks.  Note that sector size
  	 * must evenly devide DEV_BSIZE!!!!!
  	 */
! 	logsec = DEV_BSIZE/dp->d_secsize;
! 	fssize /= logsec;
  
  	/* build command */
! 	if (m <= 0 || m > 31)
! 		m = 2;
! 	sprintf(cmd, "/etc/mkfs %s %ld %d %d", device, fssize, m,
! 	    (dp->d_ntracks * dp->d_nsectors) / logsec);
  	printf("newfs: %s\n", cmd);
  	if (just_looking)
  		exit(0);
***************
*** 242,277 ****
  static
  usage()
  {
- 	register INDX	*off;
- 	register int	cnt, len;
  
! 	fputs("usage: newfs [ -N ] [ -b ] [ -B boot-block ] special-device device-type cpu\n", stderr);
! 	fputs("Known device-types are:\n\t", stderr);
! 	for (cnt = 8, off = disks;;) {
! 		len = strlen(off->key) + 2;
! 		if ((cnt += len) > 50) {
! 			fputs("\n\t", stderr);
! 			cnt = len + 8;
! 		}
! 		fputs(off->key, stderr);
! 		if ((++off)->key)
! 			fputs(", ", stderr);
! 		else
! 			break;
! 	}
! 	fputs("\n\nKnown cpu types are:\n\t", stderr);
! 	for (cnt = 8, off = cpus;;) {
! 		len = strlen(off->key) + 2;
! 		if ((cnt += len) > 50) {
! 			fputs("\n\t", stderr);
! 			cnt = len + 8;
! 		}
! 		fputs(off->key, stderr);
! 		if ((++off)->key)
! 			fputs(", ", stderr);
! 		else
! 			break;
! 	}
! 	putc('\n', stderr);
  	exit(1);
  }
--- 144,150 ----
  static
  usage()
  {
  
! 	fputs("usage: newfs [ -N ] [ -b ] [ -B boot-block ] [-m free-list-gap] special-device device-type\n", stderr);
  	exit(1);
  }
*** /old/src/etc/pstat.c	Thu Apr  5 21:50:11 1990
--- /usr/src/etc/pstat.c	Mon Jun 15 23:43:57 1992
***************
*** 89,94 ****
--- 89,98 ----
  	{ "_dmz_tty" },
  #define	SNDMZ	23
  	{ "_ndmz" },
+ #define	SDHV	24
+ 	{ "_dhv_tty" },
+ #define	SNDHV	25
+ 	{ "_ndhv" },
  	{ "" }
  };
  
***************
*** 442,447 ****
--- 446,453 ----
  		dottytype("dhu", SDHU, SNDHU);
  	if (nl[SNDMZ].n_type != 0)
  		dottytype("dmz", SDMZ, SNDMZ);
+ 	if (nl[SNDHV].n_type != 0)
+ 		dottytype("dhv", SDHV, SNDHV);
  	if (nl[SNPTY].n_type != 0)
  		dottytype("pty", SPTY, SNPTY);
  }
