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

Only need to cope with trailing whitespace if it exists. 

svn path=/trunk/netsurf/; revision=12969
This commit is contained in:
Michael Drake 2011-10-06 11:53:23 +00:00
parent 65943b7a67
commit fd5ad500c5
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
utils/nsurl.c
View File

@ -192,6 +192,7 @@ static void nsurl__get_string_markers(const char const *url_s,
{
const char *pos = url_s; /** current position in url_s */
bool is_http = false;
bool trailing_whitespace = false;
/* Initialise marker set */
struct url_markers marker = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@ -363,18 +364,31 @@ static void nsurl__get_string_markers(const char const *url_s,
/* We got to the end of url_s.
* Need to skip back over trailing whitespace to find end of URL */
pos--;
while (isspace(*pos))
pos--;
if (isspace(*pos)) {
trailing_whitespace = true;
while (isspace(*pos))
pos--;
}
marker.end = pos + 1 - url_s;
/* Ensure last url section doesn't pass end */
if (marker.fragment > marker.end) marker.fragment = marker.end;
if (marker.query > marker.end) marker.query = marker.end;
if (marker.path > marker.end) marker.path = marker.end;
if (marker.colon_last > marker.end) marker.colon_last = marker.end;
if (marker.at > marker.end) marker.at = marker.end;
if (marker.colon_last > marker.end) marker.colon_last = marker.end;
if (marker.fragment > marker.end) marker.fragment = marker.end;
if (trailing_whitespace == true) {
/* Ensure last url section doesn't pass end */
if (marker.fragment > marker.end)
marker.fragment = marker.end;
if (marker.query > marker.end)
marker.query = marker.end;
if (marker.path > marker.end)
marker.path = marker.end;
if (marker.colon_last > marker.end)
marker.colon_last = marker.end;
if (marker.at > marker.end)
marker.at = marker.end;
if (marker.colon_last > marker.end)
marker.colon_last = marker.end;
if (marker.fragment > marker.end)
marker.fragment = marker.end;
}
/* Got all the URL components pegged out now */
*markers = marker;