*** /old/src/sys/sys/vm_text.c	Sat Apr  7 20:00:00 1990
--- /usr/src/sys/sys/vm_text.c	Thu Jun  6 20:01:19 1991
***************
*** 202,208 ****
  	else
  		xp->x_size = ts;
  	if ((xp->x_daddr = malloc(swapmap, (size_t)ctod(xp->x_size))) == NULL) {
! 		swkill(u.u_procp, "xalloc: no swap space");
  		return;
  	}
  	xp->x_count = 1;
--- 202,208 ----
  	else
  		xp->x_size = ts;
  	if ((xp->x_daddr = malloc(swapmap, (size_t)ctod(xp->x_size))) == NULL) {
! 		swkill(u.u_procp, "xalloc");
  		return;
  	}
  	xp->x_count = 1;
*** /old/src/ucb/Mail/aux.c	Mon Feb 16 22:07:15 1987
--- /usr/src/ucb/Mail/aux.c	Sat Aug 17 12:35:25 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)aux.c	5.4 (Berkeley) 1/13/86";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)aux.c	5.4 (Berkeley) 1/13/86";
  #endif not lint
  
***************
*** 40,61 ****
  }
  
  /*
-  * Copy the name from the passed header line into the passed
-  * name buffer.  Null pad the name buffer.
-  */
- 
- copyname(linebuf, nbuf)
- 	char *linebuf, *nbuf;
- {
- 	register char *cp, *cp2;
- 
- 	for (cp = linebuf + 5, cp2 = nbuf; *cp != ' ' && cp2-nbuf < 8; cp++)
- 		*cp2++ = *cp;
- 	while (cp2-nbuf < 8)
- 		*cp2++ = 0;
- }
- 
- /*
   * Announce a fatal error and die.
   */
  
--- 40,45 ----
***************
*** 69,87 ****
  }
  
  /*
-  * Catch stdio errors and report them more nicely.
-  */
- 
- _error(str)
- 	char *str;
- {
- 	prs("Stdio Error: ");
- 	prs(str);
- 	prs("\n");
- 	abort();
- }
- 
- /*
   * Print a string on diagnostic output.
   */
  
--- 53,58 ----
***************
*** 213,219 ****
--- 184,192 ----
  	register int rem;
  {
  	char line2[LINESIZE];
+ #ifdef	CANTELL
  	long loc;
+ #endif
  	register char *cp, *cp2;
  	register int c;
  
***************
*** 412,432 ****
  }
  
  /*
-  * Source a file, but do nothing if the file cannot be opened.
-  */
- 
- source1(name)
- 	char name[];
- {
- 	register int f;
- 
- 	if ((f = open(name, 0)) < 0)
- 		return(0);
- 	close(f);
- 	source(name);
- }
- 
- /*
   * Pop the current input back to the previous level.
   * Update the "sourcing" flag as appropriate.
   */
--- 385,390 ----
***************
*** 739,759 ****
  		if (c == *cp)
  			cp2 = cp;
  	return(cp2);
- }
- 
- /*
-  * See if the string is a number.
-  */
- 
- numeric(str)
- 	char str[];
- {
- 	register char *cp = str;
- 
- 	while (*cp)
- 		if (!isdigit(*cp++))
- 			return(0);
- 	return(1);
  }
  
  /*
--- 697,702 ----
*** /old/src/ucb/Mail/cmd1.c	Mon Feb 16 22:07:16 1987
--- /usr/src/ucb/Mail/cmd1.c	Sat Aug 17 11:30:21 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)cmd1.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)cmd1.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
***************
*** 325,333 ****
  	register struct message *mp;
  	register int mesg;
  	register char *cp;
! 	int c, nlines;
  	int brokpipe();
! 	FILE *ibuf, *obuf;
  
  	obuf = stdout;
  	if (setjmp(pipestop)) {
--- 325,333 ----
  	register struct message *mp;
  	register int mesg;
  	register char *cp;
! 	int nlines;
  	int brokpipe();
! 	FILE *obuf;
  
  	obuf = stdout;
  	if (setjmp(pipestop)) {
***************
*** 487,493 ****
   */
  folders()
  {
! 	char dirname[BUFSIZ], cmd[BUFSIZ];
  	int pid, s, e;
  
  	if (getfold(dirname) < 0) {
--- 487,493 ----
   */
  folders()
  {
! 	char dirname[BUFSIZ];
  	int pid, s, e;
  
  	if (getfold(dirname) < 0) {
*** /old/src/ucb/Mail/cmd2.c	Mon Feb 16 22:07:16 1987
--- /usr/src/ucb/Mail/cmd2.c	Sat Aug 17 11:30:50 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)cmd2.c	5.3 (Berkeley) 9/10/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)cmd2.c	5.3 (Berkeley) 9/10/85";
  #endif not lint
  
***************
*** 195,201 ****
  	register struct message *mp;
  	register char *file, *disp;
  	char linebuf[BUFSIZ];
! 	int f, *msgvec, lc, cc, t;
  	FILE *obuf, *mesf;
  	struct stat statb;
  
--- 195,202 ----
  	register struct message *mp;
  	register char *file, *disp;
  	char linebuf[BUFSIZ];
! 	int f, *msgvec, lc, t;
! 	long cc;
  	FILE *obuf, *mesf;
  	struct stat statb;
  
***************
*** 248,254 ****
  	if (ferror(obuf))
  		perror(file);
  	fclose(obuf);
! 	printf("%s %d/%d\n", disp, lc, cc);
  	return(0);
  }
  
--- 249,255 ----
  	if (ferror(obuf))
  		perror(file);
  	fclose(obuf);
! 	printf("%s %d/%ld\n", disp, lc, cc);
  	return(0);
  }
  
