/* Function declarations */
char *url_escape (const char *);
+char *url_escape_unsafe_and_reserved (const char *);
struct url *url_parse (const char *, int *);
-const char *url_error (int);
+char *url_error (const char *, int);
char *url_full_path (const struct url *);
void url_set_dir (struct url *, const char *);
void url_set_file (struct url *, const char *);