Changeset 47356 in vbox

Timestamp:

Jul 23, 2013 5:45:07 PM (12 years ago)

Author:

vboxsync

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

87502

Message:

IPRT: Added RTVfsIoStrmOpenNormal and RTVfsFileOpenNormal.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/vfs.h (modified) (2 diffs)
• src/VBox/Runtime/common/vfs/vfsstdfile.cpp (modified) (3 diffs)

trunk/include/iprt/mangling.h

@@ -1771 +1771 @@
 # define RTVfsFileGetSize                               RT_MANGLER(RTVfsFileGetSize)
 # define RTVfsFileOpen                                  RT_MANGLER(RTVfsFileOpen)
+# define RTVfsFileOpenNormal                            RT_MANGLER(RTVfsFileOpenNormal)
 # define RTVfsFilePoll                                  RT_MANGLER(RTVfsFilePoll)
 # define RTVfsFileQueryInfo                             RT_MANGLER(RTVfsFileQueryInfo)
@@ -1791 +1792 @@
 # define RTVfsIoStrmFromStdHandle                       RT_MANGLER(RTVfsIoStrmFromStdHandle)
 # define RTVfsIoStrmIsAtEnd                             RT_MANGLER(RTVfsIoStrmIsAtEnd)
+# define RTVfsIoStrmOpenNormal                          RT_MANGLER(RTVfsIoStrmOpenNormal)
 # define RTVfsIoStrmPoll                                RT_MANGLER(RTVfsIoStrmPoll)
 # define RTVfsIoStrmQueryInfo                           RT_MANGLER(RTVfsIoStrmQueryInfo)

trunk/include/iprt/vfs.h

@@ -453 +453 @@
 
 /**
+ * Convenience function combining RTFileOpen with RTVfsIoStrmFromRTFile.
+ *
+ * @returns IPRT status code.
+ * @param   pszFilename     The path to the file in the normal file system.
+ * @param   fOpen           The flags to pass to RTFileOpen when opening the
+ *                          file, i.e. RTFILE_O_XXX.
+ * @param   phVfsIos        Where to return the VFS I/O stream handle.
+ */
+RTDECL(int)         RTVfsIoStrmOpenNormal(const char *pszFilename, uint64_t fOpen, PRTVFSIOSTREAM phVfsIos);
+
+/**
  * Create a VFS I/O stream handle from one of the standard handles.
  *
@@ -706 +717 @@
 
 /**
+ * Convenience function combining RTFileOpen with RTVfsFileFromRTFile.
+ *
+ * @returns IPRT status code.
+ * @param   pszFilename     The path to the file in the normal file system.
+ * @param   fOpen           The flags to pass to RTFileOpen when opening the
+ *                          file, i.e. RTFILE_O_XXX.
+ * @param   phVfsFile       Where to return the VFS file handle.
+ */
+RTDECL(int)         RTVfsFileOpenNormal(const char *pszFilename, uint64_t fOpen, PRTVFSFILE phVfsFile);
+
+/**
  * Convert the VFS file handle to a VFS I/O stream handle.
  *

trunk/src/VBox/Runtime/common/vfs/vfsstdfile.cpp

@@ -419 +419 @@
 
 
+/**
+ * Internal worker for RTVfsFileFromRTFile and RTVfsFileOpenNormal.
+ *
+ * @returns IRPT status code.
+ * @param   hFile               The IPRT file handle.
+ * @param   fOpen               The RTFILE_O_XXX flags.
+ * @param   fLeaveOpen          Whether to leave it open or close it.
+ * @param   phVfsFile           Where to return the handle.
+ */
+static int rtVfsFileFromRTFile(RTFILE hFile, uint64_t fOpen, bool fLeaveOpen, PRTVFSFILE phVfsFile)
+{
+    PRTVFSSTDFILE   pThis;
+    RTVFSFILE       hVfsFile;
+    int rc = RTVfsNewFile(&g_rtVfsStdFileOps, sizeof(RTVFSSTDFILE), fOpen, NIL_RTVFS, NIL_RTVFSLOCK,
+                          &hVfsFile, (void **)&pThis);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    pThis->hFile        = hFile;
+    pThis->fLeaveOpen   = fLeaveOpen;
+    *phVfsFile = hVfsFile;
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) RTVfsFileFromRTFile(RTFILE hFile, uint64_t fOpen, bool fLeaveOpen, PRTVFSFILE phVfsFile)
 {
@@ -430 +455 @@
 
     /*
-     * Set up some fake fOpen flags.
+     * Set up some fake fOpen flags if necessary and create a VFS file handle.
      */
     if (!fOpen)
         fOpen = RTFILE_O_READWRITE | RTFILE_O_DENY_NONE | RTFILE_O_OPEN_CREATE;
 
+    return rtVfsFileFromRTFile(hFile, fOpen, fLeaveOpen, phVfsFile);
+}
+
+
+RTDECL(int) RTVfsFileOpenNormal(const char *pszFilename, uint64_t fOpen, PRTVFSFILE phVfsFile)
+{
     /*
-     * Create the handle.
+     * Open the file the normal way and pass it to RTVfsFileFromRTFile.
      */
-    PRTVFSSTDFILE   pThis;
-    RTVFSFILE       hVfsFile;
-    rc = RTVfsNewFile(&g_rtVfsStdFileOps, sizeof(RTVFSSTDFILE), fOpen, NIL_RTVFS, NIL_RTVFSLOCK, &hVfsFile, (void **)&pThis);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    pThis->hFile        = hFile;
-    pThis->fLeaveOpen   = fLeaveOpen;
-    *phVfsFile = hVfsFile;
-    return VINF_SUCCESS;
-}
-
-
-RTDECL(int)         RTVfsIoStrmFromRTFile(RTFILE hFile, uint64_t fOpen, bool fLeaveOpen, PRTVFSIOSTREAM phVfsIos)
+    RTFILE hFile;
+    int rc = RTFileOpen(&hFile, pszFilename, fOpen);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Create a VFS file handle.
+         */
+        rc = rtVfsFileFromRTFile(hFile, fOpen, false /*fLeaveOpen*/, phVfsFile);
+        if (RT_FAILURE(rc))
+            RTFileClose(hFile);
+    }
+    return rc;
+}
+
+
+RTDECL(int) RTVfsIoStrmFromRTFile(RTFILE hFile, uint64_t fOpen, bool fLeaveOpen, PRTVFSIOSTREAM phVfsIos)
 {
     RTVFSFILE hVfsFile;
@@ -460 +493 @@
 }
 
+
+RTDECL(int) RTVfsIoStrmOpenNormal(const char *pszFilename, uint64_t fOpen, PRTVFSIOSTREAM phVfsIos)
+{
+    RTVFSFILE hVfsFile;
+    int rc = RTVfsFileOpenNormal(pszFilename, fOpen, &hVfsFile);
+    if (RT_SUCCESS(rc))
+        *phVfsIos = RTVfsFileToIoStream(hVfsFile);
+    return rc;
+}
+
+