emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/login.c: If we cannot get the terminal configuration, do not

Browse Source 
change the terminal configuration. setup_tty() is just a best
	effort configuration of the terminal.
	* src/login.c: Ignore failures when setting the terminal
	configuration.
	* src/login.c: Fail if the ERASECHAR or KILLCHAR configurations
	are not compatible with a cc_t type.
This commit is contained in:
nekral-guest 2009-04-22 20:12:06 +00:00
parent a362a68f53
commit 53e0ff91d3
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2009-04-22 Nicolas François <nicolas.francois@centraliens.net>
* src/login.c: If we cannot get the terminal configuration, do not
change the terminal configuration. setup_tty() is just a best
effort configuration of the terminal.
* src/login.c: Ignore failures when setting the terminal
configuration.
* src/login.c: Fail if the ERASECHAR or KILLCHAR configurations
are not compatible with a cc_t type.
2009-04-22 Paul Szabo <psz@maths.usyd.edu.au> 2009-04-22 Paul Szabo <psz@maths.usyd.edu.au>
* src/login.c: utent might be NULL after get_current_utmp(). * src/login.c: utent might be NULL after get_current_utmp().

28
src/login.c
View File

@ -165,8 +165,10 @@ static void usage (void)
static void setup_tty (void) static void setup_tty (void)
{ {
TERMIO termio; TERMIO termio;
int erasechar;
int killchar;
GTTY (0, &termio); /* get terminal characteristics */ if (GTTY (0, &termio) == 0) { /* get terminal characteristics */
/* /*
* Add your favorite terminal modes here ... * Add your favorite terminal modes here ...
@ -185,14 +187,32 @@ static void setup_tty (void)
#endif #endif
/* leave these values unchanged if not specified in login.defs */ /* leave these values unchanged if not specified in login.defs */
termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]); erasechar = getdef_num ("ERASECHAR", (int) termio.c_cc[VERASE]);
termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]); killchar = getdef_num ("KILLCHAR", (int) termio.c_cc[VKILL]);
termio.c_cc[VERASE] = (cc_t) erasechar;
termio.c_cc[VKILL] = (cc_t) killchar;
/* Make sure the values were valid.
* getdef_num cannot validate this.
*/
if (erasechar != termio.c_cc[VERASE]) {
fprintf (stderr,
_("configuration error - cannot parse %s value: '%d'"),
"ERASECHAR", erasechar);
exit (1);
}
if (killchar != termio.c_cc[VKILL]) {
fprintf (stderr,
_("configuration error - cannot parse %s value: '%d'"),
"KILLCHAR", killchar);
exit (1);
}
/* /*
* ttymon invocation prefers this, but these settings won't come into * ttymon invocation prefers this, but these settings won't come into
* effect after the first username login * effect after the first username login
*/ */
STTY (0, &termio); (void) STTY (0, &termio);
}
} }