commit 9452571567c5c993801c230dae2aa2a5de13bd0c
parent a146eeb1d2d8d467ba0c6961df60d585f7df531e
Author: ukai <ukai>
Date: Fri, 10 Jan 2003 16:33:38 +0000
[w3m-dev 03628] Re: Error occured while reset
* file.c (doExternal): bufp = NULL, return 1
(uncompress_stream): tempfname fileToDelete
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
2003-01-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03628] Re: Error occured while reset
+ * file.c (doExternal): bufp = NULL, return 1
+ (uncompress_stream): tempfname fileToDelete
+
+2003-01-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03626] Re: relative URL
* url.c (parseURL2): copy if scheme is local or local-cgi
diff --git a/file.c b/file.c
@@ -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();