diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-03-17 12:29:42 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-03-17 12:29:42 +0000 |
commit | f6eabd6cc9dfe40eafab7f2d801421b6a4de2057 (patch) | |
tree | def41e4eca37e6022a3d3bd43e7ea28c687fe075 | |
parent | d2f8eee65b411b7571e1c12e237f71602dce72d5 (diff) | |
download | netsurf-f6eabd6cc9dfe40eafab7f2d801421b6a4de2057.tar.gz netsurf-f6eabd6cc9dfe40eafab7f2d801421b6a4de2057.tar.bz2 |
Fix framebuffer resource: handling
svn path=/trunk/netsurf/; revision=12095
-rw-r--r-- | framebuffer/filetype.c | 2 | ||||
-rw-r--r-- | framebuffer/findfile.c | 10 | ||||
l--------- | framebuffer/res/adblock.css | 1 | ||||
l--------- | framebuffer/res/credits.html | 1 | ||||
l--------- | framebuffer/res/internal.css | 1 | ||||
l--------- | framebuffer/res/licence.html | 1 | ||||
l--------- | framebuffer/res/netsurf.png | 1 |
7 files changed, 15 insertions, 2 deletions
diff --git a/framebuffer/filetype.c b/framebuffer/filetype.c index 4b303e5f1..84e286d0c 100644 --- a/framebuffer/filetype.c +++ b/framebuffer/filetype.c @@ -43,6 +43,8 @@ const char *fetch_filetype(const char *unix_path) return "image/gif"; if (2 < l && strcasecmp(unix_path + l - 3, "png") == 0) return "image/png"; + if (2 < l && strcasecmp(unix_path + l - 3, "b60") == 0) + return "image/png"; if (2 < l && strcasecmp(unix_path + l - 3, "jng") == 0) return "image/jng"; if (2 < l && strcasecmp(unix_path + l - 3, "svg") == 0) diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c index 77492b108..ac5b6de28 100644 --- a/framebuffer/findfile.c +++ b/framebuffer/findfile.c @@ -59,8 +59,14 @@ fb_init_resource(const char *resource_path) char *path_to_url(const char *path) { - int urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 1; - char *url = malloc(urllen); + int urllen; + char *url; + + if (path == NULL) + return NULL; + + urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 1; + url = malloc(urllen); if (*path == '/') { path++; /* file: paths are already absolute */ diff --git a/framebuffer/res/adblock.css b/framebuffer/res/adblock.css new file mode 120000 index 000000000..e3811f62b --- /dev/null +++ b/framebuffer/res/adblock.css @@ -0,0 +1 @@ +../../!NetSurf/Resources/AdBlock,f79
\ No newline at end of file diff --git a/framebuffer/res/credits.html b/framebuffer/res/credits.html new file mode 120000 index 000000000..db395bb5a --- /dev/null +++ b/framebuffer/res/credits.html @@ -0,0 +1 @@ +../../!NetSurf/Resources/en/credits.html,faf
\ No newline at end of file diff --git a/framebuffer/res/internal.css b/framebuffer/res/internal.css new file mode 120000 index 000000000..e777d8ae1 --- /dev/null +++ b/framebuffer/res/internal.css @@ -0,0 +1 @@ +../../!NetSurf/Resources/internal.css,f79
\ No newline at end of file diff --git a/framebuffer/res/licence.html b/framebuffer/res/licence.html new file mode 120000 index 000000000..a5f990304 --- /dev/null +++ b/framebuffer/res/licence.html @@ -0,0 +1 @@ +../../!NetSurf/Resources/en/licence.html,faf
\ No newline at end of file diff --git a/framebuffer/res/netsurf.png b/framebuffer/res/netsurf.png new file mode 120000 index 000000000..0fbf42709 --- /dev/null +++ b/framebuffer/res/netsurf.png @@ -0,0 +1 @@ +../../!NetSurf/Resources/netsurf.png,b60
\ No newline at end of file |