mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
John Mark Bell 2005-02-14 21:20:26 +00:00
parent 5785f6bcac
commit 0c7b9496ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/url.c
View File

@ -37,7 +37,7 @@ void url_init(void)
"(\\?([^#[:space:]]*))?(#([^[:space:]]*))?" "(\\?([^#[:space:]]*))?(#([^[:space:]]*))?"
"[[:space:]]*$", REG_EXTENDED); "[[:space:]]*$", REG_EXTENDED);
regcomp_wrapper(&url_up_re, regcomp_wrapper(&url_up_re,
"/(|[^/]|[.][^./]|[^./][.]|[^/][^/][^/]+)/[.][.](/|$)", "/([^/]|[.][^./]|[^./][.]|[^/][^/][^/]+)/[.][.](/|$)",
REG_EXTENDED); REG_EXTENDED);
regcomp_wrapper(&url_nice_re, regcomp_wrapper(&url_nice_re,
"^([^.]{0,4}[.])?([^.][^.][.])?([^/?&;.=]*)" "^([^.]{0,4}[.])?([^.][^.][.])?([^/?&;.=]*)"
@ -92,8 +92,8 @@ url_func_result url_normalize(const char *url, char **result)
len += sizeof("http://")-1; len += sizeof("http://")-1;
} else { } else {
if ((*result = malloc(len + 6)) == NULL) { if ((*result = malloc(len + 6)) == NULL) {
LOG(("strdup failed")); LOG(("malloc failed"));
return URL_FUNC_FAILED; return URL_FUNC_NOMEM;
} }
strcpy(*result, url); strcpy(*result, url);
} }