Changeset 1632

Timestamp:

Nov 15, 2004, 7:41:15 AM (21 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/src/emx/src/lib

Files:

• libc.smak (modified) (1 diff, 1 prop)
• misc/fullpath.c (modified) (2 diffs, 1 prop)
• process/sigset.c (modified) (3 diffs, 1 prop)
• process/wait4.c (modified) (1 diff, 1 prop)
• process/waitid.c (modified) (2 diffs, 1 prop)
• sys/sharedpm.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/libc.smak

@@ -314 +314 @@
                         $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB) 
 disabled.0 = \
+                        $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL) \
                         $(LIBC.LOG.DIRS) $(LIBC.LOG.DLL) \
-                        $(LIBC.PRF.DIRS) $(LIBC.PRF.DLL) \
                         $(LIBC.ELH.DIRS) $(LIBC.ELH.DLL)
 

trunk/src/emx/src/lib/misc/fullpath.c

@@ -63 +63 @@
   if (strlen (cwd2)+1 > size)
   {
-      errno = -ERANGE;
+      errno = ERANGE;
       goto failure;
   }
@@ -72 +72 @@
       if (j+1+strlen (temp+k)+1 > size)
       {
-          errno = -ERANGE;
+          errno = ERANGE;
           goto failure;
       }

trunk/src/emx/src/lib/process/sigset.c

@@ -67 +67 @@
      * Validate input.
      */
-    if (    __SIGSET_SIG_VALID(iSignalNo)
+    if (   !__SIGSET_SIG_VALID(iSignalNo)
         ||  iSignalNo == SIGKILL
         ||  iSignalNo == SIGSTOP)
     {
-        errno = -EINVAL;
+        errno = EINVAL;
         LIBC_ASSERTM_FAILED("Invalid signal %d!\n", iSignalNo);
         LIBCLOG_RETURN_P(SIG_ERR);
@@ -78 +78 @@
         ||  pfnHandler == SIG_ACK)
     {
-        errno = -EINVAL;
+        errno = EINVAL;
         LIBC_ASSERTM_FAILED("Invalid handler %p!\n", (void *)pfnHandler);
         LIBCLOG_RETURN_P(SIG_ERR);
@@ -95 +95 @@
         if (!rc)
         {
-            rc = sigaction(iSignalNo, NULL, &SigActOld);
-            if (!rc)
-                LIBCLOG_RETURN_P(SigActOld.__sigaction_u.__sa_handler);
-            LIBC_ASSERTM_FAILED("sigaction failed with rc=%d errno=%d for querying iSignalNo=%d\n", rc, errno, iSignalNo);
-            LIBCLOG_RETURN_P(SIG_DFL);
+            LIBCLOG_RETURN_P(SIG_HOLD);
+            //rc = sigaction(iSignalNo, NULL, &SigActOld);
+            //if (!rc)
+            //    LIBCLOG_RETURN_P(SigActOld.__sigaction_u.__sa_handler);
+            //LIBC_ASSERTM_FAILED("sigaction failed with rc=%d errno=%d for querying iSignalNo=%d\n", rc, errno, iSignalNo);
+            //LIBCLOG_RETURN_P(SIG_DFL);
         }
     }

trunk/src/emx/src/lib/process/wait4.c

@@ -62 +62 @@
     {
         LIBC_ASSERTM_FAILED("pRUsage=%p - not implemented\n", (void *)pRUsage);
-        LIBCLOG_RETURN_INT(-ENOSYS);
+        errno = ENOSYS;
+        LIBCLOG_RETURN_INT(-1);
     }
 

trunk/src/emx/src/lib/process/waitid.c

@@ -59 +59 @@
     {
         LIBC_ASSERTM_FAILED("No event was selected! fOptions=%#x\n", fOptions);
-        errno = -EINVAL;
+        errno = EINVAL;
         LIBCLOG_RETURN_INT(-1);
     }
@@ -66 +66 @@
         LIBC_ASSERTM_FAILED("Unknown options %#x. (fOptions=%#x)\n",
                             fOptions & ~(WEXITED | WUNTRACED | WSTOPPED | WCONTINUED | WNOHANG | WNOWAIT), fOptions);
-        errno = -EINVAL;
+        errno = EINVAL;
         LIBCLOG_RETURN_INT(-1);
     }

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -171 +171 @@
      */
     FS_SAVE_LOAD();
-    if (!spmRequestMutexErrno(&RegRec))
+    if (!spmRequestMutex(&RegRec))
     {
         /*
@@ -214 +214 @@
      * Set return code and reason.
      */
-    int rc = spmRequestMutexErrno(&RegRec);
+    int rc = spmRequestMutex(&RegRec);
     if (!rc)
     {
@@ -758 +758 @@
      */
     int rc = spmRequestMutex(&RegRec);
-    if (!rc)
+    if (rc)
         LIBCLOG_RETURN_INT(-1);