X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/9faa7a88b7419b2d6151ac2c3fa52261c876ee8d..05b75f8d50b83e943af3be4071449304d82dbdcd:/lib/cgi.c

diff --git a/lib/cgi.c b/lib/cgi.c
index 1c1154d..8cb04bb 100644
--- 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"
@@ -207,6 +202,17 @@ const char *cgi_get(const char *name) {
   return v ? *v : NULL;
 }
 
+/** @brief Set a CGI argument */
+void cgi_set(const char *name, const char *value) {
+  value = xstrdup(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
@@ -344,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;