JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_console.cc (fhandler_console::write_normal): Remove 

erroneous premature return after collecting truncated multibyte
	sequence in trunc_buf.  Rather fall through to printing routine.
	Fix return value to take trunc_buf content into account.  Improve
	comments.
This commit is contained in:
Corinna Vinschen 2011-02-07 11:18:19 +00:00
parent 63398011f9
commit 050d09e873
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2011-02-07 Corinna Vinschen <corinna@vinschen.de>
* fhandler_console.cc (fhandler_console::write_normal): Remove
erroneous premature return after collecting truncated multibyte
sequence in trunc_buf. Rather fall through to printing routine.
Fix return value to take trunc_buf content into account. Improve
comments.
2011-02-05 Christopher Faylor <me+cygwin@cgf.cx> 2011-02-05 Christopher Faylor <me+cygwin@cgf.cx>
* autoload.cc (wsock_init): Properly define WSAStartup function pointer * autoload.cc (wsock_init): Properly define WSAStartup function pointer

29
winsup/cygwin/fhandler_console.cc
View File

@ -1679,6 +1679,9 @@ fhandler_console::write_normal (const unsigned char *src,
} }
} }
/* Loop over src buffer as long as we have just simple characters. Stop
as soon as we reach the conversion limit, or if we encounter a control
character or a truncated or invalid mutibyte sequence. */
memset (&ps, 0, sizeof ps); memset (&ps, 0, sizeof ps);
while (found < end while (found < end
&& found - src < CONVERT_LIMIT && found - src < CONVERT_LIMIT
@ -1687,13 +1690,12 @@ fhandler_console::write_normal (const unsigned char *src,
switch (ret = f_mbtowc (_REENT, NULL, (const char *) found, switch (ret = f_mbtowc (_REENT, NULL, (const char *) found,
end - found, charset, &ps)) end - found, charset, &ps))
{ {
case -2: case -2: /* Truncated multibyte sequence. Store for next write. */
/* Truncated multibyte sequence. Stick to it until the next write. */
trunc_buf.len = end - found; trunc_buf.len = end - found;
memcpy (trunc_buf.buf, found, trunc_buf.len); memcpy (trunc_buf.buf, found, trunc_buf.len);
return end; goto do_print;
case -1: case -1: /* Invalid multibyte sequence. Handled below. */
break; goto do_print;
case 0: case 0:
found++; found++;
break; break;
@ -1701,11 +1703,11 @@ fhandler_console::write_normal (const unsigned char *src,
found += ret; found += ret;
break; break;
} }
if (ret == (size_t) -1) /* Invalid multibyte sequence. */
break;
} }
/* Print all the base ones out */ do_print:
/* Print all the base characters out */
if (found != src) if (found != src)
{ {
DWORD len = found - src; DWORD len = found - src;
@ -1731,11 +1733,14 @@ fhandler_console::write_normal (const unsigned char *src,
debug_printf ("write failed, handle %p", get_output_handle ()); debug_printf ("write failed, handle %p", get_output_handle ());
return 0; return 0;
} }
/* Stop here if we reached the conversion limit. */
if (len >= CONVERT_LIMIT) if (len >= CONVERT_LIMIT)
return found; return found + trunc_buf.len;
} }
/* If there's still something in the src buffer, but it's not a truncated
if (found < end) multibyte sequence, then we stumbled over a control character or an
invalid multibyte sequence. Print it. */
if (found < end && trunc_buf.len == 0)
{ {
int x, y; int x, y;
switch (base_chars[*found]) switch (base_chars[*found])
@ -1807,7 +1812,7 @@ fhandler_console::write_normal (const unsigned char *src,
} }
found++; found++;
} }
return found; return found + trunc_buf.len;
} }
ssize_t __stdcall ssize_t __stdcall