Changeset 10143 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 3, 2008 9:19:25 AM (17 years ago)

Author:

vboxsync

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

32669

Message:

Additions/common: make the VBoxControl guest property functions utf8-safe

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -113 +113 @@
     uint32_t u32ClientID = 0;
     int rc = VINF_SUCCESS;
-
+    char *pszKey = NULL;
     char szValue[KEY_MAX_VALUE_LEN];
+
     if (argc != 1)
     {
@@ -120 +121 @@
         return 1;
     }
-    rc = VbglR3InfoSvcConnect(&u32ClientID);
+    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
     if (!RT_SUCCESS(rc))
-        VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
+        VBoxControlError("Failed to convert the key name to Utf8, error %Rrc\n", rc);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3InfoSvcConnect(&u32ClientID);
+        if (!RT_SUCCESS(rc))
+            VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
+    }
     if (RT_SUCCESS(rc))
     {
@@ -129 +136 @@
             VBoxControlError("Failed to retrieve the property value, error %Rrc\n", rc);
     }
-    if (RT_SUCCESS(rc) || (VERR_NOT_FOUND == rc))
-    {
-        if (RT_SUCCESS(rc))
-            RTPrintf("Value: %s\n", szValue);
-        else
-            RTPrintf("No value set!\n");
-    }
+    if (VERR_NOT_FOUND == rc)
+        RTPrintf("No value set!\n");
+    if (RT_SUCCESS(rc))
+        RTPrintf("Value: %S\n", szValue);
     if (u32ClientID != 0)
         VbglR3InfoSvcDisconnect(u32ClientID);
+    RTStrFree(pszKey);
     return RT_SUCCESS(rc) ? 0 : 1;
 }
@@ -153 +158 @@
 static int setGuestProperty(int argc, char *argv[])
 {
+    uint32_t u32ClientID = 0;
+    int rc = VINF_SUCCESS;
+    char *pszKey = NULL;
+    char *pszValue = NULL;
+
     if (argc != 1 && argc != 2)
     {
@@ -158 +168 @@
         return 1;
     }
-    char *pszValue = NULL;
-    int rc = VINF_SUCCESS;
-    uint32_t u32ClientID = 0;
-
-    if (2 == argc)
-    pszValue = argv[1];
-    rc = VbglR3InfoSvcConnect(&u32ClientID);
+    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
     if (!RT_SUCCESS(rc))
-        VBoxControlError("Failed to connect to the host/guest registry service, error %Rrc\n", rc);
+        VBoxControlError("Failed to convert the key name to Utf8, error %Rrc\n", rc);
+    if (RT_SUCCESS(rc) && (2 == argc))
+    {
+        rc = RTStrCurrentCPToUtf8(&pszValue, argv[1]);
+        if (!RT_SUCCESS(rc))
+            VBoxControlError("Failed to convert the key value to Utf8, error %Rrc\n", rc);
+    }
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3InfoSvcConnect(&u32ClientID);
+        if (!RT_SUCCESS(rc))
+            VBoxControlError("Failed to connect to the host/guest registry service, error %Rrc\n", rc);
+    }
     if (RT_SUCCESS(rc))
     {
@@ -175 +191 @@
     if (u32ClientID != 0)
         VbglR3InfoSvcDisconnect(u32ClientID);
+    RTStrFree(pszKey);
+    RTStrFree(pszValue);
     return RT_SUCCESS(rc) ? 0 : 1;
 }