From ec9153f471d6f229522bb1cedb7f4fbbb200a04d Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Tue, 3 Dec 2002 15:00:52 +0000 Subject: [w3m-dev 03505] Re: coredump when ssl error * file.c (loadGeneralFile): term_raw(), SIGINT before retry From: Hironori SAKAMOTO --- ChangeLog | 7 ++++++- file.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 864b131..2bb69d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-12-03 Hironori SAKAMOTO + + * [w3m-dev 03505] Re: coredump when ssl error + * file.c (loadGeneralFile): term_raw(), SIGINT before retry + 2002-12-03 AIDA Shinra * [w3m-dev 03504] coredump when ssl error @@ -5298,4 +5303,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-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 $ diff --git a/file.c b/file.c index e6d04a8..bba3d3f 100644 --- a/file.c +++ b/file.c @@ -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 #include "myctype.h" @@ -1496,6 +1496,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer, add_auth_cookie_flag = 0; load_doc: + if (fmInitialized) + term_raw(); + if (prevtrap) + signal(SIGINT, prevtrap); url_option.referer = referer; url_option.flag = flag; 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 * on an FTP server, or (2) is a local directory name. */ - if (fmInitialized) - term_raw(); - if (prevtrap) - signal(SIGINT, prevtrap); switch (f.scheme) { case SCM_FTPDIR: { -- cgit v1.2.3