Changeset 33458 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 26, 2010 11:18:04 AM (14 years ago)

Author:

vboxsync

Message:

Main: partial revert or r67042, bring back the overwrite parameter

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -253 +253 @@
  *  @param strName      name for the machine
  *  @param aId          UUID for the new machine.
- *  @param aOsType      Optional OS Type of this machine.
+ *  @param aOsType      OS Type of this machine or NULL.
+ *  @param fForceOverwrite Whether to overwrite an existing machine settings file.
  *
  *  @return  Success indicator. if not S_OK, the machine object is invalid
@@ -260 +261 @@
                       const Utf8Str &strConfigFile,
                       const Utf8Str &strName,
+                      GuestOSType *aOsType,
                       const Guid &aId,
-                      GuestOSType *aOsType /* = NULL */)
+                      bool fForceOverwrite)
 {
     LogFlowThisFuncEnter();
@@ -273 +275 @@
     if (FAILED(rc)) return rc;
 
-    rc = tryCreateMachineConfigFile();
+    rc = tryCreateMachineConfigFile(fForceOverwrite);
     if (FAILED(rc)) return rc;
 
@@ -473 +475 @@
     if (FAILED(rc)) return rc;
 
-    rc = tryCreateMachineConfigFile();
+    rc = tryCreateMachineConfigFile(false /* fForceOverwrite */);
     if (FAILED(rc)) return rc;
 
@@ -569 +571 @@
  * @return
  */
-HRESULT Machine::tryCreateMachineConfigFile()
+HRESULT Machine::tryCreateMachineConfigFile(bool fForceOverwrite)
 {
     HRESULT rc = S_OK;
@@ -582 +584 @@
         if (RT_SUCCESS(vrc))
             RTFileClose(f);
-        rc = setError(VBOX_E_FILE_ERROR,
-                      tr("Machine settings file '%s' already exists"),
-                      mData->m_strConfigFileFull.c_str());
+        if (!fForceOverwrite)
+            rc = setError(VBOX_E_FILE_ERROR,
+                          tr("Machine settings file '%s' already exists"),
+                          mData->m_strConfigFileFull.c_str());
+        else
+        {
+            /* try to delete the config file, as otherwise the creation
+             * of a new settings file will fail. */
+            int vrc2 = RTFileDelete(mData->m_strConfigFileFull.c_str());
+            if (RT_FAILURE(vrc2))
+                rc = setError(VBOX_E_FILE_ERROR,
+                              tr("Could not delete the existing settings file '%s' (%Rrc)"),
+                              mData->m_strConfigFileFull.c_str(), vrc2);
+        }
     }
     else if (    vrc != VERR_FILE_NOT_FOUND