Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/loginutils/getty.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/loginutils/getty.c (modified) (27 diffs)

branches/2.2.9/mindi-busybox/loginutils/getty.c

@@ -7 +7 @@
  * option added by Eric Rasmussen <ear@usfirst.org> - 12/28/95
  *
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * 1999-02-22 Arkadiusz Mickiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
-
+ *
  * 1999-05-05 Thorsten Kranzkowski <dl8bcu@gmx.net>
  * - enable hardware flow control before displaying /etc/issue
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -21 +20 @@
 
 #if ENABLE_FEATURE_UTMP
-#include <utmp.h>
+# include <utmp.h> /* LOGIN_PROCESS */
+#endif
+
+#ifndef IUCLC
+# define IUCLC 0
 #endif
 
@@ -29 +32 @@
  */
 #ifdef LOGIN_PROCESS                    /* defined in System V utmp.h */
-#define SYSV_STYLE                      /* select System V style getty */
 #include <sys/utsname.h>
-#include <time.h>
-#if ENABLE_FEATURE_WTMP
-extern void updwtmp(const char *filename, const struct utmp *ut);
-static void update_utmp(const char *line);
-#endif
+#else /* if !sysV style, wtmp/utmp code is off */
+#undef ENABLE_FEATURE_UTMP
+#undef ENABLE_FEATURE_WTMP
+#define ENABLE_FEATURE_UTMP 0
+#define ENABLE_FEATURE_WTMP 0
 #endif  /* LOGIN_PROCESS */
 
@@ -48 +50 @@
 /* I doubt there are systems which still need this */
 #undef HANDLE_ALLCAPS
+#undef ANCIENT_BS_KILL_CHARS
 
 #define _PATH_LOGIN "/bin/login"
@@ -58 +61 @@
 
 /* Some shorthands for control characters. */
-#define CTL(x)          (x ^ 0100)      /* Assumes ASCII dialect */
+#define CTL(x)          ((x) ^ 0100)    /* Assumes ASCII dialect */
 #define CR              CTL('M')        /* carriage return */
 #define NL              CTL('J')        /* line feed */
@@ -77 +80 @@
  * we will try is the first one specified.
  */
-#define FIRST_SPEED     0
+#define MAX_SPEED       10              /* max. nr. of baud rates */
 
 /* Storage for command-line options. */
-
-#define MAX_SPEED       10              /* max. nr. of baud rates */
-
 struct options {
     int flags;                      /* toggle switches, see below */
     unsigned timeout;               /* time-out period */
-    const char *login;                    /* login program */
-    const char *tty;                      /* name of tty */
-    const char *initstring;               /* modem init string */
-    const char *issue;                    /* alternative issue file */
+    const char *login;              /* login program */
+    const char *tty;                /* name of tty */
+    const char *initstring;         /* modem init string */
+    const char *issue;              /* alternative issue file */
     int numspeed;                   /* number of baud rates to try */
     int speeds[MAX_SPEED];          /* baud rates to be tried */
 };
-
-static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn";
-#define F_INITSTRING    (1<<0)          /* initstring is set */
-#define F_LOCAL         (1<<1)          /* force local */
-#define F_FAKEHOST      (1<<2)          /* force fakehost */
-#define F_CUSTISSUE     (1<<3)          /* give alternative issue file */
-#define F_RTSCTS        (1<<4)          /* enable RTS/CTS flow control */
-#define F_ISSUE         (1<<5)          /* display /etc/issue */
-#define F_LOGIN         (1<<6)          /* non-default login program */
-#define F_PARSE         (1<<7)          /* process modem status messages */
-#define F_TIMEOUT       (1<<8)          /* time out */
-#define F_WAITCRLF      (1<<9)          /* wait for CR or LF */
-#define F_NOPROMPT      (1<<10)         /* don't ask for login name! */
 
 /* Storage for things detected while the login name was read. */
@@ -113 +100 @@
     unsigned char eol;      /* end-of-line character */
     unsigned char parity;   /* what parity did we see */
+    /* (parity & 1): saw odd parity char with 7th bit set */
+    /* (parity & 2): saw even parity char with 7th bit set */
+    /* parity == 0: probably 7-bit, space parity? */
+    /* parity == 1: probably 7-bit, odd parity? */
+    /* parity == 2: probably 7-bit, even parity? */
+    /* parity == 3: definitely 8 bit, no parity! */
+    /* Hmm... with any value of "parity" 8 bit, no parity is possible */
 #ifdef HANDLE_ALLCAPS
     unsigned char capslock; /* upper case without lower case */
 #endif
 };
+
 
 /* Initial values for the above. */
@@ -129 +124 @@
 };
 
