Changeset 2261 for trunk

Timestamp:

Jul 18, 2005, 3:28:04 AM (20 years ago)

Author:

bird

Message:

Fixed libc_back_fsResolve to always set fInUnixTree so the result can be adjusted correctly on failure as well.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• src/lib/locale/setlocale.c (modified) (1 diff, 1 prop)
• src/lib/sys/fs.c (modified) (2 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -18 +18 @@
         o Switch the glibc locks to smutex to avoid leaking event semaphores.
         o Added _smutex_try_request().
+        o Fixed __libc_back_fsResolve to always set fInUnixTree so the result can
+          be adjusted correctly on failure as well.
 
 2005-07-11: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/src/lib/locale/setlocale.c

@@ -423 +423 @@
             if (!__libc_ucs2To(uobj, (unsigned char *)&i, 1, &ucs[0]))
             {
-                LIBC_ASSERTM_FAILED("__libc_ucs2To failed for char %d\n", i);
+                LIBCLOG_ERROR("__libc_ucs2To failed for char %d\n", i);
                 ucs[0] = (UniChar)i;
             }

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

@@ -1243 +1243 @@
      * Copy the resolved path the the caller buffer.
      */
+    if (pfInUnixTree)
+        *pfInUnixTree = fInUnixTree;
     if (!rcRet)
     {
@@ -1251 +1253 @@
             pszNativePath[cch] = '\0';
         }
-        if (pfInUnixTree)
-            *pfInUnixTree = fInUnixTree;
         LIBCLOG_RETURN_INT(0);
     }