commit 85781db052a34ac661eab1a0c8b21d74d5777d3a
parent 5a2c2685aea649d57dabd8adeb9e95ea36317cf8
Author: ukai <ukai>
Date: Mon, 18 Nov 2002 17:32:16 +0000
[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>
Diffstat:
6 files changed, 10 insertions(+), 65 deletions(-)
diff --git 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
@@ -1,5 +1,13 @@
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
* main.c (download_action): buffer management deleted
(ldDL): buffer management moved here
diff --git 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
@@ -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
@@ -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
@@ -231,6 +231,7 @@ static MySignalHandler
KeyAbort(SIGNAL_ARG)
{
LONGJMP(AbortLoading, 1);
+ SIGNAL_RETURN;
}
#ifdef USE_SSL