Changeset 36167 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Mar 4, 2011 12:33:39 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70357

Message:

Runtime/r3/posix: RTDirCreate should fail when creating a directory where a file exists.

File:

• trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp

@@ -91 +91 @@
             {
                 rc = errno;
+                bool fVerifyIsDir = true;
 #ifdef RT_OS_SOLARIS
                 /*
@@ -101 +102 @@
                     ||  rc == EACCES)
                 {
-                    rc = EEXIST;
+                    rc = RTErrConvertFromErrno(rc);
+                    fVerifyIsDir = false;  /* We'll check if it's a dir ourselves since we're going to stat() anyway. */
+                    struct stat st;
+                    if (!stat(pszNativePath, &st))
+                    {
+                        rc = VERR_ALREADY_EXISTS;
+                        if (!S_ISDIR(st.st_mode))
+                            rc = VERR_IS_A_FILE;
+                    }
                 }
+                else
+                    rc = RTErrConvertFromErrno(rc);
+#else
+                rc = RTErrConvertFromErrno(rc);
 #endif
-                rc = RTErrConvertFromErrno(rc);
-                if (rc == VERR_ALREADY_EXISTS)
+                if (   rc == VERR_ALREADY_EXISTS
+                    && fVerifyIsDir == true)
                 {
                     /*