diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-04-13 20:32:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-04-13 20:32:07 +0000 |
| commit | 84538bf29009ad356f8c67d07172f9d294fdc982 (patch) | |
| tree | 1302c1ed3e20b979b2aed6872bcb09e0d5201fd9 | |
| parent | f3e792f104c0b8370ff399b0bd3e1a5fdbd499d9 (diff) | |
single ^C on a pipe
| -rw-r--r-- | usr.bin/mail/collect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index e4dd7c5fd4f..8498e43da86 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: collect.c,v 1.4 1997/04/13 20:22:39 deraadt Exp $ */ +/* $OpenBSD: collect.c,v 1.5 1997/04/13 20:32:06 deraadt Exp $ */ /* $NetBSD: collect.c,v 1.6 1996/06/08 19:48:16 christos 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.4 1997/04/13 20:22:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: collect.c,v 1.5 1997/04/13 20:32:06 deraadt Exp $"; #endif #endif /* not lint */ @@ -154,7 +154,7 @@ cont: if (hadintr) { fflush(stdout); fprintf(stderr, - "\n(Interrupt -- one more to kill letter)\n"); + "\n(Interrupt -- one more to kill letter)\n"); } else { if (isatty(0)) { printf("(continue)\n"); @@ -601,7 +601,7 @@ collint(s) /* * the control flow is subtle, because we can be called from ~q. */ - if (!hadintr) { + if (hadintr == 0 && isatty(0)) { if (value("ignore") != NOSTR) { puts("@"); fflush(stdout); |