aboutsummaryrefslogtreecommitdiff
path: root/coreutils/stty.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/stty.c')
-rw-r--r--coreutils/stty.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 7f057ead2..0668cf7be 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1404,13 +1404,15 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
1404 1404
1405 /* Specifying both -a and -g is an error */ 1405 /* Specifying both -a and -g is an error */
1406 if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) == 1406 if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) ==
1407 (STTY_verbose_output | STTY_recoverable_output)) 1407 (STTY_verbose_output | STTY_recoverable_output)
1408 bb_error_msg_and_die("verbose and stty-readable output styles are mutually exclusive"); 1408 ) {
1409 bb_error_msg_and_die("-a and -g are mutually exclusive");
1410 }
1409 /* Specifying -a or -g with non-options is an error */ 1411 /* Specifying -a or -g with non-options is an error */
1410 if (!(stty_state & STTY_noargs) 1412 if ((stty_state & (STTY_verbose_output | STTY_recoverable_output))
1411 && (stty_state & (STTY_verbose_output | STTY_recoverable_output)) 1413 && !(stty_state & STTY_noargs)
1412 ) { 1414 ) {
1413 bb_error_msg_and_die("modes may not be set when specifying an output style"); 1415 bb_error_msg_and_die("modes may not be set when -a or -g is used");
1414 } 1416 }
1415 1417
1416 /* Now it is safe to start doing things */ 1418 /* Now it is safe to start doing things */