Changeset 36412 in vbox

Timestamp:

Mar 24, 2011 5:25:33 PM (14 years ago)

Author:

vboxsync

Message:

GuestProps: TRANSRESET implies TRANSIENT, return it for old additions and API users.

Location:

trunk

Files:

• include/VBox/HostServices/GuestPropertySvc.h (modified) (2 diffs)
• src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -179 +179 @@
 DECLINLINE(int) writeFlags(uint32_t fFlags, char *pszFlags)
 {
-    /* Putting READONLY before the other RDONLY flags keeps the result short. */
     static const uint32_t s_aFlagList[] =
     {
         TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST, TRANSRESET
     };
-    char *pszNext = pszFlags;
     int rc = VINF_SUCCESS;
+
     AssertLogRelReturn(VALID_PTR(pszFlags), VERR_INVALID_POINTER);
-    if ((fFlags & ~ALLFLAGS) != NILFLAG)
-        rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
+    if ((fFlags & ~ALLFLAGS) == NILFLAG)
     {
-        unsigned i = 0;
-        for (; i < RT_ELEMENTS(s_aFlagList); ++i)
+        /* TRANSRESET implies TRANSIENT.  For compatability with old clients we
+           always set TRANSIENT when TRANSRESET appears. */
+        if (fFlags & TRANSRESET)
+            fFlags |= TRANSIENT;
+
+        char *pszNext = pszFlags;
+        for (unsigned i = 0; i < RT_ELEMENTS(s_aFlagList); ++i)
         {
             if (s_aFlagList[i] == (fFlags & s_aFlagList[i]))
@@ -207 +209 @@
         }
         *pszNext = '\0';
-        if (fFlags != NILFLAG)
-            rc = VERR_INVALID_PARAMETER;  /* But pszFlags will still be set right. */
+
+        Assert(fFlags == NILFLAG); /* bad s_aFlagList */
     }
+    else
+        rc = VERR_INVALID_PARAMETER;
     return rc;
 }

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -81 +81 @@
     { "rdonlyhost     ",                                "RDONLYHOST" },
     { "transient, transreset, rdonlyhost",              "TRANSIENT, RDONLYHOST, TRANSRESET" },
-    { "transient, transreset, rdonlyguest",             "TRANSIENT, RDONLYGUEST, TRANSRESET" },
-    { "rdonlyguest, rdonlyhost",                        "READONLY" }
+    { "transient, transreset, rdonlyguest",             "TRANSIENT, RDONLYGUEST, TRANSRESET" },     /* max length */
+    { "rdonlyguest, rdonlyhost",                        "READONLY" },
+    { "transient,   transreset, ",                      "TRANSIENT, TRANSRESET" }, /* Don't combine them ... */
+    { "transreset, ",                                   "TRANSIENT, TRANSRESET" }, /* ... instead expand transreset for old adds. */
 };