X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/07b0d2860d14640f898da7fd6375424b297f5d1f..428c2aebd5a3c81a3c47fcb10b1e547614bd8fc4:/usr/src/usr.bin/mail/lex.c

diff --git a/usr/src/usr.bin/mail/lex.c b/usr/src/usr.bin/mail/lex.c
index 055221559c..e700c8bb56 100644
--- a/usr/src/usr.bin/mail/lex.c
+++ b/usr/src/usr.bin/mail/lex.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)lex.c	5.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)lex.c	5.23 (Berkeley) 4/1/91";
 #endif /* not lint */
 
 #include "rcv.h"
@@ -111,7 +137,7 @@ setfile(name)
 		perror(tempMesg);
 		exit(1);
 	}
-	remove(tempMesg);
+	rm(tempMesg);
 	setptr(ibuf);
 	setmsize(msgCount);
 	Fclose(ibuf);
@@ -137,7 +163,7 @@ commands()
 	int eofloop = 0;
 	register int n;
 	char linebuf[LINESIZE];
-	int intr(), stop(), hangup(), contin();
+	void intr(), stop(), hangup();
 
 	if (!sourcing) {
 		if (signal(SIGINT, SIG_IGN) != SIG_IGN)
@@ -459,6 +485,7 @@ isprefix(as1, as2)
 int	inithdr;			/* am printing startup headers */
 
 /*ARGSUSED*/
+void
 intr(s)
 {
 
@@ -482,6 +509,7 @@ intr(s)
 /*
  * When we wake up after ^Z, reprint the prompt.
  */
+void
 stop(s)
 {
 	sig_t old_action = signal(s, SIG_DFL);
@@ -500,6 +528,7 @@ stop(s)
  * Branch here on hangup signal and simulate "exit".
  */
 /*ARGSUSED*/
+void
 hangup(s)
 {