Fix escaping of paths with spaces

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/html.c b/html.c
index a60bc13..6f31097 100644
--- a/html.c
+++ b/html.c
@@ -20,3 +20,3 @@ static const char* url_escape_table[256] = {
         "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-        "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+        "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
         "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
@@ -164,5 +164,5 @@ void html_url_path(const char *txt)
                 const char *e = url_escape_table[c];
-                if (e && c!='+' && c!='&' && c!='+') {
+                if (e && c!='+' && c!='&') {
                         html_raw(txt, t - txt);
-                        html_raw(e, 3);
+                        html(e);
                         txt = t+1;
@@ -181,5 +181,7 @@ void html_url_arg(const char *txt)
                 const char *e = url_escape_table[c];
+                if (c == ' ')
+                        e = "+";
                 if (e) {
                         html_raw(txt, t - txt);
-                        html_raw(e, strlen(e));
+                        html(e);
                         txt = t+1;