Changeset 93954 in vbox

Timestamp:

Feb 25, 2022 2:34:34 PM (3 years ago)

Author:

vboxsync

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

150184

Message:

Main/Unattended: ​bugref:9781. Replacing VBOX_COND_GUEST_VERSION[exp] construct with VBOX_COND[exp] to utilize new expression functionality. Removing related code as well.

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/ol_ks.cfg (modified) (2 diffs)
• UnattendedTemplates/ol_postinstall.sh (modified) (2 diffs)
• UnattendedTemplates/redhat67_ks.cfg (modified) (2 diffs)
• UnattendedTemplates/redhat_postinstall.sh (modified) (2 diffs)
• src-server/UnattendedScript.cpp (modified) (3 diffs)

trunk/src/VBox/Main/UnattendedTemplates/ol_ks.cfg

@@ -82 +82 @@
 glibc-headers
 gcc
-@@VBOX_COND_GUEST_VERSION[>8.0.0]@@
+@@VBOX_COND[${GUEST_OS_VERSION} vgt 8.0.0]@@
 elfutils-libelf-devel
 @@VBOX_COND_END@@
@@ -107 +107 @@
 umount /tmp/vboxcdrom
 %end
-

trunk/src/VBox/Main/UnattendedTemplates/ol_postinstall.sh

@@ -202 +202 @@
 log_command_in_target yum -y install binutils
 log_command_in_target yum -y install make
-@@VBOX_COND_GUEST_VERSION[>8.0.0]@@
+@@VBOX_COND[${GUEST_OS_VERSION} vgt 8.0.0]@@
 log_command_in_target yum -y install elfutils-libelf-devel
 @@VBOX_COND_END@@
@@ -329 +329 @@
 
 exit ${MY_EXITCODE}
-

trunk/src/VBox/Main/UnattendedTemplates/redhat67_ks.cfg

@@ -82 +82 @@
 glibc-headers
 gcc
-@@VBOX_COND_GUEST_VERSION[>8.0.0]@@
+@@VBOX_COND[${GUEST_OS_VERSION} vgt 8.0.0]@@
 elfutils-libelf-devel
 @@VBOX_COND_END@@
@@ -107 +107 @@
 umount /tmp/vboxcdrom
 %end
-

trunk/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh

@@ -190 +190 @@
 log_command_in_target yum -y install binutils
 log_command_in_target yum -y install make
-@@VBOX_COND_GUEST_VERSION[>8.0.0]@@
+@@VBOX_COND[${GUEST_OS_VERSION} vgt 8.0.0]@@
 log_command_in_target yum -y install elfutils-libelf-devel
 @@VBOX_COND_END@@
@@ -317 +317 @@
 
 exit ${MY_EXITCODE}
-

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

@@ -55 +55 @@
 static const char g_szPrefixCondEnd[]    = "@@VBOX_COND_END@@";
 static const char g_szPrefixSplitter[]   = "@@VBOX_SPLITTER";
-
-
-/*********************************************************************************************************************************
-*   Static Functions                                                                                                             *
-*********************************************************************************************************************************/
-
-/**
- * Searches comparison operators'<', '<=', '>', '>=', or '=' in string.
- *
- * @returns true if detected, false if not.
- * @param   pszComparisonOperator Comparison operators string array. Assumed to be of size 3,
- * @param   pachPlaceholder       The string array in which we search the comparison operators,
- * @param   startPos              The position with in the pachPlaceholder from where the seach starts. Required to be smaller then
- *                                sizeof(pachPlaceholder) - 3
- */
-
-static bool detectComparisonOperator(char *pszComparisonOperator, const char *pachPlaceholder, size_t &startPos)
-{
-    memset(pszComparisonOperator, '\0', 3);
-    /* Search for '>', '<', '>=', '<=', '='. */
-    if (pachPlaceholder[startPos] == '<')
-    {
-        pszComparisonOperator[0] = '<';
-        ++startPos;
-        if (pachPlaceholder[startPos] == '=')
-        {
-            pszComparisonOperator[1] = '=';
-            ++startPos;
-        }
-        return true;
-    }
-    if (pachPlaceholder[startPos] == '>')
-    {
-        pszComparisonOperator[0] = '>';
-        ++startPos;
-        if (pachPlaceholder[startPos] == '=')
-        {
-            pszComparisonOperator[1] = '=';
-            ++startPos;
-        }
-        return true;
-    }
-    else if (pachPlaceholder[startPos] == '=')
-    {
-        pszComparisonOperator[0] = '=';
-        ++startPos;
-        return true;
-    }
-    return false;
-}
 
 
@@ -800 +750 @@
         (   cchPlaceholder == sizeof("@@VBOX_COND_" a_szMatch "@@") - 1U \
          && memcmp(pachPlaceholder, "@@VBOX_COND_" a_szMatch "@@", sizeof("@@VBOX_COND_" a_szMatch "@@") - 1U) == 0)