+static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn";
+#define F_INITSTRING    (1 << 0)        /* -I initstring is set */
+#define F_LOCAL         (1 << 1)        /* -L force local */
+#define F_FAKEHOST      (1 << 2)        /* -H fake hostname */
+#define F_CUSTISSUE     (1 << 3)        /* -f give alternative issue file */
+#define F_RTSCTS        (1 << 4)        /* -h enable RTS/CTS flow control */
+#define F_ISSUE         (1 << 5)        /* -i display /etc/issue */
+#define F_LOGIN         (1 << 6)        /* -l non-default login program */
+#define F_PARSE         (1 << 7)        /* -m process modem status messages */
+#define F_TIMEOUT       (1 << 8)        /* -t time out */
+#define F_WAITCRLF      (1 << 9)        /* -w wait for CR or LF */
+#define F_NOPROMPT      (1 << 10)       /* -n don't ask for login name */
+
+
+#define line_buf bb_common_bufsiz1
+
 /* The following is used for understandable diagnostics. */
-
-/* Fake hostname for ut_host specified on command line. */
-static char *fakehost = NULL;
-
-/* ... */
 #ifdef DEBUGGING
-#define debug(s) fprintf(dbf,s); fflush(dbf)
+static FILE *dbf;
 #define DEBUGTERM "/dev/ttyp0"
-static FILE *dbf;
+#define debug(...) do { fprintf(dbf, __VA_ARGS__); fflush(dbf); } while (0)
 #else
-#define debug(s) /* nothing */
-#endif
-
-
-/* bcode - convert speed string to speed code; return 0 on failure */
+#define debug(...) ((void)0)
+#endif
+
+
+/* bcode - convert speed string to speed code; return <= 0 on failure */
 static int bcode(const char *s)
 {
-    int r;
-    unsigned value = bb_strtou(s, NULL, 10);
-    if (errno) {
-        return -1;
-    }
-    r = tty_value_to_baud(value);
-    if (r > 0) {
-        return r;
-    }
-    return 0;
-}
-
+    int value = bb_strtou(s, NULL, 10); /* yes, int is intended! */
+    if (value < 0) /* bad terminating char, overflow, etc */
+        return value;
+    return tty_value_to_baud(value);
+}
 
 /* parse_speeds - parse alternate baud rates */
@@ -165 +164 @@
     char *cp;
 
+    /* NB: at least one iteration is always done */
     debug("entered parse_speeds\n");
-    for (cp = strtok(arg, ","); cp != 0; cp = strtok((char *) 0, ",")) {
-        if ((op->speeds[op->numspeed++] = bcode(cp)) <= 0)
+    while ((cp = strsep(&arg, ",")) != NULL) {
+        op->speeds[op->numspeed] = bcode(cp);
+        if (op->speeds[op->numspeed] < 0)
             bb_error_msg_and_die("bad speed: %s", cp);
+        /* note: arg "0" turns into speed B0 */
+        op->numspeed++;
         if (op->numspeed > MAX_SPEED)
             bb_error_msg_and_die("too many alternate speeds");
     }
-    debug("exiting parsespeeds\n");
-}
-
+    debug("exiting parse_speeds\n");
+}
 
 /* parse_args - parse command-line arguments */
-static void parse_args(int argc, char **argv, struct options *op)
+static void parse_args(char **argv, struct options *op, char **fakehost_p)
 {
     char *ts;
 
+    opt_complementary = "-2:t+"; /* at least 2 args; -t N */
     op->flags = getopt32(argv, opt_string,
-        &(op->initstring), &fakehost, &(op->issue),
-        &(op->login), &ts);
+        &(op->initstring), fakehost_p, &(op->issue),
+        &(op->login), &op->timeout);
+    argv += optind;
     if (op->flags & F_INITSTRING) {
-        const char *p = op->initstring;
-        char *q;
-
-        op->initstring = q = xstrdup(op->initstring);
-        /* copy optarg into op->initstring decoding \ddd
-           octal codes into chars */
-        while (*p) {
-            if (*p == '\\') {
-                p++;
-                *q++ = bb_process_escape_sequence(&p);
-            } else {
-                *q++ = *p++;
-            }
-        }
-        *q = '\0';
-    }
-    op->flags ^= F_ISSUE;           /* revert flag show /etc/issue */
-    if (op->flags & F_TIMEOUT) {
-        op->timeout = xatoul_range(ts, 1, INT_MAX);
-    }
-    argv += optind;
-    argc -= optind;
-    debug("after getopt loop\n");
-    if (argc < 2)          /* check parameter count */
-        bb_show_usage();
+        op->initstring = xstrdup(op->initstring);
+        /* decode \ddd octal codes into chars */
+        strcpy_and_process_escape_sequences((char*)op->initstring, op->initstring);
+    }
+    op->flags ^= F_ISSUE;           /* invert flag "show /etc/issue" */
+    debug("after getopt\n");
 
     /* we loosen up a bit and accept both "baudrate tty" and "tty baudrate" */
