commit 0e8349ba72b86a4641b07e497d40f217ddb6c966
parent 501dfb9a8146212f7ab1ff310602c535bf000523
Author: ukai <ukai>
Date: Fri, 8 Nov 2002 15:46:05 +0000
[w3m-dev 03386] Re: Interrupt in no_proxy_check()
* file.c (getAuthCookie): term_cbreak()
(loadGeneralFile): term_cbreak()
term_raw()
preFormUpdateBuffer() before term_raw()
(loadHTMLstream): term_raw()
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03386] Re: Interrupt in no_proxy_check()
+ * file.c (getAuthCookie): term_cbreak()
+ (loadGeneralFile): term_cbreak()
+ term_raw()
+ preFormUpdateBuffer() before term_raw()
+ (loadHTMLstream): term_raw()
+
2002-11-07 Katsumi@yamaoka.cc
* [w3m-dev 03385] install-sh typo
diff --git a/file.c b/file.c
@@ -1410,6 +1410,7 @@ getAuthCookie(struct http_auth *hauth, char *auth_header,
IN_PASSWORD)) == NULL)
return NULL;
pwd = Str_conv_to_system(Strnew_charp(pp));
+ term_cbreak();
}
else {
/*
@@ -1620,6 +1621,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
) && !Do_not_use_proxy && !check_no_proxy(pu.host))) {
if (fmInitialized) {
+ term_cbreak();
message(Sprintf("%s contacted. Waiting for reply...", pu.host)->
ptr, 0, 0);
refresh();
@@ -1698,6 +1700,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (ss == NULL) {
/* abort */
UFclose(&f);
+ if (fmInitialized)
+ term_raw();
signal(SIGINT, prevtrap);
return NULL;
}
@@ -1720,6 +1724,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (ss == NULL) {
/* abort */
UFclose(&f);
+ if (fmInitialized)
+ term_raw();
signal(SIGINT, prevtrap);
return NULL;
}
@@ -1799,10 +1805,9 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (save2tmp(f, tmpf) < 0)
UFclose(&f);
else {
- if (fmInitialized) {
+ if (fmInitialized)
term_raw();
- signal(SIGINT, prevtrap);
- }
+ signal(SIGINT, prevtrap);
doFileMove(tmpf, guess_save_name(t_buf, pu.file));
}
return NO_BUFFER;
@@ -2019,10 +2024,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
}
if (header_string)
header_string = NULL;
+ preFormUpdateBuffer(b);
if (fmInitialized)
term_raw();
signal(SIGINT, prevtrap);
- preFormUpdateBuffer(b);
return b;
}
@@ -6167,9 +6172,6 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
#endif
HTMLlineproc3(newBuf, f->stream);
w3m_halfload = FALSE;
- if (fmInitialized)
- term_raw();
- signal(SIGINT, prevtrap);
return;
}
@@ -6258,6 +6260,9 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
return;
}
if (w3m_backend) {
+ if (fmInitialized)
+ term_raw();
+ signal(SIGINT, prevtrap);
print_internal_information(&htmlenv1);
backend_halfdump_buf = htmlenv1.buf;
return;