tests: add tests for links with space in path and/or args

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 1305910b40f9513ef11a0eda21fb6d6d06e11ae5..6f31097f538fcb07b30ac59e4792cd5f5812a563 100644 (file)
--- a/html.c
+++ b/html.c
@@ -162,9 +162,9 @@ void html_url_path(const char *txt)
        while(t && *t){
                int c = *t;
                const char *e = url_escape_table[c];
        while(t && *t){
                int c = *t;
                const char *e = url_escape_table[c];

-               if (e && c!='+' && c!='&' && c!='+') {
+               if (e && c!='+' && c!='&') {

                        html_raw(txt, t - txt);
                        html_raw(txt, t - txt);

-                       html_raw(e, 3);
+                       html(e);

                        txt = t+1;
                }
                t++;
                        txt = t+1;
                }
                t++;


@@ -179,9 +179,11 @@ void html_url_arg(const char *txt)
        while(t && *t){
                int c = *t;
                const char *e = url_escape_table[c];
        while(t && *t){
                int c = *t;
                const char *e = url_escape_table[c];

+               if (c == ' ')
+                       e = "+";

                if (e) {
                        html_raw(txt, t - txt);
                if (e) {
                        html_raw(txt, t - txt);

-                       html_raw(e, 3);
+                       html(e);

                        txt = t+1;
                }
                t++;
                        txt = t+1;
                }
                t++;


@@ -277,7 +279,7 @@ char *convert_query_hexchar(char *txt)
        d1 = hextoint(*(txt+1));
        d2 = hextoint(*(txt+2));
        if (d1<0 || d2<0) {
        d1 = hextoint(*(txt+1));
        d2 = hextoint(*(txt+2));
        if (d1<0 || d2<0) {

-               memmove(txt, txt+3, n-3);
+               memmove(txt, txt+3, n-2);

                return txt-1;
        } else {
                *txt = d1 * 16 + d2;
                return txt-1;
        } else {
                *txt = d1 * 16 + d2;