***************
*** 423,428 ****
--- 424,430 ----
  		printf(" -- Core dumped\n");
  	else
  		printf("\n");
+ 	return(0);
  }
  
  /*
*** /old/src/ucb/Mail/cmd3.c	Mon Feb 16 22:07:16 1987
--- /usr/src/ucb/Mail/cmd3.c	Sat Aug 17 11:58:22 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)cmd3.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)cmd3.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
***************
*** 61,68 ****
   * Fork an interactive shell.
   */
  
! dosh(str)
! 	char *str;
  {
  	int (*sig[2])(), stat[1];
  	register int t;
--- 61,67 ----
   * Fork an interactive shell.
   */
  
! dosh()
  {
  	int (*sig[2])(), stat[1];
  	register int t;
***************
*** 205,211 ****
  	int *msgvec;
  {
  	struct message *mp;
! 	char *cp, *cp2, *cp3, *rcv, *replyto;
  	char buf[2 * LINESIZE], **ap;
  	struct name *np;
  	struct header head;
--- 204,210 ----
  	int *msgvec;
  {
  	struct message *mp;
! 	char *cp, *rcv, *replyto;
  	char buf[2 * LINESIZE], **ap;
  	struct name *np;
  	struct header head;
***************
*** 375,380 ****
--- 374,380 ----
  	if (Tflag != NOSTR)
  		close(creat(Tflag, 0600));
  	exit(e);
+ /* NOTREACHED */
  }
  
  /*
***************
*** 433,441 ****
  	char **arglist;
  {
  	register struct var *vp, *vp2;
- 	register char *cp;
  	int errs, h;
! 	char **ap;
  
  	errs = 0;
  	for (ap = arglist; *ap != NOSTR; ap++) {
--- 433,440 ----
  	char **arglist;
  {
  	register struct var *vp, *vp2;
  	int errs, h;
! 	register char **ap;
  
  	errs = 0;
  	for (ap = arglist; *ap != NOSTR; ap++) {
***************
*** 553,559 ****
   * The do nothing command for comments.
   */
  
! null(e)
  {
  	return(0);
  }
--- 552,558 ----
   * The do nothing command for comments.
   */
  
! null()
  {
  	return(0);
  }
***************
*** 568,574 ****
  	char **argv;
  {
  	register char *cp;
- 	char fname[BUFSIZ];
  	int edit;
  
  	if (argv[0] == NOSTR) {
--- 567,572 ----
***************
*** 594,599 ****
--- 592,598 ----
  		return(-1);
  	}
  	announce(0);
+ 	return(0);
  }
  
  /*
***************
*** 707,713 ****
  {
  	struct header head;
  	struct message *mp;
! 	register int i, s, *ap;
  	register char *cp, *cp2, *subject;
  
  	for (s = 0, ap = msgvec; *ap != 0; ap++) {
--- 706,712 ----
  {
  	struct header head;
  	struct message *mp;
! 	register int s, *ap;
  	register char *cp, *cp2, *subject;
  
  	for (s = 0, ap = msgvec; *ap != 0; ap++) {
*** /old/src/ucb/Mail/cmdtab.c	Mon Feb 16 22:07:16 1987
--- /usr/src/ucb/Mail/cmdtab.c	Sat Aug 17 12:03:41 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)cmdtab.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)cmdtab.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
***************
*** 17,23 ****
   */
  
  extern int type(), preserve(), delete(), undelete(), next(), shell(), schdir();
! extern int save(), help(), headers(), pdot(), strace(), respond(), editor();
  extern int edstop(), rexit(), pcmdlist(), sendmail(), from(), copycmd();
  extern int messize(), psalloc(), deltype(), unset(), set(), source();
  extern int pversion(), group(), top(), core(), null(), stouch(), visual();
--- 17,23 ----
   */
  
  extern int type(), preserve(), delete(), undelete(), next(), shell(), schdir();
! extern int save(), help(), headers(), pdot(), respond(), editor();
  extern int edstop(), rexit(), pcmdlist(), sendmail(), from(), copycmd();
  extern int messize(), psalloc(), deltype(), unset(), set(), source();
  extern int pversion(), group(), top(), core(), null(), stouch(), visual();
*** /old/src/ucb/Mail/collect.c	Wed Mar 11 09:53:50 1987
--- /usr/src/ucb/Mail/collect.c	Sat Aug 17 12:07:34 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)collect.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)collect.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
***************
*** 48,54 ****
  	struct header *hp;
  {
  	FILE *ibuf, *fbuf, *obuf;
! 	int lc, cc, escape, collrub(), intack(), collhup, collcont(), eof;
  	register int c, t;
  	char linebuf[LINESIZE], *cp;
  	extern char tempMail[];
--- 48,55 ----
  	struct header *hp;
  {
  	FILE *ibuf, *fbuf, *obuf;
! 	int lc, escape, collrub(), intack(), collcont(), eof;
! 	long cc;
  	register int c, t;
  	char linebuf[LINESIZE], *cp;
  	extern char tempMail[];
***************
*** 298,304 ****
  				cc += t;
  			}
  			fclose(fbuf);
! 			printf("%d/%d\n", lc, cc);
  			break;
  
  		case 'w':
--- 299,305 ----
  				cc += t;
  			}
  			fclose(fbuf);
! 			printf("%d/%ld\n", lc, cc);
  			break;
  
  		case 'w':
***************
*** 430,448 ****
  }
  
  /*
-  * Non destructively interrogate the value of the given signal.
-  */
- 
- psig(n)
- {
- 	register (*wassig)();
- 
- 	wassig = sigset(n, SIG_IGN);
- 	sigset(n, wassig);
- 	return((int) wassig);
- }
- 
- /*
   * Write a file, ex-like if f set.
   */
  
