[git commit] stty: trim too verbose error messages (-40 bytes)

Denys Vlasenko vda.linux at googlemail.com
Fri Oct 21 17:45:13 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=5dd1f472a41f2c3dd3c009d0e623212514205c2c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/stty.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/coreutils/stty.c b/coreutils/stty.c
index 7f057ea..0668cf7 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1404,13 +1404,15 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
 
 	/* Specifying both -a and -g is an error */
 	if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) ==
-		(STTY_verbose_output | STTY_recoverable_output))
-		bb_error_msg_and_die("verbose and stty-readable output styles are mutually exclusive");
+		(STTY_verbose_output | STTY_recoverable_output)
+	) {
+		bb_error_msg_and_die("-a and -g are mutually exclusive");
+	}
 	/* Specifying -a or -g with non-options is an error */
-	if (!(stty_state & STTY_noargs)
-	 && (stty_state & (STTY_verbose_output | STTY_recoverable_output))
+	if ((stty_state & (STTY_verbose_output | STTY_recoverable_output))
+	 && !(stty_state & STTY_noargs)
 	) {
-		bb_error_msg_and_die("modes may not be set when specifying an output style");
+		bb_error_msg_and_die("modes may not be set when -a or -g is used");
 	}
 
 	/* Now it is safe to start doing things */


More information about the busybox-cvs mailing list