lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / loginutils / getty.c

diff --git a/loginutils/getty.c b/loginutils/getty.c
index a5e8e906a4f33aaf03e533e3ee03b1a967a00c05..b1cd235fbd770328cbfd5ea6b689e96354c47284 100644 (file)
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -12,7 +12,7 @@
  * 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.
  */
 
 #include "libbb.h"
@@ -216,9 +216,7 @@ static void parse_args(char **argv, struct options *op, char **fakehost_p)
                ts = argv[0];   /* baud rate(s) */
        }
        parse_speeds(op, ts);
-
-// TODO: if applet_name is set to "getty: TTY", bb_error_msg's get simpler!
-// grep for "%s:"
+       applet_name = xasprintf("getty: %s", op->tty);
 
        if (argv[2])
                xsetenv("TERM", argv[2]);
@@ -240,7 +238,7 @@ static void open_tty(const char *tty)
 //             xchdir("/dev");
 //             xstat(tty, &st);
 //             if (!S_ISCHR(st.st_mode))
-//                     bb_error_msg_and_die("%s: not a character device", tty);
+//                     bb_error_msg_and_die("not a character device");
 
                if (tty[0] != '/')
                        tty = xasprintf("/dev/%s", tty); /* will leak it */
@@ -282,10 +280,8 @@ static void termios_init(struct termios *tp, int speed, struct options *op)
         * reads will be done in raw mode anyway. Errors will be dealt with
         * later on.
         */
-#ifdef __linux__
        /* flush input and output queues, important for modems! */
-       ioctl(0, TCFLSH, TCIOFLUSH); /* tcflush(0, TCIOFLUSH)? - same */
-#endif
+       tcflush(0, TCIOFLUSH);
        ispeed = ospeed = speed;
        if (speed == B0) {
                /* Speed was specified as "0" on command line.
@@ -299,10 +295,13 @@ static void termios_init(struct termios *tp, int speed, struct options *op)
        cfsetispeed(tp, ispeed);
        cfsetospeed(tp, ospeed);
 
-       tp->c_iflag = tp->c_lflag = tp->c_line = 0;
+       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
@@ -360,10 +359,8 @@ static void auto_baud(char *buf, unsigned size_buf, struct termios *tp)
                for (bp = buf; bp < buf + nread; bp++) {
                        if (isdigit(*bp)) {
                                speed = bcode(bp);
-                               if (speed > 0) {
-                                       tp->c_cflag &= ~CBAUD;
-                                       tp->c_cflag |= speed;
-                               }
+                               if (speed > 0)
+                                       cfsetspeed(tp, speed);
                                break;
                        }
                }
@@ -417,7 +414,7 @@ static char *get_logname(char *logname, unsigned size_logname,
 
        /* Flush pending input (esp. after parsing or switching the baud rate). */
        sleep(1);
-       ioctl(0, TCFLSH, TCIFLUSH); /* tcflush(0, TCIOFLUSH)? - same */
+       tcflush(0, TCIOFLUSH);
 
        /* Prompt for and read a login name. */
        logname[0] = '\0';
@@ -435,7 +432,7 @@ static char *get_logname(char *logname, unsigned size_logname,
                        if (read(STDIN_FILENO, &c, 1) < 1) {
                                if (errno == EINTR || errno == EIO)
                                        exit(EXIT_SUCCESS);
-                               bb_perror_msg_and_die("%s: read", op->tty);
+                               bb_perror_msg_and_die(bb_msg_read_error);
                        }
 
                        /* BREAK. If we have speeds to try,
@@ -491,7 +488,7 @@ static char *get_logname(char *logname, unsigned size_logname,
                                if (ascval < ' ') {
                                        /* ignore garbage characters */
                                } else if ((int)(bp - logname) >= size_logname - 1) {
-                                       bb_error_msg_and_die("%s: input overrun", op->tty);
+                                       bb_error_msg_and_die("input overrun");
                                } else {
                                        full_write(STDOUT_FILENO, &c, 1); /* echo the character */
                                        *bp++ = ascval; /* and store it */
@@ -526,7 +523,9 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
        tp->c_cc[VQUIT] = DEF_QUIT;     /* default quit */
        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) {
@@ -572,8 +571,8 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
 #endif
 
        /* Finally, make the new settings effective */
-       /* It's tcsetattr_stdin_TCSANOW() + error check */
-       ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty);
+       if (tcsetattr_stdin_TCSANOW(tp) < 0)
+               bb_perror_msg_and_die("tcsetattr");
 }
 
 int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -650,8 +649,8 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
         * by patching the SunOS kernel variable "zsadtrlow" to a larger value;
         * 5 seconds seems to be a good value.
         */
-       /* tcgetattr() + error check */
-       ioctl_or_perror_and_die(0, TCGETS, &termios, "%s: TCGETS", options.tty);
+       if (tcgetattr(0, &termios) < 0)
+               bb_perror_msg_and_die("tcgetattr");
 
        pid = getpid();
 #ifdef __linux__
@@ -732,5 +731,5 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
         * 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("%s: can't exec %s", options.tty, options.login);
+       bb_error_msg_and_die("can't execute '%s'", options.login);
 }