--- 431,436 ----
***************
*** 773,779 ****
  /*
   * Print (continue) when continued after ^Z.
   */
! collcont(s)
  {
  
  	printf("(continue)\n");
--- 761,767 ----
  /*
   * Print (continue) when continued after ^Z.
   */
! collcont()
  {
  
  	printf("(continue)\n");
***************
*** 833,839 ****
  # endif VMUNIX
  	if (rcvmode) {
  		if (s == SIGHUP)
! 			hangup(SIGHUP);
  		else
  			stop(s);
  	}
--- 821,827 ----
  # endif VMUNIX
  	if (rcvmode) {
  		if (s == SIGHUP)
! 			hangup();
  		else
  			stop(s);
  	}
***************
*** 845,851 ****
   * Acknowledge an interrupt signal from the tty by typing an @
   */
  
! intack(s)
  {
  	
  	puts("@");
--- 833,839 ----
   * Acknowledge an interrupt signal from the tty by typing an @
   */
  
! intack()
  {
  	
  	puts("@");
*** /old/src/ucb/Mail/config.c	Mon Feb 16 22:07:16 1987
--- /usr/src/ucb/Mail/config.c	Sat Aug 17 10:52:46 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)config.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)config.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/def.h	Mon Feb 16 22:07:17 1987
--- /usr/src/ucb/Mail/def.h	Sat Aug 17 12:05:23 1991
***************
*** 328,331 ****
  struct	var	*lookup();
  long	transmit();
  int	icequal();
- int	cmpdomain();
--- 328,330 ----
*** /old/src/ucb/Mail/edit.c	Thu Nov  2 10:12:41 1989
--- /usr/src/ucb/Mail/edit.c	Sat Aug 17 10:53:20 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)edit.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)edit.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/fio.c	Wed Mar 11 09:59:43 1987
--- /usr/src/ucb/Mail/fio.c	Sat Aug 17 11:42:15 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)fio.c	5.3 (Berkeley) 9/5/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)fio.c	5.3 (Berkeley) 9/5/85";
  #endif not lint
  
