mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 17:52:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix errors with path_to_url conversion

Browse Source
This commit is contained in:
Vincent Sanders 2014-05-27 00:08:04 +01:00
parent 00b6cfc57e
commit 688f60d963
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amiga/gui.c
View File

@ -37,6 +37,7 @@
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "utils/utf8.h" #include "utils/utf8.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/nsurl.h"
#include "utils/file.h" #include "utils/file.h"
/* NetSurf Amiga platform includes */ /* NetSurf Amiga platform includes */
@ -912,9 +913,9 @@ static void gui_init2(int argc, char** argv)
AddPart(fullpath,wbarg->wa_Name,1024); AddPart(fullpath,wbarg->wa_Name,1024);
if(!temp_homepage_url) { if(!temp_homepage_url) {
nsurl temp_url; nsurl *temp_url;
if (netsurf_path_to_nsurl(fullpath, &temp_url) == NSERROR_OK) { if (netsurf_path_to_nsurl(fullpath, &temp_url) == NSERROR_OK) {
temp_homepage_url = strcpy(nsurl_data(temp_url)); temp_homepage_url = strdup(nsurl_data(temp_url));
nsurl_unref(temp_url); nsurl_unref(temp_url);
} }
} }

1
amiga/icon.c
View File

@ -47,6 +47,7 @@
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/file.h"
#define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */ #define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */
#define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */ #define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */

1
amiga/misc.c
View File

@ -34,6 +34,7 @@
#include "amiga/utf8.h" #include "amiga/utf8.h"
#include "desktop/cookie_manager.h" #include "desktop/cookie_manager.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/corestrings.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/file.h" #include "utils/file.h"

4
atari/misc.c
View File

@ -246,10 +246,6 @@ hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb,
nsurl_unref(icon_nsurl); nsurl_unref(icon_nsurl);
/* If we built the URL here, free it */
if (url != NULL)
free(url);
if (err != NSERROR_OK) { if (err != NSERROR_OK) {
return NULL; return NULL;
} }

9
riscos/gui.c
View File

@ -57,6 +57,7 @@
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/corestrings.h"
#include "content/content.h" #include "content/content.h"
#include "content/hlcache.h" #include "content/hlcache.h"
#include "content/urldb.h" #include "content/urldb.h"
@ -746,7 +747,7 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out)
char *unix_path; /* unix path */ char *unix_path; /* unix path */
char *escurl; char *escurl;
os_error *error; os_error *error;
nserror url_err; nserror ret;
int urllen; int urllen;
char *url; /* resulting url */ char *url; /* resulting url */
@ -801,10 +802,10 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out)
free(unix_path); free(unix_path);
/* We don't want '/' to be escaped. */ /* We don't want '/' to be escaped. */
url_err = url_escape(url, FILE_SCHEME_PREFIX_LEN, false, "/", &escurl); ret = url_escape(url, FILE_SCHEME_PREFIX_LEN, false, "/", &escurl);
free(url); free(url);
if (url_err != NSERROR_OK) { if (ret != NSERROR_OK) {
return url_err; return ret;
} }
ret = nsurl_create(escurl, url_out); ret = nsurl_create(escurl, url_out);

2
windows/gui.c
View File

@ -44,6 +44,8 @@
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/file.h" #include "utils/file.h"
#include "utils/corestrings.h"
#include "utils/url.h"
#include "windows/window.h" #include "windows/window.h"
#include "windows/about.h" #include "windows/about.h"

2
windows/main.c
View File

@ -26,10 +26,12 @@
#include "desktop/gui.h" #include "desktop/gui.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/netsurf.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/filepath.h" #include "utils/filepath.h"
#include "utils/file.h"
#include "content/fetchers/resource.h" #include "content/fetchers/resource.h"
#include "windows/findfile.h" #include "windows/findfile.h"