Changeset 1715 for trunk

Timestamp:

Dec 7, 2004, 5:19:13 AM (21 years ago)

Author:

bird

Message:

Fixed some broken dir resolving. (incorrect flags)

Location:

trunk/src/emx/src/lib

Files:

• misc/dirent.c (modified) (14 diffs, 1 prop)
• sys/b_fsFileStat.c (modified) (1 diff, 1 prop)
• sys/b_fsPathResolve.c (modified) (1 diff, 1 prop)
• sys/b_fsStat.c (modified) (1 diff, 1 prop)
• sys/b_fsSymlinkStat.c (modified) (1 diff, 1 prop)

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

@@ -12 +12 @@
 #include <emx/syscalls.h>
 #include <emx/umalloc.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_IO
+#include <InnoTekLIBC/logstrict.h>
 
 
@@ -50 +52 @@
 DIR *_STD(opendir)(const char *name)
 {
+    LIBCLOG_ENTER("name=%p:{%s}\n", (void *)name, name);
     struct stat             statb;
     struct _find            find;
@@ -74 +77 @@
      */
     if (stat(nbuf, &statb) < 0)
-        return NULL;
+        LIBCLOG_RETURN_P(NULL);
     if ((statb.st_mode & S_IFMT) != S_IFDIR)
     {
         errno = ENOTDIR;
-        return NULL;
+        LIBCLOG_RETURN_P(NULL);
     }
 
@@ -90 +93 @@
     {
         errno = ENOMEM;
-        return NULL;
+        LIBCLOG_RETURN_P(NULL);
     }
     if (!*psz) /* If dot was added. */
@@ -102 +105 @@
     {
         errno = ENOMEM;
-        return pdir; /* why no free and return? */
+        LIBCLOG_RETURN_P(pdir); /* why no free and return? */
     }
 
@@ -121 +124 @@
             free_dircontents(pdir->dd_contents);
             errno = ENOMEM;
-            return NULL;
+            LIBCLOG_RETURN_P(NULL);
         }
         dp->_d_entry = (char*)(dp + 1);
@@ -151 +154 @@
     pdir->dd_cp = pdir->dd_contents;
     errno = saved_errno; /* getdirent/findnext sets errno when done */
-    return pdir;
+    LIBCLOG_RETURN_P(pdir);
 }
 
@@ -157 +160 @@
 int _STD(readdir_r)(DIR *dirp, struct dirent *pdent, struct dirent **ppdent)
 {
+    LIBCLOG_ENTER("dirp=%p pdent=%p ppdent=%p\n", (void *)dirp, (void *)pdent, (void *)ppdent);
     int cch;
     /* done? */
@@ -163 +167 @@
         errno = ENOENT;
         *ppdent = NULL;
-        return -1;
+        LIBCLOG_RETURN_P(-1);
     }
 
@@ -188 +192 @@
     dirp->dd_loc++;
     *ppdent = pdent;
-    return 0;
+    LIBCLOG_RETURN_P(0);
 }
 
@@ -203 +207 @@
 void _STD(seekdir)(DIR *dirp, long off)
 {
+    LIBCLOG_ENTER("dirp=%p off=%ld\n", (void *)dirp, off);
     if (off >= 0)
     {
@@ -216 +221 @@
     else
         errno = EINVAL;
+    LIBCLOG_RETURN_VOID();
 }
 
@@ -227 +233 @@
 long _STD(telldir)(DIR *dirp)
 {
-    return dirp->dd_loc;
+    LIBCLOG_ENTER("dirp=%p\n", (void *)dirp);
+    LIBCLOG_RETURN_LONG(dirp->dd_loc);
 }
 
@@ -233 +240 @@
 int _STD(closedir)(DIR *dirp)
 {
+    LIBCLOG_ENTER("dirp=%p\n", (void *)dirp);
     free_dircontents(dirp->dd_contents);
     free(dirp);
-    return 0;
-}
-
+    LIBCLOG_RETURN_INT(0);
+}
+

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

@@ -52 +52 @@
      */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL, szNativePath, NULL);
+    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR_MAYBE, szNativePath, NULL);
     if (!rc)
         rc = __libc_back_fsNativeFileStat(szNativePath, pStat);

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

@@ -66 +66 @@
     int     fInUnixTree;
     char    szNativePath[PATH_MAX];
-    rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL, szNativePath, &fInUnixTree);
+    rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR_MAYBE, szNativePath, &fInUnixTree);
     if (!rc)
     {

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

@@ -75 +75 @@
     /** @todo Check if fsstat() can work on a non-existing path spec. */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL, &szNativePath[0], NULL);
+    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR_MAYBE, &szNativePath[0], NULL);
     if (rc)
         LIBCLOG_RETURN_INT(rc);

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

@@ -53 +53 @@
      */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_PARENT, szNativePath, NULL);
+    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL, szNativePath, NULL);
     if (!rc)
         rc = __libc_back_fsNativeFileStat(szNativePath, pStat);