From owner-svn-soc-all@FreeBSD.ORG  Mon Aug 18 10:31:39 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 75033674
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:31:39 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 60A8E354D
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:31:39 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IAVdqv016076
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:31:39 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7IAVcWA015793
 for svn-soc-all@FreeBSD.org; Mon, 18 Aug 2014 10:31:38 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 18 Aug 2014 10:31:38 GMT
Message-Id: <201408181031.s7IAVcWA015793@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zkorchev@FreeBSD.org using -f
From: zkorchev@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r272600 - soc2014/zkorchev/freebsd_head/lib/libsol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2014 10:31:39 -0000

Author: zkorchev
Date: Mon Aug 18 10:31:38 2014
New Revision: 272600
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272600

Log:
  xml special characters handling

Modified:
  soc2014/zkorchev/freebsd_head/lib/libsol/sol.c

Modified: soc2014/zkorchev/freebsd_head/lib/libsol/sol.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/lib/libsol/sol.c	Mon Aug 18 10:23:41 2014	(r272599)
+++ soc2014/zkorchev/freebsd_head/lib/libsol/sol.c	Mon Aug 18 10:31:38 2014	(r272600)
@@ -52,6 +52,32 @@
 
 // TODO track whether a key or a value is expected and generate error when appropriate?
 
+static void xml_tag(const char *tag)
+{
+	for(; *tag; ++tag)
+		switch (*tag)
+		{
+		case ' ':
+			putchar('_');
+			break;
+		case '(':
+		case ')':
+			break;
+		case '%':
+			fputs(" percent", stdout);
+			break;
+		case '|':
+			fputs(" or ", stdout);
+			break;
+		case '/':
+			putchar('.');
+			break;
+		default:
+			putchar(*tag);
+			break;
+		}
+}
+
 static void xml_open(struct sol_stream *restrict stream)
 {
 	const char *tag;
@@ -62,8 +88,11 @@
 	if (!tag && (stream->ctx.c.depth > 1))
 		tag = stream->ctx.c.stack[stream->ctx.c.depth - 2];
 
-	if (tag)
-		printf("<%s>", tag);
+	if (tag) {
+		putchar('<');
+		xml_tag(tag);
+		putchar('>');
+	}
 	else
 		printf("<item>");
 }
@@ -86,7 +115,9 @@
 
 	if (tag)
 	{
-		printf("</%s>", tag);
+		fputs("</", stdout);
+		xml_tag(tag);
+		putchar('>');
 		if (clean) free(tag);
 	}
 	else