Changeset 3353 for trunk

Timestamp:

May 7, 2007, 4:58:50 AM (18 years ago)

Author:

bird

Message:

rmdir doesn't resolve the last path component. Fixes #163.

Location:

trunk/libc/src/kNIX

Files:

• b_fsDirRemove.c (modified) (1 diff)
• os2/b_fsNativeDirRemove.c (modified) (1 diff)

trunk/libc/src/kNIX/b_fsDirRemove.c

@@ -44 +44 @@
      */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL_SYMLINK | 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)
         rc = __libc_back_fsNativeDirRemove(szNativePath);

trunk/libc/src/kNIX/os2/b_fsNativeDirRemove.c

@@ -51 +51 @@
 
     /*
-     * OS/2 returns access denied when the directory
-     * contains files or it is not a directory. Check for
-     * directory/other and return failure accordingly.
+     * - OS/2 returns access denied when the directory contains files 
+     *   or it is not a directory. 
+     * - OS/2 returns path not found when the directory is actually a file.
+     *
+     * So, check for directory/other and return failure accordingly.
      */
-    if (rc == ERROR_ACCESS_DENIED)
+    if (    rc == ERROR_ACCESS_DENIED
+        ||  rc == ERROR_PATH_NOT_FOUND)
     {
         struct stat s;