- spelling
[oweals/busybox.git] / coreutils / stty.c
index 0fc0bfbc264e1507502f653f0e8f04c9f1c615de..cfb7f7f39463ca2b7940119383fad403d17c0d42 100644 (file)
@@ -2,15 +2,8 @@
 /* stty -- change and print terminal line settings
    Copyright (C) 1990-1999 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
+   Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+*/
 /* Usage: stty [-ag] [-F device] [setting...]
 
    Options:
 
    David MacKenzie <djm@gnu.ai.mit.edu>
 
-   Special for busybox ported by vodz@usa.net 2001
+   Special for busybox ported by Vladimir Oleynik <dzo@simtreas.ru> 2001
 
    */
 
-#include "busybox.h"
+//#define TEST
 
+#include "busybox.h"
+#include <stddef.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include <getopt.h>
 
 #include <sys/param.h>
 #include <unistd.h>
@@ -51,7 +45,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <memory.h>
 #include <fcntl.h>
 
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 # define CSWTCH _POSIX_VDISABLE
 #endif
 
-#if defined(VWERSE) && !defined (VWERASE)      /* AIX-3.2.5 */
+#if defined(VWERSE) && !defined (VWERASE)       /* AIX-3.2.5 */
 # define VWERASE VWERSE
 #endif
 #if defined(VDSUSP) && !defined (CDSUSP)
 # define CDSUSP Control ('y')
 #endif
-#if !defined(VREPRINT) && defined(VRPRNT)      /* Irix 4.0.5 */
+#if !defined(VREPRINT) && defined(VRPRNT)       /* Irix 4.0.5 */
 # define VREPRINT VRPRNT
 #endif
 #if defined(VREPRINT) && !defined(CRPRNT)
 #if defined(VDISCARD) && !defined(VFLUSHO)
 # define VFLUSHO VDISCARD
 #endif
-#if defined(VFLUSH) && !defined(VFLUSHO)       /* Ultrix 4.2 */
+#if defined(VFLUSH) && !defined(VFLUSHO)        /* Ultrix 4.2 */
 # define VFLUSHO VFLUSH
 #endif
-#if defined(CTLECH) && !defined(ECHOCTL)       /* Ultrix 4.3 */
+#if defined(CTLECH) && !defined(ECHOCTL)        /* Ultrix 4.3 */
 # define ECHOCTL CTLECH
 #endif
-#if defined(TCTLECH) && !defined(ECHOCTL)      /* Ultrix 4.2 */
+#if defined(TCTLECH) && !defined(ECHOCTL)       /* Ultrix 4.2 */
 # define ECHOCTL TCTLECH
 #endif
-#if defined(CRTKIL) && !defined(ECHOKE)        /* Ultrix 4.2 and 4.3 */
+#if defined(CRTKIL) && !defined(ECHOKE)         /* Ultrix 4.2 and 4.3 */
 # define ECHOKE CRTKIL
 #endif
 #if defined(VFLUSHO) && !defined(CFLUSHO)
@@ -154,287 +147,288 @@ enum speed_setting {
        input_speed, output_speed, both_speeds
 };
 
-/* What to output and how.  */
-enum output_type {
-       changed, all, recoverable       /* Default, -a, -g.  */
-};
-
 /* Which member(s) of `struct termios' a mode uses.  */
 enum mode_type {
+       /* Do NOT change the order or values, as mode_type_flag()
+        * depends on them. */
        control, input, output, local, combination
 };
 
 
-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'. */
-#define SANE_SET 1                             /* Set in `sane' mode. */
-#define SANE_UNSET 2                   /* Unset in `sane' mode. */
-#define REV 4                                  /* Can be turned off by prepending `-'. */
-#define OMIT 8                                 /* Don't display value. */
+#define SANE_SET 1              /* Set in `sane' mode.                  */
+#define SANE_UNSET 2            /* Unset in `sane' mode.                */
+#define REV 4                   /* Can be turned off by prepending `-'. */
+#define OMIT 8                  /* Don't display value.                 */
 
 /* Each mode.  */
 struct mode_info {
-       const char *name;                       /* Name given on command line.  */
-       enum mode_type type;            /* Which structure element to change. */
-       char flags;                                     /* Setting and display options.  */
-       unsigned long bits;                     /* Bits to set for this mode.  */
-       unsigned long mask;                     /* Other bits to turn off for this mode.  */
+       const char *name;       /* Name given on command line.           */
+       /* enum mode_type type; */
+       char type;              /* Which structure element to change.    */
+       char flags;             /* Setting and display options.          */
+       unsigned short mask;     /* Other bits to turn off for this mode. */
+       unsigned long bits;     /* Bits to set for this mode.            */
 };
 
