#include <syslog.h>
#if ENABLE_FEATURE_UTMP
-#include <utmp.h>
+#include <utmp.h> /* updwtmp() */
+#endif
+
+#ifndef IUCLC
+# define IUCLC 0
#endif
/*
*/
#ifdef LOGIN_PROCESS /* defined in System V utmp.h */
#include <sys/utsname.h>
-#include <time.h>
-#if ENABLE_FEATURE_WTMP
-extern void updwtmp(const char *filename, const struct utmp *ut);
-#endif
#else /* if !sysV style, wtmp/utmp code is off */
#undef ENABLE_FEATURE_UTMP
#undef ENABLE_FEATURE_WTMP
debug("entered parse_speeds\n");
while ((cp = strsep(&arg, ",")) != NULL) {
op->speeds[op->numspeed] = bcode(cp);
- if (op->speeds[op->numspeed] <= 0)
+ 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");
// cur_dir_fd = xopen(".", O_DIRECTORY | O_NONBLOCK);
// xchdir("/dev");
// xstat(tty, &st);
-// if ((st.st_mode & S_IFMT) != S_IFCHR)
+// if (!S_ISCHR(st.st_mode))
// bb_error_msg_and_die("%s: not a character device", tty);
if (tty[0] != '/')
/* termios_init - initialize termios settings */
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.
* Special characters are set after we have read the login name; all
*/
#ifdef __linux__
/* flush input and output queues, important for modems! */
- ioctl(0, TCFLSH, TCIOFLUSH);
+ ioctl(0, TCFLSH, TCIOFLUSH); /* tcflush(0, TCIOFLUSH)? - same */
#endif
-
- tp->c_cflag = CS8 | HUPCL | CREAD | speed;
+ 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;
+ cfsetispeed(tp, ispeed);
+ cfsetospeed(tp, ospeed);
tp->c_iflag = tp->c_lflag = tp->c_line = 0;
tp->c_oflag = OPOST | ONLCR;
tp->c_cflag |= CRTSCTS;
#endif
- ioctl(0, TCSETS, tp);
+ tcsetattr_stdin_TCSANOW(tp);
debug("term_io 2\n");
}
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);
+ tcsetattr_stdin_TCSANOW(tp);
/*
* Wait for a while, then read everything the modem has said so far and
* try to extract the speed of the dial-in call.
*/
sleep(1);
- nread = safe_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++) {
/* Restore terminal settings. Errors will be dealt with later on. */
tp->c_iflag = iflag;
tp->c_cc[VMIN] = vmin;
- ioctl(0, TCSETS, tp);
+ tcsetattr_stdin_TCSANOW(tp);
}
/* do_prompt - show login prompt, optionally preceded by /etc/issue contents */
/* Flush pending input (esp. after parsing or switching the baud rate). */
sleep(1);
- ioctl(0, TCFLSH, TCIFLUSH);
+ ioctl(0, TCFLSH, TCIFLUSH); /* tcflush(0, TCIOFLUSH)? - same */
/* Prompt for and read a login name. */
logname[0] = '\0';
while (cp->eol == '\0') {
/* Do not report trivial EINTR/EIO errors. */
- if (read(0, &c, 1) < 1) {
+ if (read(STDIN_FILENO, &c, 1) < 1) {
if (errno == EINTR || errno == EIO)
- exit(0);
+ exit(EXIT_SUCCESS);
bb_perror_msg_and_die("%s: read", op->tty);
}
#endif
cp->erase = ascval; /* set erase character */
if (bp > logname) {
- full_write(1, erase[cp->parity], 3);
+ full_write(STDOUT_FILENO, erase[cp->parity], 3);
bp--;
}
break;
#endif
cp->kill = ascval; /* set kill character */
while (bp > logname) {
- full_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 (!isprint(ascval)) {
/* ignore garbage characters */
- } else if (bp - logname >= size_logname - 1) {
+ } else if ((int)(bp - logname) >= size_logname - 1) {
bb_error_msg_and_die("%s: input overrun", op->tty);
} else {
- full_write(1, &c, 1); /* echo the character */
+ full_write(STDOUT_FILENO, &c, 1); /* echo the character */
*bp++ = ascval; /* and store it */
}
break;
}
#endif
/* Optionally enable hardware flow control */
-#ifdef CRTSCTS
+#ifdef CRTSCTS
if (op->flags & F_RTSCTS)
tp->c_cflag |= CRTSCTS;
#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);
}
safe_strncpy(ut.ut_line, line, sizeof(ut.ut_line));
if (fakehost)
safe_strncpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
- ut.ut_time = time(NULL);
+ ut.ut_tv.tv_sec = time(NULL);
ut.ut_type = LOGIN_PROCESS;
ut.ut_pid = mypid;
#endif /* CONFIG_FEATURE_UTMP */
int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int getty_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int getty_main(int argc UNUSED_PARAM, char **argv)
{
int n;
char *fakehost = NULL; /* Fake hostname for ut_host */
logmode = LOGMODE_BOTH;
#ifdef DEBUGGING
- dbf = xfopen(DEBUGTERM, "w");
+ dbf = xfopen_for_write(DEBUGTERM);
for (n = 1; argv[n]; n++) {
debug(argv[n]);
debug("\n");
* 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);
#ifdef __linux__
/* Write the modem init string and DON'T flush the buffers */
if (options.flags & F_INITSTRING) {
debug("writing init string\n");
- full_write(1, options.initstring, strlen(options.initstring));
+ /* todo: use xwrite_str? */
+ full_write(STDOUT_FILENO, options.initstring, strlen(options.initstring));
}
/* Optionally detect the baud rate from the modem status message */
char ch;
debug("waiting for cr-lf\n");
- while (safe_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" */
if (ch == '\n' || ch == '\r')
break;
/* we are here only if options.numspeed > 1 */
baud_index = (baud_index + 1) % options.numspeed;
- termios.c_cflag &= ~CBAUD;
- termios.c_cflag |= options.speeds[baud_index];
- ioctl(0, TCSETS, &termios);
+ cfsetispeed(&termios, options.speeds[baud_index]);
+ cfsetospeed(&termios, options.speeds[baud_index]);
+ tcsetattr_stdin_TCSANOW(&termios);
}
}
termios_final(&options, &termios, &chardata);
/* Now the newline character should be properly written. */
- full_write(1, "\n", 1);
+ full_write(STDOUT_FILENO, "\n", 1);
/* Let the login program take care of password validation. */
/* We use PATH because we trust that root doesn't set "bad" PATH,