Apply system_cancel patch

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c41395a..daf2b0d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
 
+       * syscalls.cc (system): Add pthread_testcancel call.
+       * thread.cc: Update list of cancellation points.
+
+2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
+
        * wait.cc: Include thread.h
        (wait4): Add pthread_testcancel call.
        Wait for child process and cancellation event.

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 8c0561e..cdb6792 100644 (file)
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1374,6 +1374,8 @@ done:
 extern "C" int
 system (const char *cmdstring)
 {
+  pthread_testcancel ();
+
   if (check_null_empty_str_errno (cmdstring))
     return -1;
 

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 649a357..e252cbb 100644 (file)
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -464,7 +464,7 @@ pread ()
 pthread_cond_timedwait ()
 pthread_cond_wait ()
 *pthread_join ()
-pthread_testcancel ()
+*pthread_testcancel ()
 putmsg ()
 putpmsg ()
 pwrite ()
@@ -478,7 +478,7 @@ sigtimedwait ()
 sigwait ()
 sigwaitinfo ()
 *sleep ()
-system ()
+*system ()
 tcdrain ()
 *usleep ()
 *wait ()