From 361bb55f01ba28960a8127b0a16c1e7a7a8de61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= <john@ankarstrom.se>
Date: Fri, 17 Sep 2021 20:57:05 +0200
Subject: Rewrite mktpl script in C

The Perl version didn't handle multiple interpolations on the same line.
---
 t/front.t  | 34 +++++++++++++++++++---------------
 t/front.tc | 25 ++++++++++++-------------
 t/post.t   |  1 +
 t/post.tc  |  3 +++
 t/user.t   |  1 +
 t/user.tc  |  5 +++++
 6 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 t/post.t
 create mode 100644 t/post.tc
 create mode 100644 t/user.t
 create mode 100644 t/user.tc

(limited to 't')

diff --git a/t/front.t b/t/front.t
index 0a372a6..a9badb0 100644
--- a/t/front.t
+++ b/t/front.t
@@ -1,16 +1,20 @@
 <h1><%= site.name %></h1>
-<% printf("Hello world!"); %>
-<br>
-Request method: <%= getenv("REQUEST_METHOD") %>
-<br>
-<%
-	char *a, *b, *bv;
-	a = nextparam(512);
-	printf("%s (%d)<br>", a, TRUNCATED(a));
-	b = nextparam(512);
-	printf("%s (%d)<br>", b, TRUNCATED(b));
-	bv = split(b);
-	printf("'%s' contains '%s'<br>", b, bv);
-	printf("Next: %s\n", nextparam(512));
-	printf("Next: %s\n", nextparam(512));
-%>
\ No newline at end of file
+<p>Thanks for the <%= getenv("REQUEST_METHOD") %> request!</p>
+<table border="1">
+	<tr style="font-weight: bold;">
+		<td style="width: 60px;">Key</td>
+		<td style="width: 140px;">Value</td>
+	</tr>
+	<%
+	char *p, *v;
+	while(p = nextparam(GET, 512)){
+		v = split(p);
+	%>
+	<tr>
+		<td><%= p %></td>
+		<td><%= v %></td>
+	</tr>
+	<%
+	}
+	%>
+</table>
\ No newline at end of file
diff --git a/t/front.tc b/t/front.tc
index 89e665a..3307c21 100644
--- a/t/front.tc
+++ b/t/front.tc
@@ -1,16 +1,15 @@
 printf("<h1>");
 printf("%s",  site.name );
-printf("</h1>\n");
- printf("Hello world!"); printf("\n<br>\nRequest method: ");
+printf("</h1>\n<p>Thanks for the ");
 printf("%s",  getenv("REQUEST_METHOD") );
-printf("<br>\n");
-	char *a, *b, *bv;
-	a = nextparam(512);
-	printf("%s (%d)<br>", a, TRUNCATED(a));
-	b = nextparam(512);
-	printf("%s (%d)<br>", b, TRUNCATED(b));
-	bv = split(b);
-	printf("'%s' contains '%s'<br>", b, bv);
-	printf("Next: %s\n", nextparam(512));
-	printf("Next: %s\n", nextparam(512));
-printf("\n");
+printf(" request!</p>\n<table border=\"1\">\n	<tr style=\"font-weight: bold;\">\n		<td style=\"width: 60px;\">Key</td>\n		<td style=\"width: 140px;\">Value</td>\n	</tr>\n	");
+	char *p, *v;
+	while(p = nextparam(GET, 512)){
+		v = split(p);
+	printf("\n	<tr>\n		<td>");
+printf("%s",  p );
+printf("</td>\n		<td>");
+printf("%s",  v );
+printf("</td>\n	</tr>\n	");
+	}
+	printf("\n</table>");
diff --git a/t/post.t b/t/post.t
new file mode 100644
index 0000000..a74f29a
--- /dev/null
+++ b/t/post.t
@@ -0,0 +1 @@
+<h1>Post <% printf("%d", id); %></h1>
diff --git a/t/post.tc b/t/post.tc
new file mode 100644
index 0000000..7c36950
--- /dev/null
+++ b/t/post.tc
@@ -0,0 +1,3 @@
+printf("<h1>Post ");
+printf("%d", id); 
+printf("</h1>\n");
diff --git a/t/user.t b/t/user.t
new file mode 100644
index 0000000..9a0fd49
--- /dev/null
+++ b/t/user.t
@@ -0,0 +1 @@
+<h1>User <% printf("%d", id); %>: <%= user->name %></h1>
\ No newline at end of file
diff --git a/t/user.tc b/t/user.tc
new file mode 100644
index 0000000..3d92e16
--- /dev/null
+++ b/t/user.tc
@@ -0,0 +1,5 @@
+printf("<h1>User ");
+printf("%d", id); 
+printf(": ");
+printf("%s",  user->name );
+printf("</h1>");
-- 
cgit v1.2.3