Changeset 27737 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 26, 2010 1:12:18 PM (15 years ago)

Author:

vboxsync

Message:

strformatrt.cpp: some xml fixes (probably not quite right yet, but good enough for now).

File:

• trunk/src/VBox/Runtime/common/string/strformatrt.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -1051 +1051 @@
                     case 's':
                     {
-                        static const char   s_szAttrEscape[] = "\n\""; /* more? */
-                        static const char   s_szElemEscape[] = "<>&'\"";
-                        const char *pszEscape = fAttr ?             s_szAttrEscape      :             s_szElemEscape;
-                        size_t      cchEscape = fAttr ? RT_ELEMENTS(s_szAttrEscape) - 1 : RT_ELEMENTS(s_szElemEscape) - 1;
+                        static const char   s_szElemEscape[] = "<>&\"'";
+                        static const char   s_szAttrEscape[] = "<>&\"\n\r"; /* more? */
+                        const char * const  pszEscape =  fAttr ?             s_szAttrEscape  :             s_szElemEscape;
+                        size_t       const  cchEscape = (fAttr ? RT_ELEMENTS(s_szAttrEscape) : RT_ELEMENTS(s_szElemEscape)) - 1;
                         size_t      cchOutput = 0;
                         const char *pszStr    = va_arg(*pArgs, char *);
@@ -1078 +1078 @@
                                 if (offLast < offCur)
                                     cchOutput += pfnOutput(pvArgOutput, &pszStr[offLast], offCur - offLast);
-                                if (fAttr)
-                                    switch (pszStr[offCur])
-                                    {
-                                        case '\n':  cchOutput += pfnOutput(pvArgOutput, "\\\n", 2); break;
-                                        case '"':   cchOutput += pfnOutput(pvArgOutput, "\\\"", 2); break;
-                                        default:
-                                            AssertFailed();
-                                    }
-                                else
-                                    switch (pszStr[offCur])
-                                    {
-                                        case '<':   cchOutput += pfnOutput(pvArgOutput, "&lt;", 4); break;
-                                        case '>':   cchOutput += pfnOutput(pvArgOutput, "&gt;", 4); break;
-                                        case '&':   cchOutput += pfnOutput(pvArgOutput, "&amp;", 5); break;
-                                        case '\'':  cchOutput += pfnOutput(pvArgOutput, "&apos;", 6); break;
-                                        case '"':   cchOutput += pfnOutput(pvArgOutput, "&qout;", 6); break;
-                                        default:
-                                            AssertFailed();
-                                    }
+                                switch (pszStr[offCur])
+                                {
+                                    case '<':   cchOutput += pfnOutput(pvArgOutput, "&lt;", 4); break;
+                                    case '>':   cchOutput += pfnOutput(pvArgOutput, "&gt;", 4); break;
+                                    case '&':   cchOutput += pfnOutput(pvArgOutput, "&amp;", 5); break;
+                                    case '\'':  cchOutput += pfnOutput(pvArgOutput, "&apos;", 6); break;
+                                    case '"':   cchOutput += pfnOutput(pvArgOutput, "&qout;", 6); break;
+                                    case '\n':  cchOutput += pfnOutput(pvArgOutput, "&#xA;", 5); break;
+                                    case '\r':  cchOutput += pfnOutput(pvArgOutput, "&#xD;", 5); break;
+                                    default:
+                                        AssertFailed();
+                                }
                                 offLast = offCur + 1;
                             }