summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2005-02-14 21:20:26 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2005-02-14 21:20:26 +0000
commit0c7b9496ef0d7a7195328d35dd96a660435c4786 (patch)
tree807167b1cc9bf709564f9a66b57bc9a5ca5f0464 /utils
parent5785f6bcac90c5927fbda31f86f509318d9cbe0e (diff)
downloadnetsurf-0c7b9496ef0d7a7195328d35dd96a660435c4786.tar.gz
netsurf-0c7b9496ef0d7a7195328d35dd96a660435c4786.tar.bz2
[project @ 2005-02-14 21:20:26 by jmb]
Make regex work with latest unixlib. Fix incorrect return value svn path=/import/netsurf/; revision=1512
Diffstat (limited to 'utils')
-rw-r--r--utils/url.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/url.c b/utils/url.c
index 23273a848..7600a1375 100644
--- a/utils/url.c
+++ b/utils/url.c
@@ -37,7 +37,7 @@ void url_init(void)
"(\\?([^#[:space:]]*))?(#([^[:space:]]*))?"
"[[:space:]]*$", REG_EXTENDED);
regcomp_wrapper(&url_up_re,
- "/(|[^/]|[.][^./]|[^./][.]|[^/][^/][^/]+)/[.][.](/|$)",
+ "/([^/]|[.][^./]|[^./][.]|[^/][^/][^/]+)/[.][.](/|$)",
REG_EXTENDED);
regcomp_wrapper(&url_nice_re,
"^([^.]{0,4}[.])?([^.][^.][.])?([^/?&;.=]*)"
@@ -92,8 +92,8 @@ url_func_result url_normalize(const char *url, char **result)
len += sizeof("http://")-1;
} else {
if ((*result = malloc(len + 6)) == NULL) {
- LOG(("strdup failed"));
- return URL_FUNC_FAILED;
+ LOG(("malloc failed"));
+ return URL_FUNC_NOMEM;
}
strcpy(*result, url);
}