+void yaz_encode_uri_component(char *dst, const char *uri)
+{
+ for (; *uri; uri++)
+ {
+ encode_uri_char(dst, *uri);
+ dst += strlen(dst);
+ }
+ *dst = '\0';
+}
+
+static unsigned char decode_uri_char(const char *path, size_t *len)
+{
+ unsigned char ch;
+ if (*path == '+')
+ {
+ ch = ' ';
+ *len = 1;
+ }
+ else if (*path == '%' && *len >= 3)
+ {
+ int d1 = hex_digit(path[1]);
+ int d2 = hex_digit(path[2]);
+ if (d1 >= 0 && d2 >= 0)
+ {
+ ch = d1 * 16 + d2;
+ *len = 3;
+ }
+ else
+ {
+ ch = *path;
+ *len = 1;
+ }
+ }
+ else
+ {
+ ch = *path;
+ *len = 1;
+ }
+ return ch;
+}
+
+void yaz_decode_uri_component(char *dst, const char *uri, size_t len)
+{
+ while (len)
+ {
+ size_t sz = len;
+ *dst++ = decode_uri_char(uri, &sz);
+ uri += sz;
+ len = len - sz;
+ }
+ *dst = '\0';
+}
+