diff options
Diffstat (limited to 'src/input/http_helper.c')
-rw-r--r-- | src/input/http_helper.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/input/http_helper.c b/src/input/http_helper.c index 90ee63c92..9b3560b22 100644 --- a/src/input/http_helper.c +++ b/src/input/http_helper.c @@ -26,9 +26,8 @@ #include <string.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "http_helper.h" -#include "xineutils.h" const char *_x_url_user_agent (const char *url) @@ -235,29 +234,6 @@ error: return 0; } -char *_x_canonicalise_url (const char *base, const char *url) { - - size_t base_length; - char *cut; - - if ((cut = strstr (url, "://"))) - return strdup (url); - - cut = strstr (base, "://"); - if (url[0] == '/') { - /* absolute - base up to first '/' after "://", then url */ - cut = strchr (cut + 3, '/'); - } - else { - /* relative - base up to & inc. last '/', then url */ - cut = strrchr (cut, '/'); - if (cut) - ++cut; - } - base_length = cut ? (size_t)(cut - base) : strlen (base); - - return _x_asprintf ("%.*s%s", (int)base_length, base, url); -} #ifdef TEST_URL /* |