[newlib-cygwin] Cygwin: console: ignore NUL byte on write in xterm emulation mode as well

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c9f153580bfb4db4f9ef023b99360d7a746bd450

commit c9f153580bfb4db4f9ef023b99360d7a746bd450
Author: Corinna Vinschen 
Date:   Thu Feb 20 14:48:03 2020 +0100

Cygwin: console: ignore NUL byte on write in xterm emulation mode as well

A NUL byte in the output stream got accidentally not handled as IGN char
in xterm console mode.  The internal mbtowc conversion doesn't handle
embedded NUL values gracefully, it always stops converting at NUL bytes.
This broke the output of strings with embedded NUL bytes.

Fix this by always skipping IGN chars in the "normal char output loop"
and make sure not to move the cursor one position to the right, as in
legacy console mode.

Signed-off-by: Corinna Vinschen 

Diff:
---
 winsup/cygwin/fhandler_console.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_console.cc 
b/winsup/cygwin/fhandler_console.cc
index 66e645a..c062fd7 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -2641,6 +2641,7 @@ fhandler_console::write_normal (const unsigned char *src,
   memset (, 0, sizeof ps);
   while (found < end
 && found - src < CONVERT_LIMIT
+&& base_chars[*found] != IGN
 && ((wincap.has_con_24bit_colors () && !con_is_legacy)
 || base_chars[*found] == NOR) )
 {
@@ -2732,7 +2733,8 @@ do_print:
  cursor_rel (-1, 0);
  break;
case IGN:
- cursor_rel (1, 0);
+if (!wincap.has_con_24bit_colors () || con_is_legacy)
+   cursor_rel (1, 0);
  break;
case CR:
  cursor_get (, );

[newlib-cygwin] Cygwin: fhandler_console.cc: fix minor style issues

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=4ec2e5e1c2d9bfdb742386a43a9d27aec4d74523

commit 4ec2e5e1c2d9bfdb742386a43a9d27aec4d74523
Author: Corinna Vinschen 
Date:   Thu Feb 20 14:57:26 2020 +0100

Cygwin: fhandler_console.cc: fix minor style issues

Signed-off-by: Corinna Vinschen 

Diff:
---
 winsup/cygwin/fhandler_console.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/fhandler_console.cc 
b/winsup/cygwin/fhandler_console.cc
index c062fd7..f7044c8 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1774,8 +1774,8 @@ static const wchar_t __vt100_conv[31] = {
0x00B7, /* Middle Dot */
 };
 
-inline
-bool fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done)
+inline bool
+fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done)
 {
   bool need_fix_tab_position = false;
   /* Check if screen will be alternated. */
@@ -2643,7 +2643,7 @@ fhandler_console::write_normal (const unsigned char *src,
 && found - src < CONVERT_LIMIT
 && base_chars[*found] != IGN
 && ((wincap.has_con_24bit_colors () && !con_is_legacy)
-|| base_chars[*found] == NOR) )
+|| base_chars[*found] == NOR))
 {
   switch (ret = f_mbtowc (_REENT, NULL, (const char *) found,
   end - found, ))