From 544486680095d1024ae991ce95cde52080cbf43c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 24 Dec 2011 22:14:46 +0000 Subject: Support file://localhost/foo URIs in serd_uri_to_path(). Support Windows file://c:/foo URIs in serd_uri_to_path() on all platforms. 100% test coverage (by line) for uri.c. git-svn-id: http://svn.drobilla.net/serd/trunk@269 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/uri.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'src/uri.c') diff --git a/src/uri.c b/src/uri.c index 4388571c..a0078920 100644 --- a/src/uri.c +++ b/src/uri.c @@ -26,29 +26,27 @@ SERD_API const uint8_t* serd_uri_to_path(const uint8_t* uri) { - const uint8_t* filename = NULL; + const uint8_t* path = NULL; if (serd_uri_string_has_scheme(uri)) { - // Absolute URI, ensure it a file and chop scheme if (strncmp((const char*)uri, "file:", 5)) { fprintf(stderr, "Non-file URI `%s'\n", uri); return NULL; - } else if (strncmp((const char*)uri + 5, "//", 2)) { - fprintf(stderr, "Illegal file URI `%s'\n", uri); - return NULL; -#ifdef __WIN32__ - } else if (!strncmp((const char*)uri, "file:///", 8)) { - filename = uri + 8; -#else + } else if (!strncmp((const char*)uri, "file://localhost/", 17)) { + path = uri + 16; } else if (!strncmp((const char*)uri, "file://", 7)) { - filename = uri + 7; -#endif + path = uri + 7; } else { - filename = uri + 5; + fprintf(stderr, "Invalid file URI `%s'\n", uri); + return NULL; + } + // Special case for awful Windows file URIs + if (is_alpha(path[1]) && path[2] == ':' && path[3] == '/') { + ++path; // Special case for terrible Windows file URIs } } else { - filename = uri; + path = uri; } - return filename; + return path; } SERD_API -- cgit v1.2.1