summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-11-15 13:56:01 -0500
committerRay Strode <rstrode@redhat.com>2010-11-15 13:56:01 -0500
commitaba7c7b89fcbbfa516d86f50f7b89a593ca95303 (patch)
tree3e8db4db9b550e6ea4c0fc2589673cb91100e944
parentb204e25c87271cd420a95e9d1f163bf6c0913552 (diff)
terminal: Don't set ISTRIP in terminal attributes
In certain error paths plymouth would erroneously set ISTRIP on the terminal. This is bogus in the same way the changes fixed by commit ea394383c54dda771dcf59e7ec11280fa945280b were bogus.
-rw-r--r--src/libply-splash-core/ply-terminal.c2
-rw-r--r--src/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index 40243799..22db27df 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -244,7 +244,7 @@ ply_terminal_set_buffered_input (ply_terminal_t *terminal)
*/
if (!terminal->original_term_attributes_saved || !(terminal->original_term_attributes.c_lflag & ICANON))
{
- term_attributes.c_iflag |= BRKINT | IGNPAR | ISTRIP | ICRNL | IXON;
+ term_attributes.c_iflag |= BRKINT | IGNPAR | ICRNL | IXON;
term_attributes.c_oflag |= OPOST;
term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN;
diff --git a/src/main.c b/src/main.c
index 7358c24b..e003d997 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1963,7 +1963,7 @@ on_crash (int signum)
tcgetattr (fd, &term_attributes);
- term_attributes.c_iflag |= BRKINT | IGNPAR | ISTRIP | ICRNL | IXON;
+ term_attributes.c_iflag |= BRKINT | IGNPAR | ICRNL | IXON;
term_attributes.c_oflag |= OPOST;
term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN;