Commit 5397d09e authored by Tatsuya Kinoshita's avatar Tatsuya Kinoshita

Adding upstream version 0.5.3

parent 6db339b3
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
/2ch.cgi/1.3/Sat Apr 26 17:01:02 2003//
/README/1.4/Wed Jan 15 15:51:29 2003//
/README.eng/1.4/Wed Jan 15 15:51:30 2003//
/backslash_to_slash.cgi/1.1/Tue Apr 15 14:46:23 2003//
/goodict.cgi/1.2/Sat Apr 12 14:28:56 2003//
/google.cgi/1.1/Fri Jan 10 16:24:01 2003//
/html2latex/1.2/Fri Nov 9 04:59:18 2001//
/htmldump/1.1.1.1/Thu Nov 8 05:16:01 2001//
/makeref/1.1.1.1/Thu Nov 8 05:16:01 2001//
/oldconfigure.sh/1.3/Wed Mar 12 17:20:47 2003//
/scanhist.rb/1.1.1.1/Thu Nov 8 05:16:01 2001//
/smb.cgi/1.3/Fri Jan 31 16:25:12 2003//
/utf8.cgi/1.1/Thu Feb 27 15:14:42 2003//
/wrap3m/1.1.1.1/Thu Nov 8 05:16:01 2001//
D
:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
/.cvsignore/1.12/Fri Sep 26 20:45:53 2003//
/README/1.1.1.1/Thu Nov 8 05:14:08 2001//
/Str.c/1.8/Tue Dec 24 17:20:46 2002//
/Str.h/1.6/Fri Apr 7 13:35:35 2006//
/TODO/1.21/Sun Apr 4 16:47:20 2004//
/anchor.c/1.33/Sat Apr 8 11:33:16 2006//
/charset-list/1.1/Mon Sep 22 21:02:16 2003//
/config.guess/1.2/Wed Aug 4 17:32:27 2004//
/config.h.dist/1.36/Fri Apr 9 17:18:49 2004//
/config.sub/1.2/Wed Aug 4 17:32:27 2004//
/ctrlcode.h/1.3/Mon Sep 22 21:02:17 2003//
/entity.c/1.7/Wed Sep 24 18:48:59 2003//
/entity.tab/1.1/Fri Nov 9 04:59:17 2001//
/form.h/1.6/Mon Sep 22 21:02:18 2003//
/frame.c/1.34/Fri Sep 26 17:59:51 2003//
/frame.h/1.6/Sat Jan 25 17:42:17 2003//
/func.c/1.27/Fri Sep 26 17:59:51 2003//
/func.h/1.4/Tue Dec 3 16:01:33 2002//
/funcname0.awk/1.1.1.1/Thu Nov 8 05:14:56 2001//
/funcname1.awk/1.1.1.1/Thu Nov 8 05:14:56 2001//
/funcname2.awk/1.1.1.1/Thu Nov 8 05:14:56 2001//
/functable.awk/1.1/Mon Dec 10 17:02:44 2001//
/hash.c/1.5/Mon Apr 7 16:27:10 2003//
/hash.h/1.6/Wed Sep 24 18:48:59 2003//
/history.c/1.11/Fri Sep 26 17:59:51 2003//
/history.h/1.5/Sat Jan 26 17:24:01 2002//
/indep.h/1.16/Mon Sep 22 21:02:19 2003//
/inflate.c/1.7/Thu Jan 31 18:28:24 2002//
/islang.c/1.3/Sat Feb 26 17:06:44 2005//
/istream.h/1.12/Mon Oct 20 16:41:56 2003//
/local.h/1.3/Tue Nov 20 17:49:23 2001//
/map.c/1.30/Wed Sep 24 18:49:00 2003//
/matrix.c/1.8/Mon Apr 7 16:27:10 2003//
/matrix.h/1.7/Thu Jul 18 14:59:02 2002//
/menu.h/1.2/Tue Nov 20 17:49:23 2001//
/mimehead.c/1.10/Sun Oct 5 18:52:51 2003//
/mkinstalldirs/1.1/Tue Sep 23 18:42:25 2003//
/myctype.c/1.7/Mon Sep 22 21:02:20 2003//
/myctype.h/1.6/Mon Sep 22 21:02:20 2003//
/news.c/1.17/Sun Oct 5 18:52:51 2003//
/parsetag.c/1.4/Tue Nov 20 17:49:23 2001//
/parsetag.h/1.2/Tue Nov 20 17:49:23 2001//
/parsetagx.h/1.4/Sat Nov 24 02:01:26 2001//
/posubst.in/1.1/Thu Sep 25 18:15:47 2003//
/regex.h/1.6/Mon Sep 22 21:02:21 2003//
/scrsize.c/1.2/Sat Nov 24 02:01:26 2001//
/search.c/1.31/Tue Mar 23 16:44:02 2004//
/table.h/1.12/Mon Sep 22 21:02:21 2003//
/terms.h/1.10/Thu Jul 15 16:32:39 2004//
/textlist.c/1.6/Mon Apr 7 16:27:11 2003//
/textlist.h/1.6/Mon Jan 20 15:30:22 2003//
/w3mhelp-lynx_en.html.in/1.1/Fri Dec 21 22:02:39 2001//
/w3mhelp-lynx_ja.html.in/1.1/Fri Dec 21 22:02:39 2001//
/w3mhelp-w3m_en.html.in/1.1/Fri Dec 21 22:02:39 2001//
/w3mhelp-w3m_ja.html.in/1.1/Fri Dec 21 22:02:39 2001//
D/Bonus////
D/Patches////
D/Symbols////
D/doc////
D/doc-jp////
D/gc////
D/intl////
D/libwc////
D/po////
D/scripts////
D/w3m-doc////
D/w3mimg////
/keybind.c/1.10/Sat Jun 10 09:52:18 2006//
/keybind_lynx.c/1.8/Sat Jun 10 09:52:18 2006//
/parsetagx.c/1.18/Sat Jun 10 09:52:18 2006//
/mailcap.c/1.13/Tue Jan 23 12:24:11 2007//
/Makefile.in/1.44/Tue Jan 4 09:22:18 2011//
/acinclude.m4/1.45/Tue Jan 4 09:22:18 2011//
/aclocal.m4/1.46/Tue Jan 4 09:22:18 2011//
/backend.c/1.15/Tue Jan 4 09:22:19 2011//
/buffer.c/1.30/Tue Jan 4 09:22:19 2011//
/config.h.in/1.21/Tue Jan 4 09:22:19 2011//
/cookie.c/1.11/Tue Jan 4 09:22:20 2011//
/display.c/1.71/Tue Jan 4 09:22:20 2011//
/etc.c/1.81/Tue Jan 4 09:22:20 2011//
/file.c/1.265/Tue Jan 4 09:22:21 2011//
/fm.h/1.149/Tue Jan 4 09:22:21 2011//
/form.c/1.35/Tue Jan 4 09:22:21 2011//
/ftp.c/1.42/Tue Jan 4 09:22:21 2011//
/html.c/1.32/Tue Jan 4 09:22:21 2011//
/html.h/1.31/Tue Jan 4 09:22:21 2011//
/image.c/1.37/Tue Jan 4 09:22:22 2011//
/indep.c/1.38/Tue Jan 4 09:22:22 2011//
/istream.c/1.27/Tue Jan 4 09:22:22 2011//
/linein.c/1.35/Tue Jan 4 09:22:22 2011//
/local.c/1.35/Tue Jan 4 09:22:22 2011//
/menu.c/1.46/Tue Jan 4 09:22:23 2011//
/mktable.c/1.16/Tue Jan 4 09:22:23 2011//
/proto.h/1.104/Tue Jan 4 09:22:23 2011//
/rc.c/1.116/Tue Jan 4 09:22:23 2011//
/regex.c/1.23/Tue Jan 4 09:22:23 2011//
/symbol.c/1.4/Tue Jan 4 09:22:23 2011//
/table.c/1.58/Tue Jan 4 09:22:23 2011//
/tagtable.tab/1.14/Tue Jan 4 09:22:23 2011//
/terms.c/1.63/Tue Jan 4 09:22:23 2011//
/url.c/1.100/Tue Jan 4 09:22:24 2011//
/w3mbookmark.c/1.12/Tue Jan 4 09:22:24 2011//
/w3mhelperpanel.c/1.14/Tue Jan 4 09:22:24 2011//
/w3mimgdisplay.c/1.19/Tue Jan 4 09:22:24 2011//
/main.c/1.270/Tue Jan 4 09:42:19 2011//
/ABOUT-NLS/1.2/Tue Jan 4 12:39:27 2011//
/config.rpath/1.2/Tue Jan 4 12:39:29 2011//
/entity.h/1.6/Tue Jan 4 12:39:29 2011//
/install-sh/1.8/Tue Jan 4 12:39:29 2011//
/ChangeLog/1.1050/Sat Jan 15 07:52:48 2011//
/NEWS/1.80/Sat Jan 15 03:01:36 2011//
/configure/1.164/Sat Jan 15 03:04:22 2011//
/configure.ac/1.12/Sat Jan 15 03:01:55 2011//
/version.c.in/1.48/Sat Jan 15 07:52:48 2011//
:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
This diff is collapsed.
......@@ -27,7 +27,6 @@ sysconfdir = @sysconfdir@
top_srcdir = @top_srcdir@
top_builddir = .
VPATH = $(top_srcdir):.
DESTDIR =
CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin
AUXBIN_DIR = $(libexecdir)/$(PACKAGE)
......@@ -46,7 +45,8 @@ DEFS = @DEFS@ -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
-DLOCALEDIR=\"$(localedir)\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
EXT_LIBS = -L. -lindep @LIBINTL@ @LIBGC@
GC_LIBS = @LIBGC@
EXT_LIBS = -L. -lindep @LIBINTL@ $(GC_LIBS)
W3M_LIBS = @W3M_LIBS@
WCTARGET = @WCTARGET@
NLSTARGET = @NLSTARGET@
......@@ -58,10 +58,12 @@ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' \
CONF_DIR='$(CONF_DIR)' \
RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)'
IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@
IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@
IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@
IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@ @IMGWINLDFLAGS@
CC0 = @CC@
CXX = @CXX@
IMGLINK = @IMGLINK@
CC = @POSUBST@ $(CC0)
CPP = @CPP@
RANLIB=@RANLIB@
......@@ -136,7 +138,11 @@ $(OBJS) $(LOBJS): fm.h funcname1.h
tagtable.c: tagtable.tab mktable$(EXT) html.h
./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@
indep.o: indep.c fm.h funcname1.h
entity.h: entity.tab mktable$(EXT)
echo '/* $$I''d$$ */' > $@
./mktable$(EXT) 100 $(srcdir)/entity.tab >> $@
indep.o: indep.c fm.h funcname1.h entity.h
func.o: funcname.c functable.c funcname1.h
keybind.o: funcname2.h
keybind_lynx.o: funcname2.h
......@@ -170,8 +176,8 @@ functable.c: funcname.tab mktable$(EXT)
./mktable$(EXT) 100 functable.tab > $@
-rm -f functable.tab
mktable$(EXT): mktable.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o mktable mktable.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS)
mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o
$(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS)
$(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS)
......@@ -193,7 +199,7 @@ dummy.o: entity.c
$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
$(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
$(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
......
w3m 0.5.3 - 2011-01-15
* security fix
- fix vulnerabilities indicated by bugs.debian.org.
- suppress sending Referer, if https:// -> http://
* new features
- adapt w3mimg to native windows on MS Windows.
- support xterm-incompatible terminals without gpm.
- add "xhtml" to default guess.
- introduce option pseudo_inlines.
- add option to avoid "wrong number of dots" error in cookies.
* other bug fixes
- fix "important" bugs from bugs.debian.org
- preserve spaces in multibyte context.
- fix proxy authentication.
w3m 0.5.2 - 2007-05-31
* security fix
......
:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
/alt.sym/1.1/Mon Sep 22 21:02:22 2003//
/big5.sym/1.1/Mon Sep 22 21:02:22 2003//
/cp850.sym/1.1/Mon Sep 22 21:02:22 2003//
/euccn.sym/1.1/Mon Sep 22 21:02:22 2003//
/eucjp.sym/1.1/Mon Sep 22 21:02:22 2003//
/euckr.sym/1.1/Mon Sep 22 21:02:22 2003//
/euctw.sym/1.1/Mon Sep 22 21:02:22 2003//
/graph.sym/1.1/Mon Sep 22 21:02:22 2003//
/sym.pl/1.1/Mon Sep 22 21:02:22 2003//
/utf8.sym/1.1/Mon Sep 22 21:02:22 2003//
D
:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
......@@ -283,18 +283,6 @@ AC_DEFUN([AC_W3M_KEYMAP],
AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)])
#
# ----------------------------------------------------------------
# AC_W3M_DIGEST_AUTH
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_DIGEST_AUTH],
[AC_SUBST(USE_DIGEST_AUTH)
AC_MSG_CHECKING(if digest auth is enabled)
AC_ARG_ENABLE(digest_auth,
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
test x"$enable_digest_auth" = xyes && AC_DEFINE(USE_DIGEST_AUTH)
AC_MSG_RESULT($enable_digest_auth)])
#
# ----------------------------------------------------------------
# AC_W3M_MIGEMO
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_MIGEMO],
......@@ -394,7 +382,7 @@ AC_DEFUN([AC_W3M_EXTLIBS],
[lib=$1
AC_MSG_CHECKING(for -l$lib)
extlib="not found"
for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64
do
if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then
LIBS="$LIBS -l$lib"
......@@ -426,6 +414,7 @@ AC_ARG_WITH(termlib,
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_GC],
[AC_MSG_CHECKING(GC library exists)
AC_SUBST(LIBGC)
AC_ARG_WITH(gc,
[ --with-gc[=PREFIX] libgc PREFIX],
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
......@@ -456,7 +445,7 @@ AC_ARG_WITH(gc,
fi
fi
unset ac_cv_lib_gc_GC_init
AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"])
if test x"$ac_cv_lib_gc_GC_init" = xno; then
AC_MSG_CHECKING(GC library location)
AC_MSG_RESULT($with_gc)
......@@ -466,7 +455,7 @@ AC_ARG_WITH(gc,
LDFLAGS="$LDFLAGS -L$dir/lib"
AC_MSG_CHECKING($dir)
unset ac_cv_lib_gc_GC_init
AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break])
LDFLAGS="$ldflags"
done
if test x"$gclibdir" = xno; then
......@@ -475,9 +464,9 @@ AC_ARG_WITH(gc,
fi])
#
# ----------------------------------------------------------------
# AC_W3M_SSL
# AC_W3M_SSL_DIGEST_AUTH
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_SSL],
AC_DEFUN([AC_W3M_SSL_DIGEST_AUTH],
[AC_SUBST(USE_SSL)
AC_SUBST(USE_SSL_VERIFY)
AC_MSG_CHECKING(if SSL is suported)
......@@ -519,7 +508,19 @@ if test x"$with_ssl" != xno; then
test x"$enable_sslverify" = xyes && AC_DEFINE(USE_SSL_VERIFY)
AC_MSG_RESULT($enable_sslverify)
fi
fi])
fi
AC_SUBST(USE_DIGEST_AUTH)
AC_MSG_CHECKING(if digest auth is enabled)
AC_ARG_ENABLE(digest_auth,
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
if test x"$enable_digest_auth" = xyes -a x"$w3m_ssl" = xfound; then
AC_DEFINE(USE_DIGEST_AUTH)
else
enable_digest_auth="no"
fi
AC_MSG_RESULT($enable_digest_auth)
])
#
# ----------------------------------------------------------------
# AC_W3M_ALARM
......@@ -568,6 +569,8 @@ AC_DEFUN([AC_W3M_IMAGE],
[AC_SUBST(USE_IMAGE)
AC_SUBST(USE_W3MIMG_X11)
AC_SUBST(USE_W3MIMG_FB)
AC_SUBST(USE_W3MIMG_WIN)
AC_SUBST(IMGLINK)
AC_SUBST(W3MIMGDISPLAY_SETUID)
AC_SUBST(INSTALL_W3MIMGDISPLAY)
INSTALL_W3MIMGDISPLAY='${INSTALL_PROGRAM}'
......@@ -582,10 +585,12 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_SUBST(IMGX11LDFLAGS)
AC_SUBST(IMGFBCFLAGS)
AC_SUBST(IMGFBLDFLAGS)
AC_SUBST(IMGWINCFLAGS)
AC_SUBST(IMGWINLDFLAGS)
AC_MSG_CHECKING(if image is enabled)
AC_ARG_ENABLE(image,
[ --enable-image[=DEVS] enable inline image handler for DEVS
DEVS may be comma separeted: x11,fb,fb+s
DEVS may be comma separeted: x11,fb,fb+s,win
default: autodetected.
'no' means disable inline image],,
[enable_image="yes"])
......@@ -599,10 +604,14 @@ AC_DEFUN([AC_W3M_IMAGE],
if test -c /dev/fb0; then
enable_image=x11,fb
fi;;
CYGWIN*)
enable_image=x11,win;;
esac
fi
save_ifs="$IFS"; IFS=",";
for img in $enable_image; do
set x $enable_image; shift
IFS="$save_ifs"
for img in "$[]@"; do
case $img in
x11) x11=yes;;
fb) fb=yes;;
......@@ -610,9 +619,9 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_DEFINE(W3MIMGDISPLAY_SETUID)
INSTALL_W3MIMGDISPLAY='${INSTALL} -o root -m 4755 -s'
AC_DEFINE(INSTALL_W3MIMGDISPLAY, $INSTALL_W3MIMGDISPLAY);;
win) win=yes;;
esac
done
IFS="$save_ifs"
enable_image=yes
AC_DEFINE(USE_IMAGE)
AC_MSG_CHECKING(image library)
......@@ -658,6 +667,7 @@ AC_DEFUN([AC_W3M_IMAGE],
esac
done
IMGTARGETS=""
IMGLINK='$(CC)'
if test x"$with_gtk2" = xyes; then
AC_W3M_CHECK_VER([GdkPixbuf],
[`$PKG_CONFIG --modversion gdk-pixbuf-2.0 2>/dev/null`],
......@@ -751,12 +761,23 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
fi
fi
if test x"$win" = xyes; then
AC_DEFINE(USE_W3MIMG_WIN)
IMGOBJS="$IMGOBJS win/win_w3mimg.o"
IMGTARGETS="${IMGTARGETS} win"
IMGWINCFLAGS="-I/usr/include/w32api"
IMGWINLDFLAGS="-lgdiplus -lgdi32 -luser32"
IMGLINK='$(CXX)'
fi
AC_DEFINE(IMGTARGETS, "$IMGTARGETS")
AC_DEFINE(IMGOBJS, "$IMGOBJS")
AC_DEFINE(IMGX11CFLAGS, "$IMGX11CFLAGS")
AC_DEFINE(IMGX11LDFLAGS, "$IMGX11LDFLAGS")
AC_DEFINE(IMGFBCFLAGS, "$IMGFBCFLAGS")
AC_DEFINE(IMGFBLDFLAGS, "$IMGLDFLAGS")
AC_DEFINE(IMGFBLDFLAGS, "$IMGFBLDFLAGS")
AC_DEFINE(IMGLINK, "$IMGLINK")
AC_DEFINE(IMGWINCFLAGS, "$IMGWINCFLAGS")
AC_DEFINE(IMGWINLDFLAGS, "$IMGWINLDFLAGS")
fi])
# ----------------------------------------------------------------
# AC_W3M_XFACE
......
This diff is collapsed.
/* $Id: backend.c,v 1.13 2003/09/22 21:02:16 ukai Exp $ */
/* $Id: backend.c,v 1.15 2010/08/08 09:53:42 htrb Exp $ */
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
......@@ -95,7 +95,7 @@ internal_get(char *url, int flag, FormList *request)
buf = loadGeneralFile(url, NULL, NO_REFERER, 0, request);
do_download = FALSE;
if (buf != NULL && buf != NO_BUFFER) {
if (!strcasecmp(buf->type, "text/html") && backend_halfdump_buf) {
if (is_html_type(buf->type) && backend_halfdump_buf) {
TextLineListItem *p;
Str first, last;
int len = 0;
......@@ -294,7 +294,7 @@ backend(void)
w3m_dump = 0;
if (COLS == 0)
COLS = 80;
COLS = DEFAULT_COLS;
#ifdef USE_MOUSE
use_mouse = FALSE;
#endif /* USE_MOUSE */
......
/* $Id: buffer.c,v 1.29 2003/09/26 17:59:51 ukai Exp $ */
/* $Id: buffer.c,v 1.30 2010/07/18 14:10:09 htrb Exp $ */
#include "fm.h"
#ifdef USE_MOUSE
......@@ -558,7 +558,7 @@ reshapeBuffer(Buffer *buf)
WcOption.auto_detect = WC_OPT_DETECT_OFF;
UseContentCharset = FALSE;
#endif
if (!strcasecmp(buf->type, "text/html"))
if (is_html_type(buf->type))
loadHTMLBuffer(&f, buf);
else
loadBuffer(&f, buf);
......@@ -590,7 +590,7 @@ reshapeBuffer(Buffer *buf)
gotoLine(buf, cur->linenumber);
}
buf->pos -= buf->currentLine->bpos;
if (FoldLine && strcasecmp(buf->type, "text/html"))
if (FoldLine && !is_html_type(buf->type))
buf->currentColumn = 0;
else
buf->currentColumn = sbuf.currentColumn;
......
......@@ -69,6 +69,7 @@
#undef USE_IMAGE
#undef USE_W3MIMG_X11
#undef USE_W3MIMG_FB
#undef USE_W3MIMG_WIN
#undef W3MIMGDISPLAY_SETUID
#undef USE_IMLIB
#undef USE_GDKPIXBUF
......@@ -81,6 +82,7 @@
#define ID_EXT
#undef CLEAR_BUF
#undef INET6
#undef HAVE_SOCKLEN_T
#undef HAVE_OLD_SS_FAMILY
#define USE_EGD
#define ENABLE_REMOVE_TRAILINGSPACES
......
This diff is collapsed.
This diff is collapsed.
dnl w3m autoconf
dnl Process this file with autoconf to produce a configure script.
AC_INIT(w3m, 0.5.2, satodai@w3m.jp)
AC_INIT(w3m, 0.5.3, satodai@w3m.jp)
PACKAGE=w3m
VERSION=0.5.2
VERSION=0.5.3
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(PACKAGE)
......@@ -17,7 +17,7 @@ W3M_LANG=${LC_ALL:-$LANG}
dnl AM_INIT_AUTOMAKE(w3m, 0.4)
AC_CONFIG_HEADER(config.h)
dnl Checks for programs.
dnl AC_PROG_CXX
AC_PROG_CXX
AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
......@@ -107,6 +107,11 @@ AC_W3M_TERMLIB
AC_W3M_GC
AC_CHECK_LIB(z, zError, [AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)"])
AC_CHECK_TYPE([socklen_t],
[AC_DEFINE(HAVE_SOCKLEN_T)], ,
[#include <sys/types.h>
#include <sys/socket.h>])
AC_DEFINE(AUXBIN_TARGETS, "$AUXBIN_TARGETS")
AC_SUBST(USE_BINMODE_STREAM)
......@@ -179,7 +184,7 @@ scripts/multipart/Makefile scripts/multipart/multipart.cgi \
scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 \
scripts/w3mman/w3mman2html.cgi \
libwc/Makefile \
w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile \
w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile \
w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html])
......
/* $Id: cookie.c,v 1.10 2006/12/10 10:53:22 inu Exp $ */
/* $Id: cookie.c,v 1.11 2010/07/26 11:38:53 htrb Exp $ */
/*
* References for version 0 cookie:
......@@ -257,6 +257,30 @@ char *special_domain[] = {
".com", ".edu", ".gov", ".mil", ".net", ".org", ".int", NULL
};
int
check_avoid_wrong_number_of_dots_domain( Str domain )
{
TextListItem *tl;
int avoid_wrong_number_of_dots_domain = FALSE;
if (Cookie_avoid_wrong_number_of_dots_domains &&
Cookie_avoid_wrong_number_of_dots_domains->nitem > 0) {
for (tl = Cookie_avoid_wrong_number_of_dots_domains->first;
tl != NULL; tl = tl->next) {
if (domain_match(domain->ptr, tl->ptr)) {
avoid_wrong_number_of_dots_domain = TRUE;
break;
}
}
}
if (avoid_wrong_number_of_dots_domain == TRUE) {
return TRUE;
} else {
return FALSE;
}
}
int
add_cookie(ParsedURL *pu, Str name, Str value,
time_t expires, Str domain, Str path,
......@@ -304,7 +328,9 @@ add_cookie(ParsedURL *pu, Str name, Str value,
domain->ptr + domain->length,
3);
if (n < 2) {
COOKIE_ERROR(COO_ESPECIAL);
if (! check_avoid_wrong_number_of_dots_domain(domain)) {
COOKIE_ERROR(COO_ESPECIAL);
}
}
else if (n == 2) {
char **sdomain;
......@@ -315,8 +341,9 @@ add_cookie(ParsedURL *pu, Str name, Str value,
strcasecmp(*sdomain, &domain->ptr[offset]) == 0)
ok = 1;
}
if (!ok)
if (!ok && ! check_avoid_wrong_number_of_dots_domain(domain)) {
COOKIE_ERROR(COO_ESPECIAL);
}
}
}
else {
......
/* $Id: display.c,v 1.70 2007/05/29 12:07:02 inu Exp $ */
/* $Id: display.c,v 1.71 2010/07/18 14:10:09 htrb Exp $ */
#include <signal.h>
#include "fm.h"
......@@ -380,7 +380,7 @@ displayBuffer(Buffer *buf, int mode)
if (buf->height == 0)
buf->height = LASTLINE + 1;
if ((buf->width != INIT_BUFFER_WIDTH &&
((buf->type && !strcmp(buf->type, "text/html")) || FoldLine))
(is_html_type(buf->type) || FoldLine))
|| buf->need_reshape) {
buf->need_reshape = TRUE;
reshapeBuffer(buf);
......
/FAQ.html/1.9/Sat Apr 8 11:26:23 2006//
/HISTORY/1.1.1.1/Thu Nov 8 05:16:27 2001//
/README.SSL/1.4/Tue May 13 17:17:54 2003//
/README.cygwin/1.4/Sun Feb 23 16:00:17 2003//
/README.dict/1.4/Wed Apr 24 18:46:48 2002//
/README.func/1.22/Mon Sep 22 21:02:23 2003//
/README.keymap/1.1.1.1/Thu Nov 8 05:16:34 2001//
/README.mailcap/1.2/Fri Nov 9 04:59:18 2001//
/README.menu/1.2/Wed Nov 27 16:28:37 2002//
/README.migemo/1.2/Tue May 13 17:17:54 2003//
/README.mouse/1.1/Mon Nov 25 17:23:47 2002//
/README.pre_form/1.3/Mon May 12 16:24:53 2003//
/README.tab/1.1/Tue Nov 5 17:24:48 2002//
/STORY.html/1.3/Tue May 13 17:17:54 2003//
/keymap.lynx/1.4/Fri Dec 13 03:02:04 2002//
/menu.default/1.4/Fri Apr 7 15:22:07 2006//
/menu.submenu/1.3/Fri Apr 7 15:22:07 2006//
/keymap.default/1.8/Sat Jun 10 09:52:18 2006//
/MANUAL.html/1.9/Tue Jan 4 09:22:24 2011//
/README.img/1.7/Tue Jan 4 09:22:24 2011//
/README.m17n/1.3/Tue Jan 4 09:22:24 2011//
/README.passwd/1.1/Tue Aug 3 10:02:16 2010//
/w3m.1/1.7/Tue Jan 4 09:22:24 2011//
/README.cookie/1.4/Sat Jan 15 01:57:39 2011//
/README/1.26/Sat Jan 15 02:17:10 2011//
D
:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
......@@ -100,8 +100,6 @@ HTML
オプションの名前や値は,~/.w3m/config で指定するものと同じ.
<dt>-no-proxy
<dd>プロキシを利用しない.
<dt>-pauth user:pass
<dd>プロキシ認証用のユーザ名とパスワードを指定する.
<dt>-no-mouse
<dd>マウスを利用しない.
<dt>-cookie
......
w3m: WWW wo Miru Tool version 0.5.2 May 31, 2007
w3m: WWW wo Miru Tool version 0.5.3 Jan 15, 2011
(C) Copyright by Akinori ITO
Hironori SAKAMOTO
Fumitoshi UKAI
......@@ -102,7 +102,7 @@ Windows
w3m の著作権は,伊藤彰則に属しています.
(C) Copyright 1994-2002 by Akinori Ito
(C) Copyright 2002-2007 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
(C) Copyright 2002-2011 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
4. 配布条件
......
......@@ -54,4 +54,9 @@
└────────────────────────────────────┘
のように設定します.
・ ドメインに含まれる "." の数が 2 よりも小さいときは不正なクッキーと
見なされます (RFC 2109 4.3.2 参照) が
cookie_avoid_wrong_number_of_dots で指定されたドメインはこの制限を
受けなくなります。Option Setting Panel の "[wrong number of dots]
を無視するドメイン" で設定できます。
......@@ -11,8 +11,8 @@ w3m
機能
・X11 上の端末(xterm,kterm,rxvt,...)または Linux の framebuffer 上に
画像(GIF,PNG,JPEG 等)を表示します。
・X11 上の端末(xterm,kterm,rxvt,...)、 Linux の framebuffer 上または
Windows 端末上に画像(GIF,PNG,JPEG 等)を表示します。
・img タグで指定されたインライン画像を表示できます。
width,height 属性に応じて必要な領域を確保してレンダリングします。
align 属性に対応しています。
......@@ -127,6 +127,13 @@ w3mimgdisplay
端末の背景色。デフォルトは、X11 では自動設定、Linux framebuffer
では #000000 (黒)。
#RRGGBB で指定する場合は # をエスケープして設定してください。
-anim <n>
アニメーションで表示する最大フレーム数を指定。0 の時は制限なし。
負の時は最後からのフレーム数と見なします。デフォルトは 100。
-margin <n>
画像をクリアする領域のマージンを指定します。スクロールしたとき画
面にゴミが残ってしまう場合に指定してみてください。
デフォルトは 0。
例)
w3m -o 'imgdisplay=w3mimgdisplay -x 5 -bg "#cccccc"'
......@@ -137,6 +144,7 @@ w3mimgdisplay
の適当なキーを連打してください。
・framebuffer 描画関係には、下記 URI のコードを利用しました。
http://www.sainet.or.jp/~yamasaki/download/fb-sample.tar.gz
・Windows では標準コンソール、Cygwin rxvt、PuTTYで動作確認しています。
更新記録
......
......@@ -225,12 +225,20 @@
strict_iso2022
厳密な ISO-2022-JP/KR/CN を使う(デフォルト ON)
OFF にすると ISO 2022 系の文字集合は全て表示/出力する。
east_asian_width
ある種のUnicode文字を全角にする(デフォルト OFF)
ON にすると East Asian Ambiguous 文字を全角とみなす。
gb18030_as_ucs
GB18030 の 4バイト文字を Unicode として扱う(デフォルト OFF)
simple_preserve_space
単純な空白の保存。
ON にすると日本語などでも文字間の空白が削除されない。
alt_entity
エンティティを ASCII の代替表現で表す(デフォルト ON)
OFF にすると ISO 8859-1 として扱う。
graphic_char