Changeset 19236 in vbox

Timestamp:

Apr 28, 2009 12:58:25 PM (16 years ago)

Author:

vboxsync

Message:

Main: Added first step for ability to run VBox with read-only configuration files.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/MachineImpl.h (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7562 +7562 @@
                               RTFILE_O_READWRITE | RTFILE_O_OPEN |
                               RTFILE_O_DENY_WRITE);
-        if (RT_FAILURE (vrc))
-        {
+        if (RT_FAILURE (vrc) && (vrc != VERR_FILE_NOT_FOUND))
+        {
+            /* Open the associated config file only with read access. */
+            vrc = RTFileOpen (&mData->mHandleCfgFile,
+                              Utf8Str (mData->mConfigFileFull),
+                              RTFILE_O_READ | RTFILE_O_OPEN |
+                              RTFILE_O_DENY_NONE);
+            if (RT_FAILURE (vrc))
+            {
+                /* We even cannot open it in read mode, so there's seriously
+                   something wrong. */
+                rc = setError (E_FAIL,
+                        tr ("Could not even open settings file '%ls' in read mode (%Rrc)"),
+                        mData->mConfigFile.raw(), vrc);
+            }
+            else
+            {
+                mData->mConfigFileReadonly = TRUE;
+            }
+        }
+        else
+        {
+            mData->mConfigFileReadonly = FALSE;
+        }
+
+        if (RT_FAILURE(vrc)) 
+        {    
             mData->mHandleCfgFile = NIL_RTFILE;
-
-            rc = setError (VBOX_E_FILE_ERROR,
-                tr ("Could not lock the settings file '%ls' (%Rrc)"),
-                mData->mConfigFileFull.raw(), vrc);
+            mData->mConfigFileReadonly = FALSE;
         }
     }
@@ -7595 +7617 @@
         /** @todo flush the directory. */
         mData->mHandleCfgFile = NIL_RTFILE;
+        mData->mConfigFileReadonly = FALSE;
     }
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4080 +4080 @@
     Assert (!isConfigLocked());
     if (!isConfigLocked())
-    {
-        /* open the associated config file */
+    {   
+        /* Open the associated config file. */
         int vrc = RTFileOpen (&mData.mCfgFile.mHandle,
-                             Utf8Str (mData.mCfgFile.mName),
-                             RTFILE_O_READWRITE | RTFILE_O_OPEN |
-                             RTFILE_O_DENY_WRITE);
-        if (RT_FAILURE (vrc))
-        {
+                              Utf8Str (mData.mCfgFile.mName),
+                              RTFILE_O_READWRITE | RTFILE_O_OPEN |
+                              RTFILE_O_DENY_WRITE);
+        if (RT_FAILURE (vrc) && (vrc != VERR_FILE_NOT_FOUND))
+        {
+            /* Open the associated config file only with read access. */
+            vrc = RTFileOpen (&mData.mCfgFile.mHandle,
+                              Utf8Str (mData.mCfgFile.mName),
+                              RTFILE_O_READ | RTFILE_O_OPEN |
+                              RTFILE_O_DENY_NONE);
+            if (RT_FAILURE (vrc))
+            {
+                /* We even cannot open it in read mode, so there's seriously
+                   something wrong. */
+                rc = setError (E_FAIL,
+                        tr ("Could not even open settings file '%ls' in read mode (%Rrc)"),
+                        mData.mCfgFile.mName.raw(), vrc);
+            }
+            else
+            {
+                mData.mCfgFile.mReadonly = TRUE;
+            }
+        }
+        else
+        {
+            mData.mCfgFile.mReadonly = FALSE;
+        }
+
+        if (RT_FAILURE(vrc)) 
+        {    
             mData.mCfgFile.mHandle = NIL_RTFILE;
-
-            /*
-             *  It is OK if the file is not found, it will be created by
-             *  init(). Otherwise return an error.
-             */
-            if (vrc != VERR_FILE_NOT_FOUND)
-                rc = setError (E_FAIL,
-                    tr ("Could not lock the settings file '%ls' (%Rrc)"),
-                    mData.mCfgFile.mName.raw(), vrc);
+            mData.mCfgFile.mReadonly = FALSE;
         }
 
@@ -4103 +4120 @@
                           mData.mCfgFile.mName.raw(), mData.mCfgFile.mHandle, rc));
     }
-
     return rc;
 }
@@ -4127 +4143 @@
         /** @todo flush the directory too. */
         mData.mCfgFile.mHandle = NIL_RTFILE;
+        mData.mCfgFile.mReadonly = FALSE;
         LogFlowThisFunc (("\n"));
     }

trunk/src/VBox/Main/include/MachineImpl.h

@@ -152 +152 @@
         BOOL mRegistered;
 
+        /** Flag indicating that the config file is read-only. */
+        BOOL mConfigFileReadonly;
         Bstr mConfigFile;
         Bstr mConfigFileFull;

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -422 +422 @@
             const Bstr mName;
             RTFILE mHandle;
+            /** Flag indicating that the config file is read-only. */
+            BOOL mReadonly;
         };