diff options
-rwxr-xr-x | amiga/gui.c | 2 | ||||
-rwxr-xr-x | atari/gui.c | 2 | ||||
-rw-r--r-- | beos/beos_gui.cpp | 2 | ||||
-rw-r--r-- | cocoa/gui.m | 2 | ||||
-rw-r--r-- | content/fetchers/resource.c | 2 | ||||
-rw-r--r-- | content/fetchers/resource.h | 2 | ||||
-rw-r--r-- | framebuffer/findfile.c | 2 | ||||
-rw-r--r-- | gtk/gui.c | 2 | ||||
-rw-r--r-- | monkey/main.c | 2 | ||||
-rw-r--r-- | riscos/gui.c | 14 | ||||
-rw-r--r-- | windows/gui.c | 2 |
11 files changed, 18 insertions, 16 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 757bb6b5c..f49e361b7 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -431,7 +431,7 @@ void ami_amiupdate(void) /* end Amiupdate */ } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { char path[1024]; char filename2[1024]; diff --git a/atari/gui.c b/atari/gui.c index 1baa049ba..3b3f6ee7f 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -1049,7 +1049,7 @@ static inline void create_cursor(int flags, short mode, void * form, MFORM_EX * }
}
-char* gui_find_resource(const char *filename)
+char* gui_get_resource_url(const char *filename)
{
return NULL;
}
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp index 2767348f7..a389b211a 100644 --- a/beos/beos_gui.cpp +++ b/beos/beos_gui.cpp @@ -422,7 +422,7 @@ static int32 bapp_thread(void *arg) return 0; } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { BString u("rsrc:/"); u << filename; diff --git a/cocoa/gui.m b/cocoa/gui.m index 694e26680..f3a0b04a2 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -50,7 +50,7 @@ NSString * const kAlwaysCloseMultipleTabs = @"AlwaysCloseMultipleTabs"; #define UNIMPL() NSLog( @"Function '%s' unimplemented", __func__ ) -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { NSString *path = [[NSBundle mainBundle] pathForResource: [NSString stringWithUTF8String: filename] ofType: @""]; if (path == nil) return NULL; diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index c8fb060b6..b0aac9067 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -177,7 +177,7 @@ fetch_resource_setup(struct fetch *fetchh, url_get_components(url, &urlcomp); - ctx->redirect_url = gui_find_resource(urlcomp.path); + ctx->redirect_url = gui_get_resource_url(urlcomp.path); if (ctx->redirect_url == NULL) { ctx->handler = fetch_resource_notfound_handler; } else { diff --git a/content/fetchers/resource.h b/content/fetchers/resource.h index 8a6c230f5..35c397310 100644 --- a/content/fetchers/resource.h +++ b/content/fetchers/resource.h @@ -48,6 +48,6 @@ void fetch_resource_register(void); * \return A string containing the full URL of the target object or * NULL if no suitable resource can be found. */ -char* gui_find_resource(const char *filename); +char* gui_get_resource_url(const char *filename); #endif diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c index b864b2ba5..77492b108 100644 --- a/framebuffer/findfile.c +++ b/framebuffer/findfile.c @@ -92,7 +92,7 @@ char *url_to_path(const char *url) return respath; } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { char buf[PATH_MAX]; return path_to_url(filepath_sfind(respaths, buf, filename)); @@ -326,7 +326,7 @@ static void check_options(char **respath) } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { char buf[PATH_MAX]; return path_to_url(filepath_sfind(respaths, buf, filename)); diff --git a/monkey/main.c b/monkey/main.c index ef38e47de..f4b75e00e 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -72,7 +72,7 @@ void gui_quit(void) gtk_fetch_filetype_fin(); } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { char buf[PATH_MAX]; return path_to_url(filepath_sfind(respaths, buf, filename)); diff --git a/riscos/gui.c b/riscos/gui.c index 457160678..230d30db2 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -281,24 +281,26 @@ static void ro_msg_save_desktop(wimp_message *message); static void ro_msg_window_info(wimp_message *message); static void ro_gui_view_source_bounce(wimp_message *message); -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { + const char base_url[] = "file:///NetSurf:/Resources/"; + size_t filename_len = strlen(filename); + /* Find max URL length */ - size_t length = SLEN("file:///NetSurf:/Resources/") + SLEN("xx/") + - strlen(filename) + 1; + size_t length = SLEN(base_url) + SLEN("xx/") + filename_len + 1; - /* Allocate memory for URL (freed by the core) */ + /* Allocate memory for URL (will be owned and freed by the core) */ char *resource_url = malloc(length); if (resource_url == NULL) return NULL; /* Insert base URL */ - resource_url = strcpy(resource_url, "file:///NetSurf:/Resources/"); + resource_url = strcpy(resource_url, base_url); /* Add language directory to URL, for translated files */ /* TODO: handle non-en langauages * handle non-html translated files */ - if (strncmp(filename + strlen(filename) - 5, ".html", 5) == 0) { + if (strncmp(filename + filename_len - 5, ".html", 5) == 0) { resource_url = strcat(resource_url, "en/"); } diff --git a/windows/gui.c b/windows/gui.c index ab469c786..6abb64f42 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -2542,7 +2542,7 @@ void gui_quit(void) LOG(("gui_quit")); } -char* gui_find_resource(const char *filename) +char* gui_get_resource_url(const char *filename) { return NULL; } |