From 03cccce553db31a8f1b9d109aebf78f78d7089e7 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Fri, 10 Jan 2003 16:33:38 +0000 Subject: [w3m-dev 03628] Re: Error occured while reset * file.c (doExternal): bufp = NULL, return 1 (uncompress_stream): tempfname fileToDelete From: Hironori SAKAMOTO --- ChangeLog | 8 +++++++- file.c | 11 ++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b1cab2..eb9a3e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-11 Hironori SAKAMOTO + + * [w3m-dev 03628] Re: Error occured while reset + * file.c (doExternal): bufp = NULL, return 1 + (uncompress_stream): tempfname fileToDelete + 2003-01-11 Hironori SAKAMOTO * [w3m-dev 03626] Re: relative URL @@ -6280,4 +6286,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.665 2003/01/10 16:29:23 ukai Exp $ +$Id: ChangeLog,v 1.666 2003/01/10 16:33:38 ukai Exp $ diff --git a/file.c b/file.c index cd63488..27dfce0 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.180 2003/01/10 16:16:45 ukai Exp $ */ +/* $Id: file.c,v 1.181 2003/01/10 16:33:46 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -7393,9 +7393,10 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp, else #endif { - if (save2tmp(uf, tmpf->ptr) < 0) - return 0; /* ??? */ - UFclose(&uf); + if (save2tmp(uf, tmpf->ptr) < 0) { + *bufp = NULL; + return 1; + } } if (mcap->flags & (MAILCAP_HTMLOUTPUT | MAILCAP_COPIOUSOUTPUT)) { if (defaultbuf == NULL) @@ -7789,6 +7790,7 @@ uncompress_stream(URLFile *uf, char **src) if (uf->scheme != SCM_LOCAL) { tmpf = tmpfname(TMPF_DFL, ext)->ptr; + pushText(fileToDelete, tmpf); if (save2tmp(*uf, tmpf) < 0) { UFclose(uf); return; @@ -7801,7 +7803,6 @@ uncompress_stream(URLFile *uf, char **src) *src = tmpf; else uf->scheme = SCM_LOCAL; - pushText(fileToDelete, tmpf); } flush_tty(); -- cgit v1.2.3