diff options
1 files changed, 3 insertions, 18 deletions
| -rw-r--r-- | uri.c | 21 |
@@ -4,6 +4,7 @@ #include "uri.h" +#include <glib.h> /* g_strcmp0() */ #include <glib/gprintf.h> /* g_fprintf() */ #include <libsoup/soup.h> /* soup* */ #include <unistd.h> /* access() */ @@ -12,26 +13,10 @@ const gchar * badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) { const gchar *fallback = "about:blank"; - SoupURI *uri; - uri = soup_uri_new(text); - if(!uri) return fallback; + if(g_strcmp0(text, "") <= 0) return fallback; - //g_fprintf(stderr, "uri->scheme = %s, uri->path = %s\n", uri->scheme, uri->path); - - if(!uri->path) - { - soup_uri_free(uri); - return fallback; - } - - if(uri->scheme) - { - soup_uri_free(uri); - return text; - } - - soup_uri_free(uri); + if(g_uri_parse_scheme(text)) return text; if(try_file && (access(text, R_OK) == 0)) return g_strdup_printf("file://%s", text); |