graph_{data,def}_json actions: Don't destroy the graph_config_t object.

[collection4.git] / src / utils_cgi.c

diff --git a/src/utils_cgi.c b/src/utils_cgi.c
index 7c01bd9..eb9d593 100644 (file)
--- a/src/utils_cgi.c
+++ b/src/utils_cgi.c
@@ -432,10 +432,17 @@ char *uri_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
       return (dest);
     }
     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];
@@ -462,6 +469,16 @@ char *uri_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
   return (dest);
 } /* }}} char *uri_escape_copy */
 
+char *uri_escape_buffer (char *buffer, size_t buffer_size) /* {{{ */
+{
+  char temp[buffer_size];
+
+  uri_escape_copy (temp, buffer, buffer_size);
+  memcpy (buffer, temp, buffer_size);
+
+  return (&buffer[0]);
+} /* }}} char *uri_escape_buffer */
+
 char *uri_escape (const char *string) /* {{{ */
 {
   char buffer[4096];
@@ -740,7 +757,7 @@ int html_print_logo (__attribute__((unused)) void *user_data) /* {{{ */
   printf ("<a href=\"%s?action=list_graphs\" id=\"logo-canvas\">\n"
       "  <h1>C<sub>4</sub></h1>\n"
       "  <div id=\"logo-subscript\">collection&nbsp;4</div>\n"
-      "</a>\n");
+      "</a>\n", script_name ());
 
   return (0);
 } /* }}} int html_print_search_box */