summaryrefslogtreecommitdiff
path: root/riscos/bitmap.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2008-06-15 00:27:22 +0000
committerJames Bursa <james@netsurf-browser.org>2008-06-15 00:27:22 +0000
commitd860d93de23a7fb27571de2b0ccb8bee5dd1abc8 (patch)
treeb80853464e08218eb2e6053e546d200e8854056e /riscos/bitmap.c
parent884b93acaac6d23ac808e1ddbd3c1055cd74dc81 (diff)
downloadnetsurf-d860d93de23a7fb27571de2b0ccb8bee5dd1abc8.tar.gz
netsurf-d860d93de23a7fb27571de2b0ccb8bee5dd1abc8.tar.bz2
Check file exists in bitmap_create_file(). Fixes empty local history when Scrap is wiped.
svn path=/trunk/netsurf/; revision=4335
Diffstat (limited to 'riscos/bitmap.c')
-rw-r--r--riscos/bitmap.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index 4d8423cdb..613b93c8f 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -224,9 +224,26 @@ struct bitmap *bitmap_create(int width, int height, unsigned int state)
struct bitmap *bitmap_create_file(char *file)
{
struct bitmap *bitmap;
+ char *r;
+ fileswitch_object_type obj_type;
+ os_error *error;
+
if (file[0] == '\0')
return NULL;
+ /* check the file exists */
+ sprintf(bitmap_unixname, "%s/%s", TEMP_FILENAME_PREFIX, file);
+ r = __riscosify(bitmap_unixname, 0, __RISCOSIFY_NO_SUFFIX,
+ bitmap_filename, 256, 0);
+ if (r == 0) {
+ LOG(("__riscosify failed"));
+ return NULL;
+ }
+ error = xosfile_read_stamped_no_path(bitmap_filename,
+ &obj_type, 0, 0, 0, 0, 0);
+ if ((error) || (obj_type != fileswitch_IS_FILE))
+ return NULL;
+
if (!filename_claim(file))
return NULL;
bitmap = calloc(1, sizeof(struct bitmap));