Applied patch from Vladimir N. Oleynik that fixes incorrect behaviour in
recovery_mode and changed option processing.
This commit is contained in:
Mark Whitley
parent
42ab250709
commit
446dd27843
322
coreutils/stty.c
322
coreutils/stty.c
@ -24,10 +24,11 @@
|
||||
|
||||
David MacKenzie <djm@gnu.ai.mit.edu>
|
||||
|
||||
Special for busybox ported by vodz@usa.net 2001
|
||||
Special for busybox ported by Vladimir Oleynik <vodz@usa.net> 2001
|
||||
|
||||
*/
|
||||
|
||||
//#define TEST
|
||||
|
||||
#include <termios.h>
|
||||
#include <sys/ioctl.h>
|
||||
@ -165,28 +166,28 @@ enum mode_type {
|
||||
};
|
||||
|
||||
|
||||
static const char evenp[] = "evenp";
|
||||
static const char raw[] = "raw";
|
||||
static const char stty_min[] = "min";
|
||||
static const char stty_time[] = "time";
|
||||
static const char evenp [] = "evenp";
|
||||
static const char raw [] = "raw";
|
||||
static const char stty_min [] = "min";
|
||||
static const char stty_time [] = "time";
|
||||
static const char stty_swtch[] = "swtch";
|
||||
static const char stty_eol[] = "eol";
|
||||
static const char stty_eof[] = "eof";
|
||||
static const char parity[] = "parity";
|
||||
static const char stty_oddp[] = "oddp";
|
||||
static const char stty_nl[] = "nl";
|
||||
static const char stty_ek[] = "ek";
|
||||
static const char stty_sane[] = "sane";
|
||||
static const char cbreak[] = "cbreak";
|
||||
static const char stty_eol [] = "eol";
|
||||
static const char stty_eof [] = "eof";
|
||||
static const char parity [] = "parity";
|
||||
static const char stty_oddp [] = "oddp";
|
||||
static const char stty_nl [] = "nl";
|
||||
static const char stty_ek [] = "ek";
|
||||
static const char stty_sane [] = "sane";
|
||||
static const char cbreak [] = "cbreak";
|
||||
static const char stty_pass8[] = "pass8";
|
||||
static const char litout[] = "litout";
|
||||
static const char cooked[] = "cooked";
|
||||
static const char decctlq[] = "decctlq";
|
||||
static const char stty_tabs[] = "tabs";
|
||||
static const char litout [] = "litout";
|
||||
static const char cooked [] = "cooked";
|
||||
static const char decctlq [] = "decctlq";
|
||||
static const char stty_tabs [] = "tabs";
|
||||
static const char stty_lcase[] = "lcase";
|
||||
static const char stty_LCASE[] = "LCASE";
|
||||
static const char stty_crt[] = "crt";
|
||||
static const char stty_dec[] = "dec";
|
||||
static const char stty_crt [] = "crt";
|
||||
static const char stty_dec [] = "dec";
|
||||
|
||||
|
||||
/* Flags for `struct mode_info'. */
|
||||
@ -205,64 +206,62 @@ struct mode_info {
|
||||
};
|
||||
|
||||
static const struct mode_info mode_info[] = {
|
||||
{"parenb", control, REV, PARENB, 0},
|
||||
{"parodd", control, REV, PARODD, 0},
|
||||
{"parenb", control, REV, PARENB, 0 },
|
||||
{"parodd", control, REV, PARODD, 0 },
|
||||
{"cs5", control, 0, CS5, CSIZE},
|
||||
{"cs6", control, 0, CS6, CSIZE},
|
||||
{"cs7", control, 0, CS7, CSIZE},
|
||||
{"cs8", control, 0, CS8, CSIZE},
|
||||
{"hupcl", control, REV, HUPCL, 0},
|
||||
{"hup", control, REV | OMIT, HUPCL, 0},
|
||||
{"cstopb", control, REV, CSTOPB, 0},
|
||||
{"cread", control, SANE_SET | REV, CREAD, 0},
|
||||
{"clocal", control, REV, CLOCAL, 0},
|
||||
{"hupcl", control, REV, HUPCL, 0 },
|
||||
{"hup", control, REV | OMIT, HUPCL, 0 },
|
||||
{"cstopb", control, REV, CSTOPB, 0 },
|
||||
{"cread", control, SANE_SET | REV, CREAD, 0 },
|
||||
{"clocal", control, REV, CLOCAL, 0 },
|
||||
#ifdef CRTSCTS
|
||||
{"crtscts", control, REV, CRTSCTS, 0},
|
||||
{"crtscts", control, REV, CRTSCTS, 0 },
|
||||
#endif
|
||||
|
||||
{"ignbrk", input, SANE_UNSET | REV, IGNBRK, 0},
|
||||
{"brkint", input, SANE_SET | REV, BRKINT, 0},
|
||||
{"ignpar", input, REV, IGNPAR, 0},
|
||||
{"parmrk", input, REV, PARMRK, 0},
|
||||
{"inpck", input, REV, INPCK, 0},
|
||||
{"istrip", input, REV, ISTRIP, 0},
|
||||
{"inlcr", input, SANE_UNSET | REV, INLCR, 0},
|
||||
{"igncr", input, SANE_UNSET | REV, IGNCR, 0},
|
||||
{"icrnl", input, SANE_SET | REV, ICRNL, 0},
|
||||
{"ixon", input, REV, IXON, 0},
|
||||
{"ixoff", input, SANE_UNSET | REV, IXOFF, 0},
|
||||
{"tandem", input, REV | OMIT, IXOFF, 0},
|
||||
{"ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 },
|
||||
{"brkint", input, SANE_SET | REV, BRKINT, 0 },
|
||||
{"ignpar", input, REV, IGNPAR, 0 },
|
||||
{"parmrk", input, REV, PARMRK, 0 },
|
||||
{"inpck", input, REV, INPCK, 0 },
|
||||
{"istrip", input, REV, ISTRIP, 0 },
|
||||
{"inlcr", input, SANE_UNSET | REV, INLCR, 0 },
|
||||
{"igncr", input, SANE_UNSET | REV, IGNCR, 0 },
|
||||
{"icrnl", input, SANE_SET | REV, ICRNL, 0 },
|
||||
{"ixon", input, REV, IXON, 0 },
|
||||
{"ixoff", input, SANE_UNSET | REV, IXOFF, 0 },
|
||||
{"tandem", input, REV | OMIT, IXOFF, 0 },
|
||||
#ifdef IUCLC
|
||||
{"iuclc", input, SANE_UNSET | REV, IUCLC, 0},
|
||||
{"iuclc", input, SANE_UNSET | REV, IUCLC, 0 },
|
||||
#endif
|
||||
#ifdef IXANY
|
||||
{"ixany", input, SANE_UNSET | REV, IXANY, 0},
|
||||
{"ixany", input, SANE_UNSET | REV, IXANY, 0 },
|
||||
#endif
|
||||
#ifdef IMAXBEL
|
||||
{"imaxbel", input, SANE_SET | REV, IMAXBEL, 0},
|
||||
{"imaxbel", input, SANE_SET | REV, IMAXBEL, 0 },
|
||||
#endif
|
||||
|
||||
{"opost", output, SANE_SET | REV, OPOST, 0},
|
||||
{"opost", output, SANE_SET | REV, OPOST, 0 },
|
||||
#ifdef OLCUC
|
||||
{"olcuc", output, SANE_UNSET | REV, OLCUC, 0},
|
||||
{"olcuc", output, SANE_UNSET | REV, OLCUC, 0 },
|
||||
#endif
|
||||
#ifdef OCRNL
|
||||
{"ocrnl", output, SANE_UNSET | REV, OCRNL, 0},
|
||||
{"ocrnl", output, SANE_UNSET | REV, OCRNL, 0 },
|
||||
#endif
|
||||
#ifdef ONLCR
|
||||
{"onlcr", output, SANE_SET | REV, ONLCR, 0},
|
||||
{"onlcr", output, SANE_SET | REV, ONLCR, 0 },
|
||||
#endif
|
||||
#ifdef ONOCR
|
||||
{"onocr", output, SANE_UNSET | REV, ONOCR, 0},
|
||||
{"onocr", output, SANE_UNSET | REV, ONOCR, 0 },
|
||||
#endif
|
||||
#ifdef ONLRET
|
||||
{"onlret", output, SANE_UNSET | REV, ONLRET, 0},
|
||||
{"onlret", output, SANE_UNSET | REV, ONLRET, 0 },
|
||||
#endif
|
||||
#ifdef OFILL
|
||||
{"ofill", output, SANE_UNSET | REV, OFILL, 0},
|
||||
{"ofill", output, SANE_UNSET | REV, OFILL, 0 },
|
||||
#endif
|
||||
#ifdef OFDEL
|
||||
{"ofdel", output, SANE_UNSET | REV, OFDEL, 0},
|
||||
{"ofdel", output, SANE_UNSET | REV, OFDEL, 0 },
|
||||
#endif
|
||||
#ifdef NLDLY
|
||||
{"nl1", output, SANE_UNSET, NL1, NLDLY},
|
||||
@ -274,6 +273,7 @@ static const struct mode_info mode_info[] = {
|
||||
{"cr1", output, SANE_UNSET, CR1, CRDLY},
|
||||
{"cr0", output, SANE_SET, CR0, CRDLY},
|
||||
#endif
|
||||
|
||||
#ifdef TABDLY
|
||||
{"tab3", output, SANE_UNSET, TAB3, TABDLY},
|
||||
{"tab2", output, SANE_UNSET, TAB2, TABDLY},
|
||||
@ -281,9 +281,10 @@ static const struct mode_info mode_info[] = {
|
||||
{"tab0", output, SANE_SET, TAB0, TABDLY},
|
||||
#else
|
||||
# ifdef OXTABS
|
||||
{"tab3", output, SANE_UNSET, OXTABS, 0},
|
||||
{"tab3", output, SANE_UNSET, OXTABS, 0 },
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef BSDLY
|
||||
{"bs1", output, SANE_UNSET, BS1, BSDLY},
|
||||
{"bs0", output, SANE_SET, BS0, BSDLY},
|
||||
@ -296,60 +297,58 @@ static const struct mode_info mode_info[] = {
|
||||
{"ff1", output, SANE_UNSET, FF1, FFDLY},
|
||||
{"ff0", output, SANE_SET, FF0, FFDLY},
|
||||
#endif
|
||||
|
||||
{"isig", local, SANE_SET | REV, ISIG, 0},
|
||||
{"icanon", local, SANE_SET | REV, ICANON, 0},
|
||||
{"isig", local, SANE_SET | REV, ISIG, 0 },
|
||||
{"icanon", local, SANE_SET | REV, ICANON, 0 },
|
||||
#ifdef IEXTEN
|
||||
{"iexten", local, SANE_SET | REV, IEXTEN, 0},
|
||||
{"iexten", local, SANE_SET | REV, IEXTEN, 0 },
|
||||
#endif
|
||||
{"echo", local, SANE_SET | REV, ECHO, 0},
|
||||
{"echoe", local, SANE_SET | REV, ECHOE, 0},
|
||||
{"crterase", local, REV | OMIT, ECHOE, 0},
|
||||
{"echok", local, SANE_SET | REV, ECHOK, 0},
|
||||
{"echonl", local, SANE_UNSET | REV, ECHONL, 0},
|
||||
{"noflsh", local, SANE_UNSET | REV, NOFLSH, 0},
|
||||
{"echo", local, SANE_SET | REV, ECHO, 0 },
|
||||
{"echoe", local, SANE_SET | REV, ECHOE, 0 },
|
||||
{"crterase", local, REV | OMIT, ECHOE, 0 },
|
||||
{"echok", local, SANE_SET | REV, ECHOK, 0 },
|
||||
{"echonl", local, SANE_UNSET | REV, ECHONL, 0 },
|
||||
{"noflsh", local, SANE_UNSET | REV, NOFLSH, 0 },
|
||||
#ifdef XCASE
|
||||
{"xcase", local, SANE_UNSET | REV, XCASE, 0},
|
||||
{"xcase", local, SANE_UNSET | REV, XCASE, 0 },
|
||||
#endif
|
||||
#ifdef TOSTOP
|
||||
{"tostop", local, SANE_UNSET | REV, TOSTOP, 0},
|
||||
{"tostop", local, SANE_UNSET | REV, TOSTOP, 0 },
|
||||
#endif
|
||||
#ifdef ECHOPRT
|
||||
{"echoprt", local, SANE_UNSET | REV, ECHOPRT, 0},
|
||||
{"prterase", local, REV | OMIT, ECHOPRT, 0},
|
||||
{"echoprt", local, SANE_UNSET | REV, ECHOPRT, 0 },
|
||||
{"prterase", local, REV | OMIT, ECHOPRT, 0 },
|
||||
#endif
|
||||
#ifdef ECHOCTL
|
||||
{"echoctl", local, SANE_SET | REV, ECHOCTL, 0},
|
||||
{"ctlecho", local, REV | OMIT, ECHOCTL, 0},
|
||||
{"echoctl", local, SANE_SET | REV, ECHOCTL, 0 },
|
||||
{"ctlecho", local, REV | OMIT, ECHOCTL, 0 },
|
||||
#endif
|
||||
#ifdef ECHOKE
|
||||
{"echoke", local, SANE_SET | REV, ECHOKE, 0},
|
||||
{"crtkill", local, REV | OMIT, ECHOKE, 0},
|
||||
{"echoke", local, SANE_SET | REV, ECHOKE, 0 },
|
||||
{"crtkill", local, REV | OMIT, ECHOKE, 0 },
|
||||
#endif
|
||||
|
||||
{evenp, combination, REV | OMIT, 0, 0},
|
||||
{parity, combination, REV | OMIT, 0, 0},
|
||||
{stty_oddp, combination, REV | OMIT, 0, 0},
|
||||
{stty_nl, combination, REV | OMIT, 0, 0},
|
||||
{stty_ek, combination, OMIT, 0, 0},
|
||||
{stty_sane, combination, OMIT, 0, 0},
|
||||
{cooked, combination, REV | OMIT, 0, 0},
|
||||
{raw, combination, REV | OMIT, 0, 0},
|
||||
{stty_pass8, combination, REV | OMIT, 0, 0},
|
||||
{litout, combination, REV | OMIT, 0, 0},
|
||||
{cbreak, combination, REV | OMIT, 0, 0},
|
||||
{evenp, combination, REV | OMIT, 0, 0 },
|
||||
{parity, combination, REV | OMIT, 0, 0 },
|
||||
{stty_oddp, combination, REV | OMIT, 0, 0 },
|
||||
{stty_nl, combination, REV | OMIT, 0, 0 },
|
||||
{stty_ek, combination, OMIT, 0, 0 },
|
||||
{stty_sane, combination, OMIT, 0, 0 },
|
||||
{cooked, combination, REV | OMIT, 0, 0 },
|
||||
{raw, combination, REV | OMIT, 0, 0 },
|
||||
{stty_pass8, combination, REV | OMIT, 0, 0 },
|
||||
{litout, combination, REV | OMIT, 0, 0 },
|
||||
{cbreak, combination, REV | OMIT, 0, 0 },
|
||||
#ifdef IXANY
|
||||
{decctlq, combination, REV | OMIT, 0, 0},
|
||||
{decctlq, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
#if defined (TABDLY) || defined (OXTABS)
|
||||
{stty_tabs, combination, REV | OMIT, 0, 0},
|
||||
{stty_tabs, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
#if defined(XCASE) && defined(IUCLC) && defined(OLCUC)
|
||||
{stty_lcase, combination, REV | OMIT, 0, 0},
|
||||
{stty_LCASE, combination, REV | OMIT, 0, 0},
|
||||
{stty_lcase, combination, REV | OMIT, 0, 0 },
|
||||
{stty_LCASE, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
{stty_crt, combination, OMIT, 0, 0},
|
||||
{stty_dec, combination, OMIT, 0, 0},
|
||||
{stty_crt, combination, OMIT, 0, 0 },
|
||||
{stty_dec, combination, OMIT, 0, 0 },
|
||||
};
|
||||
|
||||
static const int NUM_mode_info =
|
||||
@ -399,7 +398,6 @@ static const struct control_info control_info[] = {
|
||||
#ifdef VSTATUS
|
||||
{"status", CSTATUS, VSTATUS},
|
||||
#endif
|
||||
|
||||
/* These must be last because of the display routines. */
|
||||
{stty_min, 1, VMIN},
|
||||
{stty_time, 0, VTIME},
|
||||
@ -409,14 +407,14 @@ static const int NUM_control_info =
|
||||
(sizeof(control_info) / sizeof(struct control_info));
|
||||
|
||||
|
||||
static const char *visible(unsigned int ch);
|
||||
static const char * visible(unsigned int ch);
|
||||
static unsigned long baud_to_value(speed_t speed);
|
||||
static int recover_mode(char *arg, struct termios *mode);
|
||||
static int screen_columns(void);
|
||||
static int set_mode(const struct mode_info *info,
|
||||
int reversed, struct termios *mode);
|
||||
static speed_t string_to_baud(const char *arg);
|
||||
static tcflag_t *mode_type_flag(enum mode_type type, struct termios *mode);
|
||||
static tcflag_t* mode_type_flag(enum mode_type type, struct termios *mode);
|
||||
static void display_all(struct termios *mode, int fd,
|
||||
const char *device_name);
|
||||
static void display_changed(struct termios *mode);
|
||||
@ -433,7 +431,6 @@ static void set_control_char(const struct control_info *info,
|
||||
static void set_speed(enum speed_setting type,
|
||||
const char *arg, struct termios *mode);
|
||||
static void set_window_size(int rows, int cols, int fd,
|
||||
|
||||
const char *device_name);
|
||||
|
||||
/* The width of the screen, for output wrapping. */
|
||||
@ -469,13 +466,17 @@ static void wrapf(const char *message, ...)
|
||||
}
|
||||
|
||||
static const struct suffix_mult stty_suffixes[] = {
|
||||
{"b", 512},
|
||||
{"b", 512 },
|
||||
{"k", 1024},
|
||||
{"B", 1024},
|
||||
{NULL, 0}
|
||||
{NULL, 0 }
|
||||
};
|
||||
|
||||
#ifndef TEST
|
||||
extern int stty_main(int argc, char **argv)
|
||||
#else
|
||||
extern int main(int argc, char **argv)
|
||||
#endif
|
||||
{
|
||||
struct termios mode;
|
||||
enum output_type output_type;
|
||||
@ -486,7 +487,7 @@ extern int stty_main(int argc, char **argv)
|
||||
int recoverable_output;
|
||||
int k;
|
||||
int noargs = 1;
|
||||
char *file_name = NULL;
|
||||
char * file_name = NULL;
|
||||
int fd;
|
||||
const char *device_name;
|
||||
|
||||
@ -581,43 +582,39 @@ extern int stty_main(int argc, char **argv)
|
||||
++argv[k];
|
||||
reversed = 1;
|
||||
}
|
||||
for (i = 0; i < NUM_mode_info; ++i) {
|
||||
for (i = 0; i < NUM_mode_info; ++i)
|
||||
if (STREQ(argv[k], mode_info[i].name)) {
|
||||
match_found = set_mode(&mode_info[i], reversed, &mode);
|
||||
require_set_attr = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (match_found == 0 && reversed) {
|
||||
|
||||
if (match_found == 0 && reversed)
|
||||
error_msg_and_die("invalid argument `%s'", --argv[k]);
|
||||
}
|
||||
if (match_found == 0) {
|
||||
for (i = 0; i < NUM_control_info; ++i) {
|
||||
|
||||
if (match_found == 0)
|
||||
for (i = 0; i < NUM_control_info; ++i)
|
||||
if (STREQ(argv[k], control_info[i].name)) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
match_found = 1;
|
||||
++k;
|
||||
set_control_char(&control_info[i], argv[k], &mode);
|
||||
require_set_attr = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (match_found == 0) {
|
||||
if (STREQ(argv[k], "ispeed")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_speed(input_speed, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
require_set_attr = 1;
|
||||
} else if (STREQ(argv[k], "ospeed")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_speed(output_speed, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
@ -625,16 +622,14 @@ extern int stty_main(int argc, char **argv)
|
||||
}
|
||||
#ifdef TIOCGWINSZ
|
||||
else if (STREQ(argv[k], "rows")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_window_size((int) parse_number(argv[k], stty_suffixes),
|
||||
-1, fd, device_name);
|
||||
} else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_window_size(-1,
|
||||
(int) parse_number(argv[k], stty_suffixes),
|
||||
@ -647,9 +642,8 @@ extern int stty_main(int argc, char **argv)
|
||||
#endif
|
||||
#ifdef HAVE_C_LINE
|
||||
else if (STREQ(argv[k], "line")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
mode.c_line = parse_number(argv[k], stty_suffixes);
|
||||
require_set_attr = 1;
|
||||
@ -658,17 +652,15 @@ extern int stty_main(int argc, char **argv)
|
||||
else if (STREQ(argv[k], "speed")) {
|
||||
max_col = screen_columns();
|
||||
display_speed(&mode, 0);
|
||||
} else if (string_to_baud(argv[k]) != (speed_t) - 1) {
|
||||
} else if (recover_mode(argv[k], &mode) == 1)
|
||||
require_set_attr = 1;
|
||||
else if (string_to_baud(argv[k]) != (speed_t) - 1) {
|
||||
set_speed(both_speeds, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
require_set_attr = 1;
|
||||
} else {
|
||||
if (recover_mode(argv[k], &mode) == 0) {
|
||||
} else
|
||||
error_msg_and_die("invalid argument `%s'", argv[k]);
|
||||
}
|
||||
require_set_attr = 1;
|
||||
}
|
||||
}
|
||||
k++;
|
||||
}
|
||||
|
||||
@ -712,21 +704,8 @@ extern int stty_main(int argc, char **argv)
|
||||
new_mode.c_cflag &= (~CIBAUD);
|
||||
if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0)
|
||||
#endif
|
||||
{
|
||||
error_msg_and_die ("%s: unable to perform all requested operations",
|
||||
device_name);
|
||||
#ifdef TESTING
|
||||
{
|
||||
size_t i;
|
||||
|
||||
printf("new_mode: mode\n");
|
||||
for (i = 0; i < sizeof(new_mode); i++)
|
||||
printf("0x%02x: 0x%02x\n",
|
||||
*(((unsigned char *) &new_mode) + i),
|
||||
*(((unsigned char *) &mode) + i));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1382,6 +1361,79 @@ static const char *visible(unsigned int ch)
|
||||
return (const char *) buf;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
unsigned long parse_number(const char *numstr,
|
||||
const struct suffix_mult *suffixes)
|
||||
{
|
||||
const struct suffix_mult *sm;
|
||||
unsigned long int ret;
|
||||
int len;
|
||||
char *end;
|
||||
|
||||
ret = strtoul(numstr, &end, 10);
|
||||
if (numstr == end)
|
||||
error_msg_and_die("invalid number `%s'", numstr);
|
||||
while (end[0] != '\0') {
|
||||
sm = suffixes;
|
||||
while ( sm != 0 ) {
|
||||
if(sm->suffix) {
|
||||
len = strlen(sm->suffix);
|
||||
if (strncmp(sm->suffix, end, len) == 0) {
|
||||
ret *= sm->mult;
|
||||
end += len;
|
||||
break;
|
||||
}
|
||||
sm++;
|
||||
|
||||
} else
|
||||
sm = 0;
|
||||
}
|
||||
if (sm == 0)
|
||||
error_msg_and_die("invalid number `%s'", numstr);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
const char *applet_name = "stty";
|
||||
|
||||
static void verror_msg(const char *s, va_list p)
|
||||
{
|
||||
fflush(stdout);
|
||||
fprintf(stderr, "%s: ", applet_name);
|
||||
vfprintf(stderr, s, p);
|
||||
}
|
||||
|
||||
extern void error_msg_and_die(const char *s, ...)
|
||||
{
|
||||
va_list p;
|
||||
|
||||
va_start(p, s);
|
||||
verror_msg(s, p);
|
||||
va_end(p);
|
||||
putc('\n', stderr);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static void vperror_msg(const char *s, va_list p)
|
||||
{
|
||||
int err=errno;
|
||||
verror_msg(s, p);
|
||||
if (*s) s = ": ";
|
||||
fprintf(stderr, "%s%s\n", s, strerror(err));
|
||||
}
|
||||
|
||||
extern void perror_msg_and_die(const char *s, ...)
|
||||
{
|
||||
va_list p;
|
||||
|
||||
va_start(p, s);
|
||||
vperror_msg(s, p);
|
||||
va_end(p);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "linux"
|
||||
|
||||
322
stty.c
322
stty.c
@ -24,10 +24,11 @@
|
||||
|
||||
David MacKenzie <djm@gnu.ai.mit.edu>
|
||||
|
||||
Special for busybox ported by vodz@usa.net 2001
|
||||
Special for busybox ported by Vladimir Oleynik <vodz@usa.net> 2001
|
||||
|
||||
*/
|
||||
|
||||
//#define TEST
|
||||
|
||||
#include <termios.h>
|
||||
#include <sys/ioctl.h>
|
||||
@ -165,28 +166,28 @@ enum mode_type {
|
||||
};
|
||||
|
||||
|
||||
static const char evenp[] = "evenp";
|
||||
static const char raw[] = "raw";
|
||||
static const char stty_min[] = "min";
|
||||
static const char stty_time[] = "time";
|
||||
static const char evenp [] = "evenp";
|
||||
static const char raw [] = "raw";
|
||||
static const char stty_min [] = "min";
|
||||
static const char stty_time [] = "time";
|
||||
static const char stty_swtch[] = "swtch";
|
||||
static const char stty_eol[] = "eol";
|
||||
static const char stty_eof[] = "eof";
|
||||
static const char parity[] = "parity";
|
||||
static const char stty_oddp[] = "oddp";
|
||||
static const char stty_nl[] = "nl";
|
||||
static const char stty_ek[] = "ek";
|
||||
static const char stty_sane[] = "sane";
|
||||
static const char cbreak[] = "cbreak";
|
||||
static const char stty_eol [] = "eol";
|
||||
static const char stty_eof [] = "eof";
|
||||
static const char parity [] = "parity";
|
||||
static const char stty_oddp [] = "oddp";
|
||||
static const char stty_nl [] = "nl";
|
||||
static const char stty_ek [] = "ek";
|
||||
static const char stty_sane [] = "sane";
|
||||
static const char cbreak [] = "cbreak";
|
||||
static const char stty_pass8[] = "pass8";
|
||||
static const char litout[] = "litout";
|
||||
static const char cooked[] = "cooked";
|
||||
static const char decctlq[] = "decctlq";
|
||||
static const char stty_tabs[] = "tabs";
|
||||
static const char litout [] = "litout";
|
||||
static const char cooked [] = "cooked";
|
||||
static const char decctlq [] = "decctlq";
|
||||
static const char stty_tabs [] = "tabs";
|
||||
static const char stty_lcase[] = "lcase";
|
||||
static const char stty_LCASE[] = "LCASE";
|
||||
static const char stty_crt[] = "crt";
|
||||
static const char stty_dec[] = "dec";
|
||||
static const char stty_crt [] = "crt";
|
||||
static const char stty_dec [] = "dec";
|
||||
|
||||
|
||||
/* Flags for `struct mode_info'. */
|
||||
@ -205,64 +206,62 @@ struct mode_info {
|
||||
};
|
||||
|
||||
static const struct mode_info mode_info[] = {
|
||||
{"parenb", control, REV, PARENB, 0},
|
||||
{"parodd", control, REV, PARODD, 0},
|
||||
{"parenb", control, REV, PARENB, 0 },
|
||||
{"parodd", control, REV, PARODD, 0 },
|
||||
{"cs5", control, 0, CS5, CSIZE},
|
||||
{"cs6", control, 0, CS6, CSIZE},
|
||||
{"cs7", control, 0, CS7, CSIZE},
|
||||
{"cs8", control, 0, CS8, CSIZE},
|
||||
{"hupcl", control, REV, HUPCL, 0},
|
||||
{"hup", control, REV | OMIT, HUPCL, 0},
|
||||
{"cstopb", control, REV, CSTOPB, 0},
|
||||
{"cread", control, SANE_SET | REV, CREAD, 0},
|
||||
{"clocal", control, REV, CLOCAL, 0},
|
||||
{"hupcl", control, REV, HUPCL, 0 },
|
||||
{"hup", control, REV | OMIT, HUPCL, 0 },
|
||||
{"cstopb", control, REV, CSTOPB, 0 },
|
||||
{"cread", control, SANE_SET | REV, CREAD, 0 },
|
||||
{"clocal", control, REV, CLOCAL, 0 },
|
||||
#ifdef CRTSCTS
|
||||
{"crtscts", control, REV, CRTSCTS, 0},
|
||||
{"crtscts", control, REV, CRTSCTS, 0 },
|
||||
#endif
|
||||
|
||||
{"ignbrk", input, SANE_UNSET | REV, IGNBRK, 0},
|
||||
{"brkint", input, SANE_SET | REV, BRKINT, 0},
|
||||
{"ignpar", input, REV, IGNPAR, 0},
|
||||
{"parmrk", input, REV, PARMRK, 0},
|
||||
{"inpck", input, REV, INPCK, 0},
|
||||
{"istrip", input, REV, ISTRIP, 0},
|
||||
{"inlcr", input, SANE_UNSET | REV, INLCR, 0},
|
||||
{"igncr", input, SANE_UNSET | REV, IGNCR, 0},
|
||||
{"icrnl", input, SANE_SET | REV, ICRNL, 0},
|
||||
{"ixon", input, REV, IXON, 0},
|
||||
{"ixoff", input, SANE_UNSET | REV, IXOFF, 0},
|
||||
{"tandem", input, REV | OMIT, IXOFF, 0},
|
||||
{"ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 },
|
||||
{"brkint", input, SANE_SET | REV, BRKINT, 0 },
|
||||
{"ignpar", input, REV, IGNPAR, 0 },
|
||||
{"parmrk", input, REV, PARMRK, 0 },
|
||||
{"inpck", input, REV, INPCK, 0 },
|
||||
{"istrip", input, REV, ISTRIP, 0 },
|
||||
{"inlcr", input, SANE_UNSET | REV, INLCR, 0 },
|
||||
{"igncr", input, SANE_UNSET | REV, IGNCR, 0 },
|
||||
{"icrnl", input, SANE_SET | REV, ICRNL, 0 },
|
||||
{"ixon", input, REV, IXON, 0 },
|
||||
{"ixoff", input, SANE_UNSET | REV, IXOFF, 0 },
|
||||
{"tandem", input, REV | OMIT, IXOFF, 0 },
|
||||
#ifdef IUCLC
|
||||
{"iuclc", input, SANE_UNSET | REV, IUCLC, 0},
|
||||
{"iuclc", input, SANE_UNSET | REV, IUCLC, 0 },
|
||||
#endif
|
||||
#ifdef IXANY
|
||||
{"ixany", input, SANE_UNSET | REV, IXANY, 0},
|
||||
{"ixany", input, SANE_UNSET | REV, IXANY, 0 },
|
||||
#endif
|
||||
#ifdef IMAXBEL
|
||||
{"imaxbel", input, SANE_SET | REV, IMAXBEL, 0},
|
||||
{"imaxbel", input, SANE_SET | REV, IMAXBEL, 0 },
|
||||
#endif
|
||||
|
||||
{"opost", output, SANE_SET | REV, OPOST, 0},
|
||||
{"opost", output, SANE_SET | REV, OPOST, 0 },
|
||||
#ifdef OLCUC
|
||||
{"olcuc", output, SANE_UNSET | REV, OLCUC, 0},
|
||||
{"olcuc", output, SANE_UNSET | REV, OLCUC, 0 },
|
||||
#endif
|
||||
#ifdef OCRNL
|
||||
{"ocrnl", output, SANE_UNSET | REV, OCRNL, 0},
|
||||
{"ocrnl", output, SANE_UNSET | REV, OCRNL, 0 },
|
||||
#endif
|
||||
#ifdef ONLCR
|
||||
{"onlcr", output, SANE_SET | REV, ONLCR, 0},
|
||||
{"onlcr", output, SANE_SET | REV, ONLCR, 0 },
|
||||
#endif
|
||||
#ifdef ONOCR
|
||||
{"onocr", output, SANE_UNSET | REV, ONOCR, 0},
|
||||
{"onocr", output, SANE_UNSET | REV, ONOCR, 0 },
|
||||
#endif
|
||||
#ifdef ONLRET
|
||||
{"onlret", output, SANE_UNSET | REV, ONLRET, 0},
|
||||
{"onlret", output, SANE_UNSET | REV, ONLRET, 0 },
|
||||
#endif
|
||||
#ifdef OFILL
|
||||
{"ofill", output, SANE_UNSET | REV, OFILL, 0},
|
||||
{"ofill", output, SANE_UNSET | REV, OFILL, 0 },
|
||||
#endif
|
||||
#ifdef OFDEL
|
||||
{"ofdel", output, SANE_UNSET | REV, OFDEL, 0},
|
||||
{"ofdel", output, SANE_UNSET | REV, OFDEL, 0 },
|
||||
#endif
|
||||
#ifdef NLDLY
|
||||
{"nl1", output, SANE_UNSET, NL1, NLDLY},
|
||||
@ -274,6 +273,7 @@ static const struct mode_info mode_info[] = {
|
||||
{"cr1", output, SANE_UNSET, CR1, CRDLY},
|
||||
{"cr0", output, SANE_SET, CR0, CRDLY},
|
||||
#endif
|
||||
|
||||
#ifdef TABDLY
|
||||
{"tab3", output, SANE_UNSET, TAB3, TABDLY},
|
||||
{"tab2", output, SANE_UNSET, TAB2, TABDLY},
|
||||
@ -281,9 +281,10 @@ static const struct mode_info mode_info[] = {
|
||||
{"tab0", output, SANE_SET, TAB0, TABDLY},
|
||||
#else
|
||||
# ifdef OXTABS
|
||||
{"tab3", output, SANE_UNSET, OXTABS, 0},
|
||||
{"tab3", output, SANE_UNSET, OXTABS, 0 },
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef BSDLY
|
||||
{"bs1", output, SANE_UNSET, BS1, BSDLY},
|
||||
{"bs0", output, SANE_SET, BS0, BSDLY},
|
||||
@ -296,60 +297,58 @@ static const struct mode_info mode_info[] = {
|
||||
{"ff1", output, SANE_UNSET, FF1, FFDLY},
|
||||
{"ff0", output, SANE_SET, FF0, FFDLY},
|
||||
#endif
|
||||
|
||||
{"isig", local, SANE_SET | REV, ISIG, 0},
|
||||
{"icanon", local, SANE_SET | REV, ICANON, 0},
|
||||
{"isig", local, SANE_SET | REV, ISIG, 0 },
|
||||
{"icanon", local, SANE_SET | REV, ICANON, 0 },
|
||||
#ifdef IEXTEN
|
||||
{"iexten", local, SANE_SET | REV, IEXTEN, 0},
|
||||
{"iexten", local, SANE_SET | REV, IEXTEN, 0 },
|
||||
#endif
|
||||
{"echo", local, SANE_SET | REV, ECHO, 0},
|
||||
{"echoe", local, SANE_SET | REV, ECHOE, 0},
|
||||
{"crterase", local, REV | OMIT, ECHOE, 0},
|
||||
{"echok", local, SANE_SET | REV, ECHOK, 0},
|
||||
{"echonl", local, SANE_UNSET | REV, ECHONL, 0},
|
||||
{"noflsh", local, SANE_UNSET | REV, NOFLSH, 0},
|
||||
{"echo", local, SANE_SET | REV, ECHO, 0 },
|
||||
{"echoe", local, SANE_SET | REV, ECHOE, 0 },
|
||||
{"crterase", local, REV | OMIT, ECHOE, 0 },
|
||||
{"echok", local, SANE_SET | REV, ECHOK, 0 },
|
||||
{"echonl", local, SANE_UNSET | REV, ECHONL, 0 },
|
||||
{"noflsh", local, SANE_UNSET | REV, NOFLSH, 0 },
|
||||
#ifdef XCASE
|
||||
{"xcase", local, SANE_UNSET | REV, XCASE, 0},
|
||||
{"xcase", local, SANE_UNSET | REV, XCASE, 0 },
|
||||
#endif
|
||||
#ifdef TOSTOP
|
||||
{"tostop", local, SANE_UNSET | REV, TOSTOP, 0},
|
||||
{"tostop", local, SANE_UNSET | REV, TOSTOP, 0 },
|
||||
#endif
|
||||
#ifdef ECHOPRT
|
||||
{"echoprt", local, SANE_UNSET | REV, ECHOPRT, 0},
|
||||
{"prterase", local, REV | OMIT, ECHOPRT, 0},
|
||||
{"echoprt", local, SANE_UNSET | REV, ECHOPRT, 0 },
|
||||
{"prterase", local, REV | OMIT, ECHOPRT, 0 },
|
||||
#endif
|
||||
#ifdef ECHOCTL
|
||||
{"echoctl", local, SANE_SET | REV, ECHOCTL, 0},
|
||||
{"ctlecho", local, REV | OMIT, ECHOCTL, 0},
|
||||
{"echoctl", local, SANE_SET | REV, ECHOCTL, 0 },
|
||||
{"ctlecho", local, REV | OMIT, ECHOCTL, 0 },
|
||||
#endif
|
||||
#ifdef ECHOKE
|
||||
{"echoke", local, SANE_SET | REV, ECHOKE, 0},
|
||||
{"crtkill", local, REV | OMIT, ECHOKE, 0},
|
||||
{"echoke", local, SANE_SET | REV, ECHOKE, 0 },
|
||||
{"crtkill", local, REV | OMIT, ECHOKE, 0 },
|
||||
#endif
|
||||
|
||||
{evenp, combination, REV | OMIT, 0, 0},
|
||||
{parity, combination, REV | OMIT, 0, 0},
|
||||
{stty_oddp, combination, REV | OMIT, 0, 0},
|
||||
{stty_nl, combination, REV | OMIT, 0, 0},
|
||||
{stty_ek, combination, OMIT, 0, 0},
|
||||
{stty_sane, combination, OMIT, 0, 0},
|
||||
{cooked, combination, REV | OMIT, 0, 0},
|
||||
{raw, combination, REV | OMIT, 0, 0},
|
||||
{stty_pass8, combination, REV | OMIT, 0, 0},
|
||||
{litout, combination, REV | OMIT, 0, 0},
|
||||
{cbreak, combination, REV | OMIT, 0, 0},
|
||||
{evenp, combination, REV | OMIT, 0, 0 },
|
||||
{parity, combination, REV | OMIT, 0, 0 },
|
||||
{stty_oddp, combination, REV | OMIT, 0, 0 },
|
||||
{stty_nl, combination, REV | OMIT, 0, 0 },
|
||||
{stty_ek, combination, OMIT, 0, 0 },
|
||||
{stty_sane, combination, OMIT, 0, 0 },
|
||||
{cooked, combination, REV | OMIT, 0, 0 },
|
||||
{raw, combination, REV | OMIT, 0, 0 },
|
||||
{stty_pass8, combination, REV | OMIT, 0, 0 },
|
||||
{litout, combination, REV | OMIT, 0, 0 },
|
||||
{cbreak, combination, REV | OMIT, 0, 0 },
|
||||
#ifdef IXANY
|
||||
{decctlq, combination, REV | OMIT, 0, 0},
|
||||
{decctlq, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
#if defined (TABDLY) || defined (OXTABS)
|
||||
{stty_tabs, combination, REV | OMIT, 0, 0},
|
||||
{stty_tabs, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
#if defined(XCASE) && defined(IUCLC) && defined(OLCUC)
|
||||
{stty_lcase, combination, REV | OMIT, 0, 0},
|
||||
{stty_LCASE, combination, REV | OMIT, 0, 0},
|
||||
{stty_lcase, combination, REV | OMIT, 0, 0 },
|
||||
{stty_LCASE, combination, REV | OMIT, 0, 0 },
|
||||
#endif
|
||||
{stty_crt, combination, OMIT, 0, 0},
|
||||
{stty_dec, combination, OMIT, 0, 0},
|
||||
{stty_crt, combination, OMIT, 0, 0 },
|
||||
{stty_dec, combination, OMIT, 0, 0 },
|
||||
};
|
||||
|
||||
static const int NUM_mode_info =
|
||||
@ -399,7 +398,6 @@ static const struct control_info control_info[] = {
|
||||
#ifdef VSTATUS
|
||||
{"status", CSTATUS, VSTATUS},
|
||||
#endif
|
||||
|
||||
/* These must be last because of the display routines. */
|
||||
{stty_min, 1, VMIN},
|
||||
{stty_time, 0, VTIME},
|
||||
@ -409,14 +407,14 @@ static const int NUM_control_info =
|
||||
(sizeof(control_info) / sizeof(struct control_info));
|
||||
|
||||
|
||||
static const char *visible(unsigned int ch);
|
||||
static const char * visible(unsigned int ch);
|
||||
static unsigned long baud_to_value(speed_t speed);
|
||||
static int recover_mode(char *arg, struct termios *mode);
|
||||
static int screen_columns(void);
|
||||
static int set_mode(const struct mode_info *info,
|
||||
int reversed, struct termios *mode);
|
||||
static speed_t string_to_baud(const char *arg);
|
||||
static tcflag_t *mode_type_flag(enum mode_type type, struct termios *mode);
|
||||
static tcflag_t* mode_type_flag(enum mode_type type, struct termios *mode);
|
||||
static void display_all(struct termios *mode, int fd,
|
||||
const char *device_name);
|
||||
static void display_changed(struct termios *mode);
|
||||
@ -433,7 +431,6 @@ static void set_control_char(const struct control_info *info,
|
||||
static void set_speed(enum speed_setting type,
|
||||
const char *arg, struct termios *mode);
|
||||
static void set_window_size(int rows, int cols, int fd,
|
||||
|
||||
const char *device_name);
|
||||
|
||||
/* The width of the screen, for output wrapping. */
|
||||
@ -469,13 +466,17 @@ static void wrapf(const char *message, ...)
|
||||
}
|
||||
|
||||
static const struct suffix_mult stty_suffixes[] = {
|
||||
{"b", 512},
|
||||
{"b", 512 },
|
||||
{"k", 1024},
|
||||
{"B", 1024},
|
||||
{NULL, 0}
|
||||
{NULL, 0 }
|
||||
};
|
||||
|
||||
#ifndef TEST
|
||||
extern int stty_main(int argc, char **argv)
|
||||
#else
|
||||
extern int main(int argc, char **argv)
|
||||
#endif
|
||||
{
|
||||
struct termios mode;
|
||||
enum output_type output_type;
|
||||
@ -486,7 +487,7 @@ extern int stty_main(int argc, char **argv)
|
||||
int recoverable_output;
|
||||
int k;
|
||||
int noargs = 1;
|
||||
char *file_name = NULL;
|
||||
char * file_name = NULL;
|
||||
int fd;
|
||||
const char *device_name;
|
||||
|
||||
@ -581,43 +582,39 @@ extern int stty_main(int argc, char **argv)
|
||||
++argv[k];
|
||||
reversed = 1;
|
||||
}
|
||||
for (i = 0; i < NUM_mode_info; ++i) {
|
||||
for (i = 0; i < NUM_mode_info; ++i)
|
||||
if (STREQ(argv[k], mode_info[i].name)) {
|
||||
match_found = set_mode(&mode_info[i], reversed, &mode);
|
||||
require_set_attr = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (match_found == 0 && reversed) {
|
||||
|
||||
if (match_found == 0 && reversed)
|
||||
error_msg_and_die("invalid argument `%s'", --argv[k]);
|
||||
}
|
||||
if (match_found == 0) {
|
||||
for (i = 0; i < NUM_control_info; ++i) {
|
||||
|
||||
if (match_found == 0)
|
||||
for (i = 0; i < NUM_control_info; ++i)
|
||||
if (STREQ(argv[k], control_info[i].name)) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
match_found = 1;
|
||||
++k;
|
||||
set_control_char(&control_info[i], argv[k], &mode);
|
||||
require_set_attr = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (match_found == 0) {
|
||||
if (STREQ(argv[k], "ispeed")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_speed(input_speed, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
require_set_attr = 1;
|
||||
} else if (STREQ(argv[k], "ospeed")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_speed(output_speed, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
@ -625,16 +622,14 @@ extern int stty_main(int argc, char **argv)
|
||||
}
|
||||
#ifdef TIOCGWINSZ
|
||||
else if (STREQ(argv[k], "rows")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_window_size((int) parse_number(argv[k], stty_suffixes),
|
||||
-1, fd, device_name);
|
||||
} else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
set_window_size(-1,
|
||||
(int) parse_number(argv[k], stty_suffixes),
|
||||
@ -647,9 +642,8 @@ extern int stty_main(int argc, char **argv)
|
||||
#endif
|
||||
#ifdef HAVE_C_LINE
|
||||
else if (STREQ(argv[k], "line")) {
|
||||
if (k == argc - 1) {
|
||||
if (k == argc - 1)
|
||||
error_msg_and_die("missing argument to `%s'", argv[k]);
|
||||
}
|
||||
++k;
|
||||
mode.c_line = parse_number(argv[k], stty_suffixes);
|
||||
require_set_attr = 1;
|
||||
@ -658,17 +652,15 @@ extern int stty_main(int argc, char **argv)
|
||||
else if (STREQ(argv[k], "speed")) {
|
||||
max_col = screen_columns();
|
||||
display_speed(&mode, 0);
|
||||
} else if (string_to_baud(argv[k]) != (speed_t) - 1) {
|
||||
} else if (recover_mode(argv[k], &mode) == 1)
|
||||
require_set_attr = 1;
|
||||
else if (string_to_baud(argv[k]) != (speed_t) - 1) {
|
||||
set_speed(both_speeds, argv[k], &mode);
|
||||
speed_was_set = 1;
|
||||
require_set_attr = 1;
|
||||
} else {
|
||||
if (recover_mode(argv[k], &mode) == 0) {
|
||||
} else
|
||||
error_msg_and_die("invalid argument `%s'", argv[k]);
|
||||
}
|
||||
require_set_attr = 1;
|
||||
}
|
||||
}
|
||||
k++;
|
||||
}
|
||||
|
||||
@ -712,21 +704,8 @@ extern int stty_main(int argc, char **argv)
|
||||
new_mode.c_cflag &= (~CIBAUD);
|
||||
if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0)
|
||||
#endif
|
||||
{
|
||||
error_msg_and_die ("%s: unable to perform all requested operations",
|
||||
device_name);
|
||||
#ifdef TESTING
|
||||
{
|
||||
size_t i;
|
||||
|
||||
printf("new_mode: mode\n");
|
||||
for (i = 0; i < sizeof(new_mode); i++)
|
||||
printf("0x%02x: 0x%02x\n",
|
||||
*(((unsigned char *) &new_mode) + i),
|
||||
*(((unsigned char *) &mode) + i));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1382,6 +1361,79 @@ static const char *visible(unsigned int ch)
|
||||
return (const char *) buf;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
unsigned long parse_number(const char *numstr,
|
||||
const struct suffix_mult *suffixes)
|
||||
{
|
||||
const struct suffix_mult *sm;
|
||||
unsigned long int ret;
|
||||
int len;
|
||||
char *end;
|
||||
|
||||
ret = strtoul(numstr, &end, 10);
|
||||
if (numstr == end)
|
||||
error_msg_and_die("invalid number `%s'", numstr);
|
||||
while (end[0] != '\0') {
|
||||
sm = suffixes;
|
||||
while ( sm != 0 ) {
|
||||
if(sm->suffix) {
|
||||
len = strlen(sm->suffix);
|
||||
if (strncmp(sm->suffix, end, len) == 0) {
|
||||
ret *= sm->mult;
|
||||
end += len;
|
||||
break;
|
||||
}
|
||||
sm++;
|
||||
|
||||
} else
|
||||
sm = 0;
|
||||
}
|
||||
if (sm == 0)
|
||||
error_msg_and_die("invalid number `%s'", numstr);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
const char *applet_name = "stty";
|
||||
|
||||
static void verror_msg(const char *s, va_list p)
|
||||
{
|
||||
fflush(stdout);
|
||||
fprintf(stderr, "%s: ", applet_name);
|
||||
vfprintf(stderr, s, p);
|
||||
}
|
||||
|
||||
extern void error_msg_and_die(const char *s, ...)
|
||||
{
|
||||
va_list p;
|
||||
|
||||
va_start(p, s);
|
||||
verror_msg(s, p);
|
||||
va_end(p);
|
||||
putc('\n', stderr);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static void vperror_msg(const char *s, va_list p)
|
||||
{
|
||||
int err=errno;
|
||||
verror_msg(s, p);
|
||||
if (*s) s = ": ";
|
||||
fprintf(stderr, "%s%s\n", s, strerror(err));
|
||||
}
|
||||
|
||||
extern void perror_msg_and_die(const char *s, ...)
|
||||
{
|
||||
va_list p;
|
||||
|
||||
va_start(p, s);
|
||||
vperror_msg(s, p);
|
||||
va_end(p);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "linux"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user