emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getty: add sleep before initial tcdrain; reduce another sleep from 1 to 0.1s

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-01-24 00:28:43 +01:00
parent 1f0840450e
commit dc6cd12569
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
loginutils/getty.c
View File

@ -275,10 +275,13 @@ static void open_tty(const char *tty)
/* initialize termios settings */ /* initialize termios settings */
static void termios_init(struct termios *tp, int speed) static void termios_init(struct termios *tp, int speed)
{ {
/* Flush input and output queues, important for modems! */ /* Flush input and output queues, important for modems!
/* TODO: sleep(1)? Users report lost chars, and I hesitate * Users report losing previously queued output chars, and I hesitate
* to use tcdrain here instead of tcflush */ * to use tcdrain here instead of tcflush - I imagine it can block.
tcflush(0, TCIOFLUSH); * Using small sleep instead.
*/
usleep(100*1000); /* 0.1 sec */
tcflush(STDIN_FILENO, TCIOFLUSH);
/* Set speed if it wasn't specified as "0" on command line. */ /* Set speed if it wasn't specified as "0" on command line. */
if (speed != B0) if (speed != B0)
@ -402,8 +405,8 @@ static char *get_logname(char *logname, unsigned size_logname,
/* NB: *cp is pre-initialized with init_chardata */ /* NB: *cp is pre-initialized with init_chardata */
/* Flush pending input (esp. after parsing or switching the baud rate). */ /* Flush pending input (esp. after parsing or switching the baud rate). */
sleep(1); usleep(100*1000); /* 0.1 sec */
tcflush(0, TCIOFLUSH); tcflush(STDIN_FILENO, TCIOFLUSH);
/* Prompt for and read a login name. */ /* Prompt for and read a login name. */
logname[0] = '\0'; logname[0] = '\0';
@ -659,7 +662,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
* by patching the SunOS kernel variable "zsadtrlow" to a larger value; * by patching the SunOS kernel variable "zsadtrlow" to a larger value;
* 5 seconds seems to be a good value. * 5 seconds seems to be a good value.
*/ */
if (tcgetattr(0, &termios) < 0) if (tcgetattr(STDIN_FILENO, &termios) < 0)
bb_perror_msg_and_die("tcgetattr"); bb_perror_msg_and_die("tcgetattr");
pid = getpid(); pid = getpid();
@ -667,9 +670,9 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
// FIXME: do we need this? Otherwise "-" case seems to be broken... // FIXME: do we need this? Otherwise "-" case seems to be broken...
// /* Forcibly make fd 0 our controlling tty, even if another session // /* Forcibly make fd 0 our controlling tty, even if another session
// * has it as a ctty. (Another session loses ctty). */ // * has it as a ctty. (Another session loses ctty). */
// ioctl(0, TIOCSCTTY, (void*)1); // ioctl(STDIN_FILENO, TIOCSCTTY, (void*)1);
/* Make ourself a foreground process group within our session */ /* Make ourself a foreground process group within our session */
tcsetpgrp(0, pid); tcsetpgrp(STDIN_FILENO, pid);
#endif #endif
/* Update the utmp file. This tty is ours now! */ /* Update the utmp file. This tty is ours now! */