diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/strace.cc | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 7481d6632..64d572f9f 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2011-11-14 Christopher Faylor <me.cygwin2011@cgf.cx> + + * strace.cc (handle_output_debug_string): Disable code which attempted + to add stuff in between '****' blocks since they no longer are the + first thing output by an straced process. + 2011-10-13 Corinna Vinschen <corinna@vinschen.de> * cygcheck.cc (dump_sysinfo): Add Windows 8 recognition. Note as diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index 20f703822..2aea8a982 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -525,6 +525,9 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile) usecs = dusecs; } +#if 1 + child->saw_stars = 2; +#else if (child->saw_stars == 0) { FILETIME st; @@ -582,6 +585,7 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile) } } } +#endif long long d = usecs - child->last_usecs; char intbuf[40]; |