#include "hex.h"
#include "sink.h"
+/** @brief Decode a URL-encoded string to a ink
+ * @param sink Where to store result
+ * @param ptr Start of string
+ * @param n Length of string
+ * @return 0 on success, non-0 if string could not be decoded or sink write failed
+ */
int urldecode(struct sink *sink, const char *ptr, size_t n) {
int c, d1, d2;
return d.vec;
}
+/** @brief Decode a URL-decoded key-value pair list
+ * @param ptr Start of input string
+ * @param n Length of input string
+ * @return @ref kvp of values from input
+ *
+ * The KVP is in the same order as the original input.
+ *
+ * If the original input contains duplicates names, so will the KVP.
+ */
struct kvp *kvp_urldecode(const char *ptr, size_t n) {
struct kvp *kvp, **kk = &kvp, *k;
const char *q, *r, *top = ptr + n, *next;
return kvp;
}
+/** @brief URL-encode a string to a sink
+ * @param sink Where to send output
+ * @param s String to encode
+ * @param n Length of string to encode
+ * @return 0 on success or non-0 if sink write failed
+ */
int urlencode(struct sink *sink, const char *s, size_t n) {
unsigned char c;
return d.vec;
}
+/** @brief URL-encode a KVP
+ * @param kvp Linked list to encode
+ * @param np Where to store length (or NULL)
+ * @return Newly created string
+ */
char *kvp_urlencode(const struct kvp *kvp, size_t *np) {
struct dynstr d;
struct sink *sink;
return d.vec;
}
+/** @brief Set or remove a value in a @ref kvp
+ * @param kvpp Address of KVP head to modify
+ * @param name Key to search for
+ * @param value New value or NULL to delete
+ * @return 1 if any change was made otherwise 0
+ *
+ * If @p value is not NULL then the first matching key is replaced; if
+ * there was no matching key a new one is added at the end.
+ *
+ * If @p value is NULL then the first matching key is removed.
+ *
+ * If anything actually changes the return value is 1. If no actual
+ * change is made then 0 is returned instead.
+ */
int kvp_set(struct kvp **kvpp, const char *name, const char *value) {
struct kvp *k, **kk;
}
}
+/** @brief Look up a value in a @ref kvp
+ * @param kvp Head of KVP linked list
+ * @param name Key to search for
+ * @return Value or NULL
+ *
+ * The returned value is owned by the KVP so must not be modified or
+ * freed.
+ */
const char *kvp_get(const struct kvp *kvp, const char *name) {
for(;kvp && strcmp(kvp->name, name); kvp = kvp->next)
;
return kvp ? kvp->value : 0;
}
+/** @brief Construct a KVP from arguments
+ * @param name First name
+ * @return Newly created KVP
+ *
+ * Arguments must come in name/value pairs and must be followed by a (char *)0.
+ *
+ * The order of the new KVP is not formally defined though the test
+ * programs rely on it nonetheless so update them if you change it.
+ */
struct kvp *kvp_make(const char *name, ...) {
const char *value;
struct kvp *kvp = 0, *k;
value = va_arg(ap, const char *);
k = xmalloc(sizeof *k);
k->name = name;
- k->value = value ? xstrdup(value) : value;
+ k->value = value ? xstrdup(value) : "";
k->next = kvp;
kvp = k;
name = va_arg(ap, const char *);
check_integer(urldecode(sink_error(), "bar=foo", 7), -1);
check_integer(urlencode(sink_error(), "wibble", 7), -1);
check_integer(urlencode(sink_error(), " ", 1), -1);
+ k = kvp_make("wibble", "spong",
+ "blit", "blat",
+ (char *)0);
+ check_string(kvp_urlencode(k, &n),
+ "blit=blat&wibble=spong");
+ k = kvp_make("wibble", (char *)0,
+ "blit", "blat",
+ (char *)0);
+ check_string(kvp_urlencode(k, &n),
+ "blit=blat&wibble=");
}
TEST(kvp);
insist(parse_url("http://www.example.com/example%2zpath", &p) == -1);
setenv("SERVER_NAME", "www.anjou.terraraq.org.uk", 1);
- setenv("SERVER_PORT", "80", 1);
setenv("SCRIPT_NAME", "/~richard/env.cgi", 1);
+ check_string(infer_url(1),
+ "http://www.anjou.terraraq.org.uk/~richard/env.cgi");
+ setenv("SERVER_PORT", "80", 1);
check_string(infer_url(1),
"http://www.anjou.terraraq.org.uk/~richard/env.cgi");
setenv("HTTPS", "on", 1);
setenv("QUERY_STRING", "foo", 1);
check_string(infer_url(1),
"https://www.anjou.terraraq.org.uk/~richard/env.cgi");
+ setenv("SCRIPT_NAME", "", 1);
+ check_string(infer_url(1),
+ "https://www.anjou.terraraq.org.uk/");
setenv("REQUEST_URI", "/~richard/env%2ecgi", 1);
check_string(infer_url(1),
"https://www.anjou.terraraq.org.uk/~richard/env%2ecgi");