commit 28a1e54c58d59ea08b9c75817e11b6b87bc3ab97
parent e21c5e39cfd9a1c80e0ef56bca5a64f144492e89
Author: ukai <ukai>
Date: Sun, 4 Apr 2004 16:47:20 +0000
[w3m-dev 04049] w3m-cvs-1.914-misc.patch
* Makefile.in (funcname.tab): dont modify when target is unchanged.
(CFLAGS): need $(CPPFLAGS)?
* config.h.in: add HAVE_STDINT_H, HAVE_INTTYPES_H
* configure.in: s/AC_CANONICAL_SYSTEM/AC_CANONICAL_HOST/
don't use AC_CYGWIN
don't use $CYGWIN, use $host_os *cygwin*
AC_DEFINE in AC_CHECK_HEADER (float.h, sys/select.h)
add stdint.h, inttypes.h
* etc.c (find_auth_pass_entry): host is case insensitive
* libwc/wc_types.h: use stdint.h or inttypes.h
* main.c (MAIN); need GC_init()
From: AIDA Shinra <shinra@j10n.org>
Diffstat:
8 files changed, 130 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2004-04-05 AIDA Shinra <shinra@j10n.org>
+
+ * [w3m-dev 04049] w3m-cvs-1.914-misc.patch
+ * Makefile.in (funcname.tab): dont modify when target is unchanged.
+ (CFLAGS): need $(CPPFLAGS)?
+ * config.h.in: add HAVE_STDINT_H, HAVE_INTTYPES_H
+ * configure.in: s/AC_CANONICAL_SYSTEM/AC_CANONICAL_HOST/
+ don't use AC_CYGWIN
+ don't use $CYGWIN, use $host_os *cygwin*
+ AC_DEFINE in AC_CHECK_HEADER (float.h, sys/select.h)
+ add stdint.h, inttypes.h
+ * etc.c (find_auth_pass_entry): host is case insensitive
+ * libwc/wc_types.h: use stdint.h or inttypes.h
+ * main.c (MAIN); need GC_init()
+
2004-04-01 Fumitoshi UKAI <ukai@debian.or.jp>
Debian Bug#241192 w3m ipv6 FQDN resolution failure
diff --git a/Makefile.in b/Makefile.in
@@ -35,7 +35,7 @@ RC_DIR = @RC_DIR@
ETC_DIR = $(sysconfdir)
CONF_DIR = $(sysconfdir)/$(PACKAGE)
-CFLAGS = $(OPTS) @CFLAGS@ $(DEFS)
+CFLAGS = $(OPTS) @CFLAGS@ $(CPPFLAGS) $(DEFS)
WCCFLAGS = @WCCFLAGS@
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
@@ -145,7 +145,14 @@ funcname.tab: $(DEFUNS)
sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) - | \
awk '$$1 ~ /^[_A-Za-z]/ { \
for (i=2;i<=NF;i++) { print $$i, $$1} \
- }' > $@
+ }' > $@.tmp
+ @if cmp -s $@.tmp $@; then \
+ echo "$@ unchanged"; \
+ rm -f $@.tmp; \
+ else \
+ echo "$@ updated"; \
+ mv $@.tmp $@; \
+ fi
funcname.c: funcname.tab
sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@
diff --git a/TODO b/TODO
@@ -1,5 +1,85 @@
TODO lists
+refactoring
+ backend - ??
+ file - ??
+ local ?
+ func ?
+ indep ?
+ main
+
+utilities
+ Str - string modules
+ myctype
+ entity
+ symbol
+ hash
+ textlist
+ etc - system informations
+ history
+ inflate
+ matrix
+ regex
+
+configuration
+ rc
+
+UI
+ display
+ menu
+ search
+ keybind
+ linein
+ terms
+ mouse
+
+buffer
+ buffer
+
+loader - main controller
+ loader
+ - connection management
+ - protocol backends
+ - media management
+ - media processing
+
+URL
+ url
+ - protocol backends
+
+media management
+ mailcap
+ mimehead
+ mimetyps
+ - media procesings
+
+media processing
+ html
+ parsetag
+ parsetagx
+ anchor
+ form
+ frame
+ map
+ table
+ tagtable
+ plain
+ image
+
+connection management
+ conn
+ ssl?
+ istream
+
+protocol backend
+ http
+ auth
+ cookie
+ ftp
+ news
+ ...
+
+
Documentation
release notes for w3m-0.4
[w3m-dev 03739]
diff --git a/config.h.in b/config.h.in
@@ -107,6 +107,8 @@
#undef HAVE_SGTTY_H
#undef HAVE_DIRENT_H
#undef HAVE_LOCALE_H
+#undef HAVE_STDINT_H
+#undef HAVE_INTTYPES_H
#define SIZEOF_LONG_LONG 8
#if SIZEOF_LONG_LONG > 0
typedef long long clen_t;
diff --git a/configure.in b/configure.in
@@ -28,9 +28,8 @@ AC_PROG_RANLIB
AC_PATH_PROGS(PERL, perl, /usr/local/bin/perl)
AC_PATH_PROGS(NKF, nkf, /usr/local/bin/nkf)
AC_PATH_PROGS(MAN, man, /usr/bin/man)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
-AC_CYGWIN
AC_EXEEXT
AC_SUBST(EXEEXT)
@@ -110,9 +109,11 @@ AC_CHECK_LIB(z, zError, [AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)"])
AC_DEFINE(AUXBIN_TARGETS, "$AUXBIN_TARGETS")
AC_SUBST(USE_BINMODE_STREAM)
-if test x$CYGWIN = xyes; then
- AC_DEFINE(USE_BINMODE_STREAM)
-fi
+case "$host_os" in
+ *cygwin*)
+ AC_DEFINE(USE_BINMODE_STREAM)
+ ;;
+esac
AC_HEADER_DIRENT
AC_HEADER_STDC
@@ -121,9 +122,11 @@ dnl AC_CHECK_HEADERS(fcntl.h malloc.h sgtty.h strings.h sys/ioctl.h sys/time.h t
AC_CHECK_HEADER(termios.h, [AC_DEFINE(HAVE_TERMIOS_H)],
[AC_CHECK_HEADER(termio.h, [AC_DEFINE(HAVE_TERMIO_H)],
[AC_CHECK_HEADER(sgtty.h, [AC_DEFINE(HAVE_SGTTY_H)])])])
-AC_CHECK_HEADER([float.h])
-AC_CHECK_HEADER([sys/select.h])
+AC_CHECK_HEADER([float.h], [AC_DEFINE(HAVE_FLOAT_H)])
+AC_CHECK_HEADER([sys/select.h], [AC_DEFINE(HAVE_SYS_SELECT_H)])
AC_CHECK_HEADER([locale.h], [AC_DEFINE(HAVE_LOCALE_H)])
+AC_CHECK_HEADER([stdint.h], [AC_DEFINE(HAVE_STDINT_H)])
+AC_CHECK_HEADER([inttypes.h], [AC_DEFINE(HAVE_INTTYPES_H)])
dnl Checks for typedefs, structures, and compiler characteristics.
dnl AC_C_CONST
diff --git a/etc.c b/etc.c
@@ -957,7 +957,7 @@ find_auth_pass_entry(char *host, int port, char *file, char *realm,
struct auth_pass *ent;
for (ent = passwords; ent != NULL; ent = ent->next) {
if (ent->is_proxy == is_proxy
- && (!ent->host || !Strcmp_charp(ent->host, host))
+ && (!ent->host || !Strcasecmp_charp(ent->host, host))
&& (!ent->port || ent->port == port)
&& (!ent->file || !file || dir_under(ent->file->ptr, file))
&& (!ent->realm || !realm || !Strcmp_charp(ent->realm, realm))
diff --git a/libwc/wc_types.h b/libwc/wc_types.h
@@ -3,11 +3,23 @@
#define _WC_TYPES_H
#include <Str.h>
+#include <config.h>
+#if defined(HAVE_STDINT_H)
+# include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#endif
typedef unsigned char wc_uchar;
+#if defined(HAVE_STDINT_H) || defined(HAVE_INTTYPES_H)
+typedef uint8_t wc_uint8;
+typedef uint16_t wc_uint16;
+typedef uint32_t wc_uint32;
+#else
typedef unsigned char wc_uint8;
typedef unsigned short wc_uint16;
typedef unsigned long wc_uint32;
+#endif
typedef wc_uint32 wc_ccs;
typedef wc_uint32 wc_ces;
diff --git a/main.c b/main.c
@@ -383,6 +383,7 @@ main(int argc, char **argv, char **envp)
wc_ces CodePage;
#endif
#endif
+ GC_init();
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
