#include "libbb.h"
#include <syslog.h>
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* LOGIN_PROCESS */
-#endif
#ifndef IUCLC
# define IUCLC 0
#endif
*/
#define ISSUE "/etc/issue"
-/* Some shorthands for control characters */
-#define CTL(x) ((x) ^ 0100) /* Assumes ASCII dialect */
-#define BS CTL('H') /* back space */
-#define DEL CTL('?') /* delete */
-
-/* Defaults for line-editing etc. characters; you may want to change this */
-#define DEF_INTR CTL('C') /* default interrupt character */
-#define DEF_QUIT CTL('\\') /* default quit char */
-#define DEF_KILL CTL('U') /* default kill char */
-#define DEF_EOF CTL('D') /* default EOF char */
-#define DEF_EOL '\n'
-#define DEF_SWITCH 0 /* default switch char (none) */
+/* Macro to build Ctrl-LETTER. Assumes ASCII dialect */
+#define CTL(x) ((x) ^ 0100)
/*
* When multiple baud rates are specified on the command line,
#define MAX_SPEED 10 /* max. nr. of baud rates */
struct globals {
- unsigned timeout; /* time-out period */
+ unsigned timeout;
const char *login; /* login program */
const char *fakehost;
- const char *tty; /* name of tty */
- const char *initstring; /* modem init string */
+ const char *tty_name;
+ 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 */
unsigned char eol; /* end-of-line char seen (CR or NL) */
- struct termios termios; /* terminal mode bits */
+ struct termios tty_attrs;
char line_buf[128];
};
//usage:#define getty_trivial_usage
//usage: "[OPTIONS] BAUD_RATE[,BAUD_RATE]... TTY [TERMTYPE]"
//usage:#define getty_full_usage "\n\n"
-//usage: "Open a tty, prompt for a login name, then invoke /bin/login\n"
-//usage: "\nOptions:"
-//usage: "\n -h Enable hardware (RTS/CTS) flow control"
-//usage: "\n -i Don't display /etc/issue"
-//usage: "\n -L Local line, set CLOCAL on it"
+//usage: "Open TTY, prompt for login name, then invoke /bin/login\n"
+//usage: "\n -h Enable hardware RTS/CTS flow control"
+//usage: "\n -L Set CLOCAL (ignore Carrier Detect state)"
//usage: "\n -m Get baud rate from modem's CONNECT status message"
+//usage: "\n -n Don't prompt for login name"
//usage: "\n -w Wait for CR or LF before sending /etc/issue"
-//usage: "\n -n Don't prompt for a login name"
+//usage: "\n -i Don't display /etc/issue"
//usage: "\n -f ISSUE_FILE Display ISSUE_FILE instead of /etc/issue"
//usage: "\n -l LOGIN Invoke LOGIN instead of /bin/login"
-//usage: "\n -t SEC Terminate after SEC if no username is read"
+//usage: "\n -t SEC Terminate after SEC if no login name is read"
//usage: "\n -I INITSTR Send INITSTR before anything else"
//usage: "\n -H HOST Log HOST into the utmp file as the hostname"
//usage: "\n"
if (flags & F_INITSTRING) {
G.initstring = xstrdup(G.initstring);
/* decode \ddd octal codes into chars */
- strcpy_and_process_escape_sequences((char*)G.initstring, G.initstring);
+ strcpy_and_process_escape_sequences(G.initstring, G.initstring);
}
argv += optind;
debug("after getopt\n");
/* We loosen up a bit and accept both "baudrate tty" and "tty baudrate" */
- G.tty = argv[0]; /* tty name */
- ts = argv[1]; /* baud rate(s) */
+ G.tty_name = argv[0];
+ ts = argv[1]; /* baud rate(s) */
if (isdigit(argv[0][0])) {
/* A number first, assume it's a speed (BSD style) */
- G.tty = ts; /* tty name is in argv[1] */
- ts = argv[0]; /* baud rate(s) */
+ G.tty_name = ts; /* tty name is in argv[1] */
+ ts = argv[0]; /* baud rate(s) */
}
parse_speeds(ts);
- applet_name = xasprintf("getty: %s", G.tty);
if (argv[2])
xsetenv("TERM", argv[2]);
static void open_tty(void)
{
/* Set up new standard input, unless we are given an already opened port */
- if (NOT_LONE_DASH(G.tty)) {
- if (G.tty[0] != '/')
- G.tty = xasprintf("/dev/%s", G.tty); /* will leak it */
+ if (NOT_LONE_DASH(G.tty_name)) {
+ if (G.tty_name[0] != '/')
+ G.tty_name = xasprintf("/dev/%s", G.tty_name); /* will leak it */
/* Open the tty as standard input */
debug("open(2)\n");
close(0);
- xopen(G.tty, O_RDWR | O_NONBLOCK); /* uses fd 0 */
+ xopen(G.tty_name, O_RDWR | O_NONBLOCK); /* uses fd 0 */
/* Set proper protections and ownership */
fchown(0, 0, 0); /* 0:0 */
fchmod(0, 0620); /* crw--w---- */
} else {
+ char *n;
/*
- * Standard input should already be connected to an open port. Make
- * sure it is open for read/write.
+ * Standard input should already be connected to an open port.
+ * Make sure it is open for read/write.
*/
if ((fcntl(0, F_GETFL) & (O_RDWR|O_RDONLY|O_WRONLY)) != O_RDWR)
bb_error_msg_and_die("stdin is not open for read/write");
+
+ /* Try to get real tty name instead of "-" */
+ n = xmalloc_ttyname(0);
+ if (n)
+ G.tty_name = n;
}
+ applet_name = xasprintf("getty: %s", skip_dev_pfx(G.tty_name));
+}
+
+static void set_tty_attrs(void)
+{
+ if (tcsetattr_stdin_TCSANOW(&G.tty_attrs) < 0)
+ bb_perror_msg_and_die("tcsetattr");
}
-/* We manipulate termios this way:
- * - first, we read existing termios settings
- * - termios_init modifies some parts and sets it
- * - auto_baud and/or BREAK processing can set different speed and set termios
- * - termios_final again modifies some parts and sets termios before
+/* We manipulate tty_attrs this way:
+ * - first, we read existing tty_attrs
+ * - init_tty_attrs modifies some parts and sets it
+ * - auto_baud and/or BREAK processing can set different speed and set tty attrs
+ * - finalize_tty_attrs again modifies some parts and sets tty attrs before
* execing login
*/
-static void termios_init(int speed)
+static void init_tty_attrs(int speed)
{
- /* Flush input and output queues, important for modems!
- * Users report losing previously queued output chars, and I hesitate
- * to use tcdrain here instead of tcflush - I imagine it can block.
- * Using small sleep instead.
+ /* Try to drain output buffer, with 5 sec timeout.
+ * Added on request from users of ~600 baud serial interface
+ * with biggish buffer on a 90MHz CPU.
+ * They were losing hundreds of bytes of buffered output
+ * on tcflush.
*/
- usleep(100*1000); /* 0.1 sec */
+ signal_no_SA_RESTART_empty_mask(SIGALRM, record_signo);
+ alarm(5);
+ tcdrain(STDIN_FILENO);
+ alarm(0);
+
+ /* Flush input and output queues, important for modems! */
tcflush(STDIN_FILENO, TCIOFLUSH);
/* Set speed if it wasn't specified as "0" on command line */
if (speed != B0)
- cfsetspeed(&G.termios, speed);
+ cfsetspeed(&G.tty_attrs, speed);
- /*
- * Initial termios settings: 8-bit characters, raw-mode, blocking i/o.
+ /* Initial 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
- * later on.
+ * reads will be done in raw mode anyway.
*/
- G.termios.c_cflag = CS8 | HUPCL | CREAD;
- if (option_mask32 & F_LOCAL)
- G.termios.c_cflag |= CLOCAL;
- G.termios.c_iflag = 0;
- G.termios.c_lflag = 0;
- G.termios.c_oflag = OPOST | ONLCR;
- G.termios.c_cc[VMIN] = 1;
- G.termios.c_cc[VTIME] = 0;
-#ifdef __linux__
- G.termios.c_line = 0;
+ /* Clear all bits except: */
+ G.tty_attrs.c_cflag &= (0
+ /* 2 stop bits (1 otherwise)
+ * Enable parity bit (both on input and output)
+ * Odd parity (else even)
+ */
+ | CSTOPB | PARENB | PARODD
+#ifdef CMSPAR
+ | CMSPAR /* mark or space parity */
+#endif
+#ifdef CBAUD
+ | CBAUD /* (output) baud rate */
+#endif
+#ifdef CBAUDEX
+ | CBAUDEX /* (output) baud rate */
#endif
+#ifdef CIBAUD
+ | CIBAUD /* input baud rate */
+#endif
+ );
+ /* Set: 8 bits; hang up (drop DTR) on last close; enable receive */
+ G.tty_attrs.c_cflag |= CS8 | HUPCL | CREAD;
+ if (option_mask32 & F_LOCAL) {
+ /* ignore Carrier Detect pin:
+ * opens don't block when CD is low,
+ * losing CD doesn't hang up processes whose ctty is this tty
+ */
+ G.tty_attrs.c_cflag |= CLOCAL;
+ }
#ifdef CRTSCTS
if (option_mask32 & F_RTSCTS)
- G.termios.c_cflag |= CRTSCTS;
+ G.tty_attrs.c_cflag |= CRTSCTS; /* flow control using RTS/CTS pins */
+#endif
+ G.tty_attrs.c_iflag = 0;
+ G.tty_attrs.c_lflag = 0;
+ /* non-raw output; add CR to each NL */
+ G.tty_attrs.c_oflag = OPOST | ONLCR;
+
+ /* reads would block only if < 1 char is available */
+ G.tty_attrs.c_cc[VMIN] = 1;
+ /* no timeout (reads block forever) */
+ G.tty_attrs.c_cc[VTIME] = 0;
+#ifdef __linux__
+ G.tty_attrs.c_line = 0;
#endif
- tcsetattr_stdin_TCSANOW(&G.termios);
+ set_tty_attrs();
debug("term_io 2\n");
}
-static void termios_final(void)
+static void finalize_tty_attrs(void)
{
- /* General terminal-independent stuff */
- G.termios.c_iflag |= IXON | IXOFF; /* 2-way flow control */
- G.termios.c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE;
- /* no longer in lflag: | ECHOCTL | ECHOPRT */
- G.termios.c_oflag |= OPOST;
- /* G.termios.c_cflag = 0; */
- G.termios.c_cc[VINTR] = DEF_INTR;
- G.termios.c_cc[VQUIT] = DEF_QUIT;
- G.termios.c_cc[VEOF] = DEF_EOF;
- G.termios.c_cc[VEOL] = DEF_EOL;
+ /* software flow control on output (stop sending if XOFF is recvd);
+ * and on input (send XOFF when buffer is full)
+ */
+ G.tty_attrs.c_iflag |= IXON | IXOFF;
+ if (G.eol == '\r') {
+ G.tty_attrs.c_iflag |= ICRNL; /* map CR on input to NL */
+ }
+ /* Other bits in c_iflag:
+ * IXANY Any recvd char enables output (any char is also a XON)
+ * INPCK Enable parity check
+ * IGNPAR Ignore parity errors (drop bad bytes)
+ * PARMRK Mark parity errors with 0xff, 0x00 prefix
+ * (else bad byte is received as 0x00)
+ * ISTRIP Strip parity bit
+ * IGNBRK Ignore break condition
+ * BRKINT Send SIGINT on break - maybe set this?
+ * INLCR Map NL to CR
+ * IGNCR Ignore CR
+ * ICRNL Map CR to NL
+ * IUCLC Map uppercase to lowercase
+ * IMAXBEL Echo BEL on input line too long
+ * IUTF8 Appears to affect tty's idea of char widths,
+ * observed to improve backspacing through Unicode chars
+ */
+
+ /* line buffered input (NL or EOL or EOF chars end a line);
+ * recognize INT/QUIT/SUSP chars;
+ * echo input chars;
+ * echo BS-SP-BS on erase character;
+ * echo kill char specially, not as ^c (ECHOKE controls how exactly);
+ * erase all input via BS-SP-BS on kill char (else go to next line)
+ */
+ G.tty_attrs.c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE;
+ /* Other bits in c_lflag:
+ * XCASE Map uppercase to \lowercase [tried, doesn't work]
+ * ECHONL Echo NL even if ECHO is not set
+ * ECHOCTL Echo ctrl chars as ^c (else don't echo) - maybe set this?
+ * ECHOPRT On erase, echo erased chars
+ * [qwe<BS><BS><BS> input looks like "qwe\ewq/" on screen]
+ * NOFLSH Don't flush input buffer after interrupt or quit chars
+ * IEXTEN Enable extended functions (??)
+ * [glibc says it enables c_cc[LNEXT] "enter literal char"
+ * and c_cc[VDISCARD] "toggle discard buffered output" chars]
+ * FLUSHO Output being flushed (c_cc[VDISCARD] is in effect)
+ * PENDIN Retype pending input at next read or input char
+ * (c_cc[VREPRINT] is being processed)
+ * TOSTOP Send SIGTTOU for background output
+ * (why "stty sane" unsets this bit?)
+ */
+
+ G.tty_attrs.c_cc[VINTR] = CTL('C');
+ G.tty_attrs.c_cc[VQUIT] = CTL('\\');
+ G.tty_attrs.c_cc[VEOF] = CTL('D');
+ G.tty_attrs.c_cc[VEOL] = '\n';
#ifdef VSWTC
- G.termios.c_cc[VSWTC] = DEF_SWITCH;
+ G.tty_attrs.c_cc[VSWTC] = 0;
#endif
#ifdef VSWTCH
- G.termios.c_cc[VSWTCH] = DEF_SWITCH;
+ G.tty_attrs.c_cc[VSWTCH] = 0;
#endif
+ G.tty_attrs.c_cc[VKILL] = CTL('U');
+ /* Other control chars:
+ * VEOL2
+ * VERASE, VWERASE - (word) erase. we may set VERASE in get_logname
+ * VREPRINT - reprint current input buffer
+ * VLNEXT, VDISCARD, VSTATUS
+ * VSUSP, VDSUSP - send (delayed) SIGTSTP
+ * VSTART, VSTOP - chars used for IXON/IXOFF
+ */
- /* Account for special characters seen in input */
- if (G.eol == '\r') {
- G.termios.c_iflag |= ICRNL; /* map CR in input to NL */
- /* already done by termios_init */
- /* G.termios.c_oflag |= ONLCR; map NL in output to CR-NL */
- }
- G.termios.c_cc[VKILL] = DEF_KILL;
-
-#ifdef CRTSCTS
- /* Optionally enable hardware flow control */
- if (option_mask32 & F_RTSCTS)
- G.termios.c_cflag |= CRTSCTS;
-#endif
+ set_tty_attrs();
- /* Finally, make the new settings effective */
- if (tcsetattr_stdin_TCSANOW(&G.termios) < 0)
- bb_perror_msg_and_die("tcsetattr");
+ /* Now the newline character should be properly written */
+ full_write(STDOUT_FILENO, "\n", 1);
}
/* extract baud rate from modem status message */
* modem status messages is enabled.
*/
- /*
- * Don't block if input queue is empty.
- * Errors will be dealt with later on.
- */
- G.termios.c_cc[VMIN] = 0; /* don't block if queue empty */
- tcsetattr_stdin_TCSANOW(&G.termios);
+ G.tty_attrs.c_cc[VMIN] = 0; /* don't block reads (min read is 0 chars) */
+ set_tty_attrs();
/*
* Wait for a while, then read everything the modem has said so far and
if (isdigit(*bp)) {
speed = bcode(bp);
if (speed > 0)
- cfsetspeed(&G.termios, speed);
+ cfsetspeed(&G.tty_attrs, speed);
break;
}
}
}
- /* Restore terminal settings. Errors will be dealt with later on */
- G.termios.c_cc[VMIN] = 1; /* restore to value set by termios_init */
- tcsetattr_stdin_TCSANOW(&G.termios);
+ /* Restore terminal settings */
+ G.tty_attrs.c_cc[VMIN] = 1; /* restore to value set by init_tty_attrs */
+ set_tty_attrs();
}
/* get user name, establish parity, speed, erase, kill, eol;
/* Flush pending input (esp. after parsing or switching the baud rate) */
usleep(100*1000); /* 0.1 sec */
- tcflush(STDIN_FILENO, TCIOFLUSH);
+ tcflush(STDIN_FILENO, TCIFLUSH);
/* Prompt for and read a login name */
- G.line_buf[0] = '\0';
- while (!G.line_buf[0]) {
+ do {
/* Write issue file and prompt */
#ifdef ISSUE
if (!(option_mask32 & F_NOISSUE))
- print_login_issue(G.issue, G.tty);
+ print_login_issue(G.issue, G.tty_name);
#endif
print_login_prompt();
- /* Read name, watch for break, parity, erase, kill, end-of-line */
+ /* Read name, watch for break, erase, kill, end-of-line */
bp = G.line_buf;
- G.eol = '\0';
while (1) {
/* Do not report trivial EINTR/EIO errors */
errno = EINTR; /* make read of 0 bytes be silent too */
if (read(STDIN_FILENO, &c, 1) < 1) {
+ finalize_tty_attrs();
if (errno == EINTR || errno == EIO)
exit(EXIT_SUCCESS);
bb_perror_msg_and_die(bb_msg_read_error);
}
- /* BREAK. If we have speeds to try,
- * return NULL (will switch speeds and return here) */
- if (c == '\0' && G.numspeed > 1)
- return NULL;
-
- /* Do erase, kill and end-of-line processing */
switch (c) {
case '\r':
case '\n':
*bp = '\0';
G.eol = c;
goto got_logname;
- case BS:
- case DEL:
- G.termios.c_cc[VERASE] = c;
+ case CTL('H'):
+ case 0x7f:
+ G.tty_attrs.c_cc[VERASE] = c;
if (bp > G.line_buf) {
full_write(STDOUT_FILENO, "\010 \010", 3);
bp--;
bp--;
}
break;
+ case CTL('C'):
case CTL('D'):
+ finalize_tty_attrs();
exit(EXIT_SUCCESS);
+ case '\0':
+ /* BREAK. If we have speeds to try,
+ * return NULL (will switch speeds and return here) */
+ if (G.numspeed > 1)
+ return NULL;
+ /* fall through and ignore it */
default:
if ((unsigned char)c < ' ') {
/* ignore garbage characters */
}
} /* end of get char loop */
got_logname: ;
- } /* while logname is empty */
+ } while (G.line_buf[0] == '\0'); /* while logname is empty */
return G.line_buf;
}
+static void alarm_handler(int sig UNUSED_PARAM)
+{
+ finalize_tty_attrs();
+ _exit(EXIT_SUCCESS);
+}
+
int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int getty_main(int argc UNUSED_PARAM, char **argv)
{
int n;
- pid_t pid;
+ pid_t pid, tsid;
char *logname;
INIT_G();
/* Parse command-line arguments */
parse_args(argv);
- logmode = LOGMODE_NONE;
+ /* Create new session and pgrp, lose controlling tty */
+ pid = setsid(); /* this also gives us our pid :) */
+ if (pid < 0) {
+ int fd;
+ /* :(
+ * docs/ctty.htm says:
+ * "This is allowed only when the current process
+ * is not a process group leader".
+ * Thus, setsid() will fail if we _already_ are
+ * a session leader - which is quite possible for getty!
+ */
+ pid = getpid();
+ if (getsid(0) != pid) {
+ //for debugging:
+ //bb_perror_msg_and_die("setsid failed:"
+ // " pid %d ppid %d"
+ // " sid %d pgid %d",
+ // pid, getppid(),
+ // getsid(0), getpgid(0));
+ bb_perror_msg_and_die("setsid");
+ }
+ /* Looks like we are already a session leader.
+ * In this case (setsid failed) we may still have ctty,
+ * and it may be different from tty we need to control!
+ * If we still have ctty, on Linux ioctl(TIOCSCTTY)
+ * (which we are going to use a bit later) always fails -
+ * even if we try to take ctty which is already ours!
+ * Try to drop old ctty now to prevent that.
+ * Use O_NONBLOCK: old ctty may be a serial line.
+ */
+ fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
+ if (fd >= 0) {
+ /* TIOCNOTTY sends SIGHUP to the foreground
+ * process group - which may include us!
+ * Make sure to not die on it:
+ */
+ sighandler_t old = signal(SIGHUP, SIG_IGN);
+ ioctl(fd, TIOCNOTTY);
+ close(fd);
+ signal(SIGHUP, old);
+ }
+ }
- /* 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();
- /* close stdio, and stray descriptors, just in case */
+ /* 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);
#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_tty();
- ndelay_off(0);
+ ndelay_off(STDIN_FILENO);
debug("duping\n");
- xdup2(0, 1);
- xdup2(0, 2);
+ xdup2(STDIN_FILENO, 1);
+ xdup2(STDIN_FILENO, 2);
+
+ /* Steal ctty if we don't have it yet */
+ tsid = tcgetsid(STDIN_FILENO);
+ if (tsid < 0 || pid != tsid) {
+ if (ioctl(STDIN_FILENO, TIOCSCTTY, /*force:*/ (long)1) < 0)
+ bb_perror_msg_and_die("TIOCSCTTY");
+ }
+
+#ifdef __linux__
+ /* Make ourself a foreground process group within our session */
+ if (tcsetpgrp(STDIN_FILENO, pid) < 0)
+ bb_perror_msg_and_die("tcsetpgrp");
+#endif
/*
* The following ioctl will fail if stdin is not a tty, but also when
* by patching the SunOS kernel variable "zsadtrlow" to a larger value;
* 5 seconds seems to be a good value.
*/
- if (tcgetattr(STDIN_FILENO, &G.termios) < 0)
+ if (tcgetattr(STDIN_FILENO, &G.tty_attrs) < 0)
bb_perror_msg_and_die("tcgetattr");
- pid = getpid();
-#ifdef __linux__
-// 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(STDIN_FILENO, TIOCSCTTY, (void*)1);
- /* Make ourself a foreground process group within our session */
- tcsetpgrp(STDIN_FILENO, pid);
-#endif
-
/* Update the utmp file. This tty is ours now! */
- update_utmp(pid, LOGIN_PROCESS, G.tty, "LOGIN", G.fakehost);
+ update_utmp(pid, LOGIN_PROCESS, G.tty_name, "LOGIN", G.fakehost);
- /* Initialize the termios settings (raw mode, eight-bit, blocking i/o) */
- debug("calling termios_init\n");
- termios_init(G.speeds[0]);
+ /* Initialize tty attrs (raw mode, eight-bit, blocking i/o) */
+ debug("calling init_tty_attrs\n");
+ init_tty_attrs(G.speeds[0]);
/* Write the modem init string and DON'T flush the buffers */
if (option_mask32 & F_INITSTRING) {
auto_baud();
/* Set the optional timer */
+ signal(SIGALRM, alarm_handler);
alarm(G.timeout); /* if 0, alarm is not set */
/* Optionally wait for CR or LF before writing /etc/issue */
logname = NULL;
if (!(option_mask32 & F_NOPROMPT)) {
- /* NB: termios_init already set line speed
+ /* NB: init_tty_attrs already set line speed
* to G.speeds[0] */
int baud_index = 0;
break;
/* We are here only if G.numspeed > 1 */
baud_index = (baud_index + 1) % G.numspeed;
- cfsetspeed(&G.termios, G.speeds[baud_index]);
- tcsetattr_stdin_TCSANOW(&G.termios);
+ cfsetspeed(&G.tty_attrs, G.speeds[baud_index]);
+ set_tty_attrs();
}
}
/* Disable timer */
alarm(0);
- /* Finalize the termios settings */
- termios_final();
-
- /* Now the newline character should be properly written */
- full_write(STDOUT_FILENO, "\n", 1);
+ finalize_tty_attrs();
/* Let the login program take care of password validation */
/* 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(G.login, G.login, "--", logname, NULL);
+ BB_EXECLP(G.login, G.login, "--", logname, (char *)0);
bb_error_msg_and_die("can't execute '%s'", G.login);
}
projects / platform / upstream / busybox.git / blobdiff