commit daf77af1b21c33301f03d83b2c6d3a5027629247
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 19 14:17:37 2005 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 19 14:17:37 2005 +0000
tree bd323851b99f27a9c6331b71458c679349e5b013
parent c55ad8c0bb70756e6daec71f46738c4b70915bd7

New printf format specifier %t, which is like %s but escapes
XML-unfriendly chars and thereby helps in the construction of valid
XML output.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4185 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_debuglog.c

diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c
index a578280..bdf2769 100644
--- a/coregrind/m_debuglog.c
+++ b/coregrind/m_debuglog.c
@@ -261,6 +261,41 @@
 }
 
 
+/* Copy a string into the buffer, escaping bad XML chars. */
+static 
+UInt myvprintf_str_XML_simplistic ( void(*send)(HChar,void*),
+                                    void* send_arg2,
+                                    HChar* str )
+{
+   UInt   ret = 0;
+   Int    i;
+   Int    len = local_strlen(str);
+   HChar* alt;
+
+   for (i = 0; i < len; i++) {
+      switch (str[i]) {
+         case '&': alt = "&amp;"; break;
+         case '<': alt = "&lt;"; break;
+         case '>': alt = "&gt;"; break;
+         default:  alt = NULL;
+      }
+
+      if (alt) {
+         while (*alt) {
+            send(*alt, send_arg2);
+            ret++;
+            alt++;
+         }
+      } else {
+         send(str[i], send_arg2);
+         ret++;
+      }
+   }
+
+   return ret;
+}
+
+
 /* Write P into the buffer according to these args:
  *  If SIGN is true, p is a signed.
  *  BASE is the base.
@@ -448,6 +483,14 @@
                                  flags, width, str, format[i]=='S');
             break;
          }
+         case 't': { /* %t, like %s but escaping chars for XML safety */
+            /* Note: simplistic; ignores field width and flags */
+            char *str = va_arg (vargs, char *);
+            if (str == (char*) 0) str = "(null)";
+            ret += myvprintf_str_XML_simplistic(send, send_arg2, str);
+            break;
+         }
+
 //         case 'y': { /* %y - print symbol */
 //            Char buf[100];
 //            Char *cp = buf;