From a6e5e26ddd13c4b374c11b9f4cb33b85692c1ea2 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Mon, 18 Nov 2002 17:32:16 +0000
Subject: [w3m-dev 03448] Some fixes * url.c (KeyAbort): SIGNAL_RETURN *
 .cvsginore: delete w3mimgsize * scripts/.cvsignore: delete xface2xbm *
 scripts/xface2xbm.in: deleted From: Hironori SAKAMOTO
 <hsaka@mth.biglobe.ne.jp>

---
 .cvsignore           |  1 -
 ChangeLog            | 10 ++++++++-
 gc/.cvsignore        |  1 +
 scripts/.cvsignore   |  1 -
 scripts/xface2xbm.in | 63 ----------------------------------------------------
 url.c                |  3 ++-
 6 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8af762c..f3df1e5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,7 +12,6 @@ w3m
 w3mbookmark
 w3mhelperpanel
 w3mimgdisplay
-w3mimgsize
 version.c
 w3mhelp-lynx_en.html
 w3mhelp-lynx_ja.html
diff --git a/ChangeLog b/ChangeLog
index 017e6cd..97814de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-19  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03448] Some fixes
+	* url.c (KeyAbort): SIGNAL_RETURN
+	* .cvsginore: delete w3mimgsize
+	* scripts/.cvsignore: delete xface2xbm
+	* scripts/xface2xbm.in: deleted
+
 2002-11-19  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03447] Re: Open download list panel on new tab
@@ -4855,4 +4863,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.531 2002/11/18 17:29:28 ukai Exp $
+$Id: ChangeLog,v 1.532 2002/11/18 17:32:18 ukai Exp $
diff --git a/gc/.cvsignore b/gc/.cvsignore
index 290af1d..844c237 100644
--- a/gc/.cvsignore
+++ b/gc/.cvsignore
@@ -1,3 +1,4 @@
+base_lib
 gctest
 if_mach
 if_not_there
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index bbc6509..443fc0c 100644
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -5,5 +5,4 @@ w3mhelp-funcdesc.en.pl
 w3mhelp-funcdesc.ja.pl
 w3mhelp-funcname.pl
 w3mhelp-funcdesc-stamp
-xface2xbm
 xface2xpm
diff --git a/scripts/xface2xbm.in b/scripts/xface2xbm.in
index 7d6bede..e69de29 100644
--- a/scripts/xface2xbm.in
+++ b/scripts/xface2xbm.in
@@ -1,63 +0,0 @@
-#!@PERL@
-
-# compface/uncompface
-#   ftp://metalab.unc.edu/pub/Linux/apps/graphics/convert/
-$UNCOMPFACE = "uncompface";
-
-$XF = @ARGV ? shift @ARGV : '-';
-$XBM = @ARGV ? shift @ARGV : '-';
-
-open(XF, "<$XF");
-$xf = "";
-while(<XF>) {
-#	s/^X-Face://i if ($xf eq "");
-	$xf .= $_;
-}
-close(XF);
-
-pipe(R, W2);
-pipe(R2, W);
-if (! fork()) {
-	close(R);
-	close(W);
-	open(STDIN, "<&R2");
-        open(STDOUT, ">&W2");
-	exec $UNCOMPFACE;
-	exit 1;
-}
-close(R2);
-close(W2);
-print W $xf;
-close(W);
-while(<R>) {
-	while(s/0x(..)(..)//) {
-		push(@bm, hex($1), hex($2));
-	}
-}
-close(R);
-@bm || exit 1;
-
-$W = 48;
-$H = @bm * 8 / $W;	# must be 48
-open(XBM, ">$XBM");
-print XBM <<EOF;
-#define xf_width $W
-#define xf_height $H
-static char xf_bits[] = {
-EOF
-while (@bm) {
-	for (1..6) {
-		$x = shift @bm;
-		$y = 0;
-		for $i (1 .. 8) {
-			$y |= ($x & 1) << (8 - $i);
-			$x >>= 1;
-		}
-		printf XBM " 0x%02X,", $y;
-	}
-	print XBM "\n";
-}
-print XBM <<EOF;
-};
-EOF
-close(XBM);
diff --git a/url.c b/url.c
index dedcbc6..03e4c2f 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.57 2002/11/15 15:19:46 ukai Exp $ */
+/* $Id: url.c,v 1.58 2002/11/18 17:32:33 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -231,6 +231,7 @@ static MySignalHandler
 KeyAbort(SIGNAL_ARG)
 {
     LONGJMP(AbortLoading, 1);
+    SIGNAL_RETURN;
 }
 
 #ifdef USE_SSL
-- 
cgit v1.2.3