diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-11 18:47:36 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-11 18:47:36 +0000 |
commit | faca1687ceac7c07daf5478071361fe98aa4cafe (patch) | |
tree | c576e41756deed0ae9a1d75aa08e9c3fd0ae61c2 /gtk | |
parent | 4cbb19f2184bc69c408bfffd32b70390f634314c (diff) | |
download | netsurf-faca1687ceac7c07daf5478071361fe98aa4cafe.tar.gz netsurf-faca1687ceac7c07daf5478071361fe98aa4cafe.tar.bz2 |
hell with it, heres a version which should result in fewer portability complaints
svn path=/trunk/netsurf/; revision=10756
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtk_gui.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index a9e428b19..24070bb47 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -867,14 +867,22 @@ char *path_to_url(const char *path) char *url_to_path(const char *url) { - char *url_path = curl_unescape(url, 0); char *path; + char *respath; + url_func_result res; /* result from url routines */ - /* return the absolute path including leading / */ - path = strdup(url_path + (FILE_SCHEME_PREFIX_LEN - 1)); - curl_free(url_path); + res = url_path(url, &path); + if (res != URL_FUNC_OK) { + return NULL; + } - return path; + res = url_unescape(path, &respath); + free(path); + if (res != URL_FUNC_OK) { + return NULL; + } + + return respath; } |