Changeset 3353

Timestamp:

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

Author:

bird

Message:

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

Files:

• branches/libc-0.6/src/emx/src/lib/sys/b_fsDirRemove.c (modified) (4 diffs)
• trunk/libc/src/kNIX/b_fsDirRemove.c (modified) (1 diff)
• trunk/libc/src/kNIX/os2/b_fsNativeDirRemove.c (modified) (1 diff)

branches/libc-0.6/src/emx/src/lib/sys/b_fsDirRemove.c

@@ -2 +2 @@
 /** @file
  *
- * LIBC SYS Backend - rmdir.
+ * kNIX - rmdir.
  *
- * Copyright (c) 2004 knut st. osmundsen <bird@innotek.de>
+ * Copyright (c) 2004 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  *
- * This file is part of InnoTek LIBC.
+ * This file is part of kLIBC.
  *
- * InnoTek LIBC is free software; you can redistribute it and/or modify
+ * kLIBC is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * InnoTek LIBC is distributed in the hope that it will be useful,
+ * kLIBC is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20 +20 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with InnoTek LIBC; if not, write to the Free Software
+ * along with kLIBC; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
@@ -58 +58 @@
      */
     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)
         LIBCLOG_RETURN_INT(rc);
@@ -73 +73 @@
 
     /*
-     * 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;

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;