Changeset 45260 in vbox for trunk/src

Timestamp:

Mar 31, 2013 12:07:11 AM (12 years ago)

Author:

vboxsync

Message:

We should probably check the iconv return value a little more closely. Currently trying VWRN_NO_TRANSLATION instead of VERR_NO_TRANSLATION as tstUtf8 originally expected. Adjusted tstUtf8. Seen trouble in this area on testboxsh1 where neither LC_ALL, LANG nor LC_CTYPE were set.

Location:

trunk/src/VBox/Runtime

Files:

• r3/posix/utf8-posix.cpp (modified) (4 diffs)
• testcase/tstUtf8.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp

@@ -194 +194 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
+            size_t      cchNonRev;
 #if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
-            if (iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
+            cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
 #else
-            if (iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
-#endif
+            cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
+#endif
+            if (cchNonRev != (size_t)-1)
             {
                 if (!cbInLeft)
@@ -210 +212 @@
                         ((char *)pvOutputLeft)[1] = '\0';
                     *ppvOutput = pvOutput;
-                    return VINF_SUCCESS;
+                    if (cchNonRev == 0)
+                        return VINF_SUCCESS;
+                    return VWRN_NO_TRANSLATION;
                 }
                 errno = E2BIG;
@@ -320 +324 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
+            size_t      cchNonRev;
 #if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
-            if (iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
+            cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
 #else
-            if (iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
-#endif
+            cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
+#endif
+            if (cchNonRev != (size_t)-1)
             {
                 if (!cbInLeft)
@@ -337 +343 @@
                         ((char *)pvOutputLeft)[1] = '\0';
                     *ppvOutput = pvOutput;
-                    return VINF_SUCCESS;
+                    if (cchNonRev == 0)
+                        return VINF_SUCCESS;
+                    return VWRN_NO_TRANSLATION;
                 }
                 errno = E2BIG;

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -1397 +1397 @@
     char *pszOut;
     rc = RTStrUtf8ToCurrentCP(&pszOut, pszTest1);
-    if (RT_SUCCESS(rc))
+    if (rc == VINF_SUCCESS)
     {
         RTTESTI_CHECK(!strcmp(pszOut, pszTest1));
@@ -1405 +1405 @@
     }
     else
-        RTTESTI_CHECK_RC(rc, VERR_NO_TRANSLATION);
+        RTTESTI_CHECK_MSG(rc == VWRN_NO_TRANSLATION || rc == VERR_NO_TRANSLATION, ("rc=%Rrc\n", rc));
 
     RTTestSub(hTest, "VERR_NO_TRANSLATION/RTUtf16ToLatin1");