aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--file.c16
2 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cea6649..bd2bc5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-19 WATANABE Katsuyuki <knabe@sannet.ne.jp>
+
+ * [w3m-dev 03654] file.c:image_source when undef USE_IMAGE
+ * file.c (readHeader): image_source ifdef USE_IMAGE
+ (loadGeneralFile): ditto
+ (uncompress_stream): ditto
+
2003-01-19 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03653] SourceForge.net: 576032 w3m https crashes with OpenSSL-0.9.7
@@ -6597,4 +6604,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.690 2003/01/18 18:40:32 ukai Exp $
+$Id: ChangeLog,v 1.691 2003/01/19 08:28:39 ukai Exp $
diff --git a/file.c b/file.c
index 06556fd..a8c16be 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.192 2003/01/17 17:30:59 ukai Exp $ */
+/* $Id: file.c,v 1.193 2003/01/19 08:28:40 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -594,7 +594,11 @@ readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu)
else
http_response_code = 0;
- if (thru && !newBuf->header_source && !image_source) {
+ if (thru && !newBuf->header_source
+#ifdef USE_IMAGE
+ && !image_source
+#endif
+ ) {
Str tmpf = tmpfname(TMPF_DFL, NULL);
src = fopen(tmpf->ptr, "w");
if (src)
@@ -1899,8 +1903,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
page_loaded:
if (page) {
FILE *src;
+#ifdef USE_IMAGE
if (image_source)
return NULL;
+#endif
tmp = tmpfname(TMPF_SRC, ".html");
src = fopen(tmp->ptr, "w");
if (src) {
@@ -7734,7 +7740,11 @@ uncompress_stream(URLFile *uf, char **src)
return;
}
- if (uf->scheme != SCM_LOCAL && !image_source) {
+ if (uf->scheme != SCM_LOCAL
+#ifdef USE_IMAGE
+ && !image_source
+#endif
+ ) {
tmpf = tmpfname(TMPF_DFL, ext)->ptr;
if (save2tmp(*uf, tmpf) < 0) {
UFclose(uf);