Changeset 79421 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 28, 2019 8:34:58 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Added a flag to RTDirCreate for ignoring the umask and added RTDirCreateFullPathEx so it can be used when creating paths. bugref:9151

Location:

trunk/src/VBox/Runtime/r3

Files:

• dir.cpp (modified) (4 diffs)
• posix/dir-posix.cpp (modified) (2 diffs)

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

@@ -59 +59 @@
 RTDECL(int) RTDirCreateFullPath(const char *pszPath, RTFMODE fMode)
 {
+    return RTDirCreateFullPathEx(pszPath, fMode, 0);
+}
+
+
+RTDECL(int) RTDirCreateFullPathEx(const char *pszPath, RTFMODE fMode, uint32_t fFlags)
+{
     /*
      * Resolve the path.
      */
-    char szAbsPath[RTPATH_MAX];
-    int rc = RTPathAbs(pszPath, szAbsPath, sizeof(szAbsPath));
-    if (RT_FAILURE(rc))
-        return rc;
+    char *pszAbsPath = RTPathAbsDup(pszPath);
+    if (!pszAbsPath)
+        return VERR_NO_TMP_MEMORY;
 
     /*
@@ -71 +76 @@
      */
     /* skip volume name */
-    char *psz = &szAbsPath[rtPathVolumeSpecLen(szAbsPath)];
+    char *psz = &pszAbsPath[rtPathVolumeSpecLen(pszAbsPath)];
 
     /* skip the root slash if any */
-    if (    psz[0] == '/'
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        ||  psz[0] == '\\'
-#endif
-        )
+    if (RTPATH_IS_SLASH(*psz))
         psz++;
 
     /* iterate over path components. */
+    int rc = VINF_SUCCESS;
     do
     {
@@ -87 +89 @@
         if (!*psz)
             break;
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        psz = strpbrk(psz, "\\/");
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+        char *psz2 = strchr(psz, '/');
+        psz = strchr(psz, RTPATH_SLASH);
+        if (psz2 && (!psz || (uintptr_t)psz2 < (uintptr_t)psz))
+            psz = psz;
 #else
-        psz = strchr(psz, '/');
+        psz = strchr(psz, RTPATH_SLASH);
 #endif
         if (psz)
             *psz = '\0';
+
         /*
          * ASSUME that RTDirCreate will return VERR_ALREADY_EXISTS and not VERR_ACCESS_DENIED in those cases
          * where the directory exists but we don't have write access to the parent directory.
          */
-        rc = RTDirCreate(szAbsPath, fMode, 0);
+        rc = RTDirCreate(pszAbsPath, fMode, fFlags);
         if (rc == VERR_ALREADY_EXISTS)
             rc = VINF_SUCCESS;
+
         if (!psz)
             break;
@@ -106 +113 @@
     } while (RT_SUCCESS(rc));
 
+    RTStrFree(pszAbsPath);
     return rc;
 }

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

@@ -91 +91 @@
         if (RT_SUCCESS(rc))
         {
+            struct stat st;
             if (mkdir(pszNativePath, fMode & RTFS_UNIX_MASK) == 0)
+            {
+                /* If requested, we try make use the permission bits are set
+                   correctly when asked.  For now, we'll just ignore errors here. */
+                if (fCreate & RTDIRCREATE_FLAGS_IGNORE_UMASK)
+                {
+                    if (   stat(pszNativePath, &st)
+                        || (st.st_mode & 07777) != (fMode & 07777) )
+                        chmod(pszNativePath, fMode & RTFS_UNIX_MASK);
+                }
                 rc = VINF_SUCCESS;
+            }
             else
             {
@@ -109 +120 @@
                     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))
                     {