[sysvinit] Incorrect handling of UTF-8 in 2.88dsf-1?

[Petter Reinholdtsen]

I've been going throught the Debian patches and dropping the ones
currently included in version 2.88dsf-1.  This patch seemed to be
applied, but it seem to be applied wrong:

  Purpose: Make sure the utf-8 flag is not cleared from the tty.
  Authour: Samuel Thibault
  Fixes:   #547073
  
  --- trunk.orig/src/init.c       2009-10-25 15:29:44.000000000 +0100
  +++ trunk/src/init.c    2009-10-25 15:30:30.000000000 +0100
  @@ -721,7 +721,11 @@
          /*
           *      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 */
  +                      | (tty.c_iflag & IUTF8)
  +#endif /* IUTF8 */
  +            ;
          tty.c_oflag = OPOST|ONLCR;
          tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;


The code in question now look like this:

        tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
#ifdef IUTF8 /* Not defined on FreeBSD */
        tty.c_iflag |= IUTF8;
#endif /* IUTF8 */

As far as I can tell, this do not work, as it will not pass on the
existing setting of the IUTF8 bit, but instead always set it if IUTF8
is defined.

Werner, you applied it.  Do I misunderstand something?

Happy hacking,
-- 
Petter Reinholdtsen