libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* signal.cc (sigprocmask): Fix strace output to include "how". 

* fhandler_console.cc (dev_console::save_restore): Only current dwEnd line
rather than the one after that.
This commit is contained in:
Christopher Faylor 2014-05-09 14:28:48 +00:00
parent 7bc7b551f5
commit fb1565af68
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-09 Christopher Faylor <me.cygwin2014@cgf.cx>
* signal.cc (sigprocmask): Fix strace output to include "how".
* fhandler_console.cc (dev_console::save_restore): Only current dwEnd
line rather than the one after that.
2014-05-08 Corinna Vinschen <corinna@vinschen.de> 2014-05-08 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (cygheap_user::init): Fix formatting in debug output. * uinfo.cc (cygheap_user::init): Fix formatting in debug output.

12
winsup/cygwin/fhandler_console.cc
View File

@ -84,6 +84,7 @@ fhandler_console::open_shared_console (HWND hw, HANDLE& h, bool& create)
create = m != SH_JUSTOPEN; create = m != SH_JUSTOPEN;
return res; return res;
} }
class console_unit class console_unit
{ {
int n; int n;
@ -1457,7 +1458,7 @@ dev_console::save_restore (HANDLE h, char c)
{ {
fillin (h); fillin (h);
save_bufsize.X = b.dwSize.X; save_bufsize.X = b.dwSize.X;
if ((save_bufsize.Y = dwEnd.Y + 2) > b.dwSize.Y) if ((save_bufsize.Y = dwEnd.Y + 1) > b.dwSize.Y)
save_bufsize.X = b.dwSize.Y; save_bufsize.X = b.dwSize.Y;
if (save_buf) if (save_buf)
@ -1500,6 +1501,7 @@ dev_console::save_restore (HANDLE h, char c)
cob.X = 0; cob.X = 0;
cob.Y = save_top; cob.Y = save_top;
/* CGF: NOOP? Doesn't seem to position screen as expected */
/* Temporarily position at top of screen */ /* Temporarily position at top of screen */
if (!SetConsoleCursorPosition (h, cob)) if (!SetConsoleCursorPosition (h, cob))
debug_printf ("SetConsoleCursorInfo(%p, cob) failed during restore, %E", h); debug_printf ("SetConsoleCursorInfo(%p, cob) failed during restore, %E", h);
@ -1677,23 +1679,23 @@ fhandler_console::char_command (char c)
if (con.saw_space) if (con.saw_space)
{ {
CONSOLE_CURSOR_INFO console_cursor_info; CONSOLE_CURSOR_INFO console_cursor_info;
GetConsoleCursorInfo (get_output_handle (), & console_cursor_info); GetConsoleCursorInfo (get_output_handle (), &console_cursor_info);
switch (con.args[0]) switch (con.args[0])
{ {
case 0: /* blinking block */ case 0: /* blinking block */
case 1: /* blinking block (default) */ case 1: /* blinking block (default) */
case 2: /* steady block */ case 2: /* steady block */
console_cursor_info.dwSize = 100; console_cursor_info.dwSize = 100;
SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); SetConsoleCursorInfo (get_output_handle (), &console_cursor_info);
break; break;
case 3: /* blinking underline */ case 3: /* blinking underline */
case 4: /* steady underline */ case 4: /* steady underline */
console_cursor_info.dwSize = 10; /* or Windows default 25? */ console_cursor_info.dwSize = 10; /* or Windows default 25? */
SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); SetConsoleCursorInfo (get_output_handle (), &console_cursor_info);
break; break;
default: /* use value as percentage */ default: /* use value as percentage */
console_cursor_info.dwSize = con.args[0]; console_cursor_info.dwSize = con.args[0];
SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); SetConsoleCursorInfo (get_output_handle (), &console_cursor_info);
break; break;
} }
} }

2
winsup/cygwin/signal.cc
View File

@ -183,7 +183,7 @@ sigprocmask (int how, const sigset_t *set, sigset_t *oldset)
set_errno (res); set_errno (res);
res = -1; res = -1;
} }
syscall_printf ("%R = sigprocmask (%d, %p, %p)", res, set, oldset); syscall_printf ("%R = sigprocmask (%d, %p, %p)", res, how, set, oldset);
return res; return res;
} }