diff options
author | Joe Peterson <joe@skyrush.com> | 2008-02-06 04:37:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:07 -0500 |
commit | ec5b1157f8e819c72fc93aa6d2d5117c08cdc961 (patch) | |
tree | 86b6681763849672f997cdf8277de61b3ea0cf0f /drivers/char/n_tty.c | |
parent | 1a669c2f16d478cb7f4452e5fb8d09320831f4a1 (diff) |
tty: enable the echoing of ^C in the N_TTY discipline
Turn on INTR/QUIT/SUSP echoing in the N_TTY line discipline (e.g. ctrl-C
will appear as "^C" if stty echoctl is set and ctrl-C is set as INTR).
Linux seems to be the only unix-like OS (recently I've verified this on
Solaris, BSD, and Mac OS X) that does *not* behave this way, and I really
miss this as a good visual confirmation of the interrupt of a program in
the console or xterm. I remember this fondly from many Unixs I've used
over the years as well. Bringing this to Linux also seems like a good way
to make it yet more compliant with standard unix-like behavior.
[akpm@linux-foundation.org: coding-style fixes]
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/n_tty.c')
-rw-r--r-- | drivers/char/n_tty.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 596c7173997b..e0e3815f92ba 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c | |||
@@ -769,7 +769,21 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c) | |||
769 | signal = SIGTSTP; | 769 | signal = SIGTSTP; |
770 | if (c == SUSP_CHAR(tty)) { | 770 | if (c == SUSP_CHAR(tty)) { |
771 | send_signal: | 771 | send_signal: |
772 | isig(signal, tty, 0); | 772 | /* |
773 | * Echo character, and then send the signal. | ||
774 | * Note that we do not use isig() here because we want | ||
775 | * the order to be: | ||
776 | * 1) flush, 2) echo, 3) signal | ||
777 | */ | ||
778 | if (!L_NOFLSH(tty)) { | ||
779 | n_tty_flush_buffer(tty); | ||
780 | if (tty->driver->flush_buffer) | ||
781 | tty->driver->flush_buffer(tty); | ||
782 | } | ||
783 | if (L_ECHO(tty)) | ||
784 | echo_char(c, tty); | ||
785 | if (tty->pgrp) | ||
786 | kill_pgrp(tty->pgrp, signal, 1); | ||
773 | return; | 787 | return; |
774 | } | 788 | } |
775 | } | 789 | } |