===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/collect.c,v
retrieving revision 1.20.2.1
retrieving revision 1.21
diff -u -r1.20.2.1 -r1.21
--- src/usr.bin/mail/collect.c	2002/04/11 23:33:29	1.20.2.1
+++ src/usr.bin/mail/collect.c	2001/06/23 23:04:21	1.21
@@ -1,4 +1,4 @@
-/*	$OpenBSD: collect.c,v 1.20.2.1 2002/04/11 23:33:29 miod Exp $	*/
+/*	$OpenBSD: collect.c,v 1.21 2001/06/23 23:04:21 millert Exp $	*/
 /*	$NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: collect.c,v 1.20.2.1 2002/04/11 23:33:29 miod Exp $";
+static char rcsid[] = "$OpenBSD: collect.c,v 1.21 2001/06/23 23:04:21 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,19 +81,12 @@
 	int printheaders;
 {
 	FILE *fbuf;
-	int lc, cc, escape, eofcount, fd, c, t;
-	char linebuf[LINESIZE], tempname[PATHSIZE], *cp, getsub;
+	int lc, cc, fd, c, t, lastlong, rc;
+	volatile int escape, eofcount, longline;
+	volatile char getsub;
+	char linebuf[LINESIZE], tempname[PATHSIZE], *cp;
 	sigset_t oset, nset;
-	int longline, lastlong, rc;	/* Can deal with lines > LINESIZE */
 
-#if __GNUC__
-	/* Avoid siglongjmp clobbering */
-	(void)&escape;
-	(void)&eofcount;
-	(void)&getsub;
-	(void)&longline;
-#endif
-
 	collf = NULL;
 	/*
 	 * Start catching signals from here, but we're still die on interrupts
@@ -192,8 +185,7 @@
 		    value("interactive") != NULL && !lastlong &&
 		    (value("dot") != NULL || value("ignoreeof") != NULL))
 			break;
-		if (linebuf[0] != escape || value("interactive") == NULL ||
-		    lastlong) {
+		if (linebuf[0] != escape || lastlong) {
 			if (putline(collf, linebuf, !longline) < 0)
 				goto err;
 			continue;