*** /old/src/ucb/ex/ex_subr.c	Sat Mar 14 14:52:40 1987
--- /usr/src/ucb/ex/ex_subr.c	Sun Sep  8 12:00:56 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_subr.c	7.10 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_re.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_subr.c	7.10 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_re.h"
*** /old/src/ucb/ex/ex_tagio.c	Wed Feb 18 00:28:35 1987
--- /usr/src/ucb/ex/ex_tagio.c	Sun Sep  8 12:01:39 1991
***************
*** 8,14 ****
   */
  
  #ifdef FASTTAG
! #ifndef lint
  static char *sccsid = "@(#)ex_tagio.c	7.3 (Berkeley) 1/31/86";
  #endif
  
--- 8,14 ----
   */
  
  #ifdef FASTTAG
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_tagio.c	7.3 (Berkeley) 1/31/86";
  #endif
  
*** /old/src/ucb/ex/ex_temp.c	Mon Feb 16 22:07:29 1987
--- /usr/src/ucb/ex/ex_temp.c	Sun Sep  8 12:01:56 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_temp.c	7.5.1.1 (Berkeley) 8/12/86";
! #endif not lint
  
  #include "ex.h"
  #include "ex_temp.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_temp.c	7.5.1.1 (Berkeley) 8/12/86";
! #endif
  
  #include "ex.h"
  #include "ex_temp.h"
*** /old/src/ucb/ex/ex_tty.c	Mon Feb 16 22:07:30 1987
--- /usr/src/ucb/ex/ex_tty.c	Sun Sep  8 12:02:11 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_tty.c	7.10 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_tty.c	7.10 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_tty.h	Mon Feb 16 22:07:31 1987
--- /usr/src/ucb/ex/ex_tty.h	Sun Sep  8 12:45:55 1991
***************
*** 172,179 ****
  # define MAXNOMACS	128	/* max number of macros of each kind */
  # define MAXCHARMACS	2048	/* max # of chars total in macros */
  #else
