storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03386] Re: Interrupt in no_proxy_check()

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-11-08 15:46:05 +00:00
parent 88bd152f50
commit 9f17edac44
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10 -1
View File
@@ -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 2002-11-07 Katsumi@yamaoka.cc
* [w3m-dev 03385] install-sh typo * [w3m-dev 03385] install-sh typo
@@ -4378,4 +4387,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.484 2002/11/06 15:09:16 ukai Exp $ $Id: ChangeLog,v 1.485 2002/11/08 15:46:05 ukai Exp $
file.c
+13 -8
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.112 2002/11/06 03:19:30 ukai Exp $ */ /* $Id: file.c,v 1.113 2002/11/08 15:46:06 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -1410,6 +1410,7 @@ getAuthCookie(struct http_auth *hauth, char *auth_header,
IN_PASSWORD)) == NULL) IN_PASSWORD)) == NULL)
return NULL; return NULL;
pwd = Str_conv_to_system(Strnew_charp(pp)); pwd = Str_conv_to_system(Strnew_charp(pp));
term_cbreak();
} }
else { else {
/* /*
@@ -1620,6 +1621,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
) && !Do_not_use_proxy && !check_no_proxy(pu.host))) { ) && !Do_not_use_proxy && !check_no_proxy(pu.host))) {
if (fmInitialized) { if (fmInitialized) {
term_cbreak();
message(Sprintf("%s contacted. Waiting for reply...", pu.host)-> message(Sprintf("%s contacted. Waiting for reply...", pu.host)->
ptr, 0, 0); ptr, 0, 0);
refresh(); refresh();
@@ -1698,6 +1700,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (ss == NULL) { if (ss == NULL) {
/* abort */ /* abort */
UFclose(&f); UFclose(&f);
if (fmInitialized)
term_raw();
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
return NULL; return NULL;
} }
@@ -1720,6 +1724,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (ss == NULL) { if (ss == NULL) {
/* abort */ /* abort */
UFclose(&f); UFclose(&f);
if (fmInitialized)
term_raw();
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
return NULL; return NULL;
} }
@@ -1799,10 +1805,9 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (save2tmp(f, tmpf) < 0) if (save2tmp(f, tmpf) < 0)
UFclose(&f); UFclose(&f);
else { else {
if (fmInitialized) { if (fmInitialized)
term_raw(); term_raw();
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
}
doFileMove(tmpf, guess_save_name(t_buf, pu.file)); doFileMove(tmpf, guess_save_name(t_buf, pu.file));
} }
return NO_BUFFER; return NO_BUFFER;
@@ -2019,10 +2024,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
} }
if (header_string) if (header_string)
header_string = NULL; header_string = NULL;
preFormUpdateBuffer(b);
if (fmInitialized) if (fmInitialized)
term_raw(); term_raw();
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
preFormUpdateBuffer(b);
return b; return b;
} }
@@ -6167,9 +6172,6 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
#endif #endif
HTMLlineproc3(newBuf, f->stream); HTMLlineproc3(newBuf, f->stream);
w3m_halfload = FALSE; w3m_halfload = FALSE;
if (fmInitialized)
term_raw();
signal(SIGINT, prevtrap);
return; return;
} }
@@ -6258,6 +6260,9 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
return; return;
} }
if (w3m_backend) { if (w3m_backend) {
if (fmInitialized)
term_raw();
signal(SIGINT, prevtrap);
print_internal_information(&htmlenv1); print_internal_information(&htmlenv1);
backend_halfdump_buf = htmlenv1.buf; backend_halfdump_buf = htmlenv1.buf;
return; return;