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

* Correct fix for Debian bug #547073: use IUTF8 flag if defined

Browse Source 
and if already set to make sure the utf-8 flag is not cleared
  from the tty. Patch from Samuel Thibault.
This commit is contained in:
Werner Fink 2010-04-27 12:32:52 +00:00
parent 4d38df17a9
commit d886c94c9f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/Changelog
View File

@ -1,3 +1,8 @@
[ Werner Fink ]
* Correct fix for Debian bug #547073: use IUTF8 flag if defined
and if already set to make sure the utf-8 flag is not cleared
from the tty. Patch from Samuel Thibault.
sysvinit (2.88dsf) UNRELEASED; urgency=low sysvinit (2.88dsf) UNRELEASED; urgency=low
[ Petter Reinholdtsen ] [ Petter Reinholdtsen ]

7
src/init.c
View File

@ -784,10 +784,11 @@ void console_stty(void)
/* /*
* Set pre and post processing * Set pre and post processing
*/ */
tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY; tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY
#ifdef IUTF8 /* Not defined on FreeBSD */ #ifdef IUTF8 /* Not defined on FreeBSD */
tty.c_iflag |= IUTF8; | (tty.c_iflag & IUTF8)
#endif /* IUTF8 */ #endif /* IUTF8 */
;
tty.c_oflag = OPOST|ONLCR; tty.c_oflag = OPOST|ONLCR;
tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE; tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;

3
src/sulogin.c
View File

@ -101,9 +101,6 @@ void fixtty(void)
* the same result as `stty sane cr0 pass8' * the same result as `stty sane cr0 pass8'
*/ */
tty.c_iflag |= (BRKINT | ICRNL | IMAXBEL); tty.c_iflag |= (BRKINT | ICRNL | IMAXBEL);
#ifdef IUTF8 /* Not defined on FreeBSD */
tty.c_iflag |= IUTF8;
#endif /* IUTF8 */
tty.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP); tty.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP);
tty.c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0); tty.c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\ tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\