From 0c7b9496ef0d7a7195328d35dd96a660435c4786 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 14 Feb 2005 21:20:26 +0000 Subject: [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 --- utils/url.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils') 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); } -- cgit v1.2.3