Changeset 3951 for trunk

Timestamp:

Mar 18, 2019, 1:22:01 PM (7 years ago)

Author:

bird

Message:

unlink() shall not delete directories, but return EISDIR.

File:

• trunk/libc/src/kNIX/os2/b_fsUnlink.c (modified) (6 diffs)

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

@@ -30 +30 @@
 
 /**
- * Unlinks a file, directory, symlink, dev, pipe or socket.
+ * Unlinks a file, symlink, dev, pipe or socket, but not a directory.
  *
  * @returns 0 on success.
@@ -50 +50 @@
      */
     char szNativePath[PATH_MAX];
-    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL_SYMLINK | BACKFS_FLAGS_RESOLVE_DIR_MAYBE, &szNativePath[0], NULL);
+    int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL_SYMLINK, &szNativePath[0], NULL);
     if (rc)
         LIBCLOG_ERROR_RETURN_INT(rc);
@@ -90 +90 @@
          *      3) we are denied access - network, hpfs386 or SES.
          *
-         * If it's either of the first two we are subject to race conditions, so we
-         * have to retry. The third cause is distiguishable from the two othes by
-         * the failing DosSetPathInfo.
+         * If it's the first we are subject to race conditions, so we have to retry.
+         * The third cause is distiguishable from the two othes by the failing DosSetPathInfo.
          */
-        int fDirectory = 0;
         for (unsigned i = 0; (rc == ERROR_ACCESS_DENIED || rc == ERROR_PATH_NOT_FOUND) && i < 2; i++)
         {
@@ -101 +99 @@
             if (!rc)
             {
-                fDirectory = (fsts3.attrFile & FILE_DIRECTORY) != 0;
+                /* Directory? */
+                if ((fsts3.attrFile & FILE_DIRECTORY) != 0)
+                {
+                    rc = ERROR_DIRECTORY;
+                    break;
+                }
 
                 /* turn of the read-only attribute */
@@ -118 +121 @@
 
                 /* retry */
-                if (fDirectory)
-                    rc = DosDeleteDir((PCSZ)&szNativePath[0]);
-                else if (s_fUseForce == 1)
+                if (s_fUseForce == 1)
                     rc = DosForceDelete((PCSZ)&szNativePath[0]);
                 else
@@ -140 +141 @@
         {
             if (rc == ERROR_ACCESS_DENIED)
-                rc = fDirectory ? -ENOTEMPTY : -EACCES;
+                rc = -EACCES;
+            else if (rc == ERROR_DIRECTORY)
+                rc = -EISDIR;
             else
                 rc = -__libc_back_native2errno(rc);