*
* o Escaping of special characters still follows RFC 1738.
* o Interpretation of path parameters follows RFC 1808.
- * o Parsing a relative URL "x" wrt. base "http://hell.org?y"
- * gives an error, which might be wrong. However, I failed
- * to find any rule applying to this case in the RFC.
+ *
+ * XXX: The buffer handling in this module is really horrible, but it works.
*/
#include "lib/lib.h"
int err;
/* Basic checks */
- if (url_proto_path_flags[u->protoid] && !u->host ||
- u->host && !*u->host ||
+ if (url_proto_path_flags[u->protoid] && (!u->host || !*u->host) ||
!u->host && u->user ||
!u->user && u->pass ||
!u->rest)
}
}
+ /* Change path "?" to "/?" because it's the true meaning */
+ if (u->rest[0] == '?')
+ {
+ int l = strlen(u->rest);
+ if (u->bufend - u->buf < l+1)
+ return URL_ERR_TOO_LONG;
+ u->buf[0] = '/';
+ memcpy(u->buf+1, u->rest, l+1);
+ u->rest = u->buf;
+ u->buf += l+2;
+ }
+
/* Fill in missing info */
if (u->port == ~0U)
u->port = std_ports[u->protoid];