summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-02-03 12:04:48 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-02-03 12:04:48 +0000
commitad6fcea6b008638ca532436ecf8ba9fe7e41ffdd (patch)
tree7928f5211a6cd644dcfd764b1c67cf3f6b8ed121 /riscos
parenteb2c2e3f63056e7f8b992f17f94a9418ac311a0f (diff)
downloadnetsurf-ad6fcea6b008638ca532436ecf8ba9fe7e41ffdd.tar.gz
netsurf-ad6fcea6b008638ca532436ecf8ba9fe7e41ffdd.tar.bz2
Add url_fragment to extract fragment from URL
Optionally allow url_compare to ignore fragments in comparison Fix handling of url_compare result in a few places Fix redirects which contain fragments in the Location header svn path=/trunk/netsurf/; revision=3826
Diffstat (limited to 'riscos')
-rw-r--r--riscos/menus.c6
-rw-r--r--riscos/window.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/riscos/menus.c b/riscos/menus.c
index ff4537179..adfb9a109 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -1989,8 +1989,10 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action,
if (result) {
res = url_parent(c->url, &parent);
if (res == URL_FUNC_OK) {
- res = url_compare(c->url, parent, &compare);
- result = !compare;
+ res = url_compare(c->url, parent,
+ false, &compare);
+ if (res == URL_FUNC_OK)
+ result = !compare;
free(parent);
} else {
result = false;
diff --git a/riscos/window.c b/riscos/window.c
index 7824bbe7a..21e57b9f8 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -3329,8 +3329,8 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url) {
res = url_parent(url, &parent);
if (res == URL_FUNC_OK) {
- res = url_compare(url, parent, &compare);
- if (!compare && (res == URL_FUNC_OK))
+ res = url_compare(url, parent, false, &compare);
+ if ((res == URL_FUNC_OK) && !compare)
browser_window_go(g->bw, parent, 0, true);
free(parent);
}