Changeset 13551 in vbox for trunk/src/VBox/HostServices

Timestamp:

Oct 24, 2008 12:10:08 PM (16 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (4 diffs)

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

@@ -203 +203 @@
         AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
-        // pSelf->mpfnHostCallback = pfnExtension;
+        pSelf->mpfnHostCallback = pfnExtension;
         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);
 
 /*
- * Start by enumerating all values in the current node into a temporary buffer.
+ * First repack the patterns into the format expected by RTStrSimplePatternMatch()
+ */
+    bool matchAll = false;
+    char pszPatterns[MAX_PATTERN_LEN + 1];
+    if (   (NULL == paszPatterns)
+        || (cchPatterns < 2)  /* An empty pattern string means match all */
+       )
+        matchAll = true;
+    else
+    {
+        for (unsigned i = 0; i < cchPatterns - 1; ++i)
+            if (paszPatterns[i] != '\0')
+                pszPatterns[i] = paszPatterns[i];
+            else
+                pszPatterns[i] = '|';
+        pszPatterns[cchPatterns - 1] = '\0';
+    }
+
+/*
+ * Next enumerate all values in the current node into a temporary buffer.
  */
     RTMemAutoPtr<char> TmpBuf;
@@ -756 +696 @@
          * overwrite it next iteration. */
         if (   RT_SUCCESS(rc)
-            && matchesPattern(paszPatterns, cchPatterns, &TmpBuf[iTmpBuf])
+            && (   matchAll
+                || RTStrSimplePatternMultiMatch(pszPatterns, RTSTR_MAX,
+                                                &TmpBuf[iTmpBuf], RTSTR_MAX,
+                                                NULL)
+               )
            )
         {