sysvinit/sysvinit-2.88dsf-utf8.dif

46 lines
1.5 KiB
Plaintext
Raw Normal View History

Index: doc/Changelog
===================================================================
--- doc/Changelog (revision 68)
+++ doc/Changelog (working copy)
@@ -1,3 +1,7 @@
+ [ Werner Fink ]
+ * Correct fix for Debian bug #547073: use IUTF8 flag if defined
+ and if already set.
+
sysvinit (2.88dsf) UNRELEASED; urgency=low
[ Petter Reinholdtsen ]
Index: src/init.c
===================================================================
--- src/init.c (revision 68)
+++ src/init.c (working copy)
@@ -784,10 +784,11 @@ void console_stty(void)
/*
* Set pre and post processing
*/
- tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
-#ifdef IUTF8 /* Not defined on FreeBSD */
- tty.c_iflag |= IUTF8;
+ tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY
+#ifdef IUTF8 /* Not defined on FreeBSD */
+ | (tty.c_iflag & IUTF8)
#endif /* IUTF8 */
+ ;
tty.c_oflag = OPOST|ONLCR;
tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;
Index: src/sulogin.c
===================================================================
--- src/sulogin.c (revision 68)
+++ src/sulogin.c (working copy)
@@ -101,9 +101,6 @@ void fixtty(void)
* the same result as `stty sane cr0 pass8'
*/
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_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\