More event_*

[disorder] / lib / cgi.c

diff --git a/lib/cgi.c b/lib/cgi.c
index 9e455bfff40c4d818da4b33b1fce7d07f0a737c1..8cb04bb8f9170aa30bc4df9251ba01e837c17f7e 100644 (file)
--- a/lib/cgi.c
+++ b/lib/cgi.c
@@ -21,15 +21,10 @@
  * @brief CGI tools
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>
 
 #include "cgi.h"
 #include "mem.h"
@@ -213,6 +208,11 @@ void cgi_set(const char *name, const char *value) {
   hash_add(cgi_args, name, &value, HASH_INSERT_OR_REPLACE);
 }
 
+/** @brief Clear CGI arguments */
+void cgi_clear(void) {
+  cgi_args = hash_new(sizeof (char *));
+}
+
 /** @brief Add SGML-style quoting
  * @param src String to quote (UTF-8)
  * @return Quoted string
@@ -350,13 +350,11 @@ char *cgi_thisurl(const char *url) {
 
   dynstr_init(d);
   dynstr_append_string(d, url);
-  if(*keys) {
-    dynstr_append(d, '?');
-    for(n = 0; keys[n]; ++n) {
-      dynstr_append_string(d, urlencodestring(keys[n]));
-      dynstr_append(d, '=');
-      dynstr_append_string(d, cgi_get(keys[n]));
-    }
+  for(n = 0; keys[n]; ++n) {
+    dynstr_append(d, n ? '&' : '?');
+    dynstr_append_string(d, urlencodestring(keys[n]));
+    dynstr_append(d, '=');
+    dynstr_append_string(d, urlencodestring(cgi_get(keys[n])));
   }
   dynstr_terminate(d);
   return d->vec;