Changeset 2518 for branches/libc-0.6

Timestamp:

Feb 4, 2006, 7:00:39 PM (20 years ago)

Author:

bird

Message:

#33: Fixed a runpath in libc_back_signalWait which didn't reacquire the semaphore.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/signals.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -9 +9 @@
         o #25: Ensure correct address length returns from recvmsg and recvfrom.
     - libc:
+        o #33: Fixed a return path in __libc_back_signalWait which didn't reacquire the semaphore.
         o #32: Fixed incorrect readdir_r return code when out of files.
 

branches/libc-0.6/src/emx/src/lib/sys/signals.c

@@ -2967 +2967 @@
         if (*pfDone)
         {
-            rc = -EINTR;
+            rc = __libc_back_signalSemRequest();
+            if (!rc)
+                rc = -EINTR;
             break;
         }
@@ -2975 +2977 @@
          * We returned from the wait, but did we do so for the right reason?
          */
-        if (__libc_back_signalSemRequest())
-            rc = -EDEADLK;
+        int rc2 = __libc_back_signalSemRequest();
+        if (rc2 < 0)
+            rc = rc2;
         else if (*pfDone)
             rc = -EINTR;