-#define IS_PLACEHOLDER_PARTIALLY_MATCH(a_szMatch) \
-        (memcmp(pachPlaceholder, "@@VBOX_COND_" a_szMatch, sizeof("@@VBOX_COND_" a_szMatch) - 1U) == 0)
 
     /* Install Guest Additions: */
@@ -845 +793 @@
     else if (IS_PLACEHOLDER_MATCH("HAS_PROXY"))
         *pfOutputting = mpUnattended->i_getProxy().isNotEmpty();
-    else if (IS_PLACEHOLDER_PARTIALLY_MATCH("GUEST_VERSION["))
-    {
-        /* Check the passed string against format @@VBOX_COND_GUEST_VERSION[>8.04.0]@@. Allowed comparison operators are:
-         *  '<', '<=', '>', '>=', or '=' in string. No spaces are allowed in anywhere of the expr. */
-        static const char s_szTail[] = "]@@";
-        size_t endLength = sizeof(s_szTail) - 1;
-        if (memcmp(&pachPlaceholder[cchPlaceholder - endLength], RT_STR_TUPLE(s_szTail)) != 0)
-        {
-            *pfOutputting = false;
-            return mpSetError->setErrorBoth(E_FAIL, VERR_PARSE_ERROR, tr("Malformed @@VBOX_COND_GUEST_VERSION[expr]@@: Missing ']' (%.*s)"),
-                                            cchPlaceholder, pachPlaceholder);
-        }
-        size_t startPos = sizeof("@@VBOX_COND_GUEST_VERSION[") - 1;
-        size_t  endPos = cchPlaceholder - endLength;
-        if (startPos >= endPos)
-        {
-            *pfOutputting = false;
-            return mpSetError->setErrorBoth(E_FAIL, VERR_PARSE_ERROR, tr("Malformed @@VBOX_COND_GUEST_VERSION[expr]@@: Missing expr (%.*s)"),
-                                            cchPlaceholder, pachPlaceholder);
-        }
-        /* Parse for the comparison operator. Assuming the expression starts with one of the allowed operators. */
-        char pszComparisonOperator[3];
-        if (!detectComparisonOperator(pszComparisonOperator, pachPlaceholder, startPos))
-        {
-            *pfOutputting = false;
-            return mpSetError->setErrorBoth(E_FAIL, VERR_PARSE_ERROR, tr("Malformed @@VBOX_COND_GUEST_VERSION[expr]@@: Only space, '>', '>=', '<', <=', and '=' are allowed at the start. (%.*s)"),
-                                            cchPlaceholder, pachPlaceholder);
-        }
-        if (startPos >= endPos)
-        {
-            *pfOutputting = false;
-            return mpSetError->setErrorBoth(E_FAIL, VERR_PARSE_ERROR, tr("Malformed @@VBOX_COND_GUEST_VERSION[expr]@@: No version string found. (%.*s)"),
-                                            cchPlaceholder, pachPlaceholder);
-        }
-        /* Check if the version string includes any character other than '.' and digits. */
-        for (size_t i = startPos; i < endPos; ++i)
-        {
-            if ( (pachPlaceholder[i] < '0' || pachPlaceholder[i] > '9') && pachPlaceholder[i] != '.')
-            {
-                *pfOutputting = false;
-                return mpSetError->setErrorBoth(E_FAIL, VERR_PARSE_ERROR, tr("Malformed @@VBOX_COND_GUEST_VERSION[expr]@@: Version string must be consist of only digits and '.', and no spaces. (%.*s)"),
-                                                cchPlaceholder, pachPlaceholder);
-            }
-        }
-
-        RTCString strRequiredOSVersion(pachPlaceholder, startPos, endPos - startPos);
-        RTCString strDetectedOSVersion = mpUnattended->i_getDetectedOSVersion();
-        int res = RTStrVersionCompare(strDetectedOSVersion.c_str(), strRequiredOSVersion.c_str());
-
-        if (   res == 0
-            && (   pszComparisonOperator[0] == '='
-                || memcmp(pszComparisonOperator, ">=", 2) == 0
-                || memcmp(pszComparisonOperator, "<=", 2) == 0))
-            *pfOutputting = true;
-        else if (res < 0 && pszComparisonOperator[0] == '<')
-            *pfOutputting = true;
-        else if (res > 0 && pszComparisonOperator[0] == '>')
-            *pfOutputting = true;
-        else
-            *pfOutputting = false;
-    }
     else
         return mpSetError->setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Unknown conditional placeholder '%.*s'"),