aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--main.c21
2 files changed, 27 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c53dcf..431a789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-23 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 02699] initialization too late
+ * main.c (MAIN): initializations moved before arg processing
+ * debian bug closes: Bug##102445: ignores SIGWINCH while downloading
+
2001-12-22 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02696]
@@ -1437,4 +1443,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.161 2001/12/22 10:02:04 ukai Exp $
+$Id: ChangeLog,v 1.162 2001/12/23 14:24:22 ukai Exp $
diff --git a/main.c b/main.c
index ba2fe33..95e89fa 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.40 2001/12/19 18:16:18 ukai Exp $ */
+/* $Id: main.c,v 1.41 2001/12/23 14:24:22 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -667,6 +667,25 @@ MAIN(int argc, char **argv, char **envp)
if (COLS == 0)
COLS = 80;
}
+
+ SearchHeader = FALSE;
+ DefaultType = NULL;
+#ifdef JP_CHARSET
+ UseContentCharset = TRUE;
+ UseAutoDetect = TRUE;
+#endif
+
+ if (isatty(1)) {
+#ifdef SIGWINCH
+ signal(SIGWINCH, resize_hook);
+#else /* not SIGWINCH */
+ setlinescols();
+ setupscreen();
+#endif /* not SIGWINCH */
+ }
+#ifdef SIGCHLD
+ signal(SIGCHLD, sig_chld);
+#endif
#ifdef USE_BINMODE_STREAM
setmode(fileno(stdout), O_BINARY);
#endif