Changeset 1523

Timestamp:

Sep 28, 2004, 3:46:31 AM (21 years ago)

Author:

bird

Message:

_realrealpath().

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/stdlib.h (modified) (1 diff, 1 prop)
• src/emxomf/emxomfld.c (modified) (6 diffs, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/misc/_realrealpath.c (added)
• src/lib/misc/realpath.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsPathResolve.c (modified) (4 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -134 +134 @@
  * @param   pszBuf      Where to store the resolved path.
  * @param   cchBuf      Size of the buffer.
- * @param   fFlags      At the moment 0. Which means the entire path must exist.
+ * @param   fFlags      Combination of __LIBC_BACKFS_FLAGS_RESOLVE_* defines.
  */
 int __libc_Back_fsPathResolve(const char *pszPath, char *pszBuf, size_t cchBuf, unsigned fFlags);
+/** Flags for __libc_Back_fsPathResolve().
+ * @{ */
+#define __LIBC_BACKFS_FLAGS_RESOLVE_FULL    0
+/** Get the native path instead, no unix root translations. */
+#define __LIBC_BACKFS_FLAGS_RESOLVE_NATIVE  0x10
+/** @} */
+
 
 /**

trunk/src/emx/include/stdlib.h

@@ -292 +292 @@
 #ifdef __BSD_VISIBLE
 char    *_getcwdux(char *, size_t);
+/* todo: int     _chdirux(char *); */
+char    *_realrealpath(const char *, char *, size_t);
 #endif
 #ifdef  __USE_GNU

trunk/src/emx/src/emxomf/emxomfld.c

@@ -803 +803 @@
      * Make abspath with slashes the desired way and such.
      */
-    if (_abspath(pszFullname, pszName, _MAX_PATH + 1))
+    if (!_realrealpath(pszName, pszFullname, _MAX_PATH + 1))
     {
         printf("emxomfld: _abspath failed on '%s'!!!\n", pszName);
@@ -962 +962 @@
                 if (phFile)
                 {
+                    char *pszTmp;
                     if (autoconvert_flag)
                     {
@@ -968 +969 @@
                         else if (!check_omf(phFile))
                             phFile = aout_to_omf(phFile, pszFullname, TRUE);
+                    }
+
+                    /* Get the real native path. */
+                    pszTmp = _realrealpath(pszFullname, NULL, 0);
+                    if (pszTmp)
+                    {
+                        strcpy(pszFullname, pszTmp);
+                        free(pszTmp);
                     }
 
@@ -1103 +1112 @@
         rc = WLDGenerateWeakAliases (pwld, weakobj_fname, weakdef_fname);
       if (!rc && weakobj_fname[0])
-        add_name_list (&add_obj_fnames, weakobj_fname, 0);
+        {
+          char *pszTmp = _realrealpath(weakobj_fname, NULL, 0);
+          if (pszTmp)
+          {
+              strcpy(weakobj_fname, pszTmp);
+              free(pszTmp);
+          }
+          add_name_list (&add_obj_fnames, weakobj_fname, 0);
+        }
       if (!rc && weakdef_fname[0])
-        def_fname = weakdef_fname;
+        {
+          char *pszTmp = _realrealpath(weakdef_fname, NULL, 0);
+          if (pszTmp)
+          {
+              strcpy(weakdef_fname, pszTmp);
+              free(pszTmp);
+          }
+          def_fname = weakdef_fname;
+        }
 
       /* cleanup the linker */
@@ -1424 +1449 @@
                   usage ();
                 }
-              def_fname = optarg;
+              def_fname = _realrealpath(optarg, NULL, 0);
+              if (!def_fname)
+                def_fname = optarg;
             }
 
@@ -1438 +1465 @@
                   usage ();
                 }
-              res_fname = optarg;
+              res_fname = _realrealpath(optarg, NULL, 0);
+              if (!def_fname)
+                res_fname = optarg;
             }
 

trunk/src/emx/src/lib/libc.def

@@ -1190 +1190 @@
     "___libc_Back_fsDriveDefaultGet" @1210
     "___libc_Back_fsDriveDefaultSet" @1211
+    "__realrealpath" @1212

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

@@ -69 +69 @@
                 LIBCLOG_RETURN_MSG(psz, "ret %p:{%s}\n", psz, psz);
             }
+            free(psz);
         }
         else
             rc = -ENOMEM;
-        free(psz);
     }
     else

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

@@ -34 +34 @@
 #include <os2emx.h>
 #include "fs.h"
+#include <errno.h>
 #include <string.h>
 #include <InnoTekLIBC/backend.h>
@@ -49 +50 @@
  * @param   pszBuf      Where to store the resolved path.
  * @param   cchBuf      Size of the buffer.
- * @param   fFlags      At the moment 0. Which means the entire path must exist.
+ * @param   fFlags      Combination of __LIBC_BACKFS_FLAGS_RESOLVE_* defines.
  */
 int __libc_Back_fsPathResolve(const char *pszPath, char *pszBuf, size_t cchBuf, unsigned fFlags)
@@ -69 +70 @@
     {
         char *pszSrc = &szNativePath[0];
-        if (fInUnixTree)
+        if (!(fFlags & __LIBC_BACKFS_FLAGS_RESOLVE_NATIVE) && fInUnixTree)
         {
             pszSrc += __libc_gcchUnixRoot;
@@ -79 +80 @@
         if (cch < cchBuf)
         {
-            /** @todo use DosFindFirst to get the correctly cased path. */
             memcpy(pszBuf, pszSrc, cchBuf);
             LIBCLOG_RETURN_MSG(0, "ret 0 pszPath=%p:{%s}\n", (void *)pszPath, pszPath);
         }
+        else
+            rc = -ERANGE;
     }
     else