Changeset 20111 in vbox for trunk/src

Timestamp:

May 28, 2009 12:34:52 AM (16 years ago)

Author:

vboxsync

Message:

IPRT: Use the generic RTDirCreateTemp implementation - made it a bit more flexible and added a testcase for it.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• generic/RTDirCreateTemp-generic.cpp (modified) (3 diffs)
• r3/posix/dir-posix.cpp (modified) (1 diff)
• r3/win/dir-win.cpp (modified) (1 diff)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTTemp.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -275 +275 @@
         generic/critsect-generic.cpp \
         generic/env-generic.cpp \
+        generic/RTDirCreateTemp-generic.cpp \
         generic/RTFileCopy-generic.cpp \
         generic/RTFileReadAll-generic.cpp \

trunk/src/VBox/Runtime/generic/RTDirCreateTemp-generic.cpp

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/path.h>
 #include <iprt/rand.h>
 #include <iprt/string.h>
@@ -44 +45 @@
 {
     /*
-     * Validate input.
+     * Validate input and count X'es.
+     *
+     * The X'es may be trailing, or they may be a cluster of 3 or more inside
+     * the file name.
      */
     AssertPtr(pszTemplate);
     unsigned    cXes = 0;
     char       *pszX = strchr(pszTemplate, '\0');
-    while (pszX != pszTemplate && pszX[-1] == 'X')
+    if (   pszX != pszTemplate
+        && pszX[-1] != 'X')
+    {
+        /* look inside the file name. */
+        char *pszFilename = RTPathFilename(pszTemplate);
+        if (   pszFilename
+            && (size_t)(pszX - pszFilename) > 3)
+        {
+            char *pszXEnd = pszX - 1;
+            pszFilename += 3;
+            do
+            {
+                if (    pszXEnd[-1] == 'X'
+                    &&  pszXEnd[-2] == 'X'
+                    &&  pszXEnd[-3] == 'X')
+                {
+                    pszX = pszXEnd - 3;
+                    cXes = 3;
+                    break;
+                }
+            } while (pszXEnd-- != pszFilename);
+        }
+    }
+
+    /* count them */
+    while (   pszX != pszTemplate
+           && pszX[-1] == 'X')
     {
         pszX--;
         cXes++;
     }
+
+    /* fail if none found. */
     if (!cXes)
     {
@@ -70 +102 @@
         unsigned j = cXes;
         while (j-- > 0)
-            pszX[j] = s_sz[RTRandU32Ex(0, RT_ELEMENTS(s_sz) - 1)];
+            pszX[j] = s_sz[RTRandU32Ex(0, RT_ELEMENTS(s_sz) - 2)];
         int rc = RTDirCreate(pszTemplate, 0700);
         if (RT_SUCCESS(rc))

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

@@ -107 +107 @@
     LogFlow(("RTDirCreate(%p={%s}, %RTfmode): returns %Rrc\n", pszPath, pszPath, fMode, rc));
     return rc;
-}
-
-
-RTDECL(int) RTDirCreateTemp(char *pszTemplate)
-{
-    if (mkdtemp(pszTemplate))
-        return VINF_SUCCESS;
-
-    return RTErrConvertFromErrno(errno);
 }
 

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

@@ -129 +129 @@
 
 
-RTDECL(int) RTDirCreateTemp(char *pszTemplate)
-{
-    /** @todo r=bird: this doesn't work for more than 26 calls and it's racy:
-     *        http://msdn.microsoft.com/en-us/library/34wc6k1f(VS.80).aspx */
-    if (_mktemp(pszTemplate))
-    {
-        int rc = RTDirCreate(pszTemplate, 0700);
-        return rc;
-    }
-    return RTErrConvertFromErrno(errno);
-}
-
-
 RTDECL(int) RTDirRemove(const char *pszPath)
 {

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -89 +89 @@
         tstStrToNum \
         tstSystemQueryOsInfo \
+        tstRTTemp \
         tstTermCallbacks \
         tstThread-1 \
@@ -348 +349 @@
 tstSystemQueryOsInfo_SOURCES = tstSystemQueryOsInfo.cpp
 
+tstRTTemp_TEMPLATE = VBOXR3TSTEXE
+tstRTTemp_SOURCES = tstRTTemp.cpp
+
 tstTermCallbacks_SOURCES = tstTermCallbacks.cpp