Changeset 93085 in vbox for trunk/src/VBox/Main/src-server/UnattendedScript.cpp

Timestamp:

Dec 27, 2021 4:55:00 AM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Some more work on the OS/2 unattended installation.

File:

• trunk/src/VBox/Main/src-server/UnattendedScript.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/UnattendedScript.cpp

@@ -59 +59 @@
     static const char s_szPrefixCond[]     = "@@VBOX_COND_";
     static const char s_szPrefixCondEnd[]  = "@@VBOX_COND_END@@";
+    static const char s_szPrefixSplitter[] = "@@VBOX_SPLITTER";
 
     struct
@@ -128 +129 @@
             if (   pszPlaceholder[cchPlaceholder - 1] != '@'
                 || pszPlaceholder[cchPlaceholder - 2] != '@'
-                || (   strncmp(pszPlaceholder, s_szPrefixInsert, sizeof(s_szPrefixInsert) - 1) != 0
-                    && strncmp(pszPlaceholder, s_szPrefixCond,   sizeof(s_szPrefixCond)   - 1) != 0 ) )
+                || (   strncmp(pszPlaceholder, s_szPrefixInsert,   sizeof(s_szPrefixInsert)   - 1) != 0
+                    && strncmp(pszPlaceholder, s_szPrefixCond,     sizeof(s_szPrefixCond)     - 1) != 0
+                    && strncmp(pszPlaceholder, s_szPrefixSplitter, sizeof(s_szPrefixSplitter) - 1) != 0 ) )
             {
                 hrc = mpSetError->setError(E_FAIL, tr("Malformed template placeholder '%.*s'"),
@@ -188 +190 @@
              *                    one from the condition.
              */
-            else
+            else if (strncmp(pszPlaceholder, s_szPrefixSplitter, sizeof(s_szPrefixSplitter) - 1) != 0)
             {
                 Assert(strncmp(pszPlaceholder, s_szPrefixCond, sizeof(s_szPrefixCond) - 1) == 0);
@@ -208 +210 @@
                                                    offPlaceholder, offPlaceholder);
                     break;
+                }
+            }
+            /*
+             * @@VBOX_SPLITTER_START/END[filename]@@: Ignored in this pass.
+             */
+            else
+            {
+                if (fOutputting)
+                {
+                    try
+                    {
+                        rStrDst.append(pszPlaceholder, cchPlaceholder);
+                    }
+                    catch (std::bad_alloc &)
+                    {
+                        hrc = E_OUTOFMEMORY;
+                        break;
+                    }
                 }
             }