diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2001-11-16 03:32:18 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2001-11-16 03:32:18 +0000 |
commit | 9582fe878f56318e370a393a14409617fb8e7022 (patch) | |
tree | b9bcf7a53ead5bc2de59b8ed481c00f510d69343 | |
parent | [w3m-dev 02413] Re: mark history bug (diff) | |
download | w3m-9582fe878f56318e370a393a14409617fb8e7022.tar.gz w3m-9582fe878f56318e370a393a14409617fb8e7022.zip |
[w3m-dev 02414] stable SIGINT handling in HTMLlineproc0()
From: Tsutomu Okada <okada@furuno.co.jp>
-rw-r--r-- | file.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -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 <sys/types.h> #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("<br>Transfer Interrupted!<br>", &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("<br>Transfer Interrupted!<br>", &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; |