! # define MAXNOMACS	32	/* max number of macros of each kind */
! # define MAXCHARMACS	512	/* max # of chars total in macros */
  #endif
  struct maps {
  	char *cap;	/* pressing button that sends this.. */
--- 172,179 ----
  # define MAXNOMACS	128	/* max number of macros of each kind */
  # define MAXCHARMACS	2048	/* max # of chars total in macros */
  #else
! # define MAXNOMACS	48	/* max number of macros of each kind */
! # define MAXCHARMACS	1536	/* max # of chars total in macros */
  #endif
  struct maps {
  	char *cap;	/* pressing button that sends this.. */
*** /old/src/ucb/ex/ex_unix.c	Mon Feb 16 22:07:30 1987
--- /usr/src/ucb/ex/ex_unix.c	Sun Sep  8 12:02:27 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_unix.c	7.6 (Berkeley) 10/22/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_temp.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_unix.c	7.6 (Berkeley) 10/22/85";
! #endif
  
  #include "ex.h"
  #include "ex_temp.h"
*** /old/src/ucb/ex/ex_v.c	Mon Feb 16 22:07:29 1987
--- /usr/src/ucb/ex/ex_v.c	Sun Sep  8 12:02:43 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_v.c	7.8 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_re.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_v.c	7.8 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_re.h"
*** /old/src/ucb/ex/ex_vadj.c	Mon Feb 16 22:07:30 1987
--- /usr/src/ucb/ex/ex_vadj.c	Sun Sep  8 12:03:00 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vadj.c	7.9 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vadj.c	7.9 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vget.c	Mon Feb 16 22:07:33 1987
--- /usr/src/ucb/ex/ex_vget.c	Sun Sep  8 12:03:16 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vget.c	6.8 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vget.c	6.8 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vmain.c	Mon Feb 16 22:07:33 1987
--- /usr/src/ucb/ex/ex_vmain.c	Sun Sep  8 12:03:35 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vmain.c	7.7 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vmain.c	7.7 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_voper.c	Mon Feb 16 22:07:33 1987
--- /usr/src/ucb/ex/ex_voper.c	Sun Sep  8 12:03:53 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_voper.c	7.4 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_voper.c	7.4 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vops.c	Wed Feb 18 00:52:07 1987
--- /usr/src/ucb/ex/ex_vops.c	Sun Sep  8 12:04:10 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vops.c	7.7 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vops.c	7.7 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vops2.c	Wed Feb 18 00:53:10 1987
--- /usr/src/ucb/ex/ex_vops2.c	Sun Sep  8 12:04:27 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vops2.c	6.8 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vops2.c	6.8 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vops3.c	Mon Feb 16 22:07:35 1987
--- /usr/src/ucb/ex/ex_vops3.c	Sun Sep  8 12:04:44 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vops3.c	7.3 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vops3.c	7.3 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vput.c	Mon Feb 16 22:07:35 1987
--- /usr/src/ucb/ex/ex_vput.c	Sun Sep  8 12:05:03 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vput.c	7.4 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vput.c	7.4 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_vwind.c	Mon Feb 16 22:07:38 1987
--- /usr/src/ucb/ex/ex_vwind.c	Sun Sep  8 12:05:18 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_vwind.c	7.3 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_tty.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_vwind.c	7.3 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/expreserve.c	Sun Feb 22 16:14:57 1987
--- /usr/src/ucb/ex/expreserve.c	Sun Sep  8 12:05:44 1991
***************
*** 4,18 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  char *copyright =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
- #ifndef lint
  static char *sccsid = "@(#)expreserve.c	7.13 (Berkeley) 1/22/86";
! #endif not lint
  
  #ifdef BSD2_10
  #include <short_names.h
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char *copyright =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
  static char *sccsid = "@(#)expreserve.c	7.13 (Berkeley) 1/22/86";
! #endif
  
  #ifdef BSD2_10
  #include <short_names.h
*** /old/src/ucb/ex/exrecover.c	Sat Mar 14 14:53:09 1987
--- /usr/src/ucb/ex/exrecover.c	Sun Sep  8 12:06:04 1991
***************
*** 4,18 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  char *copyright =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
- #ifndef lint
  static char *sccsid = "@(#)exrecover.c	7.9 (Berkeley) 6/7/85";
! #endif not lint
  
  #include <stdio.h>	/* mjm: BUFSIZ: stdio = 512, VMUNIX = 1024 */
  #undef	BUFSIZ		/* mjm: BUFSIZ different */
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char *copyright =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
  static char *sccsid = "@(#)exrecover.c	7.9 (Berkeley) 6/7/85";
! #endif
  
  #include <stdio.h>	/* mjm: BUFSIZ: stdio = 512, VMUNIX = 1024 */
  #undef	BUFSIZ		/* mjm: BUFSIZ different */
*** /old/src/ucb/ex/ovprintf.c	Mon Feb 16 22:07:40 1987
--- /usr/src/ucb/ex/ovprintf.c	Sun Sep  8 12:06:24 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ovprintf.c	1.3 (Berkeley) 6/7/85";
! #endif not lint
  
  /*
   * This version of printf calls doprnt, and as such is not portable,
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ovprintf.c	1.3 (Berkeley) 6/7/85";
! #endif
  
  /*
   * This version of printf calls doprnt, and as such is not portable,
*** /old/src/ucb/ex/printf.c	Mon Feb 16 22:07:40 1987
--- /usr/src/ucb/ex/printf.c	Sun Sep  8 12:07:03 1991
***************
*** 4,15 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)printf.c	7.3 (Berkeley) 6/7/85";
- #endif not lint
  
  /* The pwb version this is based on */
  static char *printf_id = "@(#) printf.c:2.2 6/5/79";
  #include "varargs.h"
  /*
   * This version of printf is compatible with the Version 7 C
--- 4,16 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)printf.c	7.3 (Berkeley) 6/7/85";
  
  /* The pwb version this is based on */
  static char *printf_id = "@(#) printf.c:2.2 6/5/79";
+ #endif
+ 
  #include "varargs.h"
  /*
   * This version of printf is compatible with the Version 7 C
*** /old/src/ucb/fp/fp.c	Mon Feb 16 22:56:27 1987
--- /usr/src/ucb/fp/fp.c	Fri Jan 10 15:25:47 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("fp hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("fp hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/gprof.c	Sat Aug 22 18:27:15 1987
--- /usr/src/ucb/gprof.c	Fri Jan 10 15:25:51 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("gprof hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("gprof hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/lisp/lisp.c	Sat Mar  7 14:03:22 1987
--- /usr/src/ucb/lisp/lisp.c	Fri Jan 10 15:25:50 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("Franz lisp hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("Franz lisp hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/sendbug/bugformat	Wed Aug 26 17:11:55 1987
--- /usr/src/ucb/sendbug/bugformat	Sat Dec 28 01:28:10 1991
***************
*** 1,5 ****
  Subject: Short summary of the problem
! Index:	<source directory>/<source file> 2.10BSD
  
  Description:
  	Detailed description of the problem, suggestion, or complaint.
--- 1,5 ----
  Subject: Short summary of the problem
! Index:	<source directory>/<source file> 2.11BSD
  
  Description:
  	Detailed description of the problem, suggestion, or complaint.
*** /old/src/ucb/symorder.c	Mon Feb 16 23:44:10 1987
--- /usr/src/ucb/symorder.c	Fri Jan 10 15:25:52 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("symorder hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("symorder hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/telnet.c	Tue Jul 31 13:39:39 1990
--- /usr/src/ucb/telnet.c	Tue Aug 25 13:33:00 1992
***************
*** 551,557 ****
  	pThis = buffer;
  	buffer = buffer+min(length, BYTES_PER_LINE);
  	while (pThis < buffer) {
! 	    fprintf(NetTrace, "%.2x", (*pThis)&0xff);
  	    pThis++;
  	}
  	fprintf(NetTrace, "\n");
--- 551,557 ----
  	pThis = buffer;
  	buffer = buffer+min(length, BYTES_PER_LINE);
  	while (pThis < buffer) {
! 	    fprintf(NetTrace, "%02x", (*pThis)&0xff);
  	    pThis++;
  	}
  	fprintf(NetTrace, "\n");
*** /old/src/ucb/tftp/main.c	Mon Dec 26 15:50:19 1988
--- /usr/src/ucb/tftp/main.c	Wed May 15 21:08:00 1991
***************
*** 1,7 ****
  /*
!  * Copyright (c) 1985 Regents of the University of California.
!  * All rights reserved.  The Berkeley software License Agreement
!  * specifies the terms and conditions for redistribution.
   */
  
  #ifndef lint
--- 1,20 ----
  /*
!  * Copyright (c) 1983 Regents of the University of California.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms are permitted
!  * provided that: (1) source distributions retain this entire copyright
!  * notice and comment, and (2) distributions including binaries display
!  * the following acknowledgement:  ``This product includes software
!  * developed by the University of California, Berkeley and its contributors''
!  * in the documentation or other materials provided with the distribution
!  * and in all advertising materials mentioning features or use of this
!  * software. Neither the name of the University nor the names of its
!  * contributors may be used to endorse or promote products derived
!  * from this software without specific prior written permission.
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
!  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
!  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
  #ifndef lint
***************
*** 8,18 ****
  char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
! #endif not lint
  
  #ifndef lint
! static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 2/7/86";
! #endif not lint
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
  
--- 21,31 ----
  char copyright[] =
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
! #endif /* not lint */
  
  #ifndef lint
! static char sccsid[] = "@(#)main.c	5.9 (Berkeley) 6/1/90";
! #endif /* not lint */
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
  
***************
*** 24,30 ****
  #include <sys/file.h>
  
  #include <netinet/in.h>
- #include <arpa/inet.h>
  
  #include <signal.h>
  #include <stdio.h>
--- 37,42 ----
***************
*** 281,288 ****
  		targ = index(cp, ':');
  		*targ++ = 0;
  		hp = gethostbyname(cp);
! 		if (hp == 0) {
! 			printf("%s: Unknown host.\n", cp);
  			return;
  		}
  		bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
--- 293,301 ----
  		targ = index(cp, ':');
  		*targ++ = 0;
  		hp = gethostbyname(cp);
! 		if (hp == NULL) {
! 			fprintf(stderr, "tftp: %s: ", cp);
! 			herror((char *)NULL);
  			return;
  		}
  		bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
***************
*** 373,380 ****
  
  			*src++ = 0;
  			hp = gethostbyname(argv[n]);
! 			if (hp == 0) {
! 				printf("%s: Unknown host.\n", argv[n]);
  				continue;
  			}
  			bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
--- 386,394 ----
  
  			*src++ = 0;
  			hp = gethostbyname(argv[n]);
! 			if (hp == NULL) {
! 				fprintf(stderr, "tftp: %s: ", argv[n]);
! 				herror((char *)NULL);
  				continue;
  			}
  			bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
*** /old/src/ucb/tftp/tftp.c	Sun Jul  3 18:51:17 1988
--- /usr/src/ucb/tftp/tftp.c	Wed May 15 21:56:15 1991
***************
*** 1,15 ****
  /*
!  * Copyright (c) 1985 Regents of the University of California.
!  * All rights reserved.  The Berkeley software License Agreement
!  * specifies the terms and conditions for redistribution.
   */
  
  #ifndef lint
! static char sccsid[] = "@(#)tftp.c	5.5 (Berkeley) 2/7/86";
! #endif not lint
  
  #ifdef	BSD2_10
! #define	timeoutbuf	to_buf
  #endif
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
--- 1,28 ----
  /*
!  * Copyright (c) 1983 Regents of the University of California.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms are permitted
!  * provided that: (1) source distributions retain this entire copyright
!  * notice and comment, and (2) distributions including binaries display
!  * the following acknowledgement:  ``This product includes software
!  * developed by the University of California, Berkeley and its contributors''
!  * in the documentation or other materials provided with the distribution
!  * and in all advertising materials mentioning features or use of this
!  * software. Neither the name of the University nor the names of its
!  * contributors may be used to endorse or promote products derived
!  * from this software without specific prior written permission.
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
!  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
!  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
  #ifndef lint
! static char sccsid[] = "@(#)tftp.c	5.9 (Berkeley) 6/1/90";
! #endif /* not lint */
  
  #ifdef	BSD2_10
! #define	timeoutbuf to_buf
  #endif
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
***************
*** 67,73 ****
  	register struct tftphdr *ap;       /* data and ack packets */
  	struct tftphdr *r_init(), *dp;
  	register int block = 0, size, n;
! 	register u_long amount = 0;
  	struct sockaddr_in from;
  	int fromlen;
  	int convert;            /* true if doing nl->crlf conversion */
--- 80,86 ----
  	register struct tftphdr *ap;       /* data and ack packets */
  	struct tftphdr *r_init(), *dp;
  	register int block = 0, size, n;
! 	u_long amount = 0;
  	struct sockaddr_in from;
  	int fromlen;
  	int convert;            /* true if doing nl->crlf conversion */
***************
*** 305,314 ****
  nak(error)
  	int error;
  {
  	register struct tftphdr *tp;
  	int length;
! 	register struct errmsg *pe;
! 	extern char *sys_errlist[];
  
  	tp = (struct tftphdr *)ackbuf;
  	tp->th_opcode = htons((u_short)ERROR);
--- 318,327 ----
  nak(error)
  	int error;
  {
+ 	register struct errmsg *pe;
  	register struct tftphdr *tp;
  	int length;
! 	char *strerror();
  
  	tp = (struct tftphdr *)ackbuf;
  	tp->th_opcode = htons((u_short)ERROR);
***************
*** 317,323 ****
  		if (pe->e_code == error)
  			break;
  	if (pe->e_code < 0) {
! 		pe->e_msg = sys_errlist[error - 100];
  		tp->th_code = EUNDEF;
  	}
  	strcpy(tp->th_msg, pe->e_msg);
--- 330,336 ----
  		if (pe->e_code == error)
  			break;
  	if (pe->e_code < 0) {
! 		pe->e_msg = strerror(error - 100);
  		tp->th_code = EUNDEF;
  	}
  	strcpy(tp->th_msg, pe->e_msg);
*** /old/src/ucb/tftp/tftpsubs.c	Mon Dec 26 15:50:20 1988
--- /usr/src/ucb/tftp/tftpsubs.c	Wed May 15 21:34:37 1991
***************
*** 1,12 ****
  /*
!  * Copyright (c) 1985 Regents of the University of California.
!  * All rights reserved.  The Berkeley software License Agreement
!  * specifies the terms and conditions for redistribution.
   */
  
  #ifndef lint
! static char sccsid[] = "@(#)tftpsubs.c	1.2 (Berkeley) 2/7/86";
! #endif not lint
  
  /* Simple minded read-ahead/write-behind subroutines for tftp user and
     server.  Written originally with multiple buffers in mind, but current
--- 1,25 ----
  /*
!  * Copyright (c) 1983 Regents of the University of California.
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms are permitted
!  * provided that: (1) source distributions retain this entire copyright
!  * notice and comment, and (2) distributions including binaries display
!  * the following acknowledgement:  ``This product includes software
!  * developed by the University of California, Berkeley and its contributors''
!  * in the documentation or other materials provided with the distribution
!  * and in all advertising materials mentioning features or use of this
!  * software. Neither the name of the University nor the names of its
!  * contributors may be used to endorse or promote products derived
!  * from this software without specific prior written permission.
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
!  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
!  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
  #ifndef lint
! static char sccsid[] = "@(#)tftpsubs.c	5.5 (Berkeley) 6/1/90";
! #endif /* not lint */
  
  /* Simple minded read-ahead/write-behind subroutines for tftp user and
     server.  Written originally with multiple buffers in mind, but current
***************
*** 190,196 ****
  	    c = *p++;                   /* pick up a character */
  	    if (prevchar == '\r') {     /* if prev char was cr */
  		if (c == '\n')          /* if have cr,lf then just */
! 		   fseek(file, -1L, 1); /* smash lf on top of the cr */
  		else
  		   if (c == '\0')       /* if have cr,nul then */
  			goto skipit;    /* just skip over the putc */
--- 203,209 ----
  	    c = *p++;                   /* pick up a character */
  	    if (prevchar == '\r') {     /* if prev char was cr */
  		if (c == '\n')          /* if have cr,lf then just */
! 		   fseek(file, -1L, 1);  /* smash lf on top of the cr */
  		else
  		   if (c == '\0')       /* if have cr,nul then */
  			goto skipit;    /* just skip over the putc */
*** /old/src/ucb/vlp/vlp.c	Mon Feb 16 23:55:12 1987
--- /usr/src/ucb/vlp/vlp.c	Fri Jan 10 15:25:49 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("vlp hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("vlp hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/whois.c	Mon Feb 16 22:11:07 1987
--- /usr/src/ucb/whois.c	Fri Jan 31 10:54:27 1992
***************
*** 22,28 ****
  #include <stdio.h>
  #include <netdb.h>
  
! #define	NICHOST	"sri-nic.arpa"
  
  main(argc, argv)
  	int argc;
--- 22,28 ----
  #include <stdio.h>
  #include <netdb.h>
  
! #define	NICHOST	"nic.ddn.mil"
  
  main(argc, argv)
  	int argc;
*** /old/src/usr.bin/f77/intr.c	Mon Feb 16 16:57:38 1987
--- /usr/src/usr.bin/f77/intr.c	Thu Mar  5 14:19:26 1992
***************
*** 58,63 ****
--- 58,64 ----
  "int", 		{ INTRCONV, TYLONG },
  "real", 	{ INTRCONV, TYREAL },
  "dble", 	{ INTRCONV, TYDREAL },
+ "dreal", 	{ INTRCONV, TYDREAL },
  "cmplx", 	{ INTRCONV, TYCOMPLEX },
  "dcmplx", 	{ INTRCONV, TYDCOMPLEX },
  "ifix", 	{ INTRCONV, TYLONG },
***************
*** 137,142 ****
--- 138,144 ----
  "dexp", 	{ INTRSPEC, TYDREAL, 40 },
  "cexp", 	{ INTRSPEC, TYCOMPLEX, 41 },
  "zexp", 	{ INTRSPEC, TYDCOMPLEX, 42 },
+ "cdexp", 	{ INTRSPEC, TYDCOMPLEX, 42 },
  
  "log", 		{ INTRGEN, 4, 43 },
  "alog", 	{ INTRSPEC, TYREAL, 43 },
*** /old/src/usr.bin/lint/Makefile	Fri Apr  8 09:15:57 1988
--- /usr/src/usr.bin/lint/Makefile	Wed Aug 14 05:27:43 1991
***************
*** 3,54 ****
  #
  M=/usr/src/lib/mip
  P=/usr/src/lib/pcc
! CFLAGS=-O
! LINTLIBS=llib-port.ln llib-lc.ln llib-lcurses.ln llib-ldbm.ln llib-lm.ln \
! 	llib-lmp.ln llib-lplot.ln llib-ltermcap.ln
  SRCS=	$M/cgram.y $M/common.c $M/optim.c $M/pftn.c $M/scan.c $M/trees.c \
  	$M/xdefs.c lint.c hash.c $M/pass1.h $M/manifest.h macdefs.h \
  	lpass2.c
  
! all:	lpass1 lpass2 ${LINTLIBS}
  
! lpass1: cgram.o rodata.o comm1.o optim.o pftn.o scan.o trees.o xdefs.o \
! 	lint.o hash.o
! 	${CC} ${CFLAGS} cgram.o rodata.o comm1.o optim.o pftn.o scan.o \
! 		trees.o xdefs.o lint.o hash.o -o lpass1
  
  cgram.o: $M/manifest.h $M/pass1.h pcclocal.h macdefs.h cgram.c
- 	$(CC) -c $(CFLAGS) -I$M -I. cgram.c
  
! rodata.o: rodata.c
! 	$(CC) -c $(CFLAGS) -R rodata.c
  
  comm1.o: $M/manifest.h $M/pass1.h pcclocal.h $M/common.c macdefs.h
  	ln $M/common.c comm1.c
! 	$(CC) -c $(CFLAGS) -I$M -I. -DPASS1COMMON comm1.c
  	rm -f comm1.c
  
  optim.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/optim.c
- 	$(CC) -c $(CFLAGS) -I$M -I. $M/optim.c
  
  pftn.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/pftn.c
- 	$(CC) -c $(CFLAGS) -I$M -I. $M/pftn.c
  
  scan.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/scan.c
- 	$(CC) -c $(CFLAGS) -I$M -I. $M/scan.c
  
  trees.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/trees.c
- 	$(CC) -c $(CFLAGS) -I$M -I. $M/trees.c
  
  xdefs.o: $M/manifest.h $M/pass1.h pcclocal.h macdefs.h $M/xdefs.c
- 	$(CC) -c $(CFLAGS) -I$M -I. $M/xdefs.c
  
! rodata.c cgram.c: $M/cgram.y pcctokens
  	cat pcctokens $M/cgram.y > gram.in
  	$(YACC) gram.in
! 	rm -f rodata.c
! 	sh ./:yyfix yyexca yyact yypact yypgo yyr1 yyr2 yychk yydef
! 	mv y.tab.c cgram.c
  
  GREP=	egrep
  
--- 3,62 ----
  #
  M=/usr/src/lib/mip
  P=/usr/src/lib/pcc
! VPATH=	$M
! XSTR=	/usr/ucb/xstr
! 
! # turn off the debugging to save string space
! CFLAGS=-O -I$M -I. -DBUG1 -DBUG2 -DBUG3 -DBUG4
! LFLAGS=-i
  SRCS=	$M/cgram.y $M/common.c $M/optim.c $M/pftn.c $M/scan.c $M/trees.c \
  	$M/xdefs.c lint.c hash.c $M/pass1.h $M/manifest.h macdefs.h \
  	lpass2.c
  
! .c.o:
! 	${CC} -E ${CFLAGS} $*.c | ${XSTR} -c -
! 	${CC} -c ${CFLAGS} x.c
! 	mv -f x.o $*.o
! 	rm -f x.c
  
! all:	lpass1 lpass2
  
+ lpass1: cgram.o comm1.o optim.o pftn.o scan.o trees.o xdefs.o \
+ 	lint.o hash.o strings.o
+ 	${CC} ${LFLAGS} ${CFLAGS} cgram.o comm1.o optim.o pftn.o \
+ 		scan.o trees.o xdefs.o lint.o hash.o strings.o -o lpass1
+ 
  cgram.o: $M/manifest.h $M/pass1.h pcclocal.h macdefs.h cgram.c
  
! strings.o: strings
! 	${XSTR}
! 	${CC} -c xs.c
! 	mv -f xs.o strings.o
! 	rm -f xs.c
  
  comm1.o: $M/manifest.h $M/pass1.h pcclocal.h $M/common.c macdefs.h
  	ln $M/common.c comm1.c
! 	${CC} -E ${CFLAGS} -DPASS1COMMON comm1.c | ${XSTR} -c -
! 	${CC} -c ${CFLAGS} -DPASS1COMMON x.c
! 	mv -f x.o comm1.o
! 	rm -f x.c
  	rm -f comm1.c
  
  optim.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/optim.c
  
  pftn.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/pftn.c
  
  scan.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/scan.c
  
  trees.o: $M/manifest.h macdefs.h $M/pass1.h pcclocal.h $M/trees.c
  
  xdefs.o: $M/manifest.h $M/pass1.h pcclocal.h macdefs.h $M/xdefs.c
  
! cgram.c: $M/cgram.y pcctokens
  	cat pcctokens $M/cgram.y > gram.in
  	$(YACC) gram.in
! 	fgrep -v "static char yaccpar_sccsid" y.tab.c >cgram.c
! 	rm -f y.tab.c
  
  GREP=	egrep
  
***************
*** 61,94 ****
  	cat /usr/include/pcc.h $P/localdefs.h | $(GREP) '^#[ 	]*define[ 	][ 	]*PCC_' | sed -e 's/^#[ 	]*define[ 	][ 	]*PCC_/%term	/' > pcctokens
  
  lint.o: $M/manifest.h macdefs.h $M/pass1.h lmanifest.h
- 	${CC} -c ${CFLAGS} -I$M -I. lint.c
  
- llib-port.ln: llib-port lpass1
- 	-(/lib/cpp -C -Dlint llib-port | ./lpass1 -puv > llib-port.ln )
- 
- llib-ldbm.ln: llib-ldbm lpass1
- 	-(/lib/cpp -C -Dlint llib-ldbm | ./lpass1 -uv > llib-ldbm.ln )
- 
- llib-lm.ln: llib-lm lpass1
- 	-(/lib/cpp -C -Dlint llib-lm | ./lpass1 -uv > llib-lm.ln )
- 
- llib-lmp.ln: llib-lmp lpass1
- 	-(/lib/cpp -C -Dlint llib-lmp | ./lpass1 -uv > llib-lmp.ln )
- 
- llib-lplot.ln: llib-lplot lpass1
- 	-(/lib/cpp -C -Dlint llib-lplot | ./lpass1 -uv > llib-lplot.ln )
- 
- llib-ltermcap.ln: llib-ltermcap lpass1
- 	-(/lib/cpp -C -Dlint llib-ltermcap | ./lpass1 -uv > llib-ltermcap.ln )
- 
- llib-lc.ln: llib-lc lpass1
- 	-(/lib/cpp -C -Dlint llib-lc | ./lpass1 -v > llib-lc.ln )
- 
- llib-lcurses.ln: llib-lcurses lpass1
- 	-(/lib/cpp -C -Dlint llib-lcurses | ./lpass1 -v > llib-lcurses.ln )
- 
  lpass2: lpass2.o hash.o
! 	${CC} ${CFLAGS} lpass2.o hash.o -o lpass2
  
  lpass2.o: $M/manifest.h lmanifest.h pcclocal.h macdefs.h
  	${CC} ${CFLAGS} -c -I$M -I. lpass2.c
--- 69,77 ----
  	cat /usr/include/pcc.h $P/localdefs.h | $(GREP) '^#[ 	]*define[ 	][ 	]*PCC_' | sed -e 's/^#[ 	]*define[ 	][ 	]*PCC_/%term	/' > pcctokens
  
  lint.o: $M/manifest.h macdefs.h $M/pass1.h lmanifest.h
  
  lpass2: lpass2.o hash.o
! 	${CC} ${LFLAGS} ${CFLAGS} lpass2.o hash.o -o lpass2
  
  lpass2.o: $M/manifest.h lmanifest.h pcclocal.h macdefs.h
  	${CC} ${CFLAGS} -c -I$M -I. lpass2.c
***************
*** 97,109 ****
  	${CC} ${CFLAGS} -c -I$M -I. hash.c
  
  lintall:
! 	lint -hpv -I. -I$M  $M/cgram.c $M/xdefs.c $M/scan.c \
! 		$M/pftn.c $M/trees.c $M/optim.c lint.c
  
  install: all SHELL
  	install -s lpass1 ${DESTDIR}/usr/lib/lint/lint1
  	install -s lpass2 ${DESTDIR}/usr/lib/lint/lint2
! 	for i in llib-*; do install -c -m 644 $$i ${DESTDIR}/usr/lib/lint; done
  	-rm -f ${DESTDIR}/usr/lib/lint/llib-ltermlib*
  	ln -s llib-ltermcap ${DESTDIR}/usr/lib/lint/llib-ltermlib
  	ln -s llib-ltermcap.ln ${DESTDIR}/usr/lib/lint/llib-ltermlib.ln
--- 80,92 ----
  	${CC} ${CFLAGS} -c -I$M -I. hash.c
  
  lintall:
! 	lint -hpav -I. -I$M  -DPASS1COMMON cgram.c $M/xdefs.c $M/scan.c \
! 		$M/common.c $M/pftn.c $M/trees.c $M/optim.c hash.c lint.c
  
  install: all SHELL
  	install -s lpass1 ${DESTDIR}/usr/lib/lint/lint1
  	install -s lpass2 ${DESTDIR}/usr/lib/lint/lint2
! 	./libs
  	-rm -f ${DESTDIR}/usr/lib/lint/llib-ltermlib*
  	ln -s llib-ltermcap ${DESTDIR}/usr/lib/lint/llib-ltermlib
  	ln -s llib-ltermcap.ln ${DESTDIR}/usr/lib/lint/llib-ltermlib.ln
***************
*** 110,119 ****
  	install -c SHELL ${DESTDIR}/usr/bin/lint
  
  shrink:
! 	rm -f *.o errs rodata.c pcctokens pcclocal.h
  
  clean: shrink
! 	rm -f lpass1 lpass2 cgram.c gram.in tags ${LINTLIBS}
  
  tags:	${SRCS}
  	ctags -w ${SRCS}
--- 93,102 ----
  	install -c SHELL ${DESTDIR}/usr/bin/lint
  
  shrink:
! 	rm -f *.o errs pcctokens pcclocal.h x.c xs.c strings
  
  clean: shrink
! 	rm -f lpass1 lpass2 cgram.c gram.in tags
  
  tags:	${SRCS}
  	ctags -w ${SRCS}
*** /old/src/usr.bin/lint/hash.c	Fri Apr  8 09:14:57 1988
--- /usr/src/usr.bin/lint/hash.c	Sat Aug 17 15:53:52 1991
***************
*** 1,4 ****
! #ifndef lint
  static char sccsid[] = "@(#)hash.c	1.1	(Berkeley)	3/29/83";
  #endif lint
  
--- 1,4 ----
! #if	!defined(lint) && defined(DOSCCS)
  static char sccsid[] = "@(#)hash.c	1.1	(Berkeley)	3/29/83";
  #endif lint
  
*** /old/src/usr.bin/lint/lint.c	Thu Mar 20 18:06:42 1986
--- /usr/src/usr.bin/lint/lint.c	Sat Aug 17 16:42:57 1991
***************
*** 1,4 ****
! #ifndef lint
  static char sccsid[] = "@(#)lint.c	1.10	(Berkeley)	3/20/86";
  #endif lint
  
--- 1,4 ----
! #if	!defined(lint) && defined(DOSCCS)
  static char sccsid[] = "@(#)lint.c	1.10	(Berkeley)	3/20/86";
  #endif lint
  
***************
*** 37,43 ****
  int zflag = 0;  /* no 'structure never defined' error */
  int Cflag = 0;  /* filter out certain output, for generating libraries */
  char *libname = 0;  /* name of the library we're generating */
! 
  	/* flags for the "outdef" function */
  # define USUAL (-101)
  # define DECTY (-102)
--- 37,43 ----
  int zflag = 0;  /* no 'structure never defined' error */
  int Cflag = 0;  /* filter out certain output, for generating libraries */
  char *libname = 0;  /* name of the library we're generating */
! char *hash();
  	/* flags for the "outdef" function */
  # define USUAL (-101)
  # define DECTY (-102)
***************
*** 172,180 ****
  			werror( "lint's little mind is blown" );
  			}
  		else {
! 			j = dimtab[i+3];
  			if( j<0 || j>SYMTSZ ){
! 				k = dimtab[i];
  				l = X_NONAME | stab[j].suse;
  				}
  			else {
--- 172,180 ----
  			werror( "lint's little mind is blown" );
  			}
  		else {
! 			j = (int)dimtab[i+3];
  			if( j<0 || j>SYMTSZ ){
! 				k = (int)dimtab[i];
  				l = X_NONAME | stab[j].suse;
  				}
  			else {
***************
*** 187,193 ****
  						stab[j].sname );
  					}
  				else {
! 					k = dimtab[i];
  #ifdef FLEXNAMES
  					l = hashstr(stab[j].sname);
  #else
--- 187,193 ----
  						stab[j].sname );
  					}
  				else {
! 					k = (int)dimtab[i];
  #ifdef FLEXNAMES
  					l = hashstr(stab[j].sname);
  #else
***************
*** 204,216 ****
  	else return( 0 );
  	}
  
! bfcode( a, n ) int a[]; {
  	/* code for the beginning of a function; a is an array of
  		indices in stab for the arguments; n is the number */
  	/* this must also set retlab */
  	register i;
  	register struct symtab *cfp;
! 	static ATYPE t;
  
  	retlab = 1;
  
--- 204,216 ----
  	else return( 0 );
  	}
  
! bfcode( a, n ) OFFSZ a[]; {
  	/* code for the beginning of a function; a is an array of
  		indices in stab for the arguments; n is the number */
  	/* this must also set retlab */
  	register i;
  	register struct symtab *cfp;
! 	ATYPE t;		/* XXX static */
  
  	retlab = 1;
  
***************
*** 272,278 ****
  	}
  
  lpta( p ) NODE *p; {
! 	static ATYPE t;
  
  	if( p->in.op == CM ){
  		lpta( p->in.left );
--- 272,278 ----
  	}
  
  lpta( p ) NODE *p; {
! 	ATYPE t;		/* XXX static */
  
  	if( p->in.op == CM ){
  		lpta( p->in.left );
***************
*** 651,657 ****
  
  	register o;
  	register unsigned t, tl;
! 	int s;
  
  	switch( o = p->in.op ){
  
--- 651,657 ----
  
  	register o;
  	register unsigned t, tl;
! 	CONSZ s;
  
  	switch( o = p->in.op ){
  
***************
*** 732,738 ****
  	}
  
  
! cinit( p, sz ) NODE *p; { /* initialize p into size sz */
  	inoff += sz;
  	if( p->in.op == INIT ){
  		if( p->in.left->in.op == ICON ) return;
--- 732,738 ----
  	}
  
  
! cinit( p, sz ) NODE *p; OFFSZ sz; { /* initialize p into size sz */
  	inoff += sz;
  	if( p->in.op == INIT ){
  		if( p->in.left->in.op == ICON ) return;
***************
*** 759,769 ****
  
  char *
  strip(s) char *s; {
! #ifndef FLEXNAMES
! 	static char x[LFNM+1];
! #else
! 	static char x[BUFSIZ];
! #endif
  	register char *p;
  	static	int	stripping = 0;
  
--- 759,765 ----
  
  char *
  strip(s) char *s; {
! 	static char x[128];		/* was BUFSIZ */
  	register char *p;
  	static	int	stripping = 0;
  
***************
*** 772,783 ****
  	stripping++;
  	for( p=x; *s; ++s ){
  		if( *s != '"' ){
! #ifndef FLEXNAMES
! /* PATCHED by ROBERT HENRY on 8Jul80 to fix 14 character file name bug */
! 			if( p >= &x[LFNM] )
! #else
! 			if( p >= &x[BUFSIZ] )
! #endif
  				cerror( "filename too long" );
  			*p++ = *s;
  		}
--- 768,774 ----
  	stripping++;
  	for( p=x; *s; ++s ){
  		if( *s != '"' ){
! 			if( p >= &x[sizeof (x)] )
  				cerror( "filename too long" );
  			*p++ = *s;
  		}
***************
*** 784,822 ****
  	}
  	stripping = 0;
  	*p = '\0';
- #ifndef FLEXNAMES
- 	return( x );
- #else
  	return( hash(x) );
- #endif
  	}
  
  fsave( s ) char *s; {
  	static union rec fsname;
  	s = strip( s );
- #ifndef FLEXNAMES
- 	if( strncmp( s, fsname.f.fn, LFNM ) )
- #else
  	if (fsname.f.fn == NULL || strcmp(s, fsname.f.fn))
- #endif
  		{
  		/* new one */
- #ifndef FLEXNAMES
- 		strncpy( fsname.f.fn, s, LFNM );
- #else
  		fsname.f.fn = s;
- #endif
  		fsname.f.decflag = LFN;
  		fwrite( (char *)&fsname, sizeof(fsname), 1, stdout );
- #ifdef FLEXNAMES
  		/* if generating a library, prefix with the library name */
- 		/* only do this for flexnames */
  		if( libname ){
  			fwrite( libname, strlen(libname), 1, stdout );
  			putchar( ':' );
  			}
  		fwrite( fsname.f.fn, strlen(fsname.f.fn)+1, 1, stdout );
- #endif
  		}
  	}
  
--- 775,799 ----
  	}
  	stripping = 0;
  	*p = '\0';
  	return( hash(x) );
  	}
  
  fsave( s ) char *s; {
  	static union rec fsname;
+ 
  	s = strip( s );
  	if (fsname.f.fn == NULL || strcmp(s, fsname.f.fn))
  		{
  		/* new one */
  		fsname.f.fn = s;
  		fsname.f.decflag = LFN;
  		fwrite( (char *)&fsname, sizeof(fsname), 1, stdout );
  		/* if generating a library, prefix with the library name */
  		if( libname ){
  			fwrite( libname, strlen(libname), 1, stdout );
  			putchar( ':' );
  			}
  		fwrite( fsname.f.fn, strlen(fsname.f.fn)+1, 1, stdout );
  		}
  	}
  
***************
*** 850,855 ****
--- 827,835 ----
  main( argc, argv ) char *argv[]; {
  	char *p;
  	int i;
+ 	char ibuf[BUFSIZ];
+ 
+ 	setbuf(stdin, ibuf);
  
  	/* handle options */
  
*** /old/src/usr.bin/lint/lmanifest.h	Fri Apr  5 16:40:13 1985
--- /usr/src/usr.bin/lint/lmanifest.h	Sun Aug  4 08:53:52 1991
***************
*** 24,33 ****
  
  # define LFN 01000  /* filename record */
  
! 	/* number of chars in NAME, and filename */
  #ifndef FLEXNAMES
  # define LCHNM 8
- # define LFNM 14
  #endif
  
  typedef struct ty {
--- 24,32 ----
  
  # define LFN 01000  /* filename record */
  
! 	/* number of chars in NAME */
  #ifndef FLEXNAMES
  # define LCHNM 8
  #endif
  
  typedef struct ty {
***************
*** 54,63 ****
  	struct line l;
  	struct {
  		short decflag;
- #ifndef FLEXNAMES
- 		char fn[LFNM];
- #else
  		char *fn;
- #endif
  		} f;
  	};
--- 53,58 ----
*** /old/src/usr.bin/lint/lpass2.c	Fri Feb 21 19:02:53 1986
--- /usr/src/usr.bin/lint/lpass2.c	Sat Aug 17 15:53:19 1991
***************
*** 1,4 ****
! #ifndef lint
  static char sccsid[] = "@(#)lpass2.c	1.6	(Berkeley)	2/21/86";
  #endif lint
  
--- 1,4 ----
! #if	!defined(lint) && defined(DOSCCS)
  static char sccsid[] = "@(#)lpass2.c	1.6	(Berkeley)	2/21/86";
  #endif lint
  
***************
*** 12,21 ****
  # define RVAL 010
  # define VARARGS 0100
  
! # define NSZ 4096
! # define TYSZ 3500
! # define FSZ 500
! # define NTY 50
  
  typedef struct sty STYPE;
  struct sty { ATYPE t; STYPE *next; };
--- 12,21 ----
  # define RVAL 010
  # define VARARGS 0100
  
! # define NSZ 1630		/* was 4096 */
! # define TYSZ 1150		/* was 3500 */
! # define FSZ 200		/* was 500 must be less than 256 */
! # define NTY 32			/* was 50 */
  
  typedef struct sty STYPE;
  struct sty { ATYPE t; STYPE *next; };
***************
*** 26,36 ****
  #else
  	char *name;
  #endif
- 	short nargs;
  	int decflag;
  	int fline;
  	STYPE symty;
! 	int fno;
  	int use;
  	} STAB;
  
--- 26,36 ----
  #else
  	char *name;
  #endif
  	int decflag;
  	int fline;
  	STYPE symty;
! 	unsigned char nargs;
! 	unsigned char fno;
  	int use;
  	} STAB;
  
***************
*** 40,55 ****
  STYPE tary[TYSZ];
  STYPE *tget();
  
- #ifndef FLEXNAMES
- char fnm[FSZ][LFNM];
- #else
  char *fnm[FSZ];
! #endif
  
- #ifdef FLEXNAMES
- char *getstr();
- #endif
- 
  int tfree;  /* used to allocate types */
  int ffree;  /* used to save filenames */
  
--- 40,48 ----
  STYPE tary[TYSZ];
  STYPE *tget();
  
  char *fnm[FSZ];
! char *getstr(), *hash();
  
  int tfree;  /* used to allocate types */
  int ffree;  /* used to save filenames */
  
***************
*** 69,74 ****
--- 62,68 ----
  
  main( argc, argv ) char *argv[]; {
  	register char *p;
+ 	char ibuf[BUFSIZ], obuf[BUFSIZ];
  
  	/* first argument is intermediate file */
  	/* second argument is - options */
***************
*** 113,118 ****
--- 107,114 ----
  		error( "cannot open intermediate file" );
  		exit( 1 );
  		}
+ 	setbuf(stdin, ibuf);
+ 	setbuf(stdout, obuf);
  	if( Pflag ){
  		pfile();
  		return( 0 );
***************
*** 145,153 ****
  		if( fread( (char *)&r, sizeof(r), 1, stdin ) <= 0 ) return(0);
  		if( r.l.decflag & LFN ){
  			/* new filename */
- #ifdef FLEXNAMES
  			r.f.fn = getstr();
- #endif
  			if( Pflag ) return( 1 );
  			setfno( r.f.fn );
  			continue;
--- 141,147 ----
***************
*** 170,180 ****
  
  	/* now look up s */
  	for( i=0; i<ffree; ++i ){
- #ifndef FLEXNAMES
- 		if( !strncmp( s, fnm[i], LFNM ) )
- #else
  		if (fnm[i] == s)
- #endif
  			{
  			cfno = i;
  			return;
--- 164,170 ----
***************
*** 182,192 ****
  		}
  	/* make a new entry */
  	if( ffree >= FSZ ) error( "more than %d files", FSZ );
- #ifndef FLEXNAMES
- 	strncpy( fnm[ffree], s, LFNM );
- #else
  	fnm[ffree] = s;
- #endif
  	cfno = ffree++;
  	}
  
--- 172,178 ----
***************
*** 193,203 ****
  /* VARARGS */
  error( s, a ) char *s; {
  
- #ifndef FLEXNAMES
- 	fprintf( stderr, "pass 2 error:(file %.*s) ", LFNM, fnm[cfno] );
- #else
  	fprintf( stderr, "pass 2 error:(file %s) ", fnm[cfno] );
- #endif
  	fprintf( stderr, s, a );
  	fprintf( stderr, "\n" );
  	exit(1);
--- 179,185 ----
***************
*** 209,215 ****
  #ifndef FLEXNAMES
  	h = hashstr(r.l.name, LCHNM) % NSZ;
  #else
! 	h = (int)r.l.name % NSZ;
  #endif
  	{	register STAB *p, *q;
  		for( p=q= &stab[h]; q->decflag; ){
--- 191,197 ----
  #ifndef FLEXNAMES
  	h = hashstr(r.l.name, LCHNM) % NSZ;
  #else
! 	h = (unsigned int)r.l.name % NSZ;
  #endif
  	{	register STAB *p, *q;
  		for( p=q= &stab[h]; q->decflag; ){
***************
*** 337,351 ****
  
  viceversa(q) STAB *q; {
  	/* print out file comparison */
! #ifndef FLEXNAMES
! 	printf( "	%.*s(%d)  ::  %.*s(%d)\n",
! 		LFNM, fnm[q->fno], q->fline,
! 		LFNM, fnm[cfno], r.l.fline );
! #else
  	printf( "	%s(%d)  ::  %s(%d)\n",
  		fnm[q->fno], q->fline,
  		fnm[cfno], r.l.fline );
- #endif
  	}
  
  	/* messages for defintion/use */
--- 319,328 ----
  
  viceversa(q) STAB *q; {
  	/* print out file comparison */
! 
  	printf( "	%s(%d)  ::  %s(%d)\n",
  		fnm[q->fno], q->fline,
  		fnm[cfno], r.l.fline );
  	}
  
  	/* messages for defintion/use */
***************
*** 353,361 ****
  mess[2][2] ={
  	"",
  #ifndef FLEXNAMES
! 	"%.8s used( %.*s(%d) ), but not defined\n",
! 	"%.8s defined( %.*s(%d) ), but never used\n",
! 	"%.8s declared( %.*s(%d) ), but never used or defined\n"
  #else
  	"%s used( %s(%d) ), but not defined\n",
  	"%s defined( %s(%d) ), but never used\n",
--- 330,338 ----
  mess[2][2] ={
  	"",
  #ifndef FLEXNAMES
! 	"%.8s used( %s(%d) ), but not defined\n",
! 	"%.8s defined( %s(%d) ), but never used\n",
! 	"%.8s declared( %s(%d) ), but never used or defined\n"
  #else
  	"%s used( %s(%d) ), but not defined\n",
  	"%s defined( %s(%d) ), but never used\n",
***************
*** 397,419 ****
  			}
  		}
  	if( uflag && ( nu || nd ) )
- #ifndef FLEXNAMES
- 		printf( mess[nu][nd], q->name, LFNM, fnm[q->fno], q->fline );
- #else
  		printf( mess[nu][nd], q->name, fnm[q->fno], q->fline );
- #endif
  
  	if( (uses&(RVAL+EUSED)) == (RVAL+EUSED) ){
  		/* if functions is static, then print the file name too */
  		if( q->decflag & LST )
- #ifndef FLEXNAMES
- 			printf( "%.*s(%d):", LFNM, fnm[q->fno], q->fline );
- #else
  			printf( "%s(%d):", fnm[q->fno], q->fline );
- #endif
  #ifndef FLEXNAMES
! 		printf( "%.*s returns value which is %s ignored\n",
! 			LCHNM, q->name, uses&VUSED ? "sometimes" : "always" );
  #else
  		printf( "%s returns value which is %s ignored\n",
  			q->name, uses&VUSED ? "sometimes" : "always" );
--- 374,388 ----
  			}
  		}
  	if( uflag && ( nu || nd ) )
  		printf( mess[nu][nd], q->name, fnm[q->fno], q->fline );
  
  	if( (uses&(RVAL+EUSED)) == (RVAL+EUSED) ){
  		/* if functions is static, then print the file name too */
  		if( q->decflag & LST )
  			printf( "%s(%d):", fnm[q->fno], q->fline );
  #ifndef FLEXNAMES
! 		printf( "%.8s returns value which is %s ignored\n",
! 			q->name, uses&VUSED ? "sometimes" : "always" );
  #else
  		printf( "%s returns value which is %s ignored\n",
  			q->name, uses&VUSED ? "sometimes" : "always" );
***************
*** 422,435 ****
  
  	if( (uses&(RVAL+VUSED)) == (VUSED) && (q->decflag&(LDI|LIB|LST)) ){
  		if( q->decflag & LST )
- #ifndef FLEXNAMES
- 			printf( "%.*s(%d):", LFNM, fnm[q->fno], q->fline );
- #else
  			printf( "%s(%d):", fnm[q->fno], q->fline );
- #endif
  #ifndef FLEXNAMES
! 		printf( "%.*s value is used, but none returned\n",
! 			LCHNM, q->name);
  #else
  		printf( "%s value is used, but none returned\n", q->name);
  #endif
--- 391,399 ----
  
  	if( (uses&(RVAL+VUSED)) == (VUSED) && (q->decflag&(LDI|LIB|LST)) ){
  		if( q->decflag & LST )
  			printf( "%s(%d):", fnm[q->fno], q->fline );
  #ifndef FLEXNAMES
! 		printf( "%.8s value is used, but none returned\n", q->name);
  #else
  		printf( "%s value is used, but none returned\n", q->name);
  #endif
***************
*** 444,450 ****
  	exit(0);
  	}
  
! setuse(q) STAB *q; { /* check new type to ensure that it is used */
  
  	if( !q->decflag ){ /* new one */
  		q->decflag = r.l.decflag;
--- 408,414 ----
  	exit(0);
  	}
  
! setuse(q) register STAB *q; { /* check new type to ensure that it is used */
  
  	if( !q->decflag ){ /* new one */
  		q->decflag = r.l.decflag;
***************
*** 580,596 ****
  	ptb( r.l.decflag, dfs );
  	putchar( '\n' );
  	if( r.l.decflag & LFN ){
- #ifdef FLEXNAMES
  		printf( "fn\t\t%s\n", r.f.fn );
- #else
- 		printf( "fn\t%\t.*s\n", LFNM, r.f.fn );
- #endif
  		}
  	else {
  #ifdef FLEXNAMES
  		printf( "name\t%s\n", r.l.name );
  #else
! 		printf( "name\t%.*s\n", LCHNM, r.l.name );
  #endif
  		printf( "nargs\t%d\n", r.l.nargs );
  		printf( "fline\t%d\n", r.l.fline );
--- 544,556 ----
  	ptb( r.l.decflag, dfs );
  	putchar( '\n' );
  	if( r.l.decflag & LFN ){
  		printf( "fn\t\t%s\n", r.f.fn );
  		}
  	else {
  #ifdef FLEXNAMES
  		printf( "name\t%s\n", r.l.name );
  #else
! 		printf( "name\t%.8s\n", r.l.name );
  #endif
  		printf( "nargs\t%d\n", r.l.nargs );
  		printf( "fline\t%d\n", r.l.fline );
***************
*** 666,672 ****
  		}
  	}
  
- #ifdef FLEXNAMES
  char *
  getstr()
  {
--- 626,631 ----
***************
*** 686,692 ****
  	return (hash(buf));
  }
  
! #define	NSAVETAB	4096
  char	*savetab;
  int	saveleft;
  
--- 645,651 ----
  	return (hash(buf));
  }
  
! #define	NSAVETAB	1024		/* was 4096 */
  char	*savetab;
  int	saveleft;
  
***************
*** 717,724 ****
  /*
   * The definition for the segmented hash tables.
   */
! #define	MAXHASH	20
! #define	HASHINC	1013
  struct ht {
  	char	**ht_low;
  	char	**ht_high;
--- 676,683 ----
  /*
   * The definition for the segmented hash tables.
   */
! #define	MAXHASH	30
! #define	HASHINC	111		/* was 1013 */
  struct ht {
  	char	**ht_low;
  	char	**ht_high;
***************
*** 782,785 ****
  	exit(1);
  }
  char	*tstrbuf[1];
- #endif
--- 741,743 ----
*** /old/src/usr.bin/prof/prof.c	Fri May  8 10:15:05 1987
--- /usr/src/usr.bin/prof/prof.c	Thu Jun 25 22:11:14 1992
***************
*** 246,252 ****
   */
  getsymtab()
  {
! 	register int i;
  #ifdef BSD2_10
  	long symoff;
  #endif
--- 246,252 ----
   */
  getsymtab()
  {
! 	long i;
  #ifdef BSD2_10
  	long symoff;
  #endif
***************
*** 266,271 ****
--- 266,273 ----
  	if (!(xbuf.a_flag & 01))
  		symoff *= 2;
  	symoff += sizeof(xbuf);
+ 	if (xbuf.a_magic == A_MAGIC5 || xbuf.a_magic == A_MAGIC6)
+ 		symoff += sizeof(struct ovlhdr);
  	fseek(nfile, symoff, 0);
  #else !BSD2_10
  	fseek(nfile, N_SYMOFF(xbuf), 0);
***************
*** 587,593 ****
  	float d;
  
  	if (nflg && p2->ncall != p1->ncall)
! 		return (p2->ncall - p1->ncall);
  	d = p2->time - p1->time;
  	if (d > 0.0)
  		return(1);
--- 589,601 ----
  	float d;
  
  	if (nflg && p2->ncall != p1->ncall)
! 		{
! 		if (p2->ncall < p1->ncall)
! 			return(-1);
! 		else if (p2->ncall > p1->ncall)
! 			return(1);
! 		return(0);
! 		}
  	d = p2->time - p1->time;
  	if (d > 0.0)
  		return(1);
*** /old/src/usr.bin/tip/cmds.c	Tue Sep 20 15:15:54 1988
--- /usr/src/usr.bin/tip/cmds.c	Thu Jul 23 23:53:55 1992
***************
*** 352,358 ****
  	char line[BUFSIZ];
  	int argc;
  	char *expand();
! 	char *copynamex;
  
  	if (prompt("[put] ", copyname))
  		return;
--- 352,358 ----
  	char line[BUFSIZ];
  	int argc;
  	char *expand();
! 	char *cpynamex;
  
  	if (prompt("[put] ", copyname))
  		return;
***************
*** 362,370 ****
  	}
  	if (argc == 1)
  		argv[1] = argv[0];
! 	copynamex = expand(argv[0]);
! 	if ((fd = fopen(copynamex, "r")) == NULL) {
! 		printf("%s: cannot open\r\n", copynamex);
  		return;
  	}
  	if (boolean(value(ECHOCHECK)))
--- 362,370 ----
  	}
  	if (argc == 1)
  		argv[1] = argv[0];
! 	cpynamex = expand(argv[0]);
! 	if ((fd = fopen(cpynamex, "r")) == NULL) {
! 		printf("%s: cannot open\r\n", cpynamex);
  		return;
  	}
  	if (boolean(value(ECHOCHECK)))
*** /old/src/usr.lib/sendmail/src/alias.c	Fri Jul 21 13:39:46 1989
--- /usr/src/usr.lib/sendmail/src/alias.c	Thu Aug 22 13:25:20 1991
***************
*** 311,317 ****
  	register char *p;
  	char *rhs;
  	bool skipping;
! 	int naliases, bytes, longest;
  	FILE *af;
  	int (*oldsigint)();
  	ADDRESS al, bl;
--- 311,318 ----
  	register char *p;
  	char *rhs;
  	bool skipping;
! 	int naliases, longest;
! 	long bytes;
  	FILE *af;
  	int (*oldsigint)();
  	ADDRESS al, bl;
***************
*** 540,550 ****
  	(void) fclose(af);
  	CurEnv->e_to = NULL;
  	FileName = NULL;
! 	message(Arpa_Info, "%d aliases, longest %d bytes, %d bytes total",
  			naliases, longest, bytes);
  # ifdef LOG
  	if (LogLevel >= 8)
! 		syslog(LOG_INFO, "%d aliases, longest %d bytes, %d bytes total",
  			naliases, longest, bytes);
  # endif LOG
  }
--- 541,551 ----
  	(void) fclose(af);
  	CurEnv->e_to = NULL;
  	FileName = NULL;
! 	message(Arpa_Info, "%d aliases, longest %d bytes, %ld bytes total",
  			naliases, longest, bytes);
  # ifdef LOG
  	if (LogLevel >= 8)
! 		syslog(LOG_INFO, "%d aliases, longest %d bytes, %ld bytes total",
  			naliases, longest, bytes);
  # endif LOG
  }
*** /old/src/usr.lib/sendmail/src/conf.h	Thu Nov  2 06:05:32 1989
--- /usr/src/usr.lib/sendmail/src/conf.h	Sun Sep 22 14:00:58 1991
***************
*** 24,30 ****
  #ifdef BSD2_10
  # define MAXLINE	256		/* max line length */
  # define MAXNAME	128		/* max length of a name */
! # define MAXFIELD	768		/* max total length of a hdr field */
  # define MAXPV		30		/* max # of parms to mailers */
  # define MAXHOP		17		/* max value of HopCount */
  # define MAXATOM	70		/* max atoms per address */
--- 24,30 ----
  #ifdef BSD2_10
  # define MAXLINE	256		/* max line length */
  # define MAXNAME	128		/* max length of a name */
! # define MAXFIELD	1024		/* max total length of a hdr field */
  # define MAXPV		30		/* max # of parms to mailers */
  # define MAXHOP		17		/* max value of HopCount */
  # define MAXATOM	70		/* max atoms per address */
*** /old/src/new/rn/addng.c	Sun Mar 15 20:10:54 1987
--- /usr/src/new/rn/addng.c	Thu Aug 27 11:04:00 1992
***************
*** 39,68 ****
  
  bool
  newlist(munged,checkinlist)
! bool munged;				/* are we scanning the whole file? */
  bool checkinlist;
  {
      char *tmpname;
!     register char *s;
      long birthof();
  
!     tmpname = savestr(filexp("/tmp/rnew.%$"));
!     tmpfp = fopen(tmpname,"w");
      if (tmpfp == Nullfp) {
  	printf(cantcreate,tmpname) FLUSH;
  	return FALSE;
      }
      while (fgets(buf,LBUFLEN,actfp) != Nullch) {
  	if (s = index(buf,' ')) {
  	    *s++ = '\0';
! 	    if (strnEQ(buf,"to.",3))
  		continue;
! 	    if (find_ng(buf) == nextrcline &&
! 		    (checkinlist ?
! 			(inlist(buf)) :
! 			(birthof(buf,(ART_NUM)atol(s)) > lasttime)
! 		    )
! 		) {
  					/* if not in .newsrc and younger */
  					/* than the last time we checked */
  		fprintf(tmpfp,"%s\n",buf);
--- 39,89 ----
  
  bool
  newlist(munged,checkinlist)
! bool munged;			/* are we scanning the whole file? */
  bool checkinlist;
  {
      char *tmpname;
!     register char *s, *status;
!     register NG_NUM ngnum;
! #ifndef ACTIVE_TIMES
      long birthof();
+ #endif
+     extern char int_count;
  
!     tmpname = filexp("/tmp/rnew.%$");
!     tmpfp = fopen(tmpname,"w+");
      if (tmpfp == Nullfp) {
  	printf(cantcreate,tmpname) FLUSH;
  	return FALSE;
      }
+     UNLINK(tmpname);			/* be nice to the world */
+ 
      while (fgets(buf,LBUFLEN,actfp) != Nullch) {
+ 	/* Check if they want to break out of the new newsgroups search */
+ 	if (int_count) {
+ 	    int_count = 0;
+ 	    fclose(tmpfp);
+ 	    return FALSE;
+ 	}
  	if (s = index(buf,' ')) {
+ 	    status=s;
+ 	    while (isdigit(*status) || isspace(*status)) status++;
  	    *s++ = '\0';
! 	    if (strnEQ(buf,"to.",3) || *status == 'x' || *status == '=')
! 	        /* since = groups are refiling to another group, just
! 		   ignore their existence */
  		continue;
! #ifdef ACTIVE_TIMES
! 	    if (inlist(buf) && ((ngnum = find_ng(buf)) == nextrcline
! 				|| toread[ngnum] == TR_UNSUB)
! #else
! 	    if (checkinlist ?
! 		(inlist(buf) && ((ngnum = find_ng(buf)) == nextrcline
! 				 || toread[ngnum] == TR_UNSUB))
! 	      : (find_ng(buf) == nextrcline
! 		 && birthof(buf,(ART_NUM)atol(s)) > lasttime)
! #endif
! 	    ) {
  					/* if not in .newsrc and younger */
  					/* than the last time we checked */
  		fprintf(tmpfp,"%s\n",buf);
***************
*** 72,79 ****
  	    else {			/* not really a new group */
  		if (!munged) {		/* did we assume not munged? */
  		    fclose(tmpfp);	/* then go back, knowing that */
- 		    UNLINK(tmpname);
- 		    free(tmpname);
  		    return TRUE;	/* active file was indeed munged */
  		}
  	    }
--- 93,98 ----
***************
*** 87,105 ****
  
      /* we have successfully generated the list */
  
!     fclose(tmpfp);
!     tmpfp = fopen(tmpname,"r");
!     UNLINK(tmpname);			/* be nice to the world */
!     if (tmpfp == Nullfp) {
! 	printf(cantopen,tmpname) FLUSH;
! 	return FALSE;
!     }
      while (fgets(buf,LBUFLEN,tmpfp) != Nullch) {
  	buf[strlen(buf)-1] = '\0';
  	get_ng(buf,TRUE);		/* add newsgroup, maybe */
      }
      fclose(tmpfp);			/* be nice to ourselves */
-     free(tmpname);
      return FALSE;			/* do not call us again */
  }
  
--- 106,117 ----
  
      /* we have successfully generated the list */
  
!     fseek(tmpfp,0L,0);			/* rewind back to the beginning */
      while (fgets(buf,LBUFLEN,tmpfp) != Nullch) {
  	buf[strlen(buf)-1] = '\0';
  	get_ng(buf,TRUE);		/* add newsgroup, maybe */
      }
      fclose(tmpfp);			/* be nice to ourselves */
      return FALSE;			/* do not call us again */
  }
  
*** /old/src/new/rn/common.h	Mon Oct  8 14:05:08 1990
--- /usr/src/new/rn/common.h	Wed Jun 10 14:13:49 1992
***************
*** 213,223 ****
  /* Space conservation section */
  
  /* To save D space, cut down size of MAXRCLINE, NGMAX, VARYSIZE. */
! #define MAXRCLINE 800	/* number of lines allowed in .newsrc -was 1000*/
  			/* several parallel arrays affected. */
  			/* (You can have more lines in the active file, */
  			/* just not in the .newsrc) */
! #define HASHSIZ 881	/* should be prime, and at least MAXRCLINE + 10% 1013*/
  #define NGMAX 10	/* number of newsgroups allowed on command line -10*/
  			/* undefine ONLY symbol to disable "only" feature */
  #define VARYSIZE 128	/* this makes a block 1024 bytes long in DECville */
--- 213,223 ----
  /* Space conservation section */
  
  /* To save D space, cut down size of MAXRCLINE, NGMAX, VARYSIZE. */
! #define MAXRCLINE 900	/* number of lines allowed in .newsrc */
  			/* several parallel arrays affected. */
  			/* (You can have more lines in the active file, */
  			/* just not in the .newsrc) */
! #define HASHSIZ 991	/* should be prime, and at least MAXRCLINE + 10% */
  #define NGMAX 10	/* number of newsgroups allowed on command line -10*/
  			/* undefine ONLY symbol to disable "only" feature */
  #define VARYSIZE 128	/* this makes a block 1024 bytes long in DECville */
***************
*** 237,243 ****
  #define NOFIREWORKS	/* keep whole screen from flashing on certain */
  			/* terminals such as older Televideos */
  #define VERIFY		/* echo the command they just typed */
! #define HASHNG		/* hash newsgroup lines for fast lookup-- */
  			/* linear search used if not defined */
  #define CONDSUB		/* allow %(cond?text:text) */
  #define BACKTICK	/* allow %`command` */
--- 237,243 ----
  #define NOFIREWORKS	/* keep whole screen from flashing on certain */
  			/* terminals such as older Televideos */
  #define VERIFY		/* echo the command they just typed */
! #undef HASHNG		/* hash newsgroup lines for fast lookup-- */
  			/* linear search used if not defined */
  #define CONDSUB		/* allow %(cond?text:text) */
  #define BACKTICK	/* allow %`command` */
***************
*** 282,288 ****
  #define ASYNC_PARSE	/* allow parsing headers asyncronously to reading */
  			/* used by MCHASE and MUNGHEADER */
  #define FINDNEWNG	/* check for new newsgroups on startup */
! #define FASTNEW		/* do optimizations on FINDNEWNG for faster startup */
  			/* (this optimization can make occasional mistakes */
  			/* if a group is removed and another group of the */
  			/* same length is added, and if no softpointers are */
--- 282,288 ----
  #define ASYNC_PARSE	/* allow parsing headers asyncronously to reading */
  			/* used by MCHASE and MUNGHEADER */
  #define FINDNEWNG	/* check for new newsgroups on startup */
! #undef FASTNEW		/* do optimizations on FINDNEWNG for faster startup */
  			/* (this optimization can make occasional mistakes */
  			/* if a group is removed and another group of the */
  			/* same length is added, and if no softpointers are */
***************
*** 679,685 ****
  #endif
  typedef long		ART_POS;	/* char position in article file */
  typedef int		ART_LINE;	/* line position in article file */
! typedef short		ACT_POS;	/* char position in active file */
  typedef unsigned int	MEM_SIZE;	/* for passing to malloc */
  
  /* *** end of the machine dependent stuff *** */
--- 679,686 ----
  #endif
  typedef long		ART_POS;	/* char position in article file */
  typedef int		ART_LINE;	/* line position in article file */
! /* following was short until 6/9/92 */
! typedef long		ACT_POS;	/* char position in active file */
  typedef unsigned int	MEM_SIZE;	/* for passing to malloc */
  
  /* *** end of the machine dependent stuff *** */
*** /old/src/new/rn/ngdata.c	Sun Mar 15 22:26:37 1987
--- /usr/src/new/rn/ngdata.c	Fri Jun 12 10:09:38 1992
***************
*** 117,122 ****
--- 117,123 ----
  #ifdef MININACT
      {
  	register char *s;
+ 	char *getval();
  	ART_NUM tmp;
  
  	for (s=tmpbuf+len+1; isdigit(*s); s++) ;
***************
*** 126,131 ****
--- 127,148 ----
  #else
  	    abs1st = tmp;
  #endif
+ 	if (!in_ng) {
+ 	    for (s++; isdigit(*s); s++) ;
+ 	    while (isspace(*s)) s++;
+ 	    switch (*s) {
+ 	    case 'n': moderated = getval("NOPOSTRING"," (no posting)"); break;
+ 	    case 'm': moderated = getval("MODSTRING", " (moderated)"); break;
+ 	    /* This shouldn't even occur.  What are we doing in a non-existent
+ 	       group?  Disallow it. */
+ 	    case 'x': return TR_BOGUS;
+ 	    /* what should be done about refiled groups?  rn shouldn't even
+ 	       be in them (ie, if sci.aquaria is refiled to rec.aquaria, then
+ 	       get the news there) */
+ 	    case '=': return TR_BOGUS;
+ 	    default: moderated = nullstr;
+ 	    }
+ 	}
      }
  #endif
      return atol(tmpbuf+len+1);
*** /old/src/new/rn/ngdata.h	Sun Mar 15 22:37:32 1987
--- /usr/src/new/rn/ngdata.h	Fri Jun 12 10:06:37 1992
***************
*** 22,27 ****
--- 22,28 ----
  # endif
  #endif
  
+ EXT	char	*moderated;
  
  void	ngdata_init();
  ART_NUM	getngsize();
*** /old/src/new/rn/rcstuff.c	Fri May 29 09:33:43 1987
--- /usr/src/new/rn/rcstuff.c	Thu Jun 11 08:17:37 1992
***************
*** 111,117 ****
  	    finalize(1);
  	}
  	if (tmpfp != Nullfp && fgets(tmpbuf,10,tmpfp) != Nullch)
! 	    softptr[newng] = atoi(tmpbuf);
  	else
  	    softptr[newng] = 0;
  	some_buf[--length] = '\0';	/* wipe out newline */
--- 111,117 ----
  	    finalize(1);
  	}
  	if (tmpfp != Nullfp && fgets(tmpbuf,10,tmpfp) != Nullch)
! 	    softptr[newng] = atol(tmpbuf);
  	else
  	    softptr[newng] = 0;
  	some_buf[--length] = '\0';	/* wipe out newline */
