Changeset 94311 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Mar 19, 2022 1:34:37 AM (3 years ago)

Author:

vboxsync

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

150596

Message:

IPRT: Added RTFileCreateUnique, a saner version of RTFileCreateTemp in that it returns the file handle. bugref:10201

File:

• trunk/src/VBox/Runtime/generic/createtemp-generic.cpp (modified) (1 diff)

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

@@ -158 +158 @@
 
 
-RTDECL(int) RTFileCreateTemp(char *pszTemplate, RTFMODE fMode)
-{
+RTDECL(int) RTFileCreateUnique(PRTFILE phFile, char *pszTemplate, uint64_t fOpen)
+{
+    /*
+     * Validate input.
+     */
+    *phFile = NIL_RTFILE;
+    AssertReturn((fOpen & RTFILE_O_ACTION_MASK) == RTFILE_O_CREATE, VERR_INVALID_FLAGS);
     char       *pszX = NULL;
     unsigned    cXes = 0;
     int rc = rtCreateTempValidateTemplate(pszTemplate, &pszX, &cXes);
-    if (RT_FAILURE(rc))
-    {
-        *pszTemplate = '\0';
-        return rc;
-    }
-
-    /*
-     * Try ten thousand times.
-     */
-    int i = 10000;
-    while (i-- > 0)
-    {
-        uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_ALL | RTFILE_O_CREATE | RTFILE_O_NOT_CONTENT_INDEXED
-                       | fMode << RTFILE_O_CREATE_MODE_SHIFT;
-        rtCreateTempFillTemplate(pszX, cXes);
-        RTFILE hFile = NIL_RTFILE;
-        rc = RTFileOpen(&hFile, pszTemplate, fOpen);
-        if (RT_SUCCESS(rc))
-        {
-            RTFileClose(hFile);
-            return rc;
-        }
-        /** @todo Anything else to consider? */
-        if (rc != VERR_ALREADY_EXISTS)
-        {
-            *pszTemplate = '\0';
-            return rc;
-        }
-    }
-
-    /* we've given up. */
-    *pszTemplate = '\0';
-    return VERR_ALREADY_EXISTS;
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Try ten thousand times.
+         */
+        int i = 10000;
+        while (i-- > 0)
+        {
+            rtCreateTempFillTemplate(pszX, cXes);
+            RTFILE hFile = NIL_RTFILE;
+            rc = RTFileOpen(&hFile, pszTemplate, fOpen);
+            if (RT_SUCCESS(rc))
+            {
+                *phFile = hFile;
+                return rc;
+            }
+            /** @todo Anything else to consider? */
+            if (rc != VERR_ALREADY_EXISTS)
+            {
+                *pszTemplate = '\0';
+                return rc;
+            }
+        }
+
+        /* we've given up. */
+        rc = VERR_ALREADY_EXISTS;
+    }
+    *pszTemplate = '\0';
+    return rc;
+}
+RT_EXPORT_SYMBOL(RTFileCreateUnique);
+
+
+RTDECL(int) RTFileCreateTemp(char *pszTemplate, RTFMODE fMode)
+{
+    RTFILE hFile = NIL_RTFILE;
+    int rc = RTFileCreateUnique(&hFile, pszTemplate,
+                                RTFILE_O_WRITE | RTFILE_O_DENY_ALL | RTFILE_O_CREATE | RTFILE_O_NOT_CONTENT_INDEXED
+                                | fMode << RTFILE_O_CREATE_MODE_SHIFT);
+    if (RT_SUCCESS(rc))
+        RTFileClose(hFile);
+    return rc;
 }
 RT_EXPORT_SYMBOL(RTFileCreateTemp);