Changeset 13551

Timestamp:

10/24/08 14:10:08 (3 months ago)

Author:

vboxsync

Message:

HostServices/GuestProperties? and Main (Guest Properties): use the new iprt pattern matching APIs

Files:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (1 diff)
• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (4 diffs)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• trunk/src/VBox/Main/MachineImpl.cpp (modified) (8 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -57 +57 @@
-/** Maximum number of properties per guest */
-enum { MAX_PROPS = 256 };
+/** Maximum size for enumeration patterns */
+enum { MAX_PATTERN_LEN = 1024 };
-
-/**

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -203 +203 @@
-        AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
-        SELF *pSelf = reinterpret_cast<SELF *>(pvService);
-// 
+
-        pSelf->mpvHostData = pvExtension;
-        return VINF_SUCCESS;
@@ -614 +614 @@
-
-/**
- * Matches a sample name against a pattern.
- *
- * @returns True if matches, false if not.
- * @param   pszPat      Pattern.
- * @param   pszName     Name to match against the pattern.
- * @todo move this into IPRT
- */
-static bool matchesSinglePattern(const char *pszPat, const char *pszName)
-{
-    /* ASSUMES ASCII */
-    for (;;)
-    {
-        char chPat = *pszPat;
-        switch (chPat)
-        {
-            default:
-                if (*pszName != chPat)
-                    return false;
-                break;
-
-            case '*':
-            {
-                while ((chPat = *++pszPat) == '*' || chPat == '?')
-                    /* nothing */;
-
-                for (;;)
-                {
-                    char ch = *pszName++;
-                    if (    ch == chPat
-                        &&  (   !chPat
-                             || matchesSinglePattern(pszPat + 1, pszName)))
-                        return true;
-                    if (!ch)
-                        return false;
-                }
-                /* won't ever get here */
-                break;
-            }
-
-            case '?':
-                if (!*pszName)
-                    return false;
-                break;
-
-            case '\0':
-                return !*pszName;
-        }
-        pszName++;
-        pszPat++;
-    }
-    return true;
-}
-
-
-/* Checks to see if the given string matches against one of the patterns in
- * the list. */
-static bool matchesPattern(const char *paszPatterns, size_t cchPatterns,
-                           const char *pszString)
-{
-    size_t iOffs = 0;
-    /* If the first pattern in the list is empty, treat it as "match all". */
-    bool matched = (cchPatterns > 0) && (0 == *paszPatterns) ? true : false;
-    while ((iOffs < cchPatterns) && !matched)
-    {
-        size_t cchCurrent;
-        if (   RT_SUCCESS(RTStrNLenEx(paszPatterns + iOffs,
-                                      cchPatterns - iOffs, &cchCurrent))
-            && (cchCurrent > 0)
-           )
-        {
-            matched = matchesSinglePattern(paszPatterns + iOffs, pszString);
-            iOffs += cchCurrent + 1;
-        }
-        else
-            iOffs = cchPatterns;
-    }
-    return matched;
-}
-
-
-/**
- * Enumerate guest properties by mask, checking the validity
- * of the arguments passed.
@@ -730 +649 @@
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[0], (void **) &paszPatterns, &cchPatterns);
+    if (RT_SUCCESS(rc) && cchPatterns > MAX_PATTERN_LEN + 1)
+        rc = VERR_TOO_MUCH_DATA;
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[1], (void **) &pchBuf, &cchBuf);
-
-/*
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-    RTMemAutoPtr<char> TmpBuf;
@@ -756 +696 @@
-         * overwrite it next iteration. */
-        if (   RT_SUCCESS(rc)
-
+
+
+
+
+
-           )
-        {

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3659 +3659 @@
-    VBOXHGCMSVCPARM parm[3];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
-pszzOut
-iOut
+utf8Patterns.mutableRaw()
+utf8Patterns.length()
-
-    /*

trunk/src/VBox/Main/MachineImpl.cpp

@@ -71 +71 @@
-#include <iprt/cpputils.h>
-#include <iprt/env.h>
+#include <iprt/string.h>
-
-#include <VBox/err.h>
@@ -2830 +2831 @@
-}
-
-/**
- * Matches a sample name against a pattern.
- *
- * @returns True if matches, false if not.
- * @param   pszPat      Pattern.
- * @param   cchPat      Number of characters in pszPat
- * @param   pszName     Name to match against the pattern.
- * @todo move this into IPRT
- */
-static bool matchesSinglePatternEx(const char *pszPat, size_t cchPat, const char *pszName)
-{
-    /* ASSUMES ASCII */
-    for (;;)
-    {
-        char chPat = *pszPat;
-        switch (chPat)
-        {
-            default:
-                if (*pszName != chPat)
-                    return false;
-                break;
-
-            case '*':
-            {
-                while (   (--cchPat > 0)
-                       && ((chPat = *++pszPat) == '*' || chPat == '?')
-                      )
-                    /* nothing */;
-
-                for (;;)
-                {
-                    char ch = *pszName++;
-                    if (   cchPat == 0
-                        || (cchPat == 1 && ch == chPat)
-                        || matchesSinglePatternEx(pszPat, cchPat, pszName)
-                       )
-                        return true;
-                    if (!ch)
-                        return false;
-                }
-                /* won't ever get here */
-                break;
-            }
-
-            case '?':
-                if (!*pszName)
-                    return false;
-                break;
-
-            case '\0':
-                return !*pszName;
-        }
-        pszName++;
-        pszPat++;
-        if (--cchPat == 0)
-            return !*pszName;
-        Assert(cchPat > 0);
-    }
-    return true;
-}
-
-/* Checks to see if a pattern matches a name. */
-static bool matchesSinglePattern(const char *pszPat, const char *pszName)
-{
-    return matchesSinglePatternEx(pszPat, strlen(pszPat), pszName);
-}
-
-/* Checks to see if the given string matches against one of the patterns in
- * the list. */
-static bool matchesPattern(const char *paszPatterns, size_t cchPatterns,
-                           const char *pszString)
-{
-    size_t iOffs = 0;
-    /* If the first pattern in the list is empty, treat it as "match all". */
-    bool matched = (cchPatterns > 0) && (0 == *paszPatterns);
-    while ((iOffs < cchPatterns) && !matched)
-    {
-        size_t cchCurrent;
-        if (   RT_SUCCESS(RTStrNLenEx(paszPatterns + iOffs,
-                                      cchPatterns - iOffs, &cchCurrent))
-            && (cchCurrent > 0)
-           )
-        {
-            matched = matchesSinglePattern(paszPatterns + iOffs, pszString);
-            iOffs += cchCurrent + 1;
-        }
-        else
-            iOffs = cchPatterns;
-    }
-    return matched;
-}
-
-/* Checks to see if the given string matches against one of the patterns in
- * the comma-separated list.  Note that spaces at the beginning of patterns
- * are ignored - '?' should be used here if that is really needed. */
-static bool matchesPatternComma(const char *pcszPatterns, const char *pcszString)
-{
-    AssertPtr(pcszPatterns);
-    const char *pcszCur = pcszPatterns;
-    /* If list is empty, treat it as "match all". */
-    bool matched = (0 == *pcszPatterns);
-    bool done = false;
-    while (!done && !matched)
-    {
-        const char *pcszNext = strchr(pcszCur, ',');
-        if (pcszNext != NULL)
-        {
-            matched = matchesSinglePatternEx(pcszCur, pcszNext - pcszCur, pcszString);
-            pcszCur = pcszNext;
-            while ((',' == *pcszCur) || (' ' == *pcszCur))
-                ++pcszCur;
-        }
-        else
-        {
-            matched = matchesSinglePattern(pcszCur, pcszString);
-            done = true;
-        }
-    }
-    return matched;
-}
-
-STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aName, INPTR BSTR aValue, INPTR BSTR aFlags)
-{
@@ -2973 +2853 @@
-       )
-        return E_OUTOFMEMORY;
+    bool matchAll = false;
+    if (0 == utf8Patterns.length())
+        matchAll = true;
-
-    uint32_t fFlags = NILFLAG;
@@ -3056 +2939 @@
-                                                 &dummy, &dummy64, &dummy);
-    }
-
+
+
+
+
+
+
-        mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
-    return rc;
@@ -3091 +2979 @@
-    HRESULT rc = E_FAIL;
-
+    bool matchAll = false;
+    if ((NULL == aPatterns) || (0 == aPatterns[0]))
+        matchAll = true;
-    if (!mHWData->mPropertyServiceActive)
-    {
@@ -3100 +2991 @@
-        for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin();
-             it != mHWData->mGuestProperties.end(); ++it)
-
+
+
+
+
+
+
-                propList.push_back(*it);
-
@@ -9347 +9243 @@
-        return E_POINTER;  /* aValue can be NULL to indicate deletion */
-
+    Utf8Str utf8Name(aName);
+    Utf8Str utf8Flags(aFlags);
+    Utf8Str utf8Patterns(mHWData->mGuestPropertyNotificationPatterns);
+    if (   utf8Name.isNull()
+        || ((aFlags != NULL) && utf8Flags.isNull())
+        || utf8Patterns.isNull()
+       )
+        return E_OUTOFMEMORY;
+
-    uint32_t fFlags = NILFLAG;
-Utf8Str(aFlags)
+utf8Flags
-        return E_INVALIDARG;
+
+    bool matchAll = false;
+    if (0 == utf8Patterns.length())
+        matchAll = true;
-
-    AutoCaller autoCaller (this);
@@ -9375 +9284 @@
-    /* send a callback notification if appropriate */
-    alock.leave();
-
-
+
+
+
+
-        mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
-