Changeset 1778

Timestamp:

Jan 17, 2005, 4:25:13 AM (21 years ago)

Author:

bird

Message:

rmdir shall fail on symlink. It shall return ENOTDIR if the path exist and isn't a dir.

File:

• trunk/src/emx/src/lib/sys/b_fsDirRemove.c (modified) (3 diffs, 1 prop)

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

@@ -35 +35 @@
 #include "b_fs.h"
 #include <errno.h>
+#include <sys/stat.h>
 #include <InnoTekLIBC/backend.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
@@ -54 +55 @@
     /*
      * Resolve the path.
+     * (Symlinks should cause failure, so don't resolve last component.)
      */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR, &szNativePath[0], NULL);
+    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_PARENT | BACKFS_FLAGS_RESOLVE_DIR, &szNativePath[0], NULL);
     if (rc)
         LIBCLOG_RETURN_INT(rc);
@@ -69 +71 @@
     {
         /*
-         * OS/2 returns access denied when the directory contains files.
+         * OS/2 returns access denied when the directory
+         * contains files or it is not a directory. Check for
+         * directory/other and return failure accordingly.
          */
         if (rc == ERROR_ACCESS_DENIED)
-            rc = -ENOTEMPTY;
+        {
+            struct stat s;
+            rc = __libc_back_fsNativeFileStat(&szNativePath[0], &s);
+            if (!rc)
+                rc = S_ISDIR(s.st_mode) ? -ENOTEMPTY : -ENOTDIR;
+        }
         else
             rc = -__libc_native2errno(rc);