From 9582fe878f56318e370a393a14409617fb8e7022 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Fri, 16 Nov 2001 03:32:18 +0000 Subject: [w3m-dev 02414] stable SIGINT handling in HTMLlineproc0() From: Tsutomu Okada --- file.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index f074582..27e3bf6 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.3 2001/11/15 00:32:13 a-ito Exp $ */ +/* $Id: file.c,v 1.4 2001/11/16 03:32:18 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -4823,15 +4823,6 @@ loadHTMLstream(URLFile * f, Buffer * newBuf, FILE * src, int internal) struct readbuffer obuf; MySignalHandler(*prevtrap) (); - if (SETJMP(AbortLoading) != 0) { - HTMLlineproc1("
Transfer Interrupted!
", &htmlenv1); - goto phase2; - } - if (fmInitialized) { - prevtrap = signal(SIGINT, KeyAbort); - term_cbreak(); - } - n_textarea = 0; cur_textarea = NULL; max_textarea = MAX_TEXTAREA; @@ -4869,6 +4860,15 @@ loadHTMLstream(URLFile * f, Buffer * newBuf, FILE * src, int internal) else htmlenv1.buf = newTextLineList(); + if (SETJMP(AbortLoading) != 0) { + HTMLlineproc1("
Transfer Interrupted!
", &htmlenv1); + goto phase2; + } + if (fmInitialized) { + prevtrap = signal(SIGINT, KeyAbort); + term_cbreak(); + } + #ifdef JP_CHARSET if (newBuf != NULL && newBuf->document_code != '\0') code = newBuf->document_code; -- cgit v1.2.3