X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..05b75f8d50b83e943af3be4071449304d82dbdcd:/lib/kvp.c

diff --git a/lib/kvp.c b/lib/kvp.c
index 6c18a8f..9cd0554 100644
--- a/lib/kvp.c
+++ b/lib/kvp.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,11 +18,7 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
-
-#include <string.h>
-#include <stdio.h>
+#include "common.h"
 
 #include "mem.h"
 #include "kvp.h"
@@ -124,7 +120,11 @@ int urlencode(struct sink *sink, const char *s, size_t n) {
   return 0;
 }
 
-const char *urlencodestring(const char *s) {
+/** @brief URL-encode @p s
+ * @param s String to encode
+ * @return Encoded string
+ */
+char *urlencodestring(const char *s) {
   struct dynstr d;
 
   dynstr_init(&d);
@@ -133,6 +133,21 @@ const char *urlencodestring(const char *s) {
   return d.vec;
 }
 
+/** @brief URL-decode @p s
+ * @param s String to decode
+ * @param ns Length of string
+ * @return Decoded string or NULL
+ */
+char *urldecodestring(const char *s, size_t ns) {
+  struct dynstr d;
+
+  dynstr_init(&d);
+  if(urldecode(sink_dynstr(&d), s, ns))
+    return NULL;
+  dynstr_terminate(&d);
+  return d.vec;
+}
+
 char *kvp_urlencode(const struct kvp *kvp, size_t *np) {
   struct dynstr d;
   struct sink *sink;