diff options
Diffstat (limited to 'src/gmutil.c')
-rw-r--r-- | src/gmutil.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gmutil.c b/src/gmutil.c index 0f1bc803..72074278 100644 --- a/src/gmutil.c +++ b/src/gmutil.c | |||
@@ -49,11 +49,12 @@ void init_Url(iUrl *d, const iString *text) { | |||
49 | iRegExpMatch m; | 49 | iRegExpMatch m; |
50 | init_RegExpMatch(&m); | 50 | init_RegExpMatch(&m); |
51 | if (matchString_RegExp(urlPattern_, text, &m)) { | 51 | if (matchString_RegExp(urlPattern_, text, &m)) { |
52 | d->scheme = capturedRange_RegExpMatch(&m, 2); | 52 | d->scheme = capturedRange_RegExpMatch(&m, 2); |
53 | d->host = capturedRange_RegExpMatch(&m, 4); | 53 | d->host = capturedRange_RegExpMatch(&m, 4); |
54 | d->port = (iRangecc){ d->host.end, d->host.end }; | 54 | d->port = (iRangecc){ d->host.end, d->host.end }; |
55 | d->path = capturedRange_RegExpMatch(&m, 5); | 55 | d->path = capturedRange_RegExpMatch(&m, 5); |
56 | d->query = capturedRange_RegExpMatch(&m, 6); | 56 | d->query = capturedRange_RegExpMatch(&m, 6); |
57 | d->fragment = capturedRange_RegExpMatch(&m, 8); /* starts with a hash */ | ||
57 | /* Check if the authority contains a port. */ | 58 | /* Check if the authority contains a port. */ |
58 | init_RegExpMatch(&m); | 59 | init_RegExpMatch(&m); |
59 | if (matchRange_RegExp(authPattern_, d->host, &m)) { | 60 | if (matchRange_RegExp(authPattern_, d->host, &m)) { |
@@ -92,6 +93,7 @@ void stripDefaultUrlPort_String(iString *d) { | |||
92 | } | 93 | } |
93 | 94 | ||
94 | const iString *urlFragmentStripped_String(const iString *d) { | 95 | const iString *urlFragmentStripped_String(const iString *d) { |
96 | /* Note: Could use `iUrl` here and leave out the fragment. */ | ||
95 | const size_t fragPos = indexOf_String(d, '#'); | 97 | const size_t fragPos = indexOf_String(d, '#'); |
96 | if (fragPos != iInvalidPos) { | 98 | if (fragPos != iInvalidPos) { |
97 | return collect_String(newRange_String((iRangecc){ constBegin_String(d), | 99 | return collect_String(newRange_String((iRangecc){ constBegin_String(d), |
@@ -264,6 +266,7 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat | |||
264 | appendRange_String(absolute, orig.path); | 266 | appendRange_String(absolute, orig.path); |
265 | } | 267 | } |
266 | appendRange_String(absolute, rel.query); | 268 | appendRange_String(absolute, rel.query); |
269 | appendRange_String(absolute, rel.fragment); | ||
267 | normalize_String(absolute); | 270 | normalize_String(absolute); |
268 | cleanUrlPath_String(absolute); | 271 | cleanUrlPath_String(absolute); |
269 | return absolute; | 272 | return absolute; |