aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-02-08 14:29:52 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-02-08 14:29:52 +0000
commit012d99b0bf02370c4d1d72a00cb311f4fedb1511 (patch)
tree6763fce4e9cc14af01ebfbe5c18b79f028ac8e68
parent[w3m-dev 03022] SSL certificates of frame body (diff)
downloadw3m-012d99b0bf02370c4d1d72a00cb311f4fedb1511.tar.gz
w3m-012d99b0bf02370c4d1d72a00cb311f4fedb1511.zip
[w3m-dev 03025] fix image loading on EWS4800
* image.c (loadImage): exit if symlink failed exit if fopen failed From: Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
-rw-r--r--ChangeLog8
-rw-r--r--image.c10
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9120391..91e4334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-08 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
+
+ * [w3m-dev 03025] fix image loading on EWS4800
+ * image.c (loadImage): exit if symlink failed
+ exit if fopen failed
+
2002-02-08 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03022] SSL certificates of frame body
@@ -2893,4 +2899,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.310 2002/02/08 11:45:07 ukai Exp $
+$Id: ChangeLog,v 1.311 2002/02/08 14:29:52 ukai Exp $
diff --git a/image.c b/image.c
index 52f2528..6875f6b 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.4 2002/02/04 15:18:42 ukai Exp $ */
+/* $Id: image.c,v 1.5 2002/02/08 14:29:52 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -494,15 +494,17 @@ loadImage(int flag)
#if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT)
symlink(cache->file, cache->touch);
if (lstat(image_lock, &st)) {
- symlink(cache->file, image_lock);
+ if (symlink(cache->file, image_lock))
+ exit(0);
#else
f = fopen(cache->touch, "w");
if (f)
fclose(f);
if (stat(image_lock, &st)) {
f = fopen(image_lock, "w");
- if (f)
- fclose(f);
+ if (!f)
+ exit(0);
+ fclose(f);
#endif
kill(getppid(), SIGUSR1);
}