===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/collect.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/usr.bin/mail/collect.c	2000/06/30 16:00:17	1.19
+++ src/usr.bin/mail/collect.c	2001/01/16 05:36:08	1.20
@@ -1,4 +1,4 @@
-/*	$OpenBSD: collect.c,v 1.19 2000/06/30 16:00:17 millert Exp $	*/
+/*	$OpenBSD: collect.c,v 1.20 2001/01/16 05:36:08 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.19 2000/06/30 16:00:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: collect.c,v 1.20 2001/01/16 05:36:08 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -192,8 +192,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;
@@ -524,8 +523,7 @@
 	 * stdin = current message.
 	 * stdout = new message.
 	 */
-	if ((shell = value("SHELL")) == NULL)
-		shell = _PATH_CSHELL;
+	shell = value("SHELL");
 	if (run_command(shell,
 	    0, fileno(fp), fileno(nf), "-c", cmd, NULL) < 0) {
 		(void)Fclose(nf);