Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/loginutils/getty.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/loginutils/getty.c (modified) (48 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /* agetty.c - another getty program for Linux. By W. Z. Venema 1989
-   Ported to Linux by Peter Orbaek <poe@daimi.aau.dk>
-   This program is freely distributable. The entire man-page used to
-   be here. Now read the real man-page agetty.8 instead.
-
-   -f option added by Eric Rasmussen <ear@usfirst.org> - 12/28/95
-
-   1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
-   - added Native Language Support
-
-   1999-05-05 Thorsten Kranzkowski <dl8bcu@gmx.net>
-   - enable hardware flow control before displaying /etc/issue
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <termios.h>
-#include "busybox.h"
-
-#ifdef CONFIG_FEATURE_UTMP
+ * Ported to Linux by Peter Orbaek <poe@daimi.aau.dk>
+ * This program is freely distributable. The entire man-page used to
+ * be here. Now read the real man-page agetty.8 instead.
+ *
+ * option added by Eric Rasmussen <ear@usfirst.org> - 12/28/95
+ *
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <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.
+ *
+ */
+
+#include "libbb.h"
+#include <syslog.h>
+
+#if ENABLE_FEATURE_UTMP
 #include <utmp.h>
 #endif
 
-#define _PATH_LOGIN     "/bin/login"
-
- /* If USE_SYSLOG is undefined all diagnostics go directly to /dev/console. */
-#ifdef CONFIG_SYSLOGD
-#include <sys/param.h>
-#include <syslog.h>
-#endif
-
-
- /*
-  * Some heuristics to find out what environment we are in: if it is not
-  * System V, assume it is SunOS 4.
-  */
-
+/*
+ * Some heuristics to find out what environment we are in: if it is not
+ * System V, assume it is SunOS 4.
+ */
 #ifdef LOGIN_PROCESS                    /* defined in System V utmp.h */
 #define SYSV_STYLE                      /* select System V style getty */
-#ifdef CONFIG_FEATURE_WTMP
-extern void updwtmp(const char *filename, const struct utmp *ut);
-#endif
-#endif  /* LOGIN_PROCESS */
-
- /*
-  * Things you may want to modify.
-  *
-  * You may disagree with the default line-editing etc. characters defined
-  * below. Note, however, that DEL cannot be used for interrupt generation
-  * and for line editing at the same time.
-  */
-
-#ifdef  SYSV_STYLE
 #include <sys/utsname.h>
 #include <time.h>
-#endif
-
- /* If ISSUE is not defined, agetty will never display the contents of the
-  * /etc/issue file. You will not want to spit out large "issue" files at the
-  * wrong baud rate.
-  */
+#if ENABLE_FEATURE_WTMP
+extern void updwtmp(const char *filename, const struct utmp *ut);
+static void update_utmp(const char *line);
+#endif
+#endif  /* LOGIN_PROCESS */
+
+/*
+ * Things you may want to modify.
+ *
+ * You may disagree with the default line-editing etc. characters defined
+ * below. Note, however, that DEL cannot be used for interrupt generation
+ * and for line editing at the same time.
+ */
+
+/* I doubt there are systems which still need this */
+#undef HANDLE_ALLCAPS
+
+#define _PATH_LOGIN "/bin/login"
+
+/* If ISSUE is not defined, getty will never display the contents of the
+ * /etc/issue file. You will not want to spit out large "issue" files at the
+ * wrong baud rate.
+ */
 #define ISSUE "/etc/issue"              /* displayed before the login prompt */
 
 /* Some shorthands for control characters. */
-
 #define CTL(x)          (x ^ 0100)      /* Assumes ASCII dialect */
 #define CR              CTL('M')        /* carriage return */
@@ -83 +65 @@
 
 /* Defaults for line-editing etc. characters; you may want to change this. */
-
 #define DEF_ERASE       DEL             /* default erase character */
 #define DEF_INTR        CTL('C')        /* default interrupt character */
@@ -92 +73 @@
 #define DEF_SWITCH      0               /* default switch char */
 
- /*
-  * SunOS 4.1.1 termio is broken. We must use the termios stuff instead,
-  * because the termio -> termios translation does not clear the termios
-  * CIBAUD bits. Therefore, the tty driver would sometimes report that input
-  * baud rate != output baud rate. I did not notice that problem with SunOS
-  * 4.1. We will use termios where available, and termio otherwise.
-  */
-
-/* linux 0.12 termio is broken too, if we use it c_cc[VERASE] isn't set
-   properly, but all is well if we use termios?! */
-
-#ifdef  TCGETS
-#undef  TCGETA
-#undef  TCSETA
-#undef  TCSETAW
-#define termio  termios
-#define TCGETA  TCGETS
-#define TCSETA  TCSETS
-#define TCSETAW TCSETSW
-#endif
-
- /*
-  * When multiple baud rates are specified on the command line, the first one
-  * we will try is the first one specified.
-  */
-
+/*
+ * When multiple baud rates are specified on the command line, the first one
+ * we will try is the first one specified.
+ */
 #define FIRST_SPEED     0
 
@@ -126 +85 @@
 struct options {
     int flags;                      /* toggle switches, see below */
-    int timeout;                    /* time-out period */
-    char *login;                    /* login program */
-    char *tty;                      /* name of tty */
-    char *initstring;               /* modem init string */
-    char *issue;                    /* alternative issue file */
+    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 */
     int numspeed;                   /* number of baud rates to try */
     int speeds[MAX_SPEED];          /* baud rates to be tried */
 };
 
-static const char opt_string[] = "I:LH:f:hil:mt:wn";
+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 */
@@ -149 +108 @@
 
 /* Storage for things detected while the login name was read. */
-
 struct chardata {
-    int erase;                      /* erase character */
-    int kill;                       /* kill character */
-    int eol;                        /* end-of-line character */
-    int parity;                     /* what parity did we see */
-    int capslock;                   /* upper case without lower case */
+    unsigned char erase;    /* erase character */
+    unsigned char kill;     /* kill character */
+    unsigned char eol;      /* end-of-line character */
+    unsigned char parity;   /* what parity did we see */
+#ifdef HANDLE_ALLCAPS
+    unsigned char capslock; /* upper case without lower case */
+#endif
 };
 
 /* Initial values for the above. */
-
-static struct chardata init_chardata = {
+static const struct chardata init_chardata = {
     DEF_ERASE,                              /* default erase character */
     DEF_KILL,                               /* default kill character */
     13,                                     /* default eol char */
     0,                                      /* space parity */
+#ifdef HANDLE_ALLCAPS
     0,                                      /* no capslock */
+#endif
 };
-
-#if 0
-struct Speedtab {
-    long speed;
-    int code;
-};
-
-static struct Speedtab speedtab[] = {
-    {50, B50},
-    {75, B75},
-    {110, B110},
-    {134, B134},
-    {150, B150},
-    {200, B200},
-    {300, B300},
-    {600, B600},
-    {1200, B1200},
-    {1800, B1800},
-    {2400, B2400},
-    {4800, B4800},
-    {9600, B9600},
-#ifdef  B19200
-    {19200, B19200},
-#endif
-#ifdef  B38400
-    {38400, B38400},
-#endif
-#ifdef  EXTA
-    {19200, EXTA},
-#endif
-#ifdef  EXTB
-    {38400, EXTB},
-#endif
-#ifdef B57600
-    {57600, B57600},
-#endif
-#ifdef B115200
-    {115200, B115200},
-#endif
-#ifdef B230400
-    {230400, B230400},
-#endif
-    {0, 0},
-};
-#endif
-
-
-#ifdef  SYSV_STYLE
-#ifdef CONFIG_FEATURE_UTMP
-static void update_utmp(char *line);
-#endif
-#endif
 
 /* The following is used for understandable diagnostics. */
@@ -229 +138 @@
 #define debug(s) fprintf(dbf,s); fflush(dbf)
 #define DEBUGTERM "/dev/ttyp0"
-FILE *dbf;
+static FILE *dbf;
 #else
-#define debug(s)                                /* nothing */
-#endif
-
-
-/*
- * output error messages
- */
-static void error(const char *fmt, ...) ATTRIBUTE_NORETURN;
-static void error(const char *fmt, ...)
-{
-    va_list va_alist;
-    char buf[256];
-
-#ifdef CONFIG_SYSLOGD
-    va_start(va_alist, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, va_alist);
-    openlog(bb_applet_name, 0, LOG_AUTH);
-    syslog(LOG_ERR, "%s", buf);
-    closelog();
-#else
-    int fd;
-    size_t l;
-
-    snprintf(buf, sizeof(buf), "%s: ", bb_applet_name);
-    l = strlen(buf);
-    va_start(va_alist, fmt);
-    vsnprintf(buf + l, sizeof(buf) - l, fmt, va_alist);
-    l = strlen(buf);
-    /* truncate if need */
-    if((l + 3) > sizeof(buf))
-        l = sizeof(buf) - 3;
-    /* add \r\n always */
-    buf[l++] = '\r';
-    buf[l++] = '\n';
-    buf[l] = 0;
-    if ((fd = open("/dev/console", 1)) >= 0) {
-        write(fd, buf, l);
-        close(fd);
-    }
-#endif
-
-    va_end(va_alist);
-
-    (void) sleep((unsigned) 10);    /* be kind to init(8) */
-    exit(1);
-}
-
+#define debug(s) /* nothing */
+#endif
 
 
@@ -284 +148 @@
 {
     int r;
-    unsigned long value;
-    if (safe_strtoul((char *)s, &value)) {
+    unsigned value = bb_strtou(s, NULL, 10);
+    if (errno) {
         return -1;
     }
-    if ((r = tty_value_to_baud(value)) > 0) {
+    r = tty_value_to_baud(value);
+    if (r > 0) {
         return r;
     }
@@ -303 +168 @@
     for (cp = strtok(arg, ","); cp != 0; cp = strtok((char *) 0, ",")) {
         if ((op->speeds[op->numspeed++] = bcode(cp)) <= 0)
-            error("bad speed: %s", cp);
+            bb_error_msg_and_die("bad speed: %s", cp);
         if (op->numspeed > MAX_SPEED)
-            error("too many alternate speeds");
+            bb_error_msg_and_die("too many alternate speeds");
     }
     debug("exiting parsespeeds\n");
@@ -311 +176 @@
 
 
-/* parse-args - parse command-line arguments */
+/* parse_args - parse command-line arguments */
 static void parse_args(int argc, char **argv, struct options *op)
 {
     char *ts;
 
-    op->flags = bb_getopt_ulflags(argc, argv, opt_string,
+    op->flags = getopt32(argv, opt_string,
         &(op->initstring), &fakehost, &(op->issue),
         &(op->login), &ts);
-    if(op->flags & F_INITSTRING) {
+    if (op->flags & F_INITSTRING) {
         const char *p = op->initstring;
         char *q;
 
-        q = op->initstring = bb_xstrdup(op->initstring);
+        op->initstring = q = xstrdup(op->initstring);
         /* copy optarg into op->initstring decoding \ddd
            octal codes into chars */
@@ -337 +202 @@
     }
     op->flags ^= F_ISSUE;           /* revert flag show /etc/issue */
-    if(op->flags & F_TIMEOUT) {
-        if ((op->timeout = atoi(ts)) <= 0)
-            error("bad timeout value: %s", ts);
-    }
+    if (op->flags & F_TIMEOUT) {
+        op->timeout = xatoul_range(ts, 1, INT_MAX);
+    }
+    argv += optind;
+    argc -= optind;
     debug("after getopt loop\n");
-    if (argc < optind + 2)          /* check parameter count */
+    if (argc < 2)          /* check parameter count */
         bb_show_usage();
 
     /* we loosen up a bit and accept both "baudrate tty" and "tty baudrate" */
-    if ('0' <= argv[optind][0] && argv[optind][0] <= '9') {
+    if (isdigit(argv[0][0])) {
         /* a number first, assume it's a speed (BSD style) */
-        parse_speeds(op, argv[optind++]);       /* baud rate(s) */
-        op->tty = argv[optind]; /* tty name */
+        parse_speeds(op, argv[0]);       /* baud rate(s) */
+        op->tty = argv[1]; /* tty name */
     } else {
-        op->tty = argv[optind++];       /* tty name */
-        parse_speeds(op, argv[optind]); /* baud rate(s) */
-    }
-
-    optind++;
-    if (argc > optind && argv[optind])
-        setenv("TERM", argv[optind], 1);
+        op->tty = argv[0];       /* tty name */
+        parse_speeds(op, argv[1]); /* baud rate(s) */
+    }
+
+    if (argv[2])
+        setenv("TERM", argv[2], 1);
 
     debug("exiting parseargs\n");
@@ -363 +228 @@
 
 /* open_tty - set up tty as standard { input, output, error } */
-static void open_tty(char *tty, struct termio *tp, int local)
+static void open_tty(const char *tty, struct termios *tp, int local)
 {
     int chdir_to_root = 0;
 
     /* Set up new standard input, unless we are given an already opened port. */
-
-    if (strcmp(tty, "-")) {
+    if (NOT_LONE_DASH(tty)) {
         struct stat st;
         int fd;
 
         /* Sanity checks... */
-
-        if (chdir("/dev"))
-            error("/dev: chdir() failed: %m");
+        xchdir("/dev");
         chdir_to_root = 1;
-        if (stat(tty, &st) < 0)
-            error("/dev/%s: %m", tty);
+        xstat(tty, &st);
         if ((st.st_mode & S_IFMT) != S_IFCHR)
-            error("/dev/%s: not a character device", tty);
+            bb_error_msg_and_die("%s: not a character device", tty);
 
         /* Open the tty as standard input. */
-
-        close(0);
         debug("open(2)\n");
-        fd = open(tty, O_RDWR | O_NONBLOCK, 0);
-        if (fd != 0)
-            error("/dev/%s: cannot open as standard input: %m", tty);
+        fd = xopen(tty, O_RDWR | O_NONBLOCK);
+        xdup2(fd, 0);
+        while (fd > 2)
+            close(fd--);
     } else {
-
         /*
          * Standard input should already be connected to an open port. Make
          * sure it is open for read/write.
          */
-
-        if ((fcntl(0, F_GETFL, 0) & O_RDWR) != O_RDWR)
-            error("%s: not open for read/write", tty);
+        if ((fcntl(0, F_GETFL) & O_RDWR) != O_RDWR)
+            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");
-    if (dup2(STDIN_FILENO, STDOUT_FILENO) == -1 ||
-        dup2(STDIN_FILENO, STDERR_FILENO) == -1)
-        error("%s: dup problem: %m", tty);      /* we have a problem */
+    xdup2(0, 1);
+    xdup2(0, 2);
 
     /*
@@ -415 +272 @@
      * 5 seconds seems to be a good value.
      */
-
-    if (ioctl(0, TCGETA, tp) < 0)
-        error("%s: ioctl: %m", tty);
+    ioctl_or_perror_and_die(0, TCGETS, tp, "%s: TCGETS", tty);
 
     /*
@@ -427 +282 @@
 
 #ifdef DEBIAN
+#warning Debian /dev/vcs[a]NN hack is deprecated and will be removed
     {
         /* tty to root.dialout 660 */
@@ -432 +288 @@
         int id;
 
-        id = (gr = getgrnam("dialout")) ? gr->gr_gid : 0;
+        gr = getgrnam("dialout");
+        id = gr ? gr->gr_gid : 0;
         chown(tty, 0, id);
         chmod(tty, 0660);
@@ -440 +297 @@
             char *vcs, *vcsa;
 
-            if (!(vcs = strdup(tty)))
-                error("Can't malloc for vcs");
-            if (!(vcsa = malloc(strlen(tty) + 2)))
-                error("Can't malloc for vcsa");
+            vcs = xstrdup(tty);
+            vcsa = xmalloc(strlen(tty) + 2);
             strcpy(vcs, "vcs");
             strcpy(vcs + 3, tty + 3);
@@ -449 +304 @@
             strcpy(vcsa + 4, tty + 3);
 
-            id = (gr = getgrnam("sys")) ? gr->gr_gid : 0;
+            gr = getgrnam("sys");
+            id = gr ? gr->gr_gid : 0;
             chown(vcs, 0, id);
             chmod(vcs, 0600);
@@ -460 +316 @@
     }
 #else
-    (void) chown(tty, 0, 0);        /* root, sys */
-    (void) chmod(tty, 0622);        /* crw--w--w- */
-#endif
-    if(chdir_to_root && chdir("/"))
-        error("chdir to / failed: %m");
-}
-
-/* termio_init - initialize termio settings */
-static void termio_init(struct termio *tp, int speed, struct options *op)
+    if (NOT_LONE_DASH(tty)) {
+        chown(tty, 0, 0);        /* 0:0 */
+        chmod(tty, 0622);        /* crw--w--w- */
+    }
+#endif
+    if (chdir_to_root)
+        xchdir("/");
+}
+
+/* termios_init - initialize termios settings */
+static void termios_init(struct termios *tp, int speed, struct options *op)
 {
     /*
-     * Initial termio settings: 8-bit characters, raw-mode, blocking i/o.
+     * Initial termios settings: 8-bit characters, raw-mode, blocking i/o.
      * Special characters are set after we have read the login name; all
      * reads will be done in raw mode anyway. Errors will be dealt with
-     * lateron.
+     * later on.
      */
 #ifdef __linux__
     /* flush input and output queues, important for modems! */
-    (void) ioctl(0, TCFLSH, TCIOFLUSH);
+    ioctl(0, TCFLSH, TCIOFLUSH);
 #endif
 
@@ -498 +356 @@
 #endif
 
-    (void) ioctl(0, TCSETA, tp);
+    ioctl(0, TCSETS, tp);
 
     /* go to blocking input even in local mode */
-    fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~O_NONBLOCK);
+    ndelay_off(0);
 
     debug("term_io 2\n");
@@ -507 +365 @@
 
 /* auto_baud - extract baud rate from modem status message */
-static void auto_baud(struct termio *tp)
+static void auto_baud(char *buf, unsigned size_buf, struct termios *tp)
 {
     int speed;
     int vmin;
     unsigned iflag;
-    char buf[BUFSIZ];
     char *bp;
     int nread;
@@ -533 +390 @@
     /*
      * Use 7-bit characters, don't block if input queue is empty. Errors will
-     * be dealt with lateron.
+     * be dealt with later on.
      */
 
@@ -540 +397 @@
     vmin = tp->c_cc[VMIN];
     tp->c_cc[VMIN] = 0;                     /* don't block if queue empty */
-    (void) ioctl(0, TCSETA, tp);
+    ioctl(0, TCSETS, tp);
 
     /*
@@ -547 +404 @@
      */
 
-    (void) sleep(1);
-    if ((nread = read(0, buf, sizeof(buf) - 1)) > 0) {
+    sleep(1);
+    nread = read(0, buf, size_buf - 1);
+    if (nread > 0) {
         buf[nread] = '\0';
         for (bp = buf; bp < buf + nread; bp++) {
             if (isascii(*bp) && isdigit(*bp)) {
-                if ((speed = bcode(bp))) {
+                speed = bcode(bp);
+                if (speed) {
                     tp->c_cflag &= ~CBAUD;
                     tp->c_cflag |= speed;
@@ -560 +419 @@
         }
     }
-    /* Restore terminal settings. Errors will be dealt with lateron. */
+    /* Restore terminal settings. Errors will be dealt with later on. */
 
     tp->c_iflag = iflag;
     tp->c_cc[VMIN] = vmin;
-    (void) ioctl(0, TCSETA, tp);
+    ioctl(0, TCSETS, tp);
 }
 
 /* next_speed - select next baud rate */
-static void next_speed(struct termio *tp, struct options *op)
+static void next_speed(struct termios *tp, struct options *op)
 {
     static int baud_index = FIRST_SPEED;    /* current speed index */
@@ -575 +434 @@
     tp->c_cflag &= ~CBAUD;
     tp->c_cflag |= op->speeds[baud_index];
-    (void) ioctl(0, TCSETA, tp);
+    ioctl(0, TCSETS, tp);
 }
 
 
 /* do_prompt - show login prompt, optionally preceded by /etc/issue contents */
-static void do_prompt(struct options *op, struct termio *tp)
-{
-#ifdef  ISSUE                                   /* optional: show /etc/issue */
+static void do_prompt(struct options *op, struct termios *tp)
+{
+#ifdef ISSUE
     print_login_issue(op->issue, op->tty);
 #endif
@@ -588 +447 @@
 }
 
+#ifdef HANDLE_ALLCAPS
 /* caps_lock - string contains upper case without lower case */
 /* returns 1 if true, 0 if false */
 static int caps_lock(const char *s)
 {
-    int capslock;
-
-    for (capslock = 0; *s; s++) {
-        if (islower(*s))
-            return (0);
-        if (capslock == 0)
-            capslock = isupper(*s);
-    }
-    return (capslock);
-}
-
-#define logname bb_common_bufsiz1
+    while (*s)
+        if (islower(*s++))
+            return 0;
+    return 1;
+}
+#endif
+
 /* get_logname - get user name, establish parity, speed, erase, kill, eol */
 /* return NULL on failure, logname on success */
-static char *get_logname(struct options *op, struct chardata *cp, struct termio *tp)
+static char *get_logname(char *logname, unsigned size_logname,
+        struct options *op, struct chardata *cp, struct termios *tp)
 {
     char *bp;
@@ -613 +469 @@
     int bits;                       /* # of "1" bits per character */
     int mask;                       /* mask with 1 bit up */
-    static char *erase[] = {        /* backspace-space-backspace */
+    static const char erase[][3] = {    /* backspace-space-backspace */
         "\010\040\010",                 /* space parity */
         "\010\040\010",                 /* odd parity */
@@ -626 +482 @@
     /* Flush pending input (esp. after parsing or switching the baud rate). */
 
-    (void) sleep(1);
-    (void) ioctl(0, TCFLSH, TCIFLUSH);
+    sleep(1);
+    ioctl(0, TCFLSH, TCIFLUSH);
 
     /* Prompt for and read a login name. */
 
-    for (*logname = 0; *logname == 0; /* void */ ) {
+    logname[0] = '\0';
+    while (!logname[0]) {
 
         /* Write issue file and prompt, with "parity" bit == 0. */
@@ -639 +496 @@
         /* Read name, watch for break, parity, erase, kill, end-of-line. */
 
-        for (bp = logname, cp->eol = 0; cp->eol == 0; /* void */ ) {
+        bp = logname;
+        cp->eol = '\0';
+        while (cp->eol == '\0') {
 
             /* Do not report trivial EINTR/EIO errors. */
-
             if (read(0, &c, 1) < 1) {
                 if (errno == EINTR || errno == EIO)
                     exit(0);
-                error("%s: read: %m", op->tty);
+                bb_perror_msg_and_die("%s: read", op->tty);
             }
+
             /* Do BREAK handling elsewhere. */
-
-            if ((c == 0) && op->numspeed > 1)
-                /* return (0); */
+            if (c == '\0' && op->numspeed > 1)
                 return NULL;
 
             /* Do parity bit handling. */
-
-            if (c != (ascval = (c & 0177))) {       /* "parity" bit on ? */
-                for (bits = 1, mask = 1; mask & 0177; mask <<= 1)
+            ascval = c & 0177;
+            if (c != ascval) {       /* "parity" bit on ? */
+                bits = 1;
+                mask = 1;
+                while (mask & 0177) {
                     if (mask & ascval)
                         bits++; /* count "1" bits */
-                cp->parity |= ((bits & 1) ? 1 : 2);
+                    mask <<= 1;
+                }
+                /* ... |= 2 - even, 1 - odd */
+                cp->parity |= 2 - (bits & 1);
             }
+
             /* Do erase, kill and end-of-line processing. */
-
             switch (ascval) {
             case CR:
             case NL:
-                *bp = 0;                /* terminate logname */
+                *bp = '\0';             /* terminate logname */
                 cp->eol = ascval;       /* set end-of-line char */
                 break;
@@ -675 +537 @@
                 cp->erase = ascval;     /* set erase character */
                 if (bp > logname) {
-                    (void) write(1, erase[cp->parity], 3);
+                    write(1, erase[cp->parity], 3);
                     bp--;
                 }
@@ -683 +545 @@
                 cp->kill = ascval;      /* set kill character */
                 while (bp > logname) {
-                    (void) write(1, erase[cp->parity], 3);
+                    write(1, erase[cp->parity], 3);
                     bp--;
                 }
@@ -691 +553 @@
             default:
                 if (!isascii(ascval) || !isprint(ascval)) {
-                    /* ignore garbage characters */ ;
-                } else if (bp - logname >= sizeof(logname) - 1) {
-                    error("%s: input overrun", op->tty);
+                    /* ignore garbage characters */
+                } else if (bp - logname >= size_logname - 1) {
+                    bb_error_msg_and_die("%s: input overrun", op->tty);
                 } else {
-                    (void) write(1, &c, 1); /* echo the character */
+                    write(1, &c, 1); /* echo the character */
                     *bp++ = ascval; /* and store it */
                 }
@@ -704 +566 @@
     /* Handle names with upper case and no lower case. */
 
-    if ((cp->capslock = caps_lock(logname))) {
+#ifdef HANDLE_ALLCAPS
+    cp->capslock = caps_lock(logname);
+    if (cp->capslock) {
         for (bp = logname; *bp; bp++)
             if (isupper(*bp))
                 *bp = tolower(*bp);     /* map name to lower case */
     }
-    return (logname);
-}
-
-/* termio_final - set the final tty mode bits */
-static void termio_final(struct options *op, struct termio *tp, struct chardata *cp)
+#endif
+    return logname;
+}
+
+/* termios_final - set the final tty mode bits */
+static void termios_final(struct options *op, struct termios *tp, struct chardata *cp)
 {
     /* General terminal-independent stuff. */
@@ -754 +619 @@
         break;
     }
+
     /* Account for upper case without lower case. */
-
+#ifdef HANDLE_ALLCAPS
     if (cp->capslock) {
         tp->c_iflag |= IUCLC;
@@ -761 +627 @@
         tp->c_oflag |= OLCUC;
     }
+#endif
     /* Optionally enable hardware flow control */
 
@@ -770 +637 @@
     /* Finally, make the new settings effective */
 
-    if (ioctl(0, TCSETA, tp) < 0)
-        error("%s: ioctl: TCSETA: %m", op->tty);
-}
-
-
-#ifdef  SYSV_STYLE
-#ifdef CONFIG_FEATURE_UTMP
+    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(char *line)
+static void update_utmp(const char *line)
 {
     struct utmp ut;
@@ -784 +650 @@
     time_t t;
     int mypid = getpid();
-#if ! (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
-    struct flock lock;
-#endif
 
     /*
@@ -802 +665 @@
     setutent();
     while ((utp = getutent())
-           && !(utp->ut_type == INIT_PROCESS && utp->ut_pid == mypid))  /* nothing */
-        ;
+           && !(utp->ut_type == INIT_PROCESS && utp->ut_pid == mypid))
+        /* nothing */;
 
     if (utp) {
@@ -812 +675 @@
         safe_strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
     }
-    /*endutent(); */
+    /* endutent(); */
 
     strcpy(ut.ut_user, "LOGIN");
@@ -826 +689 @@
     endutent();
 
-#ifdef CONFIG_FEATURE_WTMP
+#if ENABLE_FEATURE_WTMP
     if (access(bb_path_wtmp_file, R_OK|W_OK) == -1)
         close(creat(bb_path_wtmp_file, 0664));
@@ -837 +700 @@
 
 
-#undef logname
+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 */
+    /* 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 termio termio;           /* terminal mode bits */
-    static struct options options = {
+    struct termios termios;           /* terminal mode bits */
+    struct options options = {
         0,                      /* show /etc/issue (SYSV_STYLE) */
         0,                      /* no timeout */
@@ -857 +724 @@
     };
 
+    /* Already too late because of theoretical
+     * possibility of getty --help somehow triggered
+     * inadvertently before we reach this. Oh well. */
+    logmode = LOGMODE_NONE;
+    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 */
+    die_sleep = 10;
+    msg_eol = "\r\n";
+    openlog(applet_name, LOG_PID, LOG_AUTH);
+    logmode = LOGMODE_BOTH;
+
 #ifdef DEBUGGING
-    dbf = bb_xfopen(DEBUGTERM, "w");
+    dbf = xfopen(DEBUGTERM, "w");
 
     {
@@ -871 +755 @@
 
     /* Parse command-line arguments. */
-
     parse_args(argc, argv, &options);
 
-#ifdef __linux__
-    setsid();
-#endif
-
+#ifdef SYSV_STYLE
+#if ENABLE_FEATURE_UTMP
     /* Update the utmp file. */
-
-
-#ifdef  SYSV_STYLE
-#ifdef CONFIG_FEATURE_UTMP
     update_utmp(options.tty);
 #endif
@@ -889 +766 @@
     debug("calling open_tty\n");
     /* Open the tty as standard { input, output, error }. */
-    open_tty(options.tty, &termio, options.flags & F_LOCAL);
+    open_tty(options.tty, &termios, options.flags & F_LOCAL);
 
 #ifdef __linux__
@@ -899 +776 @@
     }
 #endif
-    /* Initialize the termio settings (raw mode, eight-bit, blocking i/o). */
-    debug("calling termio_init\n");
-    termio_init(&termio, options.speeds[FIRST_SPEED], &options);
+    /* 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 */
@@ -911 +788 @@
     if (!(options.flags & F_LOCAL)) {
         /* go to blocking write mode unless -L is specified */
-        fcntl(1, F_SETFL, fcntl(1, F_GETFL, 0) & ~O_NONBLOCK);
+        ndelay_off(1);
     }
 
@@ -917 +794 @@
     debug("before autobaud\n");
     if (options.flags & F_PARSE)
-        auto_baud(&termio);
+        auto_baud(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), &termios);
 
     /* Set the optional timer. */
     if (options.timeout)
-        (void) alarm((unsigned) options.timeout);
+        alarm(options.timeout);
 
     /* optionally wait for CR or LF before writing /etc/issue */
@@ -942 +819 @@
         /* Read the login name. */
         debug("reading login name\n");
-        /* while ((logname = get_logname(&options, &chardata, &termio)) == 0) */
-        while ((logname = get_logname(&options, &chardata, &termio)) ==
-               NULL) next_speed(&termio, &options);
+        logname = get_logname(bb_common_bufsiz1, sizeof(bb_common_bufsiz1),
+                &options, &chardata, &termios);
+        while (logname == NULL)
+            next_speed(&termios, &options);
     }
 
@@ -950 +828 @@
 
     if (options.timeout)
-        (void) alarm(0);
-
-    /* Finalize the termio settings. */
-
-    termio_final(&options, &termio, &chardata);
+        alarm(0);
+
+    /* Finalize the termios settings. */
+
+    termios_final(&options, &termios, &chardata);
 
     /* Now the newline character should be properly written. */
 
-    (void) write(1, "\n", 1);
+    write(1, "\n", 1);
 
     /* Let the login program take care of password validation. */
 
-    (void) execl(options.login, options.login, "--", logname, (char *) 0);
-    error("%s: can't exec %s: %m", options.tty, options.login);
-}
-
+    execl(options.login, options.login, "--", logname, (char *) 0);
+    bb_error_msg_and_die("%s: can't exec %s", options.tty, options.login);
+}