X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..28dc2d220aee492d34c35e3e0756248a16d55b5a:/lib/kvp.c

diff --git a/lib/kvp.c b/lib/kvp.c
index d3a80f5..4aa31a1 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
@@ -124,7 +124,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 +137,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;
@@ -192,4 +211,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:7c983bde915ec06fbda8d8cdc465dd9d */