Changeset 83991 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 27, 2020 10:08:37 AM (5 years ago)

Author:

vboxsync

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

137558

Message:

IPRT,VBoxAddInstallNt3x.cpp: Split out the IPRT bits from VBoxAddInstallNt3x.cpp and move template to /Config.kmk.

Location:

trunk/src/VBox/Runtime/r3

Files:

• RTPathTemp.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/path.cpp ) (3 diffs)
• path.cpp (modified) (2 diffs)
• win/nocrt-alloc-win.cpp (added)
• win/nocrt-startup-exe-win.cpp (added)
• win/nocrt-streams-win.cpp (added)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Path Manipulation.
+ * IPRT - Path Manipulation, RTPathTemp.
  */
 
@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include "internal/iprt.h"
+#include <iprt/path.h>
+
 #include <iprt/assert.h>
 #include <iprt/env.h>
 #include <iprt/err.h>
-#include <iprt/path.h>
 #include <iprt/string.h>
 #include "internal/path.h"
-#include "internal/process.h"
-
-
-#ifdef RT_OS_SOLARIS
-/**
- * Hack to strip of the architecture subdirectory from the exec dir.
- *
- * @returns See RTPathExecDir.
- * @param   pszPath             See RTPathExecDir.
- * @param   cchPath             See RTPathExecDir.
- */
-DECLINLINE(int) rtPathSolarisArchHack(char *pszPath, size_t cchPath)
-{
-    int rc = RTPathExecDir(pszPath, cchPath);
-    if (RT_SUCCESS(rc))
-    {
-        const char *pszLast = RTPathFilename(pszPath);
-        if (   !strcmp(pszLast, "amd64")
-            || !strcmp(pszLast, "i386"))
-            RTPathStripFilename(pszPath);
-    }
-    return rc;
-}
-#endif
-
-
-RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
-{
-    AssertReturn(g_szrtProcExePath[0], VERR_WRONG_ORDER);
-
-    /*
-     * Calc the length and check if there is space before copying.
-     */
-    size_t cch = g_cchrtProcDir;
-    if (cch < cchPath)
-    {
-        memcpy(pszPath, g_szrtProcExePath, cch);
-        pszPath[cch] = '\0';
-        return VINF_SUCCESS;
-    }
-
-    AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cchPath, cch));
-    return VERR_BUFFER_OVERFLOW;
-}
-
-
-RTDECL(int) RTPathAppPrivateNoArch(char *pszPath, size_t cchPath)
-{
-#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
-    return RTStrCopy(pszPath, cchPath, RTPATH_APP_PRIVATE);
-#elif defined(RT_OS_SOLARIS)
-    return rtPathSolarisArchHack(pszPath, cchPath);
-#else
-    return RTPathExecDir(pszPath, cchPath);
-#endif
-}
-
-
-RTDECL(int) RTPathAppPrivateArch(char *pszPath, size_t cchPath)
-{
-#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH)
-    return RTStrCopy(pszPath, cchPath, RTPATH_APP_PRIVATE_ARCH);
-#else
-    return RTPathExecDir(pszPath, cchPath);
-#endif
-}
-
-
-RTDECL(int) RTPathAppPrivateArchTop(char *pszPath, size_t cchPath)
-{
-#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH_TOP)
-    return RTStrCopy(pszPath, cchPath, RTPATH_APP_PRIVATE_ARCH_TOP);
-#elif !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH)
-    return RTStrCopy(pszPath, cchPath, RTPATH_APP_PRIVATE_ARCH);
-#elif defined(RT_OS_SOLARIS)
-    return rtPathSolarisArchHack(pszPath, cchPath);
-#else
-    int rc = RTPathExecDir(pszPath, cchPath);
-    return rc;
-#endif
-}
-
-
-RTDECL(int) RTPathSharedLibs(char *pszPath, size_t cchPath)
-{
-#if !defined(RT_OS_WINDOWS) && defined(RTPATH_SHARED_LIBS)
-    return RTStrCopy(pszPath, cchPath, RTPATH_SHARED_LIBS);
-#else
-    return RTPathExecDir(pszPath, cchPath);
-#endif
-}
-
-
-RTDECL(int) RTPathAppDocs(char *pszPath, size_t cchPath)
-{
-#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_DOCS)
-    return RTStrCopy(pszPath, cchPath, RTPATH_APP_DOCS);
-#elif defined(RT_OS_SOLARIS)
-    return rtPathSolarisArchHack(pszPath, cchPath);
-#else
-    return RTPathExecDir(pszPath, cchPath);
-#endif
-}
 
 
@@ -177 +75 @@
 }
 
-
-RTR3DECL(int) RTPathGetMode(const char *pszPath, PRTFMODE pfMode)
-{
-    AssertPtrReturn(pfMode, VERR_INVALID_POINTER);
-
-    RTFSOBJINFO ObjInfo;
-    int rc = RTPathQueryInfoEx(pszPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
-    if (RT_SUCCESS(rc))
-        *pfMode = ObjInfo.Attr.fMode;
-
-    return rc;
-}

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

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include "internal/iprt.h"
+#include <iprt/path.h>
+
 #include <iprt/assert.h>
-#include <iprt/env.h>
-#include <iprt/err.h>
-#include <iprt/path.h>
+#include <iprt/errcore.h>
 #include <iprt/string.h>
 #include "internal/path.h"
@@ -141 +141 @@
 
 
-RTDECL(int) RTPathTemp(char *pszPath, size_t cchPath)
-{
-    /*
-     * Try get it from the environment first.
-     */
-    static const char * const s_apszVars[] =
-    {
-        "IPRT_TMPDIR"
-#if defined(RT_OS_WINDOWS)
-        , "TMP", "TEMP", "USERPROFILE"
-#elif defined(RT_OS_OS2)
-        , "TMP", "TEMP", "TMPDIR"
-#else
-        , "TMPDIR"
-#endif
-    };
-    for (size_t iVar = 0; iVar < RT_ELEMENTS(s_apszVars); iVar++)
-    {
-        int rc = RTEnvGetEx(RTENV_DEFAULT, s_apszVars[iVar], pszPath, cchPath, NULL);
-        if (rc != VERR_ENV_VAR_NOT_FOUND)
-            return rc;
-    }
-
-    /*
-     * Here we should use some sane system default, instead we just use
-     * the typical unix temp dir for now.
-     */
-    /** @todo Windows should default to the windows directory, see GetTempPath.
-     * Some unixes has path.h and _PATH_TMP. There is also a question about
-     * whether /var/tmp wouldn't be a better place...  */
-    if (cchPath < sizeof("/tmp") )
-        return VERR_BUFFER_OVERFLOW;
-    memcpy(pszPath, "/tmp", sizeof("/tmp"));
-    return VINF_SUCCESS;
-}
-
-
 RTR3DECL(int) RTPathGetMode(const char *pszPath, PRTFMODE pfMode)
 {