Changeset 6992 in vbox

Timestamp:

Feb 18, 2008 1:34:17 PM (17 years ago)

Author:

vboxsync

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

28187

Message:

Restrict RTFILE_O_NOT_CONTENT_INDEXED to file creation.

Location:

trunk

Files:

• include/iprt/file.h (modified) (3 diffs)
• src/VBox/Runtime/r3/fileio.cpp (modified) (4 diffs)
• src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (2 diffs)

trunk/include/iprt/file.h

@@ -94 +94 @@
 #define RTFILE_O_ACTION_MASK        0x00000300
 
-/** Turns off indexing of files on Windows hosts.
+/** Turns off indexing of files on Windows hosts, *CREATE* only.
  * @remark  This might not be implemented on all platforms,
  *          and will be ignored on those.
@@ -270 +270 @@
 
 /**
- * Determine the maximum file size. 
- *  
- * @returns The max size of the file. 
+ * Determine the maximum file size.
+ *
+ * @returns The max size of the file.
  *          -1 on failure, the file position is undefined.
- * @param   File        Handle to the file. 
- * @see     RTFileGetMaxSizeEx. 
+ * @param   File        Handle to the file.
+ * @see     RTFileGetMaxSizeEx.
  */
 RTR3DECL(RTFOFF) RTFileGetMaxSize(RTFILE File);
 
 /**
- * Determine the maximum file size. 
- *  
+ * Determine the maximum file size.
+ *
  * @returns IPRT status code.
- * @param   File        Handle to the file. 
- * @param   pcbMax      Where to store the max file size. 
+ * @param   File        Handle to the file.
+ * @param   pcbMax      Where to store the max file size.
  * @see     RTFileGetMaxSize.
  */
@@ -290 +290 @@
 
 /**
- * Determine the maximum file size depending on the file system the file is stored on. 
- *  
- * @returns The max size of the file. 
+ * Determine the maximum file size depending on the file system the file is stored on.
+ *
+ * @returns The max size of the file.
  *          -1 on failure.
- * @param   File        Handle to the file.         
+ * @param   File        Handle to the file.
  */
 RTR3DECL(RTFOFF) RTFileGetMaxSize(RTFILE File);

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

@@ -142 +142 @@
 #endif
         ||  (fOpen & (RTFILE_O_TRUNCATE | RTFILE_O_WRITE)) == RTFILE_O_TRUNCATE
+        ||  (   fOpen & RTFILE_O_NOT_CONTENT_INDEXED
+             && !(   (fOpen & RTFILE_O_ACTION_MASK) == RTFILE_O_OPEN_CREATE
+                  || (fOpen & RTFILE_O_ACTION_MASK) == RTFILE_O_CREATE
+                  || (fOpen & RTFILE_O_ACTION_MASK) == RTFILE_O_CREATE_REPLACE))
        )
     {
@@ -219 +223 @@
 
 /**
- * Determine the maximum file size. 
- *  
- * @returns The max size of the file. 
+ * Determine the maximum file size.
+ *
+ * @returns The max size of the file.
  *          -1 on failure, the file position is undefined.
- * @param   File        Handle to the file. 
- * @see     RTFileGetMaxSizeEx. 
+ * @param   File        Handle to the file.
+ * @see     RTFileGetMaxSizeEx.
  */
 RTR3DECL(RTFOFF) RTFileGetMaxSize(RTFILE File)
@@ -235 +239 @@
 
 /**
- * Determine the maximum file size. 
- *  
+ * Determine the maximum file size.
+ *
  * @returns IPRT status code.
- * @param   File        Handle to the file. 
- * @param   pcbMax      Where to store the max file size. 
+ * @param   File        Handle to the file.
+ * @param   pcbMax      Where to store the max file size.
  * @see     RTFileGetMaxSize.
  */
 RTR3DECL(int) RTFileGetMaxSizeEx(RTFILE File, PRTFOFF pcbMax)
 {
-    /* 
-     * Save the current location 
+    /*
+     * Save the current location
      */
     uint64_t offOld;
@@ -253 +257 @@
 
     /*
-     * Perform a binary search for the max file size. 
+     * Perform a binary search for the max file size.
      */
     uint64_t offLow  =       0;
     uint64_t offHigh = 8 * _1T; /* we don't need bigger files */
-    /** @todo r=bird: This isn't doing the trick for windows (at least not vista). 
-     * Close to offHigh is returned regardless of NTFS or FAT32. 
-     * We might have to make this code OS specific... 
-     * In the worse case, we'll have to try GetVolumeInformationByHandle on vista and fall 
+    /** @todo r=bird: This isn't doing the trick for windows (at least not vista).
+     * Close to offHigh is returned regardless of NTFS or FAT32.
+     * We might have to make this code OS specific...
+     * In the worse case, we'll have to try GetVolumeInformationByHandle on vista and fall
      * back on NtQueryVolumeInformationFile(,,,, FileFsAttributeInformation) else where, and
      * check for known file system names. (For LAN shares we'll have to figure out the remote
-     * file system.) */ 
+     * file system.) */
     //uint64_t offHigh = INT64_MAX;
     for (;;)

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

@@ -231 +231 @@
 
     /*
-     * Turn off indexing of directory through Windows Indexing Service
+     * Turn off indexing of directory through Windows Indexing Service.
      */
     if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)
@@ -264 +264 @@
 
     /*
-     * Turn off indexing of directory through Windows Indexing Service
+     * Turn off indexing of directory through Windows Indexing Service.
      */
     if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)