Changeset 35708 in vbox for trunk/src/VBox/Main/src-helper-apps

Timestamp:

Jan 25, 2011 12:58:25 PM (14 years ago)

Author:

vboxsync

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

69642

Message:

VBoxExtPackHelperApp.cpp: Adjusted r69630 to restore the actual directory permissions.

File:

• trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -347 +347 @@
 static RTEXITCODE UnpackExtPackDir(const char *pszDstDirName, RTVFSOBJ hVfsObj)
 {
-    int rc = RTDirCreate(pszDstDirName, 0755);
+    /*
+     * Get the mode mask before creating the directory.
+     */
+    RTFSOBJINFO ObjInfo;
+    int rc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsObjQueryInfo failed on '%s': %Rrc", pszDstDirName, rc);
+    ObjInfo.Attr.fMode &= ~(RTFS_UNIX_IWOTH | RTFS_UNIX_IWGRP);
+
+    rc = RTDirCreate(pszDstDirName, ObjInfo.Attr.fMode);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to create directory '%s': %Rrc", pszDstDirName, rc);
-#if !defined(RT_OS_WINDOWS)
-    /* This is necessary because of umask! */
-    rc = RTPathSetMode(pszDstDirName, 0755);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions: %Rrc ('%s')", rc, pszDstDirName);
+
+#ifndef RT_OS_WINDOWS
+    /*
+     * Because of umask, we have to apply the mode again.
+     */
+    rc = RTPathSetMode(pszDstDirName, ObjInfo.Attr.fMode);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to set directory permissions on '%s': %Rrc", pszDstDirName, rc);
 #else
     /** @todo Ownership tricks on windows? */