diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-08 20:27:18 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-08 20:27:18 +0000 |
| commit | b1c7c56166d97358cc0ed1609500ed505e4eba62 (patch) | |
| tree | 839f272b393cfa0a5d07c8e57070161fdad59b24 /usr.bin | |
| parent | 814728edcff01a7239599a48342e6e71fd0b3389 (diff) | |
Don't do tilde escapes unless we are in interactive mode. Now the
behavior matches the man page...
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mail/collect.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index e376d0b1636..1ac2aa206e7 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: collect.c,v 1.23 2001/11/21 15:26:39 millert Exp $ */ +/* $OpenBSD: collect.c,v 1.24 2002/04/08 20:27:17 millert Exp $ */ /* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94"; #else -static const char rcsid[] = "$OpenBSD: collect.c,v 1.23 2001/11/21 15:26:39 millert Exp $"; +static const char rcsid[] = "$OpenBSD: collect.c,v 1.24 2002/04/08 20:27:17 millert Exp $"; #endif #endif /* not lint */ @@ -161,7 +161,8 @@ cont: value("interactive") != NULL && !lastlong && (value("dot") != NULL || value("ignoreeof") != NULL)) break; - if (linebuf[0] != escape || lastlong) { + if (linebuf[0] != escape || value("interactive") == NULL || + lastlong) { if (putline(collf, linebuf, !longline) < 0) goto err; continue; |