===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/collect.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -c -r1.20 -r1.20.2.1
*** src/usr.bin/mail/collect.c	2001/01/16 05:36:08	1.20
--- src/usr.bin/mail/collect.c	2002/04/11 23:33:29	1.20.2.1
***************
*** 1,4 ****
! /*	$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 $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: collect.c,v 1.20.2.1 2002/04/11 23:33:29 miod Exp $	*/
  /*	$NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
  #else
! static char rcsid[] = "$OpenBSD: collect.c,v 1.20 2001/01/16 05:36:08 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #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 $";
  #endif
  #endif /* not lint */
  
***************
*** 192,198 ****
  		    value("interactive") != NULL && !lastlong &&
  		    (value("dot") != NULL || value("ignoreeof") != NULL))
  			break;
! 		if (linebuf[0] != escape || lastlong) {
  			if (putline(collf, linebuf, !longline) < 0)
  				goto err;
  			continue;
--- 192,199 ----
  		    value("interactive") != NULL && !lastlong &&
  		    (value("dot") != NULL || value("ignoreeof") != NULL))
  			break;
! 		if (linebuf[0] != escape || value("interactive") == NULL ||
! 		    lastlong) {
  			if (putline(collf, linebuf, !longline) < 0)
  				goto err;
  			continue;