-static const struct mode_info mode_info[] = {
-       {"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},
+#define MI_ENTRY(N,T,F,B,M) { N, T, F, M, B }
+
+static const struct  mode_info mode_info[] = {
+       MI_ENTRY("parenb",   control,     REV,               PARENB,     0 ),
+       MI_ENTRY("parodd",   control,     REV,               PARODD,     0 ),
+       MI_ENTRY("cs5",      control,     0,                 CS5,     CSIZE),
+       MI_ENTRY("cs6",      control,     0,                 CS6,     CSIZE),
+       MI_ENTRY("cs7",      control,     0,                 CS7,     CSIZE),
+       MI_ENTRY("cs8",      control,     0,                 CS8,     CSIZE),
+       MI_ENTRY("hupcl",    control,     REV,               HUPCL,      0 ),
+       MI_ENTRY("hup",      control,     REV        | OMIT, HUPCL,      0 ),
+       MI_ENTRY("cstopb",   control,     REV,               CSTOPB,     0 ),
+       MI_ENTRY("cread",    control,     SANE_SET   | REV,  CREAD,      0 ),
+       MI_ENTRY("clocal",   control,     REV,               CLOCAL,     0 ),
 #ifdef CRTSCTS
-       {"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},
+       MI_ENTRY("crtscts",  control,     REV,               CRTSCTS,    0 ),
+#endif
+       MI_ENTRY("ignbrk",   input,       SANE_UNSET | REV,  IGNBRK,     0 ),
+       MI_ENTRY("brkint",   input,       SANE_SET   | REV,  BRKINT,     0 ),
+       MI_ENTRY("ignpar",   input,       REV,               IGNPAR,     0 ),
+       MI_ENTRY("parmrk",   input,       REV,               PARMRK,     0 ),
+       MI_ENTRY("inpck",    input,       REV,               INPCK,      0 ),
+       MI_ENTRY("istrip",   input,       REV,               ISTRIP,     0 ),
+       MI_ENTRY("inlcr",    input,       SANE_UNSET | REV,  INLCR,      0 ),
+       MI_ENTRY("igncr",    input,       SANE_UNSET | REV,  IGNCR,      0 ),
+       MI_ENTRY("icrnl",    input,       SANE_SET   | REV,  ICRNL,      0 ),
+       MI_ENTRY("ixon",     input,       REV,               IXON,       0 ),
+       MI_ENTRY("ixoff",    input,       SANE_UNSET | REV,  IXOFF,      0 ),
+       MI_ENTRY("tandem",   input,       REV        | OMIT, IXOFF,      0 ),
 #ifdef IUCLC
-       {"iuclc", input, SANE_UNSET | REV, IUCLC, 0},
+       MI_ENTRY("iuclc",    input,       SANE_UNSET | REV,  IUCLC,      0 ),
 #endif
 #ifdef IXANY
-       {"ixany", input, SANE_UNSET | REV, IXANY, 0},
+       MI_ENTRY("ixany",    input,       SANE_UNSET | REV,  IXANY,      0 ),
 #endif
 #ifdef IMAXBEL
-       {"imaxbel", input, SANE_SET | REV, IMAXBEL, 0},
+       MI_ENTRY("imaxbel",  input,       SANE_SET   | REV,  IMAXBEL,    0 ),
 #endif
-
-       {"opost", output, SANE_SET | REV, OPOST, 0},
+       MI_ENTRY("opost",    output,      SANE_SET   | REV,  OPOST,      0 ),
 #ifdef OLCUC
-       {"olcuc", output, SANE_UNSET | REV, OLCUC, 0},
+       MI_ENTRY("olcuc",    output,      SANE_UNSET | REV,  OLCUC,      0 ),
 #endif
 #ifdef OCRNL
-       {"ocrnl", output, SANE_UNSET | REV, OCRNL, 0},
+       MI_ENTRY("ocrnl",    output,      SANE_UNSET | REV,  OCRNL,      0 ),
 #endif
 #ifdef ONLCR
-       {"onlcr", output, SANE_SET | REV, ONLCR, 0},
+       MI_ENTRY("onlcr",    output,      SANE_SET   | REV,  ONLCR,      0 ),
 #endif
 #ifdef ONOCR
-       {"onocr", output, SANE_UNSET | REV, ONOCR, 0},
+       MI_ENTRY("onocr",    output,      SANE_UNSET | REV,  ONOCR,      0 ),
 #endif
 #ifdef ONLRET
-       {"onlret", output, SANE_UNSET | REV, ONLRET, 0},
+       MI_ENTRY("onlret",   output,      SANE_UNSET | REV,  ONLRET,     0 ),
 #endif
 #ifdef OFILL
-       {"ofill", output, SANE_UNSET | REV, OFILL, 0},
+       MI_ENTRY("ofill",    output,      SANE_UNSET | REV,  OFILL,      0 ),
 #endif
 #ifdef OFDEL
-       {"ofdel", output, SANE_UNSET | REV, OFDEL, 0},
+       MI_ENTRY("ofdel",    output,      SANE_UNSET | REV,  OFDEL,      0 ),
 #endif
 #ifdef NLDLY
-       {"nl1", output, SANE_UNSET, NL1, NLDLY},
-       {"nl0", output, SANE_SET, NL0, NLDLY},
+       MI_ENTRY("nl1",      output,      SANE_UNSET,        NL1,     NLDLY),
+       MI_ENTRY("nl0",      output,      SANE_SET,          NL0,     NLDLY),
 #endif
 #ifdef CRDLY
-       {"cr3", output, SANE_UNSET, CR3, CRDLY},
-       {"cr2", output, SANE_UNSET, CR2, CRDLY},
-       {"cr1", output, SANE_UNSET, CR1, CRDLY},
-       {"cr0", output, SANE_SET, CR0, CRDLY},
+       MI_ENTRY("cr3",      output,      SANE_UNSET,        CR3,     CRDLY),
+       MI_ENTRY("cr2",      output,      SANE_UNSET,        CR2,     CRDLY),
+       MI_ENTRY("cr1",      output,      SANE_UNSET,        CR1,     CRDLY),
+       MI_ENTRY("cr0",      output,      SANE_SET,          CR0,     CRDLY),
 #endif
+
 #ifdef TABDLY
-       {"tab3", output, SANE_UNSET, TAB3, TABDLY},
-       {"tab2", output, SANE_UNSET, TAB2, TABDLY},
-       {"tab1", output, SANE_UNSET, TAB1, TABDLY},
-       {"tab0", output, SANE_SET, TAB0, TABDLY},
+       MI_ENTRY("tab3",     output,      SANE_UNSET,        TAB3,   TABDLY),
+       MI_ENTRY("tab2",     output,      SANE_UNSET,        TAB2,   TABDLY),
+       MI_ENTRY("tab1",     output,      SANE_UNSET,        TAB1,   TABDLY),
+       MI_ENTRY("tab0",     output,      SANE_SET,          TAB0,   TABDLY),
 #else
 # ifdef OXTABS
-       {"tab3", output, SANE_UNSET, OXTABS, 0},
+       MI_ENTRY("tab3",     output,      SANE_UNSET,        OXTABS,     0 ),
 # endif
 #endif
+
 #ifdef BSDLY
-       {"bs1", output, SANE_UNSET, BS1, BSDLY},
-       {"bs0", output, SANE_SET, BS0, BSDLY},
+       MI_ENTRY("bs1",      output,      SANE_UNSET,        BS1,     BSDLY),
+       MI_ENTRY("bs0",      output,      SANE_SET,          BS0,     BSDLY),
 #endif
 #ifdef VTDLY
-       {"vt1", output, SANE_UNSET, VT1, VTDLY},
-       {"vt0", output, SANE_SET, VT0, VTDLY},
+       MI_ENTRY("vt1",      output,      SANE_UNSET,        VT1,     VTDLY),
+       MI_ENTRY("vt0",      output,      SANE_SET,          VT0,     VTDLY),
 #endif
 #ifdef FFDLY
-       {"ff1", output, SANE_UNSET, FF1, FFDLY},
-       {"ff0", output, SANE_SET, FF0, FFDLY},
+       MI_ENTRY("ff1",      output,      SANE_UNSET,        FF1,     FFDLY),
+       MI_ENTRY("ff0",      output,      SANE_SET,          FF0,     FFDLY),
 #endif
-
-       {"isig", local, SANE_SET | REV, ISIG, 0},
-       {"icanon", local, SANE_SET | REV, ICANON, 0},
+       MI_ENTRY("isig",     local,       SANE_SET   | REV,  ISIG,       0 ),
+       MI_ENTRY("icanon",   local,       SANE_SET   | REV,  ICANON,     0 ),
 #ifdef IEXTEN
-       {"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},
+       MI_ENTRY("iexten",   local,       SANE_SET   | REV,  IEXTEN,     0 ),
+#endif
+       MI_ENTRY("echo",     local,       SANE_SET   | REV,  ECHO,       0 ),
+       MI_ENTRY("echoe",    local,       SANE_SET   | REV,  ECHOE,      0 ),
+       MI_ENTRY("crterase", local,       REV        | OMIT, ECHOE,      0 ),
+       MI_ENTRY("echok",    local,       SANE_SET   | REV,  ECHOK,      0 ),
+       MI_ENTRY("echonl",   local,       SANE_UNSET | REV,  ECHONL,     0 ),
+       MI_ENTRY("noflsh",   local,       SANE_UNSET | REV,  NOFLSH,     0 ),
 #ifdef XCASE
-       {"xcase", local, SANE_UNSET | REV, XCASE, 0},
+       MI_ENTRY("xcase",    local,       SANE_UNSET | REV,  XCASE,      0 ),
 #endif
 #ifdef TOSTOP
-       {"tostop", local, SANE_UNSET | REV, TOSTOP, 0},
+       MI_ENTRY("tostop",   local,       SANE_UNSET | REV,  TOSTOP,     0 ),
 #endif
 #ifdef ECHOPRT
-       {"echoprt", local, SANE_UNSET | REV, ECHOPRT, 0},
-       {"prterase", local, REV | OMIT, ECHOPRT, 0},
+       MI_ENTRY("echoprt",  local,       SANE_UNSET | REV,  ECHOPRT,    0 ),
+       MI_ENTRY("prterase", local,       REV | OMIT,        ECHOPRT,    0 ),
 #endif
 #ifdef ECHOCTL
-       {"echoctl", local, SANE_SET | REV, ECHOCTL, 0},
-       {"ctlecho", local, REV | OMIT, ECHOCTL, 0},
+       MI_ENTRY("echoctl",  local,       SANE_SET   | REV,  ECHOCTL,    0 ),
+       MI_ENTRY("ctlecho",  local,       REV        | OMIT, ECHOCTL,    0 ),
 #endif
 #ifdef ECHOKE
-       {"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},
+       MI_ENTRY("echoke",   local,       SANE_SET   | REV,  ECHOKE,     0 ),
+       MI_ENTRY("crtkill",  local,       REV        | OMIT, ECHOKE,     0 ),
+#endif
+       MI_ENTRY(evenp,      combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(parity,     combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(stty_oddp,  combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(stty_nl,    combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(stty_ek,    combination, OMIT,              0,          0 ),
+       MI_ENTRY(stty_sane,  combination, OMIT,              0,          0 ),
+       MI_ENTRY(cooked,     combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(raw,        combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(stty_pass8, combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(litout,     combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(cbreak,     combination, REV        | OMIT, 0,          0 ),
 #ifdef IXANY
-       {decctlq, combination, REV | OMIT, 0, 0},
+       MI_ENTRY(decctlq,    combination, REV        | OMIT, 0,          0 ),
 #endif
 #if defined (TABDLY) || defined (OXTABS)
-       {stty_tabs, combination, REV | OMIT, 0, 0},
+       MI_ENTRY(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},
+       MI_ENTRY(stty_lcase, combination, REV        | OMIT, 0,          0 ),
+       MI_ENTRY(stty_LCASE, combination, REV        | OMIT, 0,          0 ),
 #endif
-       {stty_crt, combination, OMIT, 0, 0},
-       {stty_dec, combination, OMIT, 0, 0},
+       MI_ENTRY(stty_crt,   combination, OMIT,              0,          0 ),
+       MI_ENTRY(stty_dec,   combination, OMIT,              0,          0 ),
 };
 
-static const int NUM_mode_info =
-
-       (sizeof(mode_info) / sizeof(struct mode_info));
+enum {
+       NUM_mode_info =
+       (sizeof(mode_info) / sizeof(struct mode_info))
+};
 
 /* Control character settings.  */
 struct control_info {
-       const char *name;                       /* Name given on command line.  */
-       unsigned char saneval;          /* Value to set for `stty sane'.  */
-       int offset;                                     /* Offset in c_cc.  */
+       const char *name;                       /* Name given on command line.  */
+       unsigned char saneval;          /* Value to set for `stty sane'.  */
+       unsigned char offset;                           /* Offset in c_cc.  */
 };
 
 /* Control characters. */
 
-static const struct control_info control_info[] = {
-       {"intr", CINTR, VINTR},
-       {"quit", CQUIT, VQUIT},
-       {"erase", CERASE, VERASE},
-       {"kill", CKILL, VKILL},
-       {stty_eof, CEOF, VEOF},
-       {stty_eol, CEOL, VEOL},
+static const struct  control_info control_info[] = {
+       {"intr",     CINTR,   VINTR},
+       {"quit",     CQUIT,   VQUIT},
+       {"erase",    CERASE,  VERASE},
+       {"kill",     CKILL,   VKILL},
+       {stty_eof,   CEOF,    VEOF},
+       {stty_eol,   CEOL,    VEOL},
 #ifdef VEOL2
-       {"eol2", CEOL2, VEOL2},
+       {"eol2",     CEOL2,   VEOL2},
 #endif
 #ifdef VSWTCH
-       {stty_swtch, CSWTCH, VSWTCH},
+       {stty_swtch, CSWTCH,  VSWTCH},
 #endif
-       {"start", CSTART, VSTART},
-       {"stop", CSTOP, VSTOP},
-       {"susp", CSUSP, VSUSP},
+       {"start",    CSTART,  VSTART},
+       {"stop",     CSTOP,   VSTOP},
+       {"susp",     CSUSP,   VSUSP},
 #ifdef VDSUSP
-       {"dsusp", CDSUSP, VDSUSP},
+       {"dsusp",    CDSUSP,  VDSUSP},
 #endif
 #ifdef VREPRINT
-       {"rprnt", CRPRNT, VREPRINT},
+       {"rprnt",    CRPRNT,  VREPRINT},
 #endif
 #ifdef VWERASE
-       {"werase", CWERASE, VWERASE},
+       {"werase",   CWERASE, VWERASE},
 #endif
 #ifdef VLNEXT
-       {"lnext", CLNEXT, VLNEXT},
+       {"lnext",    CLNEXT,  VLNEXT},
 #endif
 #ifdef VFLUSHO
-       {"flush", CFLUSHO, VFLUSHO},
+       {"flush",    CFLUSHO, VFLUSHO},
 #endif
 #ifdef VSTATUS
-       {"status", CSTATUS, VSTATUS},
+       {"status",   CSTATUS, VSTATUS},
 #endif
-
        /* These must be last because of the display routines. */
-       {stty_min, 1, VMIN},
-       {stty_time, 0, VTIME},
+       {stty_min,   1,       VMIN},
+       {stty_time,  0,       VTIME},
+};
+
+enum {
+       NUM_control_info =
+       (sizeof(control_info) / sizeof(struct control_info))
 };
 
-static const int NUM_control_info =
-       (sizeof(control_info) / sizeof(struct control_info));
-
-
-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 void display_all(struct termios *mode, int fd,
-               const char *device_name);
-static void display_changed(struct termios *mode);
-static void display_recoverable(struct termios *mode);
-static void display_settings(enum output_type output_type, 
-               struct termios *mode, int fd,
-               const char *device_name);
-static void display_speed(struct termios *mode, int fancy);
-static void display_window_size(int fancy, int fd,
-               const char *device_name);
-static void sane_mode(struct termios *mode);
-static void set_control_char(const struct control_info *info,
-               const char *arg, struct termios *mode);
-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);
+#define EMT(t) ((enum mode_type)(t))
+
+static const char *  visible(unsigned int ch);
+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 void          display_all(struct termios *mode);
+static void          display_changed(struct termios *mode);
+static void          display_recoverable(struct termios *mode);
+static void          display_speed(struct termios *mode, int fancy);
+static void          display_window_size(int fancy);
+static void          sane_mode(struct termios *mode);
+static void          set_control_char(const struct control_info *info,
+                                       const char *arg, struct termios *mode);
+static void          set_speed(enum speed_setting type,
+                                       const char *arg, struct termios *mode);
+static void          set_window_size(int rows, int cols);
+
+static const char *device_name;
+
+static ATTRIBUTE_NORETURN void perror_on_device(const char *fmt)
+{
+       bb_perror_msg_and_die(fmt, device_name);
+}
+
 
 /* The width of the screen, for output wrapping. */
 static int max_col;
@@ -449,7 +443,7 @@ static int current_col;
 static void wrapf(const char *message, ...)
 {
        va_list args;
-       char buf[1024];                         /* Plenty long for our needs. */
+       char buf[1024];                 /* Plenty long for our needs. */
        int buflen;
 
        va_start(args, message);
@@ -469,28 +463,30 @@ static void wrapf(const char *message, ...)
 }
 
 static const struct suffix_mult stty_suffixes[] = {
-       {"b", 512},
-       {"k", 1024},
-       {"B", 1024},
-       {NULL, 0}
+       {"b",  512 },
+       {"k",  1024},
+       {"B",  1024},
+       {NULL, 0   }
 };
 
-extern int stty_main(int argc, char **argv)
+#ifndef TEST
+int stty_main(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
 {
        struct termios mode;
-       enum output_type output_type;
-       int optc;
-       int require_set_attr;
-       int speed_was_set;
-       int verbose_output;
-       int recoverable_output;
-       int k;
-       int noargs = 1;
-       char *file_name = NULL;
-       int fd;
-       const char *device_name;
-
-       output_type = changed;
+       void (*output_func)(struct termios *);
+       int    optc;
+       int    require_set_attr;
+       int    speed_was_set;
+       int    verbose_output;
+       int    recoverable_output;
+       int    k;
+       int    noargs = 1;
+       char * file_name = NULL;
+
+       output_func = display_changed;
        verbose_output = 0;
        recoverable_output = 0;
 
@@ -501,21 +497,21 @@ extern int stty_main(int argc, char **argv)
                switch (optc) {
                case 'a':
                        verbose_output = 1;
-                       output_type = all;
+                       output_func = display_all;
                        break;
 
                case 'g':
                        recoverable_output = 1;
-                       output_type = recoverable;
+                       output_func = display_recoverable;
                        break;
 
                case 'F':
                        if (file_name)
-                               error_msg_and_die("only one device may be specified");
+                               bb_error_msg_and_die("only one device may be specified");
                        file_name = optarg;
                        break;
 
-               default:                                /* unrecognized option */
+               default:                /* unrecognized option */
                        noargs = 0;
                        break;
                }
@@ -528,12 +524,12 @@ extern int stty_main(int argc, char **argv)
                noargs = 0;
 
        /* Specifying both -a and -g gets an error.  */
-       if (verbose_output && recoverable_output)
-               error_msg_and_die ("verbose and stty-readable output styles are mutually exclusive");
+       if (verbose_output & recoverable_output)
+               bb_error_msg_and_die ("verbose and stty-readable output styles are mutually exclusive");
 
        /* Specifying any other arguments with -a or -g gets an error.  */
-       if (!noargs && (verbose_output || recoverable_output))
-               error_msg_and_die ("modes may not be set when specifying an output style");
+       if (~noargs & (verbose_output | recoverable_output))
+               bb_error_msg_and_die ("modes may not be set when specifying an output style");
 
        /* FIXME: it'd be better not to open the file until we've verified
           that all arguments are valid.  Otherwise, we could end up doing
@@ -544,80 +540,93 @@ extern int stty_main(int argc, char **argv)
                int fdflags;
 
                device_name = file_name;
-               fd = open(device_name, O_RDONLY | O_NONBLOCK);
-               if (fd < 0)
-                       perror_msg_and_die("%s", device_name);
-               if ((fdflags = fcntl(fd, F_GETFL)) == -1
-                       || fcntl(fd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
-                       perror_msg_and_die("%s: couldn't reset non-blocking mode",
-                                                          device_name);
+               fclose(stdin);
+               bb_xopen(device_name, O_RDONLY | O_NONBLOCK);
+               if ((fdflags = fcntl(STDIN_FILENO, F_GETFL)) == -1
+                       || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
+                       perror_on_device("%s: couldn't reset non-blocking mode");
        } else {
-               fd = 0;
-               device_name = "standard input";
+               device_name = bb_msg_standard_input;
        }
 
        /* Initialize to all zeroes so there is no risk memcmp will report a
           spurious difference in an uninitialized portion of the structure.  */
        memset(&mode, 0, sizeof(mode));
-       if (tcgetattr(fd, &mode))
-               perror_msg_and_die("%s", device_name);
+       if (tcgetattr(STDIN_FILENO, &mode))
+               perror_on_device("%s");
 
-       if (verbose_output || recoverable_output || noargs) {
+       if (verbose_output | recoverable_output | noargs) {
                max_col = screen_columns();
                current_col = 0;
-               display_settings(output_type, &mode, fd, device_name);
+               output_func(&mode);
                return EXIT_SUCCESS;
        }
 
        speed_was_set = 0;
        require_set_attr = 0;
-       k = optind;
-       while (k < argc) {
+       k = 0;
+       while (++k < argc) {
                int match_found = 0;
                int reversed = 0;
                int i;
 
                if (argv[k][0] == '-') {
+                       char *find_dev_opt;
+
                        ++argv[k];
+
+     /* Handle "-a", "-ag", "-aF/dev/foo", "-aF /dev/foo", etc.
+       Find the options that have been parsed.  This is really
+       gross, but it's needed because stty SETTINGS look like options to
+       getopt(), so we need to work around things in a really horrible
+       way.  If any new options are ever added to stty, the short option
+       MUST NOT be a letter which is the first letter of one of the
+       possible stty settings.
+     */
+                       find_dev_opt = strchr(argv[k], 'F'); /* find -*F* */
+                       if(find_dev_opt) {
+                               if(find_dev_opt[1]==0)  /* -*F   /dev/foo */
+                                       k++;            /* skip  /dev/foo */
+                               continue;   /* else -*F/dev/foo - no skip */
+                       }
+                       if(argv[k][0]=='a' || argv[k][0]=='g')
+                               continue;
+                       /* Is not options - is reverse params */
                        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) {
-                       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 && reversed)
+                       bb_error_msg_and_die("invalid argument `%s'", --argv[k]);
+
+               if (match_found == 0)
+                       for (i = 0; i < NUM_control_info; ++i)
                                if (STREQ(argv[k], control_info[i].name)) {
-                                       if (k == argc - 1) {
-                                               error_msg_and_die("missing argument to `%s'", argv[k]);
-                                       }
+                                       if (k == argc - 1)
+                                           bb_error_msg_and_die(bb_msg_requires_arg, 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) {
-                                       error_msg_and_die("missing argument to `%s'", argv[k]);
-                               }
+                               if (k == argc - 1)
+                                   bb_error_msg_and_die(bb_msg_requires_arg, 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) {
-                                       error_msg_and_die("missing argument to `%s'", argv[k]);
-                               }
+                               if (k == argc - 1)
+                                   bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
                                ++k;
                                set_speed(output_speed, argv[k], &mode);
                                speed_was_set = 1;
@@ -625,58 +634,51 @@ extern int stty_main(int argc, char **argv)
                        }
 #ifdef TIOCGWINSZ
                        else if (STREQ(argv[k], "rows")) {
-                               if (k == argc - 1) {
-                                       error_msg_and_die("missing argument to `%s'", argv[k]);
-                               }
+                               if (k == argc - 1)
+                                   bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
                                ++k;
-                               set_window_size((int) parse_number(argv[k], stty_suffixes),
-                                                               -1, fd, device_name);
+                               set_window_size((int) bb_xparse_number(argv[k], stty_suffixes),
+                                                               -1);
                        } else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) {
-                               if (k == argc - 1) {
-                                       error_msg_and_die("missing argument to `%s'", argv[k]);
-                               }
+                               if (k == argc - 1)
+                                   bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
                                ++k;
                                set_window_size(-1,
-                                                               (int) parse_number(argv[k], stty_suffixes),
-                                                               fd, device_name);
+                                               (int) bb_xparse_number(argv[k], stty_suffixes));
                        } else if (STREQ(argv[k], "size")) {
                                max_col = screen_columns();
                                current_col = 0;
-                               display_window_size(0, fd, device_name);
+                               display_window_size(0);
                        }
 #endif
 #ifdef HAVE_C_LINE
                        else if (STREQ(argv[k], "line")) {
-                               if (k == argc - 1) {
-                                       error_msg_and_die("missing argument to `%s'", argv[k]);
-                               }
+                               if (k == argc - 1)
+                                       bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
                                ++k;
-                               mode.c_line = parse_number(argv[k], stty_suffixes);
+                               mode.c_line = bb_xparse_number(argv[k], stty_suffixes);
                                require_set_attr = 1;
                        }
 #endif
                        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) {
-                                       error_msg_and_die("invalid argument `%s'", argv[k]);
-                               }
-                               require_set_attr = 1;
-                       }
+                       } else
+                               bb_error_msg_and_die("invalid argument `%s'", argv[k]);
                }
-               k++;
        }
 
        if (require_set_attr) {
                struct termios new_mode;
 
-               if (tcsetattr(fd, TCSADRAIN, &mode))
-                       perror_msg_and_die("%s", device_name);
+               if (tcsetattr(STDIN_FILENO, TCSADRAIN, &mode))
+                       perror_on_device("%s");
 
                /* POSIX (according to Zlotnick's book) tcsetattr returns zero if
                   it performs *any* of the requested operations.  This means it
@@ -688,8 +690,8 @@ extern int stty_main(int argc, char **argv)
                /* Initialize to all zeroes so there is no risk memcmp will report a
                   spurious difference in an uninitialized portion of the structure.  */
                memset(&new_mode, 0, sizeof(new_mode));
-               if (tcgetattr(fd, &new_mode))
-                       perror_msg_and_die("%s", device_name);
+               if (tcgetattr(STDIN_FILENO, &new_mode))
+                       perror_on_device("%s");
 
                /* Normally, one shouldn't use memcmp to compare structures that
                   may have `holes' containing uninitialized data, but we have been
@@ -712,21 +714,7 @@ 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
-                       }
+                               perror_on_device ("%s: unable to perform all requested operations");
                }
        }
 
@@ -743,7 +731,7 @@ set_mode(const struct mode_info *info, int reversed, struct termios *mode)
        if (reversed && (info->flags & REV) == 0)
                return 0;
 
-       bitsp = mode_type_flag(info->type, mode);
+       bitsp = mode_type_flag(EMT(info->type), mode);
 
        if (bitsp == NULL) {
                /* Combination mode. */
@@ -882,9 +870,9 @@ set_mode(const struct mode_info *info, int reversed, struct termios *mode)
 #endif
                                ;
                else if (info->name == stty_dec) {
-                       mode->c_cc[VINTR] = 3;  /* ^C */
-                       mode->c_cc[VERASE] = 127;       /* DEL */
-                       mode->c_cc[VKILL] = 21; /* ^U */
+                       mode->c_cc[VINTR] = 3;  /* ^C */
+                       mode->c_cc[VERASE] = 127;       /* DEL */
+                       mode->c_cc[VKILL] = 21; /* ^U */
                        mode->c_lflag |= ECHOE
 #ifdef ECHOCTL
                                | ECHOCTL
@@ -898,9 +886,9 @@ set_mode(const struct mode_info *info, int reversed, struct termios *mode)
 #endif
                }
        } else if (reversed)
-               *bitsp = *bitsp & ~info->mask & ~info->bits;
+               *bitsp = *bitsp & ~((unsigned long)info->mask) & ~info->bits;
        else
-               *bitsp = (*bitsp & ~info->mask) | info->bits;
+               *bitsp = (*bitsp & ~((unsigned long)info->mask)) | info->bits;
 
        return 1;
 }
@@ -912,18 +900,18 @@ set_control_char(const struct control_info *info, const char *arg,
        unsigned char value;
 
        if (info->name == stty_min || info->name == stty_time)
-               value = parse_number(arg, stty_suffixes);
+               value = bb_xparse_number(arg, stty_suffixes);
        else if (arg[0] == '\0' || arg[1] == '\0')
                value = arg[0];
        else if (STREQ(arg, "^-") || STREQ(arg, "undef"))
                value = _POSIX_VDISABLE;
-       else if (arg[0] == '^' && arg[1] != '\0') {     /* Ignore any trailing junk. */
+       else if (arg[0] == '^' && arg[1] != '\0') {     /* Ignore any trailing junk. */
                if (arg[1] == '?')
                        value = 127;
                else
-                       value = arg[1] & ~0140; /* Non-letters get weird results. */
+                       value = arg[1] & ~0140; /* Non-letters get weird results. */
        } else
-               value = parse_number(arg, stty_suffixes);
+               value = bb_xparse_number(arg, stty_suffixes);
        mode->c_cc[info->offset] = value;
 }
 
@@ -933,10 +921,13 @@ set_speed(enum speed_setting type, const char *arg, struct termios *mode)
        speed_t baud;
 
        baud = string_to_baud(arg);
-       if (type == input_speed || type == both_speeds)
+
+       if (type != output_speed) {     /* either input or both */
                cfsetispeed(mode, baud);
-       if (type == output_speed || type == both_speeds)
+       }
+       if (type != input_speed) {      /* either output or both */
                cfsetospeed(mode, baud);
+       }
 }
 
 #ifdef TIOCGWINSZ
@@ -949,13 +940,13 @@ static int get_win_size(int fd, struct winsize *win)
 }
 
 static void
-set_window_size(int rows, int cols, int fd, const char *device_name)
+set_window_size(int rows, int cols)
 {
        struct winsize win;
 
-       if (get_win_size(fd, &win)) {
+       if (get_win_size(STDIN_FILENO, &win)) {
                if (errno != EINVAL)
-                       perror_msg_and_die("%s", device_name);
+                       perror_on_device("%s");
                memset(&win, 0, sizeof(win));
        }
 
@@ -977,32 +968,29 @@ set_window_size(int rows, int cols, int fd, const char *device_name)
                ttysz.ts_lines = win.ws_row;
                ttysz.ts_cols = win.ws_col;
 
-               win.ws_row = 1;
-               win.ws_col = 1;
+               win.ws_row = win.ws_col = 1;
 
-               if (ioctl(fd, TIOCSWINSZ, (char *) &win))
-                       perror_msg_and_die("%s", device_name);
-
-               if (ioctl(fd, TIOCSSIZE, (char *) &ttysz))
-                       perror_msg_and_die("%s", device_name);
+               if ((ioctl(STDIN_FILENO, TIOCSWINSZ, (char *) &win) != 0)
+                       || (ioctl(STDIN_FILENO, TIOCSSIZE, (char *) &ttysz) != 0)) {
+                       perror_on_device("%s");
+               }
                return;
        }
 # endif
 
-       if (ioctl(fd, TIOCSWINSZ, (char *) &win))
-               perror_msg_and_die("%s", device_name);
+       if (ioctl(STDIN_FILENO, TIOCSWINSZ, (char *) &win))
+               perror_on_device("%s");
 }
 
-static void display_window_size(int fancy, int fd, const char *device_name)
+static void display_window_size(int fancy)
 {
+       const char *fmt_str = "%s" "\0" "%s: no size information for this device";
        struct winsize win;
 
-       if (get_win_size(fd, &win)) {
-               if (errno != EINVAL)
-                       perror_msg_and_die("%s", device_name);
-               if (!fancy)
-                       perror_msg_and_die("%s: no size information for this device",
-                                                          device_name);
+       if (get_win_size(STDIN_FILENO, &win)) {
+               if ((errno != EINVAL) || ((fmt_str += 2), !fancy)) {
+                       perror_on_device(fmt_str);
+               }
        } else {
                wrapf(fancy ? "rows %d; columns %d;" : "%d %d\n",
                          win.ws_row, win.ws_col);
@@ -1014,6 +1002,9 @@ static void display_window_size(int fancy, int fd, const char *device_name)
 
 static int screen_columns(void)
 {
+       int columns;
+       const char *s;
+
 #ifdef TIOCGWINSZ
        struct winsize win;
 
@@ -1027,48 +1018,26 @@ static int screen_columns(void)
                return win.ws_col;
 #endif
 
-       if (getenv("COLUMNS"))
-               return atoi(getenv("COLUMNS"));
-       return 80;
-}
-
-static tcflag_t *mode_type_flag(enum mode_type type, struct termios *mode)
-{
-       switch (type) {
-       case control:
-               return &mode->c_cflag;
-
-       case input:
-               return &mode->c_iflag;
-
-       case output:
-               return &mode->c_oflag;
-
-       case local:
-               return &mode->c_lflag;
-
-       default:                                        /* combination: */
-               return NULL;
+       columns = 80;
+       if ((s = getenv("COLUMNS"))) {
+               columns = atoi(s);
        }
+       return columns;
 }
 
-static void
-display_settings(enum output_type output_type, struct termios *mode,
-                                int fd, const char *device_name)
+static tcflag_t *mode_type_flag(enum mode_type type, struct termios *mode)
 {
-       switch (output_type) {
-       case changed:
-               display_changed(mode);
-               break;
-
-       case all:
-               display_all(mode, fd, device_name);
-               break;
-
-       case recoverable:
-               display_recoverable(mode);
-               break;
+       static const unsigned char tcflag_offsets[] = {
+               offsetof(struct termios, c_cflag), /* control */
+               offsetof(struct termios, c_iflag), /* input */
+               offsetof(struct termios, c_oflag), /* output */
+               offsetof(struct termios, c_lflag) /* local */
+       };
+
+       if (((unsigned int) type) <= local) {
+               return (tcflag_t *)(((char *) mode) + tcflag_offsets[(int)type]);
        }
+       return NULL;
 }
 
 static void display_changed(struct termios *mode)
@@ -1117,16 +1086,16 @@ static void display_changed(struct termios *mode)
        for (i = 0; i < NUM_mode_info; ++i) {
                if (mode_info[i].flags & OMIT)
                        continue;
-               if (mode_info[i].type != prev_type) {
+               if (EMT(mode_info[i].type) != prev_type) {
                        if (empty_line == 0) {
                                putchar('\n');
                                current_col = 0;
                                empty_line = 1;
                        }
-                       prev_type = mode_info[i].type;
+                       prev_type = EMT(mode_info[i].type);
                }
 
-               bitsp = mode_type_flag(mode_info[i].type, mode);
+               bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
                mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
                if ((*bitsp & mask) == mode_info[i].bits) {
                        if (mode_info[i].flags & SANE_UNSET) {
@@ -1146,7 +1115,7 @@ static void display_changed(struct termios *mode)
 }
 
 static void
-display_all(struct termios *mode, int fd, const char *device_name)
+display_all(struct termios *mode)
 {
        int i;
        tcflag_t *bitsp;
@@ -1155,7 +1124,7 @@ display_all(struct termios *mode, int fd, const char *device_name)
 
        display_speed(mode, 1);
 #ifdef TIOCGWINSZ
-       display_window_size(1, fd, device_name);
+       display_window_size(1);
 #endif
 #ifdef HAVE_C_LINE
        wrapf("line = %d;", mode->c_line);
@@ -1189,13 +1158,13 @@ display_all(struct termios *mode, int fd, const char *device_name)
        for (i = 0; i < NUM_mode_info; ++i) {
                if (mode_info[i].flags & OMIT)
                        continue;
-               if (mode_info[i].type != prev_type) {
+               if (EMT(mode_info[i].type) != prev_type) {
                        putchar('\n');
                        current_col = 0;
-                       prev_type = mode_info[i].type;
+                       prev_type = EMT(mode_info[i].type);
                }
 
-               bitsp = mode_type_flag(mode_info[i].type, mode);
+               bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
                mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
                if ((*bitsp & mask) == mode_info[i].bits)
                        wrapf("%s", mode_info[i].name);
@@ -1208,13 +1177,20 @@ display_all(struct termios *mode, int fd, const char *device_name)
 
 static void display_speed(struct termios *mode, int fancy)
 {
-       if (cfgetispeed(mode) == 0 || cfgetispeed(mode) == cfgetospeed(mode))
-               wrapf(fancy ? "speed %lu baud;" : "%lu\n",
-                         baud_to_value(cfgetospeed(mode)));
-       else
-               wrapf(fancy ? "ispeed %lu baud; ospeed %lu baud;" : "%lu %lu\n",
-                         baud_to_value(cfgetispeed(mode)),
-                         baud_to_value(cfgetospeed(mode)));
+       unsigned long ispeed, ospeed;
+       const char *fmt_str =
+               "%lu %lu\n\0"        "ispeed %lu baud; ospeed %lu baud;\0"
+               "%lu\n\0" "\0\0\0\0" "speed %lu baud;";
+
+       ospeed = ispeed = cfgetispeed(mode);
+       if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
+               ispeed = ospeed;                /* in case ispeed was 0 */
+               fmt_str += 43;
+       }
+       if (fancy) {
+               fmt_str += 9;
+       }
+       wrapf(fmt_str, bb_baud_to_value(ispeed), bb_baud_to_value(ospeed));
        if (!fancy)
                current_col = 0;
 }
@@ -1261,63 +1237,9 @@ static int recover_mode(char *arg, struct termios *mode)
        return 1;
 }
 
-struct speed_map {
-       speed_t speed;                          /* Internal form. */
-       unsigned long value;            /* Numeric value. */
-};
-
-static const struct speed_map speeds[] = {
-       {B0, 0},
-       {B50, 50},
-       {B75, 75},
-       {B110, 110},
-       {B134, 134},
-       {B150, 150},
-       {B200, 200},
-       {B300, 300},
-       {B600, 600},
-       {B1200, 1200},
-       {B1800, 1800},
-       {B2400, 2400},
-       {B4800, 4800},
-       {B9600, 9600},
-       {B19200, 19200},
-       {B38400, 38400},
-#ifdef B57600
-       {B57600, 57600},
-#endif
-#ifdef B115200
-       {B115200, 115200},
-#endif
-#ifdef B230400
-       {B230400, 230400},
-#endif
-#ifdef B460800
-       {B460800, 460800},
-#endif
-};
-
-static const int NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map));
-
 static speed_t string_to_baud(const char *arg)
 {
-       int i;
-       static const struct suffix_mult stty_zerosuff = { NULL, 0 };
-
-       for (i = 0; i < NUM_SPEEDS; ++i)
-               if (parse_number(arg, &stty_zerosuff) == speeds[i].value)
-                       return speeds[i].speed;
-       return (speed_t) - 1;
-}
-
-static unsigned long baud_to_value(speed_t speed)
-{
-       int i;
-
-       for (i = 0; i < NUM_SPEEDS; ++i)
-               if (speed == speeds[i].speed)
-                       return speeds[i].value;
-       return 0;
+       return bb_value_to_baud(bb_xparse_number(arg, 0));
 }
 
 static void sane_mode(struct termios *mode)
@@ -1335,11 +1257,13 @@ static void sane_mode(struct termios *mode)
 
        for (i = 0; i < NUM_mode_info; ++i) {
                if (mode_info[i].flags & SANE_SET) {
-                       bitsp = mode_type_flag(mode_info[i].type, mode);
-                       *bitsp = (*bitsp & ~mode_info[i].mask) | mode_info[i].bits;
+                       bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
+                       *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask))
+                               | mode_info[i].bits;
                } else if (mode_info[i].flags & SANE_UNSET) {
-                       bitsp = mode_type_flag(mode_info[i].type, mode);
-                       *bitsp = *bitsp & ~mode_info[i].mask & ~mode_info[i].bits;
+                       bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
+                       *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask)
+                               & ~mode_info[i].bits;
                }
        }
 }
@@ -1352,41 +1276,32 @@ static const char *visible(unsigned int ch)
        static char buf[10];
        char *bpout = buf;
 
-       if (ch == _POSIX_VDISABLE)
+       if (ch == _POSIX_VDISABLE) {
                return "<undef>";
+       }
 
-       if (ch >= 32) {
-               if (ch < 127)
-                       *bpout++ = ch;
-               else if (ch == 127) {
-                       *bpout++ = '^';
-                       *bpout++ = '?';
-               } else {
-                       *bpout++ = 'M', *bpout++ = '-';
-                       if (ch >= 128 + 32) {
-                               if (ch < 128 + 127)
-                                       *bpout++ = ch - 128;
-                               else {
-                                       *bpout++ = '^';
-                                       *bpout++ = '?';
-                               }
-                       } else {
-                               *bpout++ = '^';
-                               *bpout++ = ch - 128 + 64;
-                       }
-               }
-       } else {
+       if (ch >= 128) {
+               ch -= 128;
+               *bpout++ = 'M';
+               *bpout++ = '-';
+       }
+
+       if (ch < 32) {
                *bpout++ = '^';
                *bpout++ = ch + 64;
+       } else if (ch < 127) {
+               *bpout++ = ch;
+       } else {
+               *bpout++ = '^';
+               *bpout++ = '?';
        }
+
        *bpout = '\0';
        return (const char *) buf;
 }
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+#ifdef TEST
+
+const char *bb_applet_name = "stty";
+
+#endif