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

getty: simplify macros; improve VSWTC[H] compat

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-01-24 18:17:19 +01:00
parent 6b1ce45598
commit 7073964b5f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
loginutils/getty.c
View File

@ -68,19 +68,16 @@ static FILE *dbf;
/* Some shorthands for control characters */ /* Some shorthands for control characters */
#define CTL(x) ((x) ^ 0100) /* Assumes ASCII dialect */ #define CTL(x) ((x) ^ 0100) /* Assumes ASCII dialect */
#define CR CTL('M') /* carriage return */
#define NL CTL('J') /* line feed */
#define BS CTL('H') /* back space */ #define BS CTL('H') /* back space */
#define DEL CTL('?') /* delete */ #define DEL CTL('?') /* delete */
/* Defaults for line-editing etc. characters; you may want to change this */ /* 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 */ #define DEF_INTR CTL('C') /* default interrupt character */
#define DEF_QUIT CTL('\\') /* default quit char */ #define DEF_QUIT CTL('\\') /* default quit char */
#define DEF_KILL CTL('U') /* default kill char */ #define DEF_KILL CTL('U') /* default kill char */
#define DEF_EOF CTL('D') /* default EOF char */ #define DEF_EOF CTL('D') /* default EOF char */
#define DEF_EOL '\n' #define DEF_EOL '\n'
#define DEF_SWITCH 0 /* default switch char */ #define DEF_SWITCH 0 /* default switch char (none) */
/* /*
* When multiple baud rates are specified on the command line, * When multiple baud rates are specified on the command line,
@ -293,9 +290,12 @@ static void termios_final(void)
#ifdef VSWTC #ifdef VSWTC
G.termios.c_cc[VSWTC] = DEF_SWITCH; G.termios.c_cc[VSWTC] = DEF_SWITCH;
#endif #endif
#ifdef VSWTCH
G.termios.c_cc[VSWTCH] = DEF_SWITCH;
#endif
/* Account for special characters seen in input */ /* Account for special characters seen in input */
if (G.eol == CR) { if (G.eol == '\r') {
G.termios.c_iflag |= ICRNL; /* map CR in input to NL */ G.termios.c_iflag |= ICRNL; /* map CR in input to NL */
/* already done by termios_init */ /* already done by termios_init */
/* G.termios.c_oflag |= ONLCR; map NL in output to CR-NL */ /* G.termios.c_oflag |= ONLCR; map NL in output to CR-NL */
@ -406,8 +406,8 @@ static char *get_logname(void)
/* Do erase, kill and end-of-line processing */ /* Do erase, kill and end-of-line processing */
switch (c) { switch (c) {
case CR: case '\r':
case NL: case '\n':
*bp = '\0'; *bp = '\0';
G.eol = c; G.eol = c;
goto got_logname; goto got_logname;
@ -456,7 +456,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
#ifdef ISSUE #ifdef ISSUE
G.issue = ISSUE; /* default issue file */ G.issue = ISSUE; /* default issue file */
#endif #endif
G.eol = CR; G.eol = '\r';
/* Parse command-line arguments */ /* Parse command-line arguments */
parse_args(argv); parse_args(argv);
@ -545,7 +545,6 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
/* Optionally wait for CR or LF before writing /etc/issue */ /* Optionally wait for CR or LF before writing /etc/issue */
if (option_mask32 & F_WAITCRLF) { if (option_mask32 & F_WAITCRLF) {
char ch; char ch;
debug("waiting for cr-lf\n"); debug("waiting for cr-lf\n");
while (safe_read(STDIN_FILENO, &ch, 1) == 1) { while (safe_read(STDIN_FILENO, &ch, 1) == 1) {
debug("read %x\n", (unsigned char)ch); debug("read %x\n", (unsigned char)ch);