+    op->tty = argv[0];      /* tty name */
+    ts = argv[1];           /* baud rate(s) */
     if (isdigit(argv[0][0])) {
         /* a number first, assume it's a speed (BSD style) */
-        parse_speeds(op, argv[0]);       /* baud rate(s) */
-        op->tty = argv[1]; /* tty name */
-    } else {
-        op->tty = argv[0];       /* tty name */
-        parse_speeds(op, argv[1]); /* baud rate(s) */
-    }
+        op->tty = ts;   /* tty name is in argv[1] */
+        ts = argv[0];   /* baud rate(s) */
+    }
+    parse_speeds(op, ts);
+    applet_name = xasprintf("getty: %s", op->tty);
 
     if (argv[2])
-        setenv("TERM", argv[2], 1);
-
-    debug("exiting parseargs\n");
+        xsetenv("TERM", argv[2]);
+
+    debug("exiting parse_args\n");
 }
 
 /* open_tty - set up tty as standard { input, output, error } */
-static void open_tty(const char *tty, struct termios *tp, int local)
-{
-    int chdir_to_root = 0;
-
+static void open_tty(const char *tty)
+{
     /* Set up new standard input, unless we are given an already opened port. */
     if (NOT_LONE_DASH(tty)) {
-        struct stat st;
-        int fd;
+//      struct stat st;
+//      int cur_dir_fd;
+//      int fd;
 
         /* Sanity checks... */
-        xchdir("/dev");
-        chdir_to_root = 1;
-        xstat(tty, &st);
-        if ((st.st_mode & S_IFMT) != S_IFCHR)
-            bb_error_msg_and_die("%s: not a character device", tty);
+//      cur_dir_fd = xopen(".", O_DIRECTORY | O_NONBLOCK);
+//      xchdir("/dev");
+//      xstat(tty, &st);
+//      if (!S_ISCHR(st.st_mode))
+//          bb_error_msg_and_die("not a character device");
+
+        if (tty[0] != '/')
+            tty = xasprintf("/dev/%s", tty); /* will leak it */
 
         /* Open the tty as standard input. */
         debug("open(2)\n");
-        fd = xopen(tty, O_RDWR | O_NONBLOCK);
-        xdup2(fd, 0);
-        while (fd > 2)
-            close(fd--);
+        close(0);
+        /*fd =*/ xopen(tty, O_RDWR | O_NONBLOCK); /* uses fd 0 */
+
+//      /* Restore current directory */
+//      fchdir(cur_dir_fd);
+
+        /* Open the tty as standard input, continued */
+//      xmove_fd(fd, 0);
+//      /* fd is >= cur_dir_fd, and cur_dir_fd gets closed too here: */
+//      while (fd > 2)
+//          close(fd--);
+
+        /* Set proper protections and ownership. */
+        fchown(0, 0, 0);        /* 0:0 */
+        fchmod(0, 0620);        /* crw--w---- */
     } else {
         /*
@@ -258 +257 @@
             bb_error_msg_and_die("stdin is not open for read/write");
     }
-
-    /* Replace current standard output/error fd's with new ones */
-    debug("duping\n");
-    xdup2(0, 1);
-    xdup2(0, 2);
-
-    /*
-     * The following ioctl will fail if stdin is not a tty, but also when
-     * there is noise on the modem control lines. In the latter case, the
-     * common course of action is (1) fix your cables (2) give the modem more
-     * time to properly reset after hanging up. SunOS users can achieve (2)
-     * by patching the SunOS kernel variable "zsadtrlow" to a larger value;
-     * 5 seconds seems to be a good value.
-     */
-    ioctl_or_perror_and_die(0, TCGETS, tp, "%s: TCGETS", tty);
-
-    /*
-     * It seems to be a terminal. Set proper protections and ownership. Mode
-     * 0622 is suitable for SYSV <4 because /bin/login does not change
-     * protections. SunOS 4 login will change the protections to 0620 (write
-     * access for group tty) after the login has succeeded.
-     */
-
-#ifdef DEBIAN
-#warning Debian /dev/vcs[a]NN hack is deprecated and will be removed
-    {
-        /* tty to root.dialout 660 */
-        struct group *gr;
-        int id;
-
-        gr = getgrnam("dialout");
-        id = gr ? gr->gr_gid : 0;
-        chown(tty, 0, id);
-        chmod(tty, 0660);
-
-        /* vcs,vcsa to root.sys 600 */
-        if (!strncmp(tty, "tty", 3) && isdigit(tty[3])) {
-            char *vcs, *vcsa;
-
-            vcs = xstrdup(tty);
-            vcsa = xmalloc(strlen(tty) + 2);
-            strcpy(vcs, "vcs");
-            strcpy(vcs + 3, tty + 3);
-            strcpy(vcsa, "vcsa");
-            strcpy(vcsa + 4, tty + 3);
-
-            gr = getgrnam("sys");
-            id = gr ? gr->gr_gid : 0;
-            chown(vcs, 0, id);
-            chmod(vcs, 0600);
-            chown(vcsa, 0, id);
-            chmod(vcs, 0600);
-
-            free(vcs);
-            free(vcsa);
-        }
-    }
-#else
-    if (NOT_LONE_DASH(tty)) {
-        chown(tty, 0, 0);        /* 0:0 */
-        chmod(tty, 0622);        /* crw--w--w- */
-    }
-#endif
-    if (chdir_to_root)
-        xchdir("/");
 }
 
@@ -328 +262 @@
 static void termios_init(struct termios *tp, int speed, struct options *op)
 {
+    speed_t ispeed, ospeed;
     /*
      * Initial termios settings: 8-bit characters, raw-mode, blocking i/o.
@@ -334 +269 @@
      * later on.
      */
-#ifdef __linux__
     /* flush input and output queues, important for modems! */
-    ioctl(0, TCFLSH, TCIOFLUSH);
-#endif
-
-    tp->c_cflag = CS8 | HUPCL | CREAD | speed;
-    if (op->flags & F_LOCAL) {
+    tcflush(0, TCIOFLUSH);
+    ispeed = ospeed = speed;
+    if (speed == B0) {
+        /* Speed was specified as "0" on command line.
+         * Just leave it unchanged */
+        ispeed = cfgetispeed(tp);
+        ospeed = cfgetospeed(tp);
+    }
+    tp->c_cflag = CS8 | HUPCL | CREAD;
+    if (op->flags & F_LOCAL)
         tp->c_cflag |= CLOCAL;
-    }
-
-    tp->c_iflag = tp->c_lflag = tp->c_line = 0;
+    cfsetispeed(tp, ispeed);
+    cfsetospeed(tp, ospeed);
+
+    tp->c_iflag = tp->c_lflag = 0;
     tp->c_oflag = OPOST | ONLCR;
     tp->c_cc[VMIN] = 1;
     tp->c_cc[VTIME] = 0;
+#ifdef __linux__
+    tp->c_line = 0;
+#endif
 
     /* Optionally enable hardware flow control */
-
-#ifdef  CRTSCTS
+#ifdef CRTSCTS
     if (op->flags & F_RTSCTS)
         tp->c_cflag |= CRTSCTS;
 #endif
 
-    ioctl(0, TCSETS, tp);
-
-    /* go to blocking input even in local mode */
-    ndelay_off(0);
+    tcsetattr_stdin_TCSANOW(tp);
 
     debug("term_io 2\n");
@@ -392 +331 @@
      * be dealt with later on.
      */
-
     iflag = tp->c_iflag;
     tp->c_iflag |= ISTRIP;          /* enable 8th-bit stripping */
     vmin = tp->c_cc[VMIN];
-    tp->c_cc[VMIN] = 0;                     /* don't block if queue empty */
-    ioctl(0, TCSETS, tp);
+    tp->c_cc[VMIN] = 0;             /* don't block if queue empty */
+    tcsetattr_stdin_TCSANOW(tp);
 
     /*
@@ -403 +341 @@
      * try to extract the speed of the dial-in call.
      */
-
     sleep(1);
-    nread = read(0, buf, size_buf - 1);
+    nread = safe_read(STDIN_FILENO, buf, size_buf - 1);
     if (nread > 0) {
         buf[nread] = '\0';
         for (bp = buf; bp < buf + nread; bp++) {
-            if (isascii(*bp) && isdigit(*bp)) {
+            if (isdigit(*bp)) {
                 speed = bcode(bp);
-                if (speed) {
-                    tp->c_cflag &= ~CBAUD;
-                    tp->c_cflag |= speed;
-                }
+                if (speed > 0)
+                    cfsetspeed(tp, speed);
                 break;
             }
         }
     }
+
     /* Restore terminal settings. Errors will be dealt with later on. */
-
     tp->c_iflag = iflag;
     tp->c_cc[VMIN] = vmin;
-    ioctl(0, TCSETS, tp);
-}
-
-/* next_speed - select next baud rate */
-static void next_speed(struct termios *tp, struct options *op)
-{
-    static int baud_index = FIRST_SPEED;    /* current speed index */
-
-    baud_index = (baud_index + 1) % op->numspeed;
-    tp->c_cflag &= ~CBAUD;
-    tp->c_cflag |= op->speeds[baud_index];
-    ioctl(0, TCSETS, tp);
-}
-
+    tcsetattr_stdin_TCSANOW(tp);
+}
 
 /* do_prompt - show login prompt, optionally preceded by /etc/issue contents */
-static void do_prompt(struct options *op, struct termios *tp)
+static void do_prompt(struct options *op)
 {
 #ifdef ISSUE
@@ -448 +371 @@
 
 #ifdef HANDLE_ALLCAPS
-/* caps_lock - string contains upper case without lower case */
+/* all_is_upcase - string contains upper case without lower case */
 /* returns 1 if true, 0 if false */
-static int caps_lock(const char *s)
+static int all_is_upcase(const char *s)
 {
     while (*s)
@@ -459 +382 @@
 #endif
 
-/* get_logname - get user name, establish parity, speed, erase, kill, eol */
-/* return NULL on failure, logname on success */
+/* get_logname - get user name, establish parity, speed, erase, kill, eol;
+ * return NULL on BREAK, logname on success */
 static char *get_logname(char *logname, unsigned size_logname,
-        struct options *op, struct chardata *cp, struct termios *tp)
+        struct options *op, struct chardata *cp)
 {
     char *bp;
-    char c;             /* input character, full eight bits */
+    char c;                         /* input character, full eight bits */
     char ascval;                    /* low 7 bits of input character */
     int bits;                       /* # of "1" bits per character */
     int mask;                       /* mask with 1 bit up */
-    static const char erase[][3] = {    /* backspace-space-backspace */
+    static const char erase[][3] = {/* backspace-space-backspace */
         "\010\040\010",                 /* space parity */
         "\010\040\010",                 /* odd parity */
         "\210\240\210",                 /* even parity */
-        "\210\240\210",                 /* no parity */
+        "\010\040\010",                 /* 8 bit no parity */
     };
 
-    /* Initialize kill, erase, parity etc. (also after switching speeds). */
-
-    *cp = init_chardata;
+    /* NB: *cp is pre-initialized with init_chardata */
 
     /* Flush pending input (esp. after parsing or switching the baud rate). */
-
     sleep(1);
-    ioctl(0, TCFLSH, TCIFLUSH);
+    tcflush(0, TCIOFLUSH);
 
     /* Prompt for and read a login name. */
-
     logname[0] = '\0';
     while (!logname[0]) {
-
         /* Write issue file and prompt, with "parity" bit == 0. */
-
-        do_prompt(op, tp);
+        do_prompt(op);
 
         /* Read name, watch for break, parity, erase, kill, end-of-line. */
-
         bp = logname;
         cp->eol = '\0';
@@ -501 +417 @@
 
             /* Do not report trivial EINTR/EIO errors. */
-            if (read(0, &c, 1) < 1) {
+            errno = EINTR; /* make read of 0 bytes be silent too */
+            if (read(STDIN_FILENO, &c, 1) < 1) {
                 if (errno == EINTR || errno == EIO)
-                    exit(0);
-                bb_perror_msg_and_die("%s: read", op->tty);
+                    exit(EXIT_SUCCESS);
+                bb_perror_msg_and_die(bb_msg_read_error);
             }
 
-            /* Do BREAK handling elsewhere. */
+            /* BREAK. If we have speeds to try,
+             * return NULL (will switch speeds and return here) */
             if (c == '\0' && op->numspeed > 1)
                 return NULL;
 
             /* Do parity bit handling. */
-            ascval = c & 0177;
-            if (c != ascval) {       /* "parity" bit on ? */
+            if (!(op->flags & F_LOCAL) && (c & 0x80)) {       /* "parity" bit on? */
                 bits = 1;
                 mask = 1;
-                while (mask & 0177) {
-                    if (mask & ascval)
+                while (mask & 0x7f) {
+                    if (mask & c)
                         bits++; /* count "1" bits */
                     mask <<= 1;
@@ -526 +443 @@
 
             /* Do erase, kill and end-of-line processing. */
+            ascval = c & 0x7f;
             switch (ascval) {
             case CR:
@@ -534 +452 @@
             case BS:
             case DEL:
+#ifdef ANCIENT_BS_KILL_CHARS
             case '#':
+#endif
                 cp->erase = ascval;     /* set erase character */
                 if (bp > logname) {
-                    write(1, erase[cp->parity], 3);
+                    full_write(STDOUT_FILENO, erase[cp->parity], 3);
                     bp--;
                 }
                 break;
             case CTL('U'):
+#ifdef ANCIENT_BS_KILL_CHARS
             case '@':
+#endif
                 cp->kill = ascval;      /* set kill character */
                 while (bp > logname) {
-                    write(1, erase[cp->parity], 3);
+                    full_write(STDOUT_FILENO, erase[cp->parity], 3);
                     bp--;
                 }
                 break;
             case CTL('D'):
-                exit(0);
+                exit(EXIT_SUCCESS);
             default:
-                if (!isascii(ascval) || !isprint(ascval)) {
+                if (ascval < ' ') {
                     /* ignore garbage characters */
-                } else if (bp - logname >= size_logname - 1) {
-                    bb_error_msg_and_die("%s: input overrun", op->tty);
+                } else if ((int)(bp - logname) >= size_logname - 1) {
+                    bb_error_msg_and_die("input overrun");
                 } else {
-                    write(1, &c, 1); /* echo the character */
+                    full_write(STDOUT_FILENO, &c, 1); /* echo the character */
                     *bp++ = ascval; /* and store it */
                 }
@@ -567 +489 @@
 
 #ifdef HANDLE_ALLCAPS
-    cp->capslock = caps_lock(logname);
+    cp->capslock = all_is_upcase(logname);
     if (cp->capslock) {
         for (bp = logname; *bp; bp++)
@@ -581 +503 @@
 {
     /* General terminal-independent stuff. */
-
     tp->c_iflag |= IXON | IXOFF;    /* 2-way flow control */
     tp->c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE;
@@ -591 +512 @@
     tp->c_cc[VEOF] = DEF_EOF;       /* default EOF character */
     tp->c_cc[VEOL] = DEF_EOL;
+#ifdef VSWTC
     tp->c_cc[VSWTC] = DEF_SWITCH;   /* default switch character */
+#endif
 
     /* Account for special characters seen in input. */
-
     if (cp->eol == CR) {
         tp->c_iflag |= ICRNL;   /* map CR in input to NL */
@@ -603 +525 @@
 
     /* Account for the presence or absence of parity bits in input. */
-
     switch (cp->parity) {
     case 0:                                 /* space (always 0) parity */
+// I bet most people go here - they use only 7-bit chars in usernames....
         break;
     case 1:                                 /* odd parity */
@@ -617 +539 @@
         tp->c_cflag &= ~CSIZE;
         tp->c_cflag |= CS7;
+// FIXME: wtf? case 3: we saw both even and odd 8-bit bytes -
+// it's probably some umlauts etc, but definitely NOT 7-bit!!!
+// Entire parity detection madness here just begs for deletion...
         break;
     }
@@ -629 +554 @@
 #endif
     /* Optionally enable hardware flow control */
-
-#ifdef  CRTSCTS
+#ifdef CRTSCTS
     if (op->flags & F_RTSCTS)
         tp->c_cflag |= CRTSCTS;
@@ -636 +560 @@
 
     /* Finally, make the new settings effective */
-
-    ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty);
-}
-
-
-#ifdef SYSV_STYLE
-#if ENABLE_FEATURE_UTMP
-/* update_utmp - update our utmp entry */
-static void update_utmp(const char *line)
-{
-    struct utmp ut;
-    struct utmp *utp;
-    time_t t;
-    int mypid = getpid();
-
-    /*
-     * The utmp file holds miscellaneous information about things started by
-     * /sbin/init and other system-related events. Our purpose is to update
-     * the utmp entry for the current process, in particular the process type
-     * and the tty line we are listening to. Return successfully only if the
-     * utmp file can be opened for update, and if we are able to find our
-     * entry in the utmp file.
-     */
-    if (access(_PATH_UTMP, R_OK|W_OK) == -1) {
-        close(creat(_PATH_UTMP, 0664));
-    }
-    utmpname(_PATH_UTMP);
-    setutent();
-    while ((utp = getutent())
-           && !(utp->ut_type == INIT_PROCESS && utp->ut_pid == mypid))
-        /* nothing */;
-
-    if (utp) {
-        memcpy(&ut, utp, sizeof(ut));
-    } else {
-        /* some inits don't initialize utmp... */
-        memset(&ut, 0, sizeof(ut));
-        safe_strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
-    }
-    /* endutent(); */
-
-    strcpy(ut.ut_user, "LOGIN");
-    safe_strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-    if (fakehost)
-        safe_strncpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
-    time(&t);
-    ut.ut_time = t;
-    ut.ut_type = LOGIN_PROCESS;
-    ut.ut_pid = mypid;
-
-    pututline(&ut);
-    endutent();
-
-#if ENABLE_FEATURE_WTMP
-    if (access(bb_path_wtmp_file, R_OK|W_OK) == -1)
-        close(creat(bb_path_wtmp_file, 0664));
-    updwtmp(bb_path_wtmp_file, &ut);
-#endif
-}
-
-#endif /* CONFIG_FEATURE_UTMP */
-#endif /* SYSV_STYLE */
-
-
-int getty_main(int argc, char **argv);
-int getty_main(int argc, char **argv)
-{
-    int nullfd;
-    char *logname = NULL;           /* login name, given to /bin/login */
+    if (tcsetattr_stdin_TCSANOW(tp) < 0)
+        bb_perror_msg_and_die("tcsetattr");
+}
+
+int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int getty_main(int argc UNUSED_PARAM, char **argv)
+{
+    int n;
+    pid_t pid;
+    char *fakehost = NULL;          /* Fake hostname for ut_host */
+    char *logname;                  /* login name, given to /bin/login */
     /* Merging these into "struct local" may _seem_ to reduce
      * parameter passing, but today's gcc will inline
      * statics which are called once anyway, so don't do that */
     struct chardata chardata;       /* set by get_logname() */
-    struct termios termios;           /* terminal mode bits */
-    struct options options = {
-        0,                      /* show /etc/issue (SYSV_STYLE) */
-        0,                      /* no timeout */
-        _PATH_LOGIN,            /* default login program */
-        "tty1",                 /* default tty line */
-        "",                     /* modem init string */
+    struct termios termios;         /* terminal mode bits */
+    struct options options;
+
+    chardata = init_chardata;
+
+    memset(&options, 0, sizeof(options));
+    options.login = _PATH_LOGIN;    /* default login program */
+    options.tty = "tty1";           /* default tty line */
+    options.initstring = "";        /* modem init string */
 #ifdef ISSUE
-        ISSUE,                  /* default issue file */
-#else
-        NULL,
-#endif
-        0,                      /* no baud rates known yet */
-    };
-
-    /* Already too late because of theoretical
-     * possibility of getty --help somehow triggered
-     * inadvertently before we reach this. Oh well. */
+    options.issue = ISSUE;          /* default issue file */
+#endif
+
+    /* Parse command-line arguments. */
+    parse_args(argv, &options, &fakehost);
+
     logmode = LOGMODE_NONE;
+
+    /* Create new session, lose controlling tty, if any */
+    /* docs/ctty.htm says:
+     * "This is allowed only when the current process
+     *  is not a process group leader" - is this a problem? */
     setsid();
-    nullfd = xopen(bb_dev_null, O_RDWR);
-    /* dup2(nullfd, 0); - no, because of possible "getty - 9600" */
-    /* open_tty() will take care of fd# 0 anyway */
-    dup2(nullfd, 1);
-    dup2(nullfd, 2);
-    while (nullfd > 2) close(nullfd--);
-    /* We want special flavor of error_msg_and_die */
+    /* close stdio, and stray descriptors, just in case */
+    n = xopen(bb_dev_null, O_RDWR);
+    /* dup2(n, 0); - no, we need to handle "getty - 9600" too */
+    xdup2(n, 1);
+    xdup2(n, 2);
+    while (n > 2)
+        close(n--);
+
+    /* Logging. We want special flavor of error_msg_and_die */
     die_sleep = 10;
     msg_eol = "\r\n";
+    /* most likely will internally use fd #3 in CLOEXEC mode: */
     openlog(applet_name, LOG_PID, LOG_AUTH);
     logmode = LOGMODE_BOTH;
 
 #ifdef DEBUGGING
-    dbf = xfopen(DEBUGTERM, "w");
-
-    {
-        int i;
-
-        for (i = 1; i < argc; i++) {
-            debug(argv[i]);
-            debug("\n");
-        }
-    }
-#endif
-
-    /* Parse command-line arguments. */
-    parse_args(argc, argv, &options);
-
-#ifdef SYSV_STYLE
-#if ENABLE_FEATURE_UTMP
-    /* Update the utmp file. */
-    update_utmp(options.tty);
-#endif
-#endif
-
+    dbf = xfopen_for_write(DEBUGTERM);
+    for (n = 1; argv[n]; n++) {
+        debug(argv[n]);
+        debug("\n");
+    }
+#endif
+
+    /* Open the tty as standard input, if it is not "-" */
+    /* If it's not "-" and not taken yet, it will become our ctty */
     debug("calling open_tty\n");
-    /* Open the tty as standard { input, output, error }. */
-    open_tty(options.tty, &termios, options.flags & F_LOCAL);
-
+    open_tty(options.tty);
+    ndelay_off(0);
+    debug("duping\n");
+    xdup2(0, 1);
+    xdup2(0, 2);
+
+    /*
+     * The following ioctl will fail if stdin is not a tty, but also when
+     * there is noise on the modem control lines. In the latter case, the
+     * common course of action is (1) fix your cables (2) give the modem more
+     * time to properly reset after hanging up. SunOS users can achieve (2)
+     * by patching the SunOS kernel variable "zsadtrlow" to a larger value;
+     * 5 seconds seems to be a good value.
+     */
+    if (tcgetattr(0, &termios) < 0)
+        bb_perror_msg_and_die("tcgetattr");
+
+    pid = getpid();
 #ifdef __linux__
-    {
-        int iv;
-
-        iv = getpid();
-        ioctl(0, TIOCSPGRP, &iv);
-    }
-#endif
+// FIXME: do we need this? Otherwise "-" case seems to be broken...
+    // /* Forcibly make fd 0 our controlling tty, even if another session
+    //  * has it as a ctty. (Another session loses ctty). */
+    // ioctl(0, TIOCSCTTY, (void*)1);
+    /* Make ourself a foreground process group within our session */
+    tcsetpgrp(0, pid);
+#endif
+
+    /* Update the utmp file. This tty is ours now! */
+    update_utmp(pid, LOGIN_PROCESS, options.tty, "LOGIN", fakehost);
+
     /* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */
     debug("calling termios_init\n");
-    termios_init(&termios, options.speeds[FIRST_SPEED], &options);
-
-    /* write the modem init string and DON'T flush the buffers */
+    termios_init(&termios, options.speeds[0], &options);
+
+    /* Write the modem init string and DON'T flush the buffers */
     if (options.flags & F_INITSTRING) {
         debug("writing init string\n");
-        write(1, options.initstring, strlen(options.initstring));
-    }
-
-    if (!(options.flags & F_LOCAL)) {
-        /* go to blocking write mode unless -L is specified */
-        ndelay_off(1);
-    }
-
-    /* Optionally detect the baud rate from the modem status message. */
+        full_write1_str(options.initstring);
+    }
+
+    /* Optionally detect the baud rate from the modem status message */
     debug("before autobaud\n");
     if (options.flags & F_PARSE)
-        auto_baud(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), &termios);
-
-    /* Set the optional timer. */
-    if (options.timeout)
-        alarm(options.timeout);
-
-    /* optionally wait for CR or LF before writing /etc/issue */
+        auto_baud(line_buf, sizeof(line_buf), &termios);
+
+    /* Set the optional timer */
+    alarm(options.timeout); /* if 0, alarm is not set */
+
+    /* Optionally wait for CR or LF before writing /etc/issue */
     if (options.flags & F_WAITCRLF) {
         char ch;
 
         debug("waiting for cr-lf\n");
-        while (read(0, &ch, 1) == 1) {
+        while (safe_read(STDIN_FILENO, &ch, 1) == 1) {
+            debug("read %x\n", (unsigned char)ch);
             ch &= 0x7f;                     /* strip "parity bit" */
-#ifdef DEBUGGING
-            fprintf(dbf, "read %c\n", ch);
-#endif
             if (ch == '\n' || ch == '\r')
                 break;
@@ -815 +685 @@
     }
 
-    chardata = init_chardata;
+    logname = NULL;
     if (!(options.flags & F_NOPROMPT)) {
-        /* Read the login name. */
-        debug("reading login name\n");
-        logname = get_logname(bb_common_bufsiz1, sizeof(bb_common_bufsiz1),
-                &options, &chardata, &termios);
-        while (logname == NULL)
-            next_speed(&termios, &options);
+        /* NB:termios_init already set line speed
+         * to options.speeds[0] */
+        int baud_index = 0;
+
+        while (1) {
+            /* Read the login name. */
+            debug("reading login name\n");
+            logname = get_logname(line_buf, sizeof(line_buf),
+                    &options, &chardata);
+            if (logname)
+                break;
+            /* we are here only if options.numspeed > 1 */
+            baud_index = (baud_index + 1) % options.numspeed;
+            cfsetispeed(&termios, options.speeds[baud_index]);
+            cfsetospeed(&termios, options.speeds[baud_index]);
+            tcsetattr_stdin_TCSANOW(&termios);
+        }
     }
 
     /* Disable timer. */
-
-    if (options.timeout)
-        alarm(0);
+    alarm(0);
 
     /* Finalize the termios settings. */
-
     termios_final(&options, &termios, &chardata);
 
     /* Now the newline character should be properly written. */
-
-    write(1, "\n", 1);
+    full_write(STDOUT_FILENO, "\n", 1);
 
     /* Let the login program take care of password validation. */
-
-    execl(options.login, options.login, "--", logname, (char *) 0);
-    bb_error_msg_and_die("%s: can't exec %s", options.tty, options.login);
-}
+    /* We use PATH because we trust that root doesn't set "bad" PATH,
+     * and getty is not suid-root applet. */
+    /* With -n, logname == NULL, and login will ask for username instead */
+    BB_EXECLP(options.login, options.login, "--", logname, NULL);
+    bb_error_msg_and_die("can't execute '%s'", options.login);
+}