[w3m-dev 03505] Re: coredump when ssl error

* file.c (loadGeneralFile): term_raw(), SIGINT before retry
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-12-03 15:00:52 +00:00
parent 82ef7c22a1
commit ec9153f471
2 changed files with 11 additions and 6 deletions
+6 -1
View File
@@ -1,3 +1,8 @@
2002-12-03 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03505] Re: coredump when ssl error
* file.c (loadGeneralFile): term_raw(), SIGINT before retry
2002-12-03 AIDA Shinra <aida-s@jcom.home.ne.jp> 2002-12-03 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [w3m-dev 03504] coredump when ssl error * [w3m-dev 03504] coredump when ssl error
@@ -5298,4 +5303,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.574 2002/12/02 17:48:56 ukai Exp $ $Id: ChangeLog,v 1.575 2002/12/03 15:00:52 ukai Exp $
+5 -5
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.139 2002/12/02 17:55:46 ukai Exp $ */ /* $Id: file.c,v 1.140 2002/12/03 15:00:53 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -1496,6 +1496,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
add_auth_cookie_flag = 0; add_auth_cookie_flag = 0;
load_doc: load_doc:
if (fmInitialized)
term_raw();
if (prevtrap)
signal(SIGINT, prevtrap);
url_option.referer = referer; url_option.referer = referer;
url_option.flag = flag; url_option.flag = flag;
f = openURL(tpath, &pu, current, &url_option, request, extra_header, of, f = openURL(tpath, &pu, current, &url_option, request, extra_header, of,
@@ -1508,10 +1512,6 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
/* openURL failure: it means either (1) the requested URL is a directory name /* openURL failure: it means either (1) the requested URL is a directory name
* on an FTP server, or (2) is a local directory name. * on an FTP server, or (2) is a local directory name.
*/ */
if (fmInitialized)
term_raw();
if (prevtrap)
signal(SIGINT, prevtrap);
switch (f.scheme) { switch (f.scheme) {
case SCM_FTPDIR: case SCM_FTPDIR:
{ {