***************
*** 26,38 ****
  setptr(ibuf)
  	FILE *ibuf;
  {
! 	register int c;
! 	register char *cp, *cp2;
  	register int count, l;
  	long s;
  	off_t offset;
  	char linebuf[LINESIZE];
- 	char wbuf[LINESIZE];
  	int maybe, mestmp, flag, inhead;
  	struct message this;
  	extern char tempSet[];
--- 26,36 ----
  setptr(ibuf)
  	FILE *ibuf;
  {
! 	register char *cp;
  	register int count, l;
  	long s;
  	off_t offset;
  	char linebuf[LINESIZE];
  	int maybe, mestmp, flag, inhead;
  	struct message this;
  	extern char tempSet[];
***************
*** 247,253 ****
  	FILE *obuf, *ibuf, *readstat;
  	struct stat statb;
  	char tempname[30], *id;
- 	int (*sigs[3])();
  
  	if (readonly)
  		return;
--- 245,250 ----
***************
*** 352,358 ****
   */
  holdsigs()
  {
- 	register int i;
  
  	if (sigdepth++ == 0)
  		omask = sigblock(sigmask(SIGHUP)|sigmask(SIGINT)|sigmask(SIGQUIT));
--- 349,354 ----
***************
*** 363,369 ****
   */
  relsesigs()
  {
- 	register int i;
  
  	if (--sigdepth == 0)
  		sigsetmask(omask);
--- 359,364 ----
***************
*** 423,431 ****
  {
  	char xname[BUFSIZ];
  	char cmdbuf[BUFSIZ];
! 	register int pid, l, rc;
  	register char *cp, *Shell;
! 	int s, pivec[2], (*sigint)();
  	struct stat sbuf;
  
  	if (name[0] == '+' && getfold(cmdbuf) >= 0) {
--- 418,426 ----
  {
  	char xname[BUFSIZ];
  	char cmdbuf[BUFSIZ];
! 	register int pid, l;
  	register char *cp, *Shell;
! 	int s, pivec[2];
  	struct stat sbuf;
  
  	if (name[0] == '+' && getfold(cmdbuf) >= 0) {
*** /old/src/ucb/Mail/fmt.c	Mon Feb 16 22:07:17 1987
--- /usr/src/ucb/Mail/fmt.c	Sat Aug 17 10:54:55 1991
***************
*** 4,16 ****
   * 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 = "@(#)fmt.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,14 ----
   * 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 = "@(#)fmt.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/getname.c	Mon Feb 16 22:07:17 1987
--- /usr/src/ucb/Mail/getname.c	Sat Aug 17 10:55:20 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)getname.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)getname.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/glob.h	Mon Feb 16 22:07:17 1987
--- /usr/src/ucb/Mail/glob.h	Sat Aug 17 12:04:27 1991
***************
*** 27,33 ****
  int	noreset;			/* String resets suspended */
  int	sourcing;			/* Currently reading variant file */
  int	loading;			/* Loading user definitions */
- int	shudann;			/* Print headers when possible */
  int	cond;				/* Current state of conditional exc. */
  FILE	*itf;				/* Input temp file buffer */
  FILE	*otf;				/* Output temp file buffer */
--- 27,32 ----
*** /old/src/ucb/Mail/head.c	Mon Feb 16 22:07:17 1987
--- /usr/src/ucb/Mail/head.c	Sat Aug 17 12:02:58 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)head.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)head.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
***************
*** 242,259 ****
  	if (*cp == '\0')
  		return(NOSTR);
  	return(cp);
- }
- 
- /*
-  * Test to see if the character is an ascii alphabetic.
-  */
- 
- isalpha(c)
- {
- 	register int ch;
- 
- 	ch = raise(c);
- 	return(ch >= 'A' && ch <= 'Z');
  }
  
  /*
--- 242,247 ----
*** /old/src/ucb/Mail/lex.c	Sun Feb 22 14:28:23 1987
--- /usr/src/ucb/Mail/lex.c	Sat Aug 17 12:28:58 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)lex.c	5.4 (Berkeley) 11/2/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)lex.c	5.4 (Berkeley) 11/2/85";
  #endif not lint
  
***************
*** 440,446 ****
  /*
   * When we wake up after ^Z, reprint the prompt.
   */
! contin(s)
  {
  
  	printf(prompt);
--- 440,446 ----
  /*
   * When we wake up after ^Z, reprint the prompt.
   */
! contin()
  {
  
  	printf(prompt);
***************
*** 553,561 ****
  	}
  }
  
  stop(s)
  {
- 	register FILE *fp;
  
  # ifndef VMUNIX
  	s = SIGINT;
--- 553,561 ----
  	}
  }
  
+ /* ARGSUSED */
  stop(s)
  {
  
  # ifndef VMUNIX
  	s = SIGINT;
***************
*** 672,684 ****
  	return(mdot);
  }
  
- strace() {}
- 
  /*
   * Print the current version number.
   */
  
! pversion(e)
  {
  	printf("Version %s\n", version);
  	return(0);
--- 672,682 ----
  	return(mdot);
  }
  
  /*
   * Print the current version number.
   */
  
! pversion()
  {
  	printf("Version %s\n", version);
  	return(0);
*** /old/src/ucb/Mail/list.c	Mon Feb 16 22:07:18 1987
--- /usr/src/ucb/Mail/list.c	Sat Aug 17 10:57:07 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)list.c	5.4 (Berkeley) 11/2/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)list.c	5.4 (Berkeley) 11/2/85";
  #endif not lint
  
*** /old/src/ucb/Mail/main.c	Mon Feb 16 22:07:18 1987
--- /usr/src/ucb/Mail/main.c	Sat Aug 17 11:44:45 1991
***************
*** 4,16 ****
   * 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 = "@(#)main.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
--- 4,14 ----
   * 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 = "@(#)main.c	5.3 (Berkeley) 9/15/85";
  #endif not lint
  
***************
*** 41,48 ****
  {
  	register char *ef;
  	register int i, argp;
! 	int mustsend, uflag, hdrstop(), (*prevint)(), f;
! 	FILE *ibuf, *ftat;
  	struct sgttyb tbuf;
  
  #ifdef signal
--- 39,45 ----
  {
  	register char *ef;
  	register int i, argp;
! 	int mustsend, hdrstop(), (*prevint)(), f;
  	struct sgttyb tbuf;
  
  #ifdef signal
***************
*** 56,62 ****
  	 * all the temporary files, buffer standard output, and so forth.
  	 */
  
- 	uflag = 0;
  	argv[argc] = (char *) -1;
  #ifdef	GETHOST
  	inithost();
--- 53,58 ----
***************
*** 134,140 ****
  			/*
  			 * Next argument is person to pretend to be.
  			 */
- 			uflag++;
  			if (i >= argc - 1) {
  				fprintf(stderr, "Missing user name for -u\n");
  				exit(1);
--- 130,135 ----
*** /old/src/ucb/Mail/names.c	Mon Feb 16 22:07:18 1987
--- /usr/src/ucb/Mail/names.c	Sat Aug 17 12:06:20 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)names.c	5.3 (Berkeley) 11/10/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)names.c	5.3 (Berkeley) 11/10/85";
  #endif not lint
  
***************
*** 194,201 ****
  verify(names)
  	struct name *names;
  {
  	register struct name *np, *top, *t, *x;
! 	register char *cp;
  
  #ifdef SENDMAIL
  	return(names);
--- 194,202 ----
  verify(names)
  	struct name *names;
  {
+ #ifndef	SENDMAIL
  	register struct name *np, *top, *t, *x;
! #endif
  
  #ifdef SENDMAIL
  	return(names);
***************
*** 258,268 ****
  	struct header *hp;
  {
  	register int c;
! 	register struct name *np, *top, *t, *x;
  	long now;
  	char *date, *fname, *shell, *ctime();
  	FILE *fout, *fin;
! 	int ispipe, s, pid;
  	extern char tempEdit[];
  
  	top = names;
--- 259,272 ----
  	struct header *hp;
  {
  	register int c;
! 	register struct name *np, *top;
! #ifdef	CRAZYWOW
! 	struct	name *t, *x;
! #endif
  	long now;
  	char *date, *fname, *shell, *ctime();
  	FILE *fout, *fin;
! 	int ispipe, s;
  	extern char tempEdit[];
  
  	top = names;
***************
*** 321,327 ****
  
  		if (ispipe) {
  			wait(&s);
! 			switch (pid = fork()) {
  			case 0:
  				sigchild();
  				sigsys(SIGHUP, SIG_IGN);
--- 325,331 ----
  
  		if (ispipe) {
  			wait(&s);
! 			switch (fork()) {
  			case 0:
  				sigchild();
  				sigsys(SIGHUP, SIG_IGN);
***************
*** 437,449 ****
  	struct name *names;
  {
  	register struct name *new, *np, *cp;
- 	struct name *getto;
  	struct grouphead *gh;
  	register int metoo;
  
  	new = NIL;
  	np = names;
- 	getto = NIL;
  	metoo = (value("metoo") != NOSTR);
  	while (np != NIL) {
  		if (np->n_name[0] == '\\') {
--- 441,451 ----
***************
*** 790,805 ****
  	return(c);
  }
  
- cmpdomain(name, dname)
- 	register char *name, *dname;
- {
- 	char buf[BUFSIZ];
- 
- 	strcpy(buf, dname);
- 	buf[strlen(name)] = '\0';
- 	return(icequal(name, buf));
- }
- 
  /*
   * Delete the given name from a namelist, using the passed
   * function to compare the names.
--- 792,797 ----
***************
*** 844,865 ****
  
  	for (p = np; p != NIL; p = p->n_flink)
  		p->n_name = netmap(p->n_name, from);
- }
- 
- /*
-  * Pretty print a name list
-  * Uncomment it if you need it.
-  */
- 
- prettyprint(name)
- 	struct name *name;
- {
- 	register struct name *np;
- 
- 	np = name;
- 	while (np != NIL) {
- 		fprintf(stderr, "%s(%d) ", np->n_name, np->n_type);
- 		np = np->n_flink;
- 	}
- 	fprintf(stderr, "\n");
  }
--- 836,839 ----
*** /old/src/ucb/Mail/optim.c	Sun Feb 22 15:21:31 1987
--- /usr/src/ucb/Mail/optim.c	Sat Aug 17 12:00:47 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)optim.c	5.5 (Berkeley) 11/2/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)optim.c	5.5 (Berkeley) 11/2/85";
  #endif not lint
  
***************
*** 273,279 ****
  minit()
  {
  	register struct xtrahash *xp, **tp;
- 	register int i;
  
  	midfree = 0;
  	tp = &xtab[0];
--- 273,278 ----
***************
*** 473,479 ****
  			printf("Made up bad net name\n");
  			printf("Machine code %c (0%o)\n", cp[-1], cp[-1]);
  			printf("Sorry -- dumping now.  Alert K. Shoens\n");
! 			core(0);
  			goto err;
  		}
  		strcat(name, cp2);
--- 472,478 ----
  			printf("Made up bad net name\n");
  			printf("Machine code %c (0%o)\n", cp[-1], cp[-1]);
  			printf("Sorry -- dumping now.  Alert K. Shoens\n");
! 			core();
  			goto err;
  		}
  		strcat(name, cp2);
*** /old/src/ucb/Mail/popen.c	Wed Mar 11 10:01:42 1987
--- /usr/src/ucb/Mail/popen.c	Sat Aug 17 10:59:27 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)popen.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)popen.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/quit.c	Mon Feb 16 22:07:19 1987
--- /usr/src/ucb/Mail/quit.c	Sat Aug 17 11:00:05 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)quit.c	5.3 (Berkeley) 3/6/86";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)quit.c	5.3 (Berkeley) 3/6/86";
  #endif not lint
  
*** /old/src/ucb/Mail/send.c	Sun Feb 22 15:23:52 1987
--- /usr/src/ucb/Mail/send.c	Sat Aug 17 11:53:16 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)send.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)send.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
***************
*** 32,43 ****
  	FILE *obuf;
  {
  	register struct message *mp;
- 	register int t;
  	long c;
  	FILE *ibuf;
  	char line[LINESIZE], field[BUFSIZ];
  	int lc, ishead, infld, fline, dostat;
! 	char *cp, *cp2;
  
  	mp = mailp;
  	ibuf = setinput(mp);
--- 32,42 ----
  	FILE *obuf;
  {
  	register struct message *mp;
  	long c;
  	FILE *ibuf;
  	char line[LINESIZE], field[BUFSIZ];
  	int lc, ishead, infld, fline, dostat;
! 	register char *cp, *cp2;
  
  	mp = mailp;
  	ibuf = setinput(mp);
***************
*** 217,225 ****
  sendmail(str)
  	char *str;
  {
- 	register char **ap;
- 	char *bufp;
- 	register int t;
  	struct header head;
  
  	if (blankline(str))
--- 216,221 ----
***************
*** 330,336 ****
  			printf(" \"%s\"", *t);
  		printf("\n");
  		fflush(stdout);
! 		return;
  	}
  	if ((cp = value("record")) != NOSTR)
  		savemail(expand(cp), hp, mtf);
--- 326,332 ----
  			printf(" \"%s\"", *t);
  		printf("\n");
  		fflush(stdout);
! 		return(0);
  	}
  	if ((cp = value("record")) != NOSTR)
  		savemail(expand(cp), hp, mtf);
***************
*** 372,378 ****
  			sigset(i, SIG_IGN);
  		if (!stat(POSTAGE, &sbuf))
  			if ((postage = fopen(POSTAGE, "a")) != NULL) {
! 				fprintf(postage, "%s %d %d\n", myname,
  				    count(to), fsize(mtf));
  				fclose(postage);
  			}
--- 368,374 ----
  			sigset(i, SIG_IGN);
  		if (!stat(POSTAGE, &sbuf))
  			if ((postage = fopen(POSTAGE, "a")) != NULL) {
! 				fprintf(postage, "%s %d %ld\n", myname,
  				    count(to), fsize(mtf));
  				fclose(postage);
  			}
***************
*** 419,425 ****
  	struct header *hp;
  	struct name *tolist;
  {
- 	register struct name *nlist;
  	register int f;
  	register struct name *np;
  
--- 415,420 ----
***************
*** 556,561 ****
--- 551,557 ----
   * Save the outgoing mail on the passed file.
   */
  
+ /* ARGSUSED */
  savemail(name, hp, fi)
  	char name[];
  	struct header *hp;
*** /old/src/ucb/Mail/sigretro.c	Mon Feb 16 22:07:19 1987
--- /usr/src/ucb/Mail/sigretro.c	Sat Aug 17 11:06:08 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)sigretro.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)sigretro.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/strings.c	Mon Feb 16 22:07:19 1987
--- /usr/src/ucb/Mail/strings.c	Sat Aug 17 11:06:40 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)strings.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)strings.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/temp.c	Mon Feb 16 22:07:19 1987
--- /usr/src/ucb/Mail/temp.c	Sat Aug 17 11:53:53 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)temp.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)temp.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
***************
*** 25,33 ****
  
  tinit()
  {
! 	register char *cp, *cp2;
  	char uname[PATHSIZE];
- 	register int err = 0;
  	register int pid;
  
  	pid = getpid();
--- 25,32 ----
  
  tinit()
  {
! 	register char *cp;
  	char uname[PATHSIZE];
  	register int pid;
  
  	pid = getpid();
***************
*** 50,56 ****
  		uid = getuid() & UIDMASK;
  		if (username(uid, uname) < 0) {
  			copy("ubluit", myname);
- 			err++;
  			if (rcvmode) {
  				printf("Who are you!?\n");
  				exit(1);
--- 49,54 ----
*** /old/src/ucb/Mail/tty.c	Sun Feb 22 14:37:50 1987
--- /usr/src/ucb/Mail/tty.c	Sat Aug 17 11:59:59 1991
***************
*** 41,47 ****
  	int (*savesigs[2])();
  #endif
  	int (*savecont)();
- 	register int s;
  	int errs;
  
  # ifdef VMUNIX
--- 41,46 ----
***************
*** 223,229 ****
  /*
   * Receipt continuation.
   */
! ttycont(s)
  {
  
  	hadcont++;
--- 222,228 ----
  /*
   * Receipt continuation.
   */
! ttycont()
  {
  
  	hadcont++;
***************
*** 235,239 ****
   * Null routine to satisfy
   * silly system bug that denies us holding SIGCONT
   */
! signull(s)
  {}
--- 234,238 ----
   * Null routine to satisfy
   * silly system bug that denies us holding SIGCONT
   */
! signull()
  {}
*** /old/src/ucb/Mail/v7.local.c	Mon Feb 16 22:07:20 1987
--- /usr/src/ucb/Mail/v7.local.c	Sat Aug 17 11:07:55 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)v7.local.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)v7.local.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
*** /old/src/ucb/Mail/vars.c	Mon Feb 16 22:07:20 1987
--- /usr/src/ucb/Mail/vars.c	Sat Aug 17 11:56:13 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)vars.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)vars.c	5.2 (Berkeley) 6/21/85";
  #endif not lint
  
***************
*** 155,161 ****
  hash(name)
  	char name[];
  {
! 	register unsigned h;
  	register char *cp;
  
  	for (cp = name, h = 0; *cp; h = (h << 2) + *cp++)
--- 155,161 ----
  hash(name)
  	char name[];
  {
! 	register int h;
  	register char *cp;
  
  	for (cp = name, h = 0; *cp; h = (h << 2) + *cp++)
*** /old/src/ucb/dbx/dbx.c	Mon Feb 16 22:41:34 1987
--- /usr/src/ucb/dbx/dbx.c	Fri Jan 10 15:25:48 1992
***************
*** 1,5 ****
  main()
  {
! 	puts("dbx hasn't been implemented under 2.10BSD.");
  	exit(-1);
  }
--- 1,5 ----
  main()
  {
! 	puts("dbx hasn't been implemented under 2.11BSD.");
  	exit(-1);
  }
*** /old/src/ucb/ex/bcopy.c	Mon Feb 16 22:07:24 1987
--- /usr/src/ucb/ex/bcopy.c	Sun Sep  8 11:56:55 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)bcopy.c	7.3 (Berkeley) 6/7/85";
! #endif not lint
  
  /* block copy from from to to, count bytes */
  bcopy(from, to, count)
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)bcopy.c	7.3 (Berkeley) 6/7/85";
! #endif
  
  /* block copy from from to to, count bytes */
  bcopy(from, to, count)
*** /old/src/ucb/ex/ex.c	Mon Feb 16 22:07:24 1987
--- /usr/src/ucb/ex/ex.c	Sun Sep  8 11:57:27 1991
***************
*** 4,16 ****
   * 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 = "@(#)ex.c	7.5.1.1 (Berkeley) 8/12/86";
  #endif not lint
  
--- 4,14 ----
   * 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 = "@(#)ex.c	7.5.1.1 (Berkeley) 8/12/86";
  #endif not lint
  
*** /old/src/ucb/ex/ex_addr.c	Mon Feb 16 22:07:24 1987
--- /usr/src/ucb/ex/ex_addr.c	Sun Sep  8 11:57:42 1991
***************
*** 4,10 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_addr.c	7.3 (Berkeley) 6/7/85";
  #endif not lint
  
--- 4,10 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_addr.c	7.3 (Berkeley) 6/7/85";
  #endif not lint
  
*** /old/src/ucb/ex/ex_cmds.c	Mon Feb 16 22:07:24 1987
--- /usr/src/ucb/ex/ex_cmds.c	Sun Sep  8 11:58:02 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_cmds.c	7.10 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_argv.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_cmds.c	7.10 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_argv.h"
*** /old/src/ucb/ex/ex_cmds2.c	Mon Feb 16 22:07:25 1987
--- /usr/src/ucb/ex/ex_cmds2.c	Sun Sep  8 11:58:20 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_cmds2.c	7.4 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_argv.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_cmds2.c	7.4 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_argv.h"
*** /old/src/ucb/ex/ex_cmdsub.c	Mon Feb 16 22:07:25 1987
--- /usr/src/ucb/ex/ex_cmdsub.c	Sun Sep  8 11:58:39 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_cmdsub.c	7.7 (Berkeley) 6/7/85";
! #endif not lint
  
  #include "ex.h"
  #include "ex_argv.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_cmdsub.c	7.7 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_argv.h"
*** /old/src/ucb/ex/ex_data.c	Mon Feb 16 22:07:25 1987
--- /usr/src/ucb/ex/ex_data.c	Sun Sep  8 11:58:54 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_data.c	7.5 (Berkeley) 8/29/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_data.c	7.5 (Berkeley) 8/29/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_extern.c	Mon Feb 16 22:07:25 1987
--- /usr/src/ucb/ex/ex_extern.c	Sun Sep  8 11:59:09 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_extern.c	7.4 (Berkeley) 6/7/85";
! #endif not lint
  
  /*
   * Provide defs of the global variables.
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_extern.c	7.4 (Berkeley) 6/7/85";
! #endif
  
  /*
   * Provide defs of the global variables.
*** /old/src/ucb/ex/ex_get.c	Mon Feb 16 22:07:26 1987
--- /usr/src/ucb/ex/ex_get.c	Sun Sep  8 11:59:26 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_get.c	7.6 (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_get.c	7.6 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_io.c	Mon Feb 16 22:07:26 1987
--- /usr/src/ucb/ex/ex_io.c	Sun Sep  8 11:59:44 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_io.c	7.11.1.1 (Berkeley) 8/12/86";
! #endif not lint
  
  #include "ex.h"
  #include "ex_argv.h"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  static char *sccsid = "@(#)ex_io.c	7.11.1.1 (Berkeley) 8/12/86";
! #endif
  
  #include "ex.h"
  #include "ex_argv.h"
*** /old/src/ucb/ex/ex_put.c	Mon Feb 16 22:07:27 1987
--- /usr/src/ucb/ex/ex_put.c	Sun Sep  8 12:00:02 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_put.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_put.c	7.9 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_tty.h"
*** /old/src/ucb/ex/ex_re.c	Sat Mar 14 14:51:00 1987
--- /usr/src/ucb/ex/ex_re.c	Sun Sep  8 12:00:20 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_re.c	7.5 (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_re.c	7.5 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_re.h"
*** /old/src/ucb/ex/ex_set.c	Mon Feb 16 22:07:28 1987
--- /usr/src/ucb/ex/ex_set.c	Sun Sep  8 12:00:35 1991
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
  static char *sccsid = "@(#)ex_set.c	7.4 (Berkeley) 6/7/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_set.c	7.4 (Berkeley) 6/7/85";
! #endif
  
  #include "ex.h"
  #include "ex_temp.h"
