X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cgi.c;h=7995e3f1b8cd323992bdbb7c0150b0c461624e2d;hb=3a5182f49dd2bf9e617566a8a9ec7689db4f4f8b;hp=785191422c9e449a2d85995581a53675dbf3f26a;hpb=1ca9e6ca7959d20780bb3bc336404549156415c7;p=collection4.git
diff --git a/src/utils_cgi.c b/src/utils_cgi.c
index 7851914..7995e3f 100644
--- a/src/utils_cgi.c
+++ b/src/utils_cgi.c
@@ -433,10 +433,16 @@ char *uri_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
}
else if ((((unsigned char) src[in]) < 32)
|| (src[in] == ' ')
- || (src[in] == '&')
- || (src[in] == ';')
- || (src[in] == '?')
- || (src[in] == '/')
+ /* RFC 3986, gen-delims */
+ || (src[in] == ':') || (src[in] == '/') || (src[in] == '?')
+ || (src[in] == '#') || (src[in] == '[') || (src[in] == ']')
+ || (src[in] == '@')
+ /* RFC 3986, sub-delims */
+ || (src[in] == '!') || (src[in] == '$') || (src[in] == '&')
+ || (src[in] == '(') || (src[in] == ')') || (src[in] == '*')
+ || (src[in] == '+') || (src[in] == ',') || (src[in] == ';')
+ || (src[in] == '=') || (src[in] == '\'')
+ /* 8-bit data */
|| (((unsigned char) src[in]) >= 128))
{
char esc[4];
@@ -684,6 +690,12 @@ int html_print_page (const char *title, /* {{{ */
" \n"
" \n"
+ " \n"
+ " \n"
+ " \n"
" \n"
" \n",
@@ -751,7 +763,7 @@ int html_print_logo (__attribute__((unused)) void *user_data) /* {{{ */
printf ("\n"
" C4
\n"
" collection 4
\n"
- "\n");
+ "\n", script_name ());
return (0);
} /* }}} int html_print_search_box */