Revert "vt: remove zero-white-space handling from conv_uni_to_pc()"

This reverts commit b35f7a773cbcbfea3bc87a33c7d0f39e34ed83ec.

A new version of the series was submitted, so it's easier to revert the
old one and add the new one due to the changes invovled.

Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index bb4bb272ebec566ec90b4dc5a89519116490d3d3..82d70083fead062c77b8cfb097c3d86dc2b56279 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -870,6 +870,8 @@ int conv_uni_to_pc(struct vc_data *conp, long ucs)
                return -4;              /* Not found */
        else if (ucs < 0x20)
                return -1;              /* Not a printable character */
+       else if (ucs == 0xfeff || (ucs >= 0x200b && ucs <= 0x200f))
+               return -2;                      /* Zero-width space */
        /*
         * UNI_DIRECT_BASE indicates the start of the region in the User Zone
         * which always has a 1:1 mapping to the currently loaded font.  The

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 0d1d663c7809d59ed02ff06653e2f1bee2db1e04..dc84f9c6b7c6238277a2ebb34e567c16649b314e 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2964,15 +2964,13 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c,
                                        goto out;
                                }
                        }
-                       /* padding for the legacy display like done below */
-                       tc = ' ';
                }
        }
 
        /* Now try to find out how to display it */
        tc = conv_uni_to_pc(vc, tc);
        if (tc & ~charmask) {
-               if (tc == -1)
+               if (tc == -1 || tc == -2)
                        return -1; /* nothing to display */
 
                /* Glyph not found */