diff options
Diffstat (limited to '')
-rw-r--r-- | coreutils/stty.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/stty.c b/coreutils/stty.c index 8b70af65e..cfb7f7f39 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | //#define TEST | 24 | //#define TEST |
25 | 25 | ||
26 | #include "busybox.h" | ||
26 | #include <stddef.h> | 27 | #include <stddef.h> |
27 | #include <termios.h> | 28 | #include <termios.h> |
28 | #include <sys/ioctl.h> | 29 | #include <sys/ioctl.h> |
@@ -45,7 +46,6 @@ | |||
45 | #include <errno.h> | 46 | #include <errno.h> |
46 | #include <limits.h> | 47 | #include <limits.h> |
47 | #include <fcntl.h> | 48 | #include <fcntl.h> |
48 | #include "busybox.h" | ||
49 | 49 | ||
50 | #define STREQ(a, b) (strcmp ((a), (b)) == 0) | 50 | #define STREQ(a, b) (strcmp ((a), (b)) == 0) |
51 | 51 | ||
@@ -608,7 +608,7 @@ int main(int argc, char **argv) | |||
608 | for (i = 0; i < NUM_control_info; ++i) | 608 | for (i = 0; i < NUM_control_info; ++i) |
609 | if (STREQ(argv[k], control_info[i].name)) { | 609 | if (STREQ(argv[k], control_info[i].name)) { |
610 | if (k == argc - 1) | 610 | if (k == argc - 1) |
611 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 611 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
612 | match_found = 1; | 612 | match_found = 1; |
613 | ++k; | 613 | ++k; |
614 | set_control_char(&control_info[i], argv[k], &mode); | 614 | set_control_char(&control_info[i], argv[k], &mode); |
@@ -619,14 +619,14 @@ int main(int argc, char **argv) | |||
619 | if (match_found == 0) { | 619 | if (match_found == 0) { |
620 | if (STREQ(argv[k], "ispeed")) { | 620 | if (STREQ(argv[k], "ispeed")) { |
621 | if (k == argc - 1) | 621 | if (k == argc - 1) |
622 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 622 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
623 | ++k; | 623 | ++k; |
624 | set_speed(input_speed, argv[k], &mode); | 624 | set_speed(input_speed, argv[k], &mode); |
625 | speed_was_set = 1; | 625 | speed_was_set = 1; |
626 | require_set_attr = 1; | 626 | require_set_attr = 1; |
627 | } else if (STREQ(argv[k], "ospeed")) { | 627 | } else if (STREQ(argv[k], "ospeed")) { |
628 | if (k == argc - 1) | 628 | if (k == argc - 1) |
629 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 629 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
630 | ++k; | 630 | ++k; |
631 | set_speed(output_speed, argv[k], &mode); | 631 | set_speed(output_speed, argv[k], &mode); |
632 | speed_was_set = 1; | 632 | speed_was_set = 1; |
@@ -635,13 +635,13 @@ int main(int argc, char **argv) | |||
635 | #ifdef TIOCGWINSZ | 635 | #ifdef TIOCGWINSZ |
636 | else if (STREQ(argv[k], "rows")) { | 636 | else if (STREQ(argv[k], "rows")) { |
637 | if (k == argc - 1) | 637 | if (k == argc - 1) |
638 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 638 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
639 | ++k; | 639 | ++k; |
640 | set_window_size((int) bb_xparse_number(argv[k], stty_suffixes), | 640 | set_window_size((int) bb_xparse_number(argv[k], stty_suffixes), |
641 | -1); | 641 | -1); |
642 | } else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) { | 642 | } else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) { |
643 | if (k == argc - 1) | 643 | if (k == argc - 1) |
644 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 644 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
645 | ++k; | 645 | ++k; |
646 | set_window_size(-1, | 646 | set_window_size(-1, |
647 | (int) bb_xparse_number(argv[k], stty_suffixes)); | 647 | (int) bb_xparse_number(argv[k], stty_suffixes)); |
@@ -654,7 +654,7 @@ int main(int argc, char **argv) | |||
654 | #ifdef HAVE_C_LINE | 654 | #ifdef HAVE_C_LINE |
655 | else if (STREQ(argv[k], "line")) { | 655 | else if (STREQ(argv[k], "line")) { |
656 | if (k == argc - 1) | 656 | if (k == argc - 1) |
657 | bb_error_msg_and_die("missing argument to `%s'", argv[k]); | 657 | bb_error_msg_and_die(bb_msg_requires_arg, argv[k]); |
658 | ++k; | 658 | ++k; |
659 | mode.c_line = bb_xparse_number(argv[k], stty_suffixes); | 659 | mode.c_line = bb_xparse_number(argv[k], stty_suffixes); |
660 | require_set_attr = 1; | 660 | require_set_attr = 1; |