From 2a4afa22b11f6ac5f2dcb6a50386966db8de6a3f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 15 Jan 2006 18:06:44 +0100
Subject: [PATCH 001/204] Minor simplification

---
 doc/tools/code2doc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/tools/code2doc b/doc/tools/code2doc
index 6513ffe7..f91ef8fd 100755
--- a/doc/tools/code2doc
+++ b/doc/tools/code2doc
@@ -21,14 +21,12 @@ usage($HELP) if $opt_h or @ARGV < 1;
 sub put_section {
 	if ($title) {
 		print "\n$title\n";
-		$_ = $title;
-		s/[^-]/-/g;
-		print "$_\n" if not $indent;
+		$title =~ s/[^-]/-/g;
+		print "$title\n" if not $indent;
 	}
 	if ($body) {
-		$_ = $body;
-		s/#newline#/$indent/g;
-		print "$_\n";
+		$body =~ s/#newline#/$indent/g;
+		print "$body\n";
 	}
 	$title = $body = undef;
 }

From 2748d043f9f88dc8a37acc2215383c8b20dbb713 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 15 Jan 2006 18:37:34 +0100
Subject: [PATCH 002/204] Autogenerate .vimrc files and put the master in
 config/vimrc

This changes the init target to be idempotent: most importantly it will now
never overwrite a Makefile if it exists. Additionally 'make init' will
generate the .vimrc files. Yay, no more stupid 'added fairies' commits! ;)
---
 .gitignore                         |  1 +
 Makefile.lib                       | 11 ++++++++---
 config/.vimrc                      |  2 --
 config/m4/.vimrc                   |  2 --
 .vimrc => config/vimrc             |  2 ++
 configure.in                       |  2 +-
 debian/.vimrc                      |  2 --
 doc/.vimrc                         |  2 --
 doc/man/.vimrc                     |  2 --
 doc/man/man1/.vimrc                |  2 --
 doc/man/man5/.vimrc                |  2 --
 doc/tools/.vimrc                   |  2 --
 po/.vimrc                          |  2 --
 src/.vimrc                         |  2 --
 src/bfu/.vimrc                     |  2 --
 src/bookmarks/.vimrc               |  2 --
 src/bookmarks/backend/.vimrc       |  2 --
 src/cache/.vimrc                   |  2 --
 src/config/.vimrc                  |  2 --
 src/cookies/.vimrc                 |  2 --
 src/dialogs/.vimrc                 |  2 --
 src/document/.vimrc                |  2 --
 src/document/css/.vimrc            |  2 --
 src/document/dom/.vimrc            |  2 --
 src/document/html/.vimrc           |  2 --
 src/document/html/parser/.vimrc    |  2 --
 src/document/plain/.vimrc          |  2 --
 src/dom/.vimrc                     |  2 --
 src/dom/css/.vimrc                 |  2 --
 src/dom/sgml/.vimrc                |  2 --
 src/dom/sgml/docbook/.vimrc        |  2 --
 src/dom/test/.vimrc                |  2 --
 src/ecmascript/.vimrc              |  2 --
 src/ecmascript/spidermonkey/.vimrc |  2 --
 src/encoding/.vimrc                |  2 --
 src/formhist/.vimrc                |  2 --
 src/globhist/.vimrc                |  2 --
 src/intl/.vimrc                    |  2 --
 src/intl/gettext/.vimrc            |  2 --
 src/main/.vimrc                    |  2 --
 src/mime/.vimrc                    |  2 --
 src/mime/backend/.vimrc            |  2 --
 src/network/.vimrc                 |  2 --
 src/network/ssl/.vimrc             |  2 --
 src/osdep/.vimrc                   |  2 --
 src/osdep/beos/.vimrc              |  2 --
 src/osdep/os2/.vimrc               |  2 --
 src/osdep/riscos/.vimrc            |  2 --
 src/osdep/unix/.vimrc              |  2 --
 src/osdep/win32/.vimrc             |  2 --
 src/protocol/.vimrc                |  2 --
 src/protocol/auth/.vimrc           |  2 --
 src/protocol/bittorrent/.vimrc     |  2 --
 src/protocol/file/.vimrc           |  2 --
 src/protocol/finger/.vimrc         |  2 --
 src/protocol/ftp/.vimrc            |  2 --
 src/protocol/gopher/.vimrc         |  2 --
 src/protocol/http/.vimrc           |  2 --
 src/protocol/nntp/.vimrc           |  2 --
 src/protocol/rewrite/.vimrc        |  2 --
 src/protocol/smb/.vimrc            |  2 --
 src/scripting/.vimrc               |  2 --
 src/scripting/guile/.vimrc         |  2 --
 src/scripting/lua/.vimrc           |  2 --
 src/scripting/perl/.vimrc          |  2 --
 src/scripting/python/.vimrc        |  2 --
 src/scripting/ruby/.vimrc          |  2 --
 src/session/.vimrc                 |  2 --
 src/terminal/.vimrc                |  2 --
 src/util/.vimrc                    |  2 --
 src/viewer/.vimrc                  |  2 --
 src/viewer/dump/.vimrc             |  2 --
 src/viewer/text/.vimrc             |  2 --
 73 files changed, 12 insertions(+), 142 deletions(-)
 delete mode 100644 config/.vimrc
 delete mode 100644 config/m4/.vimrc
 rename .vimrc => config/vimrc (70%)
 delete mode 100644 debian/.vimrc
 delete mode 100644 doc/.vimrc
 delete mode 100644 doc/man/.vimrc
 delete mode 100644 doc/man/man1/.vimrc
 delete mode 100644 doc/man/man5/.vimrc
 delete mode 100644 doc/tools/.vimrc
 delete mode 100644 po/.vimrc
 delete mode 100644 src/.vimrc
 delete mode 100644 src/bfu/.vimrc
 delete mode 100644 src/bookmarks/.vimrc
 delete mode 100644 src/bookmarks/backend/.vimrc
 delete mode 100644 src/cache/.vimrc
 delete mode 100644 src/config/.vimrc
 delete mode 100644 src/cookies/.vimrc
 delete mode 100644 src/dialogs/.vimrc
 delete mode 100644 src/document/.vimrc
 delete mode 100644 src/document/css/.vimrc
 delete mode 100644 src/document/dom/.vimrc
 delete mode 100644 src/document/html/.vimrc
 delete mode 100644 src/document/html/parser/.vimrc
 delete mode 100644 src/document/plain/.vimrc
 delete mode 100644 src/dom/.vimrc
 delete mode 100644 src/dom/css/.vimrc
 delete mode 100644 src/dom/sgml/.vimrc
 delete mode 100644 src/dom/sgml/docbook/.vimrc
 delete mode 100644 src/dom/test/.vimrc
 delete mode 100644 src/ecmascript/.vimrc
 delete mode 100644 src/ecmascript/spidermonkey/.vimrc
 delete mode 100644 src/encoding/.vimrc
 delete mode 100644 src/formhist/.vimrc
 delete mode 100644 src/globhist/.vimrc
 delete mode 100644 src/intl/.vimrc
 delete mode 100644 src/intl/gettext/.vimrc
 delete mode 100644 src/main/.vimrc
 delete mode 100644 src/mime/.vimrc
 delete mode 100644 src/mime/backend/.vimrc
 delete mode 100644 src/network/.vimrc
 delete mode 100644 src/network/ssl/.vimrc
 delete mode 100644 src/osdep/.vimrc
 delete mode 100644 src/osdep/beos/.vimrc
 delete mode 100644 src/osdep/os2/.vimrc
 delete mode 100644 src/osdep/riscos/.vimrc
 delete mode 100644 src/osdep/unix/.vimrc
 delete mode 100644 src/osdep/win32/.vimrc
 delete mode 100644 src/protocol/.vimrc
 delete mode 100644 src/protocol/auth/.vimrc
 delete mode 100644 src/protocol/bittorrent/.vimrc
 delete mode 100644 src/protocol/file/.vimrc
 delete mode 100644 src/protocol/finger/.vimrc
 delete mode 100644 src/protocol/ftp/.vimrc
 delete mode 100644 src/protocol/gopher/.vimrc
 delete mode 100644 src/protocol/http/.vimrc
 delete mode 100644 src/protocol/nntp/.vimrc
 delete mode 100644 src/protocol/rewrite/.vimrc
 delete mode 100644 src/protocol/smb/.vimrc
 delete mode 100644 src/scripting/.vimrc
 delete mode 100644 src/scripting/guile/.vimrc
 delete mode 100644 src/scripting/lua/.vimrc
 delete mode 100644 src/scripting/perl/.vimrc
 delete mode 100644 src/scripting/python/.vimrc
 delete mode 100644 src/scripting/ruby/.vimrc
 delete mode 100644 src/session/.vimrc
 delete mode 100644 src/terminal/.vimrc
 delete mode 100644 src/util/.vimrc
 delete mode 100644 src/viewer/.vimrc
 delete mode 100644 src/viewer/dump/.vimrc
 delete mode 100644 src/viewer/text/.vimrc

diff --git a/.gitignore b/.gitignore
index 91840605..0d2802bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ depcomp
 autom4te.cache
 stamp-h1
 .deps
+.vimrc
 elinks
 *.swp
 *.patch
diff --git a/Makefile.lib b/Makefile.lib
index b6c124af..8e2f90fe 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -78,9 +78,10 @@ INCLUDE_ALL=1
 endif
 
 ifneq ($(findstring init,$(MAKECMDGOALS)),)
-# FIXME: Detect when $(subdir)/Makefile is $(srcdir)/$(subdir)/Makefile
-# and error out so the user won't overwrite the 'master' Makefiles.
 INCLUDE_ALL=1
+ifndef SRC
+SRC = $(shell cd $(top_srcdir) && pwd)
+endif
 endif
 
 ifdef INCLUDE_ALL
@@ -131,9 +132,13 @@ all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5)
 init-recursive: init-default
 
 init-default:
+	@{ echo ':set runtimepath+=.'; \
+	   echo ':runtime $(SRC)/config/vimrc'; \
+	} > .vimrc
 	@$(foreach subdir,$(sort $(SUBDIRS)), \
 		$(MKINSTALLDIRS) $(subdir) >/dev/null; \
-		echo 'include $(SRC)/$(RELPATH)/$(subdir)/Makefile' > $(subdir)/Makefile;)
+		test -e "$(subdir)/Makefile" \
+		|| echo 'include $(SRC)/$(RELPATH)/$(subdir)/Makefile' > $(subdir)/Makefile;)
 
 clean-default cleanall-default:
 	@-test -z "$(CLEAN)" || $(RM) $(CLEAN)
diff --git a/config/.vimrc b/config/.vimrc
deleted file mode 100644
index b9796ce1..00000000
--- a/config/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
diff --git a/config/m4/.vimrc b/config/m4/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/config/m4/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/.vimrc b/config/vimrc
similarity index 70%
rename from .vimrc
rename to config/vimrc
index 5b83db24..59c5edc2 100644
--- a/.vimrc
+++ b/config/vimrc
@@ -1,3 +1,5 @@
+" Master vimrc file for the ELinks project
+
 :set shiftwidth=8
 :set tabstop=8
 :set softtabstop=0
diff --git a/configure.in b/configure.in
index ea911848..616b305a 100644
--- a/configure.in
+++ b/configure.in
@@ -1348,9 +1348,9 @@ abs_srcdir="$(cd "$srcdir" && pwd)"
 # builddir is always absolute!
 if test "$abs_srcdir" != "$builddir"; then
 	echo "include $abs_srcdir/Makefile" > "$builddir/Makefile"
-	"$MAKE" "SRC=$abs_srcdir" init
 fi
 
+"$MAKE" "SRC=$abs_srcdir" init
 
 dnl ===================================================================
 dnl Configuration summary
diff --git a/debian/.vimrc b/debian/.vimrc
deleted file mode 100644
index b9796ce1..00000000
--- a/debian/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
diff --git a/doc/.vimrc b/doc/.vimrc
deleted file mode 100644
index b9796ce1..00000000
--- a/doc/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
diff --git a/doc/man/.vimrc b/doc/man/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/doc/man/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/doc/man/man1/.vimrc b/doc/man/man1/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/doc/man/man1/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/doc/man/man5/.vimrc b/doc/man/man5/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/doc/man/man5/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/doc/tools/.vimrc b/doc/tools/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/doc/tools/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/po/.vimrc b/po/.vimrc
deleted file mode 100644
index b9796ce1..00000000
--- a/po/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
diff --git a/src/.vimrc b/src/.vimrc
deleted file mode 100644
index b9796ce1..00000000
--- a/src/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
diff --git a/src/bfu/.vimrc b/src/bfu/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/bfu/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/bookmarks/.vimrc b/src/bookmarks/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/bookmarks/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/bookmarks/backend/.vimrc b/src/bookmarks/backend/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/bookmarks/backend/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/cache/.vimrc b/src/cache/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/cache/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/config/.vimrc b/src/config/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/config/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/cookies/.vimrc b/src/cookies/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/cookies/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/dialogs/.vimrc b/src/dialogs/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/dialogs/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/document/.vimrc b/src/document/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/document/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/document/css/.vimrc b/src/document/css/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/document/css/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/document/dom/.vimrc b/src/document/dom/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/document/dom/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/document/html/.vimrc b/src/document/html/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/document/html/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/document/html/parser/.vimrc b/src/document/html/parser/.vimrc
deleted file mode 100644
index be903491..00000000
--- a/src/document/html/parser/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../../.vimrc
diff --git a/src/document/plain/.vimrc b/src/document/plain/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/document/plain/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/dom/.vimrc b/src/dom/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/dom/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/dom/css/.vimrc b/src/dom/css/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/dom/css/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/dom/sgml/.vimrc b/src/dom/sgml/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/dom/sgml/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/dom/sgml/docbook/.vimrc b/src/dom/sgml/docbook/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/dom/sgml/docbook/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/dom/test/.vimrc b/src/dom/test/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/dom/test/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/ecmascript/.vimrc b/src/ecmascript/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/ecmascript/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/ecmascript/spidermonkey/.vimrc b/src/ecmascript/spidermonkey/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/ecmascript/spidermonkey/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/encoding/.vimrc b/src/encoding/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/encoding/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/formhist/.vimrc b/src/formhist/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/formhist/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/globhist/.vimrc b/src/globhist/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/globhist/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/intl/.vimrc b/src/intl/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/intl/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/intl/gettext/.vimrc b/src/intl/gettext/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/intl/gettext/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/main/.vimrc b/src/main/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/main/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/mime/.vimrc b/src/mime/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/mime/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/mime/backend/.vimrc b/src/mime/backend/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/mime/backend/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/network/.vimrc b/src/network/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/network/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/network/ssl/.vimrc b/src/network/ssl/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/network/ssl/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/osdep/.vimrc b/src/osdep/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/osdep/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/osdep/beos/.vimrc b/src/osdep/beos/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/osdep/beos/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/osdep/os2/.vimrc b/src/osdep/os2/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/osdep/os2/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/osdep/riscos/.vimrc b/src/osdep/riscos/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/osdep/riscos/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/osdep/unix/.vimrc b/src/osdep/unix/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/osdep/unix/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/osdep/win32/.vimrc b/src/osdep/win32/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/osdep/win32/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/.vimrc b/src/protocol/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/protocol/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/protocol/auth/.vimrc b/src/protocol/auth/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/auth/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/bittorrent/.vimrc b/src/protocol/bittorrent/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/bittorrent/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/file/.vimrc b/src/protocol/file/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/file/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/finger/.vimrc b/src/protocol/finger/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/finger/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/ftp/.vimrc b/src/protocol/ftp/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/ftp/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/gopher/.vimrc b/src/protocol/gopher/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/gopher/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/http/.vimrc b/src/protocol/http/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/http/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/nntp/.vimrc b/src/protocol/nntp/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/nntp/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/rewrite/.vimrc b/src/protocol/rewrite/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/rewrite/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/protocol/smb/.vimrc b/src/protocol/smb/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/protocol/smb/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/scripting/.vimrc b/src/scripting/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/scripting/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/scripting/guile/.vimrc b/src/scripting/guile/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/scripting/guile/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/scripting/lua/.vimrc b/src/scripting/lua/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/scripting/lua/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/scripting/perl/.vimrc b/src/scripting/perl/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/scripting/perl/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/scripting/python/.vimrc b/src/scripting/python/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/scripting/python/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/scripting/ruby/.vimrc b/src/scripting/ruby/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/scripting/ruby/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/session/.vimrc b/src/session/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/session/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/terminal/.vimrc b/src/terminal/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/terminal/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/util/.vimrc b/src/util/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/util/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/viewer/.vimrc b/src/viewer/.vimrc
deleted file mode 100644
index 284fcf0e..00000000
--- a/src/viewer/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
diff --git a/src/viewer/dump/.vimrc b/src/viewer/dump/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/viewer/dump/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/viewer/text/.vimrc b/src/viewer/text/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/viewer/text/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc

From 943f9d7185f4ab723e56afeb426464b30a909570 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 15 Jan 2006 18:49:44 +0100
Subject: [PATCH 003/204] Create .gitignore file when builddir != srcdir

... so that cg-status will not list files in the builddir when it is
embedded in the srcdir.
---
 configure.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.in b/configure.in
index 616b305a..cd1cda3f 100644
--- a/configure.in
+++ b/configure.in
@@ -1347,7 +1347,10 @@ AC_OUTPUT([ \
 abs_srcdir="$(cd "$srcdir" && pwd)"
 # builddir is always absolute!
 if test "$abs_srcdir" != "$builddir"; then
+	# Bootstrap the Makefile creation
 	echo "include $abs_srcdir/Makefile" > "$builddir/Makefile"
+	# Make cg-status ignore this build directory
+	echo "*" > "$builddir/.gitignore"
 fi
 
 "$MAKE" "SRC=$abs_srcdir" init

From 6deb090b48a74c449dccbaccb7fa2e1f6c81b260 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 15 Jan 2006 19:14:10 +0100
Subject: [PATCH 004/204] Blast some more .vimrc files which for some strange
 reason was uncommitable

---
 src/terminal/graphics/.vimrc | 2 --
 src/terminal/text/.vimrc     | 2 --
 src/viewer/graphics/.vimrc   | 2 --
 3 files changed, 6 deletions(-)
 delete mode 100644 src/terminal/graphics/.vimrc
 delete mode 100644 src/terminal/text/.vimrc
 delete mode 100644 src/viewer/graphics/.vimrc

diff --git a/src/terminal/graphics/.vimrc b/src/terminal/graphics/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/terminal/graphics/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/terminal/text/.vimrc b/src/terminal/text/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/terminal/text/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
diff --git a/src/viewer/graphics/.vimrc b/src/viewer/graphics/.vimrc
deleted file mode 100644
index 18f65e47..00000000
--- a/src/viewer/graphics/.vimrc
+++ /dev/null
@@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc

From becf3b42abb7a931574768656b733025087d67df Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 15 Jan 2006 22:23:39 +0100
Subject: [PATCH 005/204] Create .vimrc files both during all and init

Then make init doesn't have to always be run by configure.
---
 Makefile.lib | 11 ++++++-----
 configure.in |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index 8e2f90fe..fc7a40a2 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -126,15 +126,12 @@ CLEAN += $(PROG) $(OBJS)
 #############################################################################
 # The main default rules
 
-all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5)
+all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5) .vimrc
 
 # Ensure that Makefiles in subdirs are created before we recursive into them
 init-recursive: init-default
 
-init-default:
-	@{ echo ':set runtimepath+=.'; \
-	   echo ':runtime $(SRC)/config/vimrc'; \
-	} > .vimrc
+init-default: .vimrc
 	@$(foreach subdir,$(sort $(SUBDIRS)), \
 		$(MKINSTALLDIRS) $(subdir) >/dev/null; \
 		test -e "$(subdir)/Makefile" \
@@ -166,6 +163,10 @@ ifdef MAN5
 		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man5);)
 endif
 
+.vimrc: $(top_srcdir)/Makefile.lib
+	@{ echo ':set runtimepath+=.'; \
+	   echo ':runtime $(top_srcdir)/config/vimrc'; \
+	} > .vimrc
 
 ##############################################################################
 # Auto-testing infrastructure
diff --git a/configure.in b/configure.in
index cd1cda3f..e70b85e4 100644
--- a/configure.in
+++ b/configure.in
@@ -1349,12 +1349,12 @@ abs_srcdir="$(cd "$srcdir" && pwd)"
 if test "$abs_srcdir" != "$builddir"; then
 	# Bootstrap the Makefile creation
 	echo "include $abs_srcdir/Makefile" > "$builddir/Makefile"
+	"$MAKE" "SRC=$abs_srcdir" init
+
 	# Make cg-status ignore this build directory
 	echo "*" > "$builddir/.gitignore"
 fi
 
-"$MAKE" "SRC=$abs_srcdir" init
-
 dnl ===================================================================
 dnl Configuration summary
 dnl ===================================================================

From a892c84601fe7db59a072bc9c3e059b5cba3c097 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 00:18:39 +0100
Subject: [PATCH 006/204] Make it possible to build all-docs when $(builddir)
 != $(srcdir)

---
 doc/Makefile          | 25 +++++++++++++++----------
 doc/elinks.1.txt      |  2 +-
 doc/elinks.conf.5.txt |  2 +-
 doc/elinkskeys.5.txt  |  4 ++--
 doc/installation.txt  |  2 +-
 doc/tools/conf2doc    |  3 ++-
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index a421fb48..f5edabb2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,6 +12,9 @@ docdir = $(datadir)/doc
 HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html
 PDF_DIR  = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf
 
+ASCIIDOC_CONF  = $(srcdir)asciidoc.conf
+ASCIIDOC_FLAGS = -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
+
 #############################################################################
 # Build files
 
@@ -108,7 +111,7 @@ quiet_cmd_help2doc = ' [$(LINK_COLOR)HELP2DOC$(END_COLOR)]   $(RELPATH)$@'
       cmd_help2doc = $(LOCALES) $(HELP2DOC) $(ELINKS) $@ > $@
 
 quiet_cmd_conf2doc = ' [$(LINK_COLOR)CONF2DOC$(END_COLOR)]   $(RELPATH)$@'
-      cmd_conf2doc = $(LOCALES) $(CONF2DOC) > $@
+      cmd_conf2doc = $(LOCALES) $(CONF2DOC) $(FEATURES) > $@
 
 quiet_cmd_keys2doc = ' [$(LINK_COLOR)KEYS2DOC$(END_COLOR)]   $(RELPATH)$@'
       cmd_keys2doc = $(LOCALES) $(KEYS2DOC) $(KBDBIND) $@ > $@
@@ -149,25 +152,27 @@ api: $(patsubst %.txt,%.html,$(API_TXT))
             cmd_jw = $(JW) -b $(2) $<
 
    quiet_cmd_xmlto = '    [$(LINK_COLOR)XMLTO$(END_COLOR)]   $(RELPATH)$@'
-         cmd_xmlto = $(XMLTO) $(3) $(2) $<
+         cmd_xmlto = $(XMLTO) -o $(call outdir) $(3) $(2) $<
 
 quiet_cmd_pod2html = ' [$(LINK_COLOR)POD2HTML$(END_COLOR)]   $(RELPATH)$@'
       cmd_pod2html = $(POD2HTML) --outfile=$@ < $<
 
 quiet_cmd_asciidoc = ' [$(LINK_COLOR)ASCIIDOC$(END_COLOR)]   $(RELPATH)$@'
-      cmd_asciidoc = $(ASCIIDOC) -f asciidoc.conf -b $(2) -d $(call doctype,$<) -o $@ $<
+      cmd_asciidoc = $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b $(call backend) -d $(call doctype) -o $@ $<
 
-# Based on filename in $(1) find out asciidoc doctype.
-doctype = $(if $(findstring .1.,$(1)),manpage,$(if $(findstring .5.,$(1)),manpage,book))
+# Based on $@ find out asciidoc doctype or backend + xmlto output dir.
+doctype = $(if $(findstring .1.,$@)$(findstring .5.,$@),manpage,book)
+backend = $(if $(findstring .xml,$@),docbook,xhtml11)
+outdir  = $(if $(findstring -chunked,$@),$@,.)
 
 # Loosely track dependencies via asciidoc includes.
-asciidoc_dep = sed -n 's@include::\(.*\)\[.*@$@: \1@p' < $< > .deps/$(@F).asciidoc
+asciidoc_dep = sed -n 's/[{]builddir}//g;s@include::\(.*\)\[.*@$@: $< \1@p' < $< > .deps/$(@F).asciidoc
 
 -include .deps/*.asciidoc
 
 # Do a little post-processing of man pages. Inserting title headers and date.
 MAN_DATE = $(shell date -I)
-man_desc = `sed -n 's/:Description:\s*\(.*\)/\1/p' < $(subst .xml,.txt,$<)`
+man_desc = `sed -n 's/:Description:\s*\(.*\)/\1/p' < $(srcdir)$(subst .xml,.txt,$(<F))`
 man_hack = sed "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\" \"$(1)\"/" < $@ | \
 	   sed "s/@squote@/\\\\'/g" > $@.tmp && mv $@.tmp $@
 
@@ -175,11 +180,11 @@ man_hack = sed "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\"
 #############################################################################
 # Build recipies
 
-%.html: %.txt asciidoc.conf
+%.html: %.txt $(ASCIIDOC_CONF)
 	$(call cmd,asciidoc,xhtml11)
 	@-$(call asciidoc_dep)
 
-%.xml: %.txt asciidoc.conf
+%.xml: %.txt $(ASCIIDOC_CONF)
 	$(call cmd,asciidoc,docbook)
 	@-$(call asciidoc_dep)
 
@@ -192,7 +197,7 @@ man_hack = sed "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\"
 	@$(call man_hack,$(call man_desc))
 
 %.html-chunked: %.xml
-	$(call cmd,xmlto,html,-o $@)
+	$(call cmd,xmlto,html)
 
 %.pdf: %.xml
 	$(call cmd,jw,pdf)
diff --git a/doc/elinks.1.txt b/doc/elinks.1.txt
index 0866fa49..060336f6 100644
--- a/doc/elinks.1.txt
+++ b/doc/elinks.1.txt
@@ -35,7 +35,7 @@ Most options can be set in the user interface or config file, so usually you
 do not need to care about them. Note that this list is roughly equivalent to
 the output of running ELinks with the option `--long-help`.
 
-include::option-command.txt[]
+include::{builddir}option-command.txt[]
 
 ENVIRONMENT VARIABLES
 ---------------------
diff --git a/doc/elinks.conf.5.txt b/doc/elinks.conf.5.txt
index 15394cf7..715d9027 100644
--- a/doc/elinks.conf.5.txt
+++ b/doc/elinks.conf.5.txt
@@ -56,7 +56,7 @@ Some sample settings:
 
 OPTIONS
 -------
-include::option-config.txt[]
+include::{builddir}option-config.txt[]
 
 SEE ALSO
 --------
diff --git a/doc/elinkskeys.5.txt b/doc/elinkskeys.5.txt
index d5323075..a59c1583 100644
--- a/doc/elinkskeys.5.txt
+++ b/doc/elinkskeys.5.txt
@@ -93,7 +93,7 @@ FIXME:
 KEYMAP ACTIONS
 --------------
 
-include::keymap-actions.txt[]
+include::{builddir}keymap-actions.txt[]
 
 DEFAULT BINDINGS
 ----------------
@@ -101,7 +101,7 @@ DEFAULT BINDINGS
 The default bindings are shown below. Any bindings in `~/.elinks/elinks.conf`
 will override these.
 
-include::keymap-defaults.txt[]
+include::{builddir}keymap-defaults.txt[]
 
 AUTHOR
 ------
diff --git a/doc/installation.txt b/doc/installation.txt
index c999f160..b8e076e7 100644
--- a/doc/installation.txt
+++ b/doc/installation.txt
@@ -71,6 +71,6 @@ include::small.txt[]
 
 include::ecmascript.txt[]
 
-include::features.txt[]
+include::{builddir}features.txt[]
 
 endif::installation-webpage[]
diff --git a/doc/tools/conf2doc b/doc/tools/conf2doc
index d8bff9f2..99034bb2 100755
--- a/doc/tools/conf2doc
+++ b/doc/tools/conf2doc
@@ -4,6 +4,7 @@
 # Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2005
 #
 
+CONFFILE="$1"
 TMPFILE=$(mktemp import-features.conf.XXXXXX) || exit 1
 
 strip_comment()
@@ -53,7 +54,7 @@ __END__
 	fi
 }
 
-cat ../features.conf | while read line; do
+cat "$CONFFILE" | while read line; do
 	case "$line" in
 	"### "*)
 		print_section

From 4a2cde1c00cc0148bf543d1737c34522912dc40a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 00:38:47 +0100
Subject: [PATCH 007/204] Introduce dom_stack_code enum and use it for
 push_dom_node()

---
 src/dom/select.c      |  4 ++--
 src/dom/sgml/parser.c | 18 ++++++++++++------
 src/dom/stack.c       | 13 +++++++------
 src/dom/stack.h       | 12 +++++++++++-
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/dom/select.c b/src/dom/select.c
index a0e5d764..ff84cbee 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -506,7 +506,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 			select->selector = select_node;
 		}
 
-		if (!push_dom_node(stack, &select_node->node))
+		if (push_dom_node(stack, &select_node->node) != DOM_STACK_CODE_OK)
 			return DOM_ERR_INVALID_STATE;
 
 		if (select_node->node.type != DOM_NODE_ELEMENT)
@@ -1070,7 +1070,7 @@ select_dom_nodes(struct dom_select *select, struct dom_node *root)
 			      &dom_select_data_context_info);
 	add_dom_stack_tracer(&select_data.stack, "select-match: ");
 
-	if (push_dom_node(&select_data.stack, &select->selector->node)) {
+	if (push_dom_node(&select_data.stack, &select->selector->node) == DOM_STACK_CODE_OK) {
 		get_dom_stack_top(&select_data.stack)->immutable = 1;
 		walk_dom_nodes(&stack, root);
 	}
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index fce56a9e..411fa883 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -39,7 +39,10 @@ add_sgml_document(struct dom_stack *stack, struct dom_string *string)
 {
 	struct dom_node *node = init_dom_node(DOM_NODE_DOCUMENT, string);
 
-	return node ? push_dom_node(stack, node) : NULL;
+	if (node && push_dom_node(stack, node) == DOM_STACK_CODE_OK)
+		return node;
+
+	return NULL;
 }
 
 static inline struct dom_node *
@@ -58,7 +61,7 @@ add_sgml_element(struct dom_stack *stack, struct dom_scanner_token *token)
 	node_info = get_sgml_node_info(parser->info->elements, node);
 	node->data.element.type = node_info->type;
 
-	if (!push_dom_node(stack, node))
+	if (push_dom_node(stack, node) != DOM_STACK_CODE_OK)
 		return NULL;
 
 	state = get_dom_stack_top(stack);
@@ -92,7 +95,7 @@ add_sgml_attribute(struct dom_stack *stack,
 	if (valtoken && valtoken->type == SGML_TOKEN_STRING)
 		node->data.attribute.quoted = 1;
 
-	if (!node || !push_dom_node(stack, node))
+	if (!node || push_dom_node(stack, node) != DOM_STACK_CODE_OK)
 		return;
 
 	pop_dom_node(stack);
@@ -119,7 +122,10 @@ add_sgml_proc_instruction(struct dom_stack *stack, struct dom_scanner_token *tar
 		node->data.proc_instruction.type = DOM_PROC_INSTRUCTION;
 	}
 
-	return push_dom_node(stack, node);
+	if (push_dom_node(stack, node) == DOM_STACK_CODE_OK)
+		return node;
+
+	return NULL;
 }
 
 static inline void
@@ -133,7 +139,7 @@ add_sgml_node(struct dom_stack *stack, enum dom_node_type type, struct dom_scann
 	if (token->type == SGML_TOKEN_SPACE)
 		node->data.text.only_space = 1;
 
-	if (push_dom_node(stack, node))
+	if (push_dom_node(stack, node) == DOM_STACK_CODE_OK)
 		pop_dom_node(stack);
 }
 
@@ -403,7 +409,7 @@ parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 	}
 
 	node = init_dom_node(DOM_NODE_TEXT, &source);
-	if (!node || !push_dom_node(&parser->parsing, node))
+	if (!node || push_dom_node(&parser->parsing, node) != DOM_STACK_CODE_OK)
 		return SGML_PARSER_CODE_MEM_ALLOC;
 
 	pop_dom_node(&parser->parsing);
diff --git a/src/dom/stack.c b/src/dom/stack.c
index f41c1cb7..ba5a8d62 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -154,7 +154,7 @@ call_dom_stack_callbacks(struct dom_stack *stack, struct dom_stack_state *state,
 	}
 }
 
-struct dom_node *
+enum dom_stack_code
 push_dom_node(struct dom_stack *stack, struct dom_node *node)
 {
 	struct dom_stack_state *state;
@@ -164,13 +164,13 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 	assert(0 < node->type && node->type < DOM_NODES);
 
 	if (stack->depth > DOM_STACK_MAX_DEPTH) {
-		return NULL;
+		return DOM_STACK_CODE_ERROR_MAX_DEPTH;
 	}
 
 	state = realloc_dom_stack_states(&stack->states, stack->depth);
 	if (!state) {
 		done_dom_node(node);
-		return NULL;
+		return DOM_STACK_CODE_ERROR_MEM_ALLOC;
 	}
 
 	state += stack->depth;
@@ -181,7 +181,7 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 		if (context->info->object_size
 		    && !realloc_dom_stack_state_objects(context, stack->depth)) {
 			done_dom_node(node);
-			return NULL;
+			return DOM_STACK_CODE_ERROR_MEM_ALLOC;
 		}
 	}
 
@@ -193,7 +193,7 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 	stack->depth++;
 	call_dom_stack_callbacks(stack, state, DOM_STACK_PUSH);
 
-	return node;
+	return DOM_STACK_CODE_OK;
 }
 
 void
@@ -349,7 +349,8 @@ walk_dom_nodes(struct dom_stack *stack, struct dom_node *root)
 	if (!context)
 		return;
 
-	push_dom_node(stack, root);
+	if (push_dom_node(stack, root) != DOM_STACK_CODE_OK)
+		return;
 
 	while (!dom_stack_is_empty(stack)) {
 		struct dom_stack_state *state = get_dom_stack_top(stack);
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 153654e0..09c21229 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -9,6 +9,16 @@ struct dom_stack;
 
 /* API Doc :: dom-stack */
 
+/** DOM stack code
+ *
+ * Codes used by the DOM stack to indicate states.
+ */
+enum dom_stack_code {
+	DOM_STACK_CODE_OK,		/*: All is well */
+	DOM_STACK_CODE_ERROR_MEM_ALLOC,	/*: Memory allocation failure */
+	DOM_STACK_CODE_ERROR_MAX_DEPTH,	/*: Stack max depth reached */
+};
+
 /** DOM stack callback
  *
  * Used by contexts, for 'hooking' into the node traversing. */
@@ -230,7 +240,7 @@ void done_dom_stack_context(struct dom_stack *stack, struct dom_stack_context *c
  *
  * If an error occurs the node is released with ref:[done_dom_node] and NULL is
  * returned. Else the pushed node is returned. */
-struct dom_node *push_dom_node(struct dom_stack *stack, struct dom_node *node);
+enum dom_stack_code push_dom_node(struct dom_stack *stack, struct dom_node *node);
 
 /** Pop the top stack state
  *

From eecc22751d2c539ba60f187486bea2d8417905aa Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 00:55:58 +0100
Subject: [PATCH 008/204] Use dom_stack_code enum for dom_stack_callback_T

---
 src/document/dom/renderer.c | 50 +++++++++++++++++++++++++------------
 src/dom/select.c            | 14 ++++++++---
 src/dom/sgml/parser.c       |  8 ++++--
 src/dom/stack.c             | 16 +++++++++---
 src/dom/stack.h             |  3 ++-
 5 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 24630723..18f44641 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -500,7 +500,7 @@ render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *no
 }
 #endif
 
-static void
+enum dom_stack_code
 render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -513,15 +513,15 @@ render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *dat
 		|| node->type == DOM_NODE_CDATA_SECTION
 		|| node->type == DOM_NODE_COMMENT)) {
 		render_dom_node_enhanced_text(renderer, node);
-		return;
-	}
+	} else
 #endif
+		render_dom_node_text(renderer, &renderer->styles[node->type], node);
 
-	render_dom_node_text(renderer, &renderer->styles[node->type], node);
+	return DOM_STACK_CODE_OK;
 }
 
 /* This callback is also used for rendering processing instruction nodes.  */
-static void
+static enum dom_stack_code
 render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -529,9 +529,11 @@ render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *
 	assert(node && renderer && renderer->document);
 
 	render_dom_node_text(renderer, &renderer->styles[node->type], node);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -544,7 +546,7 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
 	assert(node && renderer && renderer->document);
 
 	if (!string || !length)
-		return;
+		return DOM_STACK_CODE_OK;
 
 	if (check_dom_node_source(renderer, string, length)) {
 		render_dom_flush(renderer, string);
@@ -553,9 +555,11 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
 	}
 
 	render_dom_text(renderer, &renderer->styles[node->type], string, length);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -620,9 +624,11 @@ render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void
 			render_dom_text(renderer, template, value, valuelen);
 		}
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -639,9 +645,11 @@ render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *da
 	}
 
 	render_dom_node_text(renderer, &renderer->styles[node->type], node);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -652,6 +660,8 @@ render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *da
 	if (check_dom_node_source(renderer, renderer->position, 0)) {
 		render_dom_flush(renderer, renderer->end);
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 static struct dom_stack_context_info dom_source_renderer_context_info = {
@@ -693,7 +703,7 @@ static struct dom_stack_context_info dom_source_renderer_context_info = {
 
 /* DOM RSS Renderer */
 
-static void
+enum dom_stack_code
 dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -735,9 +745,11 @@ dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 
 		renderer->node = node;
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -776,9 +788,11 @@ dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 	default:
 		break;
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 dom_rss_push_content(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -788,7 +802,7 @@ dom_rss_push_content(struct dom_stack *stack, struct dom_node *node, void *data)
 	assert(node && renderer && renderer->document);
 
 	if (!renderer->node)
-		return;
+		return DOM_STACK_CODE_OK;
 
 	if (node->type == DOM_NODE_ENTITY_REFERENCE) {
 		string -= 1;
@@ -800,6 +814,8 @@ dom_rss_push_content(struct dom_stack *stack, struct dom_node *node, void *data)
 	} else {
 		add_to_dom_string(&renderer->text, string, length);
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 static struct dom_string *
@@ -901,13 +917,13 @@ render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
 	}
 }
 
-static void
+enum dom_stack_code
 dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
 
 	if (!renderer->channel)
-		return;
+		return DOM_STACK_CODE_OK;
 
 	render_rss_item(renderer, renderer->channel);
 
@@ -927,6 +943,8 @@ dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *data)
 	mem_free_if(renderer->items);
 
 	done_dom_node(root);
+
+	return DOM_STACK_CODE_OK;
 }
 
 
diff --git a/src/dom/select.c b/src/dom/select.c
index ff84cbee..e1e4d548 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -897,7 +897,7 @@ match_element_selector(struct dom_select_node *selector, struct dom_node *node,
 #define get_dom_select_data(stack) ((stack)->current->data)
 
 /* Matches an element node being visited against the current selector stack. */
-static void
+enum dom_stack_code
 dom_select_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -921,11 +921,13 @@ dom_select_push_element(struct dom_stack *stack, struct dom_node *node, void *da
 		if (selector)
 			push_dom_node(&select_data->stack, &selector->node);
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 /* Ensures that nodes, no longer 'reachable' on the stack do not have any
  * states associated with them on the select data stack. */
-static void
+enum dom_stack_code
 dom_select_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -944,12 +946,14 @@ dom_select_pop_element(struct dom_stack *stack, struct dom_node *node, void *dat
 			continue;
 		}
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 /* For now this is only for matching the ':contains(<string>)' pseudo-class.
  * Any node which can contain text and thus characters from the given <string>
  * are handled in this common callback. */
-static void
+enum dom_stack_code
 dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -961,7 +965,7 @@ dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 	WDBG("Text node: %d chars", node->string.length);
 
 	if (!text_sel)
-		return;
+		return DOM_STACK_CODE_OK;
 
 	text = &text_sel->node.string;
 
@@ -973,6 +977,8 @@ dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 	default:
 		ERROR("Unhandled type");
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 /* Context info for interacting with the DOM tree or stream stack. */
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 411fa883..26a021fa 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -432,7 +432,7 @@ struct sgml_parsing_state {
 	size_t depth;
 };
 
-static void
+enum dom_stack_code
 sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = get_sgml_parser(stack);
@@ -448,9 +448,11 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 			 SGML_STATE_TEXT, count_lines, complete, incremental,
 			 detect_errors);
 	parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = get_sgml_parser(stack);
@@ -464,6 +466,8 @@ sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 	}
 
 	assert(parsing->depth == parser->stack.depth);
+
+	return DOM_STACK_CODE_OK;
 }
 
 static struct dom_stack_context_info sgml_parsing_context_info = {
diff --git a/src/dom/stack.c b/src/dom/stack.c
index ba5a8d62..2197482f 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -489,7 +489,7 @@ static unsigned char indent_string[] =
 #define get_indent_offset(stack) \
 	((stack)->depth < sizeof(indent_string)/2 ? (stack)->depth * 2 : sizeof(indent_string))
 
-static void
+enum dom_stack_code
 dom_stack_trace_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *value = &node->string;
@@ -500,9 +500,11 @@ dom_stack_trace_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 		get_indent_offset(stack), indent_string,
 		name->length, name->string,
 		value->length, value->string);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 dom_stack_trace_id_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string value;
@@ -523,9 +525,11 @@ dom_stack_trace_id_leaf(struct dom_stack *stack, struct dom_node *node, void *da
 
 	if (is_dom_string_set(&value))
 		done_dom_string(&value);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 dom_stack_trace_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -544,9 +548,11 @@ dom_stack_trace_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 
 	if (is_dom_string_set(&value))
 		done_dom_string(&value);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+enum dom_stack_code
 dom_stack_trace_branch(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -561,6 +567,8 @@ dom_stack_trace_branch(struct dom_stack *stack, struct dom_node *node, void *dat
 		empty_string_or_(stack->current->data),
 		get_indent_offset(stack), indent_string,
 		id->length, id->string, name->length, name->string);
+
+	return DOM_STACK_CODE_OK;
 }
 
 struct dom_stack_context_info dom_stack_trace_context_info = {
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 09c21229..211c52b6 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -22,7 +22,8 @@ enum dom_stack_code {
 /** DOM stack callback
  *
  * Used by contexts, for 'hooking' into the node traversing. */
-typedef void (*dom_stack_callback_T)(struct dom_stack *, struct dom_node *, void *);
+typedef enum dom_stack_code
+	(*dom_stack_callback_T)(struct dom_stack *, struct dom_node *, void *);
 
 #define DOM_STACK_MAX_DEPTH	4096
 

From 4e6b05394d0ee148c87ba98c2e2acb850ea30171 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 05:09:45 +0100
Subject: [PATCH 009/204] ADD DOM_STACK_CODE_FREE_NODE so callbacks can remove
 nodes when popping

---
 src/dom/stack.c | 19 ++++++++++++++-----
 src/dom/stack.h |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/dom/stack.c b/src/dom/stack.c
index 2197482f..3597593c 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -129,10 +129,12 @@ enum dom_stack_action {
 	DOM_STACK_POP,
 };
 
-static void
+/* Returns whether the node should be freed with done_dom_node(). */
+static int
 call_dom_stack_callbacks(struct dom_stack *stack, struct dom_stack_state *state,
 			 enum dom_stack_action action)
 {
+	int free_node = 0;
 	int i;
 
 	for (i = 0; i < stack->contexts_size; i++) {
@@ -148,10 +150,18 @@ call_dom_stack_callbacks(struct dom_stack *stack, struct dom_stack_state *state,
 			void *data = get_dom_stack_state_data(context, state);
 
 			stack->current = context;
-			callback(stack, state->node, data);
+			switch (callback(stack, state->node, data)) {
+			case DOM_STACK_CODE_FREE_NODE:
+				free_node = 1;
+				break;
+			default:
+				break;
+			}
 			stack->current = NULL;
 		}
 	}
+
+	return free_node;
 }
 
 enum dom_stack_code
@@ -211,9 +221,8 @@ pop_dom_node(struct dom_stack *stack)
 	if (state->immutable)
 		return;
 
-	call_dom_stack_callbacks(stack, state, DOM_STACK_POP);
-
-	if (stack->flags & DOM_STACK_FLAG_FREE_NODES)
+	if (call_dom_stack_callbacks(stack, state, DOM_STACK_POP)
+	    || (stack->flags & DOM_STACK_FLAG_FREE_NODES))
 		done_dom_node(state->node);
 
 	stack->depth--;
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 211c52b6..996b2a00 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -15,6 +15,7 @@ struct dom_stack;
  */
 enum dom_stack_code {
 	DOM_STACK_CODE_OK,		/*: All is well */
+	DOM_STACK_CODE_FREE_NODE,	/*: Free the (popped) node */
 	DOM_STACK_CODE_ERROR_MEM_ALLOC,	/*: Memory allocation failure */
 	DOM_STACK_CODE_ERROR_MAX_DEPTH,	/*: Stack max depth reached */
 };

From 768f97c38e3c583372ad8f5642e88a0b2ebee04d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 05:10:22 +0100
Subject: [PATCH 010/204] Add get_dom_node_prev() which gets the previous
 sibling of a DOM node

---
 src/dom/node.c | 35 ++++++++++++++++++++++++++++++-----
 src/dom/node.h |  3 +++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/dom/node.c b/src/dom/node.c
index 7ac7e1b9..8d86a7a1 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -225,16 +225,15 @@ get_dom_node_map_entry(struct dom_node_list *list, enum dom_node_type type,
 	return dom_node_list_bsearch(&search, list);
 }
 
-int
-get_dom_node_list_index(struct dom_node *parent, struct dom_node *node)
+static int
+get_dom_node_list_pos(struct dom_node_list *list, struct dom_node *node)
 {
-	struct dom_node_list **list = get_dom_node_list(parent, node);
 	struct dom_node *entry;
 	int i;
 
-	if (!list) return -1;
+	assert(list);
 
-	foreach_dom_node (*list, entry, i) {
+	foreach_dom_node (list, entry, i) {
 		if (entry == node)
 			return i;
 	}
@@ -242,6 +241,32 @@ get_dom_node_list_index(struct dom_node *parent, struct dom_node *node)
 	return -1;
 }
 
+int
+get_dom_node_list_index(struct dom_node *parent, struct dom_node *node)
+{
+	struct dom_node_list **list = get_dom_node_list(parent, node);
+
+	return list ? get_dom_node_list_pos(*list, node) : -1;
+}
+
+struct dom_node *
+get_dom_node_prev(struct dom_node *node)
+{
+	struct dom_node_list **list;
+	int index;
+
+	assert(node->parent);
+
+	list = get_dom_node_list(node->parent, node);
+	if (!list) return NULL;
+
+	index = get_dom_node_list_pos(*list, node);
+	if (index > 0)
+		return (*list)->entries[index - 1];
+
+	return NULL;
+}
+
 /* Nodes */
 
 struct dom_node *
diff --git a/src/dom/node.h b/src/dom/node.h
index 542b8930..3e5e94c8 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -243,6 +243,9 @@ int get_dom_node_list_index(struct dom_node *parent, struct dom_node *node);
  * @list is already sorted properly. */
 int get_dom_node_map_index(struct dom_node_list *list, struct dom_node *node);
 
+/* Returns the previous sibling to the node. */
+struct dom_node *get_dom_node_prev(struct dom_node *node);
+
 /* Looks up the @node_map for a node matching the requested type and name.
  * The @subtype maybe be 0 indication unknown subtype and only name should be
  * tested else it will indicate either the element or attribute private

From 6c85c0f00959424919e6cad10fa3ba6627fed2dd Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 05:12:34 +0100
Subject: [PATCH 011/204] Add DOM configuration inspired module

It add support for normalizing a DOM document in various ways, such as
removing comments, converting CDATA section nodes to text nodes, cleanup
whitespace, etc.

Use it in the RSS renderer to sanitize the text to be rendered.
---
 src/document/dom/renderer.c |  37 +----
 src/dom/Makefile            |   2 +-
 src/dom/configuration.c     | 300 ++++++++++++++++++++++++++++++++++++
 src/dom/configuration.h     |  90 +++++++++++
 4 files changed, 399 insertions(+), 30 deletions(-)
 create mode 100644 src/dom/configuration.c
 create mode 100644 src/dom/configuration.h

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 18f44641..10e034e9 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -22,6 +22,7 @@
 #include "document/document.h"
 #include "document/dom/renderer.h"
 #include "document/renderer.h"
+#include "dom/configuration.h"
 #include "dom/scanner.h"
 #include "dom/sgml/parser.h"
 #include "dom/sgml/rss/rss.h"
@@ -703,6 +704,9 @@ static struct dom_stack_context_info dom_source_renderer_context_info = {
 
 /* DOM RSS Renderer */
 
+#define RSS_CONFIG_FLAGS \
+	(DOM_CONFIG_NORMALIZE_WHITESPACE | DOM_CONFIG_NORMALIZE_CHARACTERS)
+
 enum dom_stack_code
 dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
@@ -792,32 +796,6 @@ dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 	return DOM_STACK_CODE_OK;
 }
 
-enum dom_stack_code
-dom_rss_push_content(struct dom_stack *stack, struct dom_node *node, void *data)
-{
-	struct dom_renderer *renderer = stack->current->data;
-	unsigned char *string = node->string.string;
-	int length = node->string.length;
-
-	assert(node && renderer && renderer->document);
-
-	if (!renderer->node)
-		return DOM_STACK_CODE_OK;
-
-	if (node->type == DOM_NODE_ENTITY_REFERENCE) {
-		string -= 1;
-		length += 2;
-	}
-
-	if (!is_dom_string_set(&renderer->text)) {
-		init_dom_string(&renderer->text, string, length);
-	} else {
-		add_to_dom_string(&renderer->text, string, length);
-	}
-
-	return DOM_STACK_CODE_OK;
-}
-
 static struct dom_string *
 get_rss_node_text(struct dom_node *node)
 {
@@ -955,9 +933,9 @@ static struct dom_stack_context_info dom_rss_renderer_context_info = {
 		/*				*/ NULL,
 		/* DOM_NODE_ELEMENT		*/ dom_rss_push_element,
 		/* DOM_NODE_ATTRIBUTE		*/ NULL,
-		/* DOM_NODE_TEXT		*/ dom_rss_push_content,
-		/* DOM_NODE_CDATA_SECTION	*/ dom_rss_push_content,
-		/* DOM_NODE_ENTITY_REFERENCE	*/ dom_rss_push_content,
+		/* DOM_NODE_TEXT		*/ NULL,
+		/* DOM_NODE_CDATA_SECTION	*/ NULL,
+		/* DOM_NODE_ENTITY_REFERENCE	*/ NULL,
 		/* DOM_NODE_ENTITY		*/ NULL,
 		/* DOM_NODE_PROC_INSTRUCTION	*/ NULL,
 		/* DOM_NODE_COMMENT		*/ NULL,
@@ -1046,6 +1024,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	} else if (doctype == SGML_DOCTYPE_RSS) {
 		add_dom_stack_context(&parser->stack, &renderer,
 				      &dom_rss_renderer_context_info);
+		add_dom_config_normalizer(&parser->stack, RSS_CONFIG_FLAGS); 
 	}
 
 	/* FIXME: When rendering this way we don't really care about the code.
diff --git a/src/dom/Makefile b/src/dom/Makefile
index 35a6b392..cdff0bab 100644
--- a/src/dom/Makefile
+++ b/src/dom/Makefile
@@ -2,7 +2,7 @@ top_builddir=../..
 include $(top_builddir)/Makefile.config
 
 SUBDIRS = css sgml
-OBJS = node.o select.o stack.o scanner.o
+OBJS = configuration.o node.o select.o stack.o scanner.o
 
 SUBDIRS-$(CONFIG_DEBUG) += test
 
diff --git a/src/dom/configuration.c b/src/dom/configuration.c
new file mode 100644
index 00000000..f43690b8
--- /dev/null
+++ b/src/dom/configuration.c
@@ -0,0 +1,300 @@
+/* DOM Configuration */
+
+#include "elinks.h"
+
+#include "dom/configuration.h"
+#include "dom/node.h"
+#include "dom/stack.h"
+#include "dom/string.h"
+
+
+static enum dom_stack_code
+normalize_text_node_whitespace(struct dom_node *node)
+{
+	unsigned char buf[256];
+	struct dom_string string = INIT_DOM_STRING(NULL, 0);
+	int count = 0, i = 0;
+	unsigned char *text = node->string.string;
+
+	assert(node->type == DOM_NODE_TEXT);
+
+	while (i < node->string.length) {
+		int j;
+
+		for (j = 0; j < sizeof(buf) && i < node->string.length; i++) {
+			unsigned char data = text[i];
+
+			if (isspace(data)) {
+				if (count == 1)
+					continue;
+
+				data = ' ';
+				count = 1;
+
+			} else {
+				count = 0;
+			}
+
+			buf[j++] = data;
+		}
+
+		if (!add_to_dom_string(&string, buf, j)) {
+			done_dom_string(&string);
+			return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+		}
+	}
+
+	if (node->data.text.allocated)
+		done_dom_string(&node->string);
+
+	set_dom_string(&node->string, string.string, string.length);
+	node->data.text.allocated = 1;
+
+	return DOM_STACK_CODE_OK;
+
+}
+
+static enum dom_stack_code
+append_node_text(struct dom_config *config, struct dom_node *node)
+{
+	struct dom_node *prev = get_dom_node_prev(node);
+	size_t length;
+	struct dom_string dest;
+	struct dom_string src;
+	int error = 0;
+
+	copy_struct(&src, &node->string);
+
+	if (!prev || prev->type != DOM_NODE_TEXT) {
+		/* Preserve text nodes with no one to append to. */
+		if (node->type == DOM_NODE_TEXT)
+			return DOM_STACK_CODE_OK;
+
+		prev = NULL;
+		set_dom_string(&dest, NULL, 0);
+
+	} else {
+		if (prev->data.text.allocated) {
+			copy_struct(&dest, &prev->string);
+		} else {
+			set_dom_string(&dest, NULL, 0);
+			if (!add_to_dom_string(&dest, prev->string.string, prev->string.length))
+				return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+			set_dom_string(&prev->string, dest.string, dest.length);
+			prev->data.text.allocated = 1;
+		}
+	}
+
+	length = dest.length;
+
+	switch (node->type) {
+	case DOM_NODE_CDATA_SECTION:
+	case DOM_NODE_TEXT:
+		if (!add_to_dom_string(&dest, src.string, src.length))
+			error = 1;
+		break;
+
+	case DOM_NODE_ENTITY_REFERENCE:
+		/* FIXME: Until we will have uniform encoding at this point
+		 * (UTF-8) we just add the entity reference unexpanded assuming
+		 * that convert_string() will eventually do the work of
+		 * expanding it. */
+		if (!add_to_dom_string(&dest, "&", 1)
+		    || !add_to_dom_string(&dest, src.string, src.length)
+		    || !add_to_dom_string(&dest, ";", 1)) {
+			error = 1;
+		}
+		break;
+
+	default:
+		INTERNAL("Cannot append from node %d", node->type);
+	}
+
+	if (error) {
+		if (prev)
+			prev->string.length = length;
+		else
+			done_dom_string(&dest);
+		return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+	}
+
+	if (prev) {
+		copy_struct(&prev->string, &dest);
+
+		if ((config->flags & DOM_CONFIG_NORMALIZE_WHITESPACE)
+		    && node->type != DOM_NODE_ENTITY_REFERENCE) {
+			/* XXX: Ignore errors since we want to always
+			 * free the appended node at this point. */
+			normalize_text_node_whitespace(prev);
+		}
+
+		return DOM_STACK_CODE_FREE_NODE;
+
+	} else {
+		int was_cdata_section = node->type == DOM_NODE_CDATA_SECTION;
+
+		node->type = DOM_NODE_TEXT;
+		memset(&node->data, 0, sizeof(node->data));
+		node->data.text.allocated = 1;
+		copy_struct(&node->string, &dest);
+
+		if ((config->flags & DOM_CONFIG_NORMALIZE_WHITESPACE)
+		    && was_cdata_section) {
+			/* XXX: Ignore errors since we want to always ok the
+			 * append. */
+			normalize_text_node_whitespace(node);
+		}
+
+		return DOM_STACK_CODE_OK;
+	}
+}
+
+static enum dom_stack_code
+dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	struct dom_config *config = stack->current->data;
+	enum dom_stack_code code = DOM_STACK_CODE_OK;
+
+	switch (node->type) {
+	case DOM_NODE_ELEMENT:
+		if ((config->flags & DOM_CONFIG_UNKNOWN)
+		    && !node->data.element.type) {
+			/* Drop elements that are not known from the built-in
+			 * node info. */
+			code = DOM_STACK_CODE_FREE_NODE;
+		}
+		break;
+
+	case DOM_NODE_ATTRIBUTE:
+		if ((config->flags & DOM_CONFIG_UNKNOWN)
+		    && !node->data.attribute.type) {
+			/* Drop elements that are not known from the built-in
+			 * node info. */
+			code = DOM_STACK_CODE_FREE_NODE;
+		}
+		break;
+
+	case DOM_NODE_PROCESSING_INSTRUCTION:
+		if ((config->flags & DOM_CONFIG_UNKNOWN)
+		    && !node->data.proc_instruction.type) {
+			/* Drop elements that are not known from the built-in
+			 * node info. */
+			code = DOM_STACK_CODE_FREE_NODE;
+		}
+		break;
+
+	case DOM_NODE_TEXT:
+		if (config->flags & DOM_CONFIG_NORMALIZE_CHARACTERS) {
+			code = append_node_text(config, node);
+
+		} else if (!(config->flags & DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE)
+			   && node->data.text.only_space) {
+			/* Discard all Text nodes that contain
+			 * whitespaces in element content]. */
+			code = DOM_STACK_CODE_FREE_NODE;
+		}
+		break;
+
+	case DOM_NODE_COMMENT:
+		if (!(config->flags & DOM_CONFIG_COMMENTS)) {
+			/* Discard all comments. */
+			code = DOM_STACK_CODE_FREE_NODE;
+		}
+		break;
+
+	case DOM_NODE_CDATA_SECTION:
+		if (!(config->flags & DOM_CONFIG_CDATA_SECTIONS)) {
+			/* Transform CDATASection nodes into Text nodes. The new Text
+			 * node is then combined with any adjacent Text node. */
+			code = append_node_text(config, node);
+		}
+		break;
+
+	case DOM_NODE_ENTITY_REFERENCE:
+		if (!(config->flags & DOM_CONFIG_ENTITIES)) {
+			/* Remove all EntityReference nodes from the document,
+			 * putting the entity expansions directly in their place. Text
+			 * nodes are normalized. Only unexpanded entity references are
+			 * kept in the document. */
+			code = append_node_text(config, node);
+		}
+		break;
+
+	case DOM_NODE_DOCUMENT:
+		mem_free(config);
+		break;
+
+	default:
+		break;
+	}
+
+	return code;
+}
+
+enum dom_stack_code
+dom_normalize_text(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	struct dom_config *config = stack->current->data;
+
+	if (config->flags & DOM_CONFIG_NORMALIZE_WHITESPACE) {
+		/* Normalize whitespace in the text. */
+		return normalize_text_node_whitespace(node);
+	}
+
+	return DOM_STACK_CODE_OK;
+}
+
+
+static struct dom_stack_context_info dom_config_normalizer_context = {
+	/* Object size: */			0,
+	/* Push: */
+	{
+		/*				*/ NULL,
+		/* DOM_NODE_ELEMENT		*/ NULL,
+		/* DOM_NODE_ATTRIBUTE		*/ NULL,
+		/* DOM_NODE_TEXT		*/ dom_normalize_text,
+		/* DOM_NODE_CDATA_SECTION	*/ NULL,
+		/* DOM_NODE_ENTITY_REFERENCE	*/ NULL,
+		/* DOM_NODE_ENTITY		*/ NULL,
+		/* DOM_NODE_PROC_INSTRUCTION	*/ NULL,
+		/* DOM_NODE_COMMENT		*/ NULL,
+		/* DOM_NODE_DOCUMENT		*/ NULL,
+		/* DOM_NODE_DOCUMENT_TYPE	*/ NULL,
+		/* DOM_NODE_DOCUMENT_FRAGMENT	*/ NULL,
+		/* DOM_NODE_NOTATION		*/ NULL,
+	},
+	/* Pop: */
+	{
+		/*				*/ NULL,
+		/* DOM_NODE_ELEMENT		*/ dom_normalize_node_end,
+		/* DOM_NODE_ATTRIBUTE		*/ dom_normalize_node_end,
+		/* DOM_NODE_TEXT		*/ dom_normalize_node_end,
+		/* DOM_NODE_CDATA_SECTION	*/ dom_normalize_node_end,
+		/* DOM_NODE_ENTITY_REFERENCE	*/ dom_normalize_node_end,
+		/* DOM_NODE_ENTITY		*/ dom_normalize_node_end,
+		/* DOM_NODE_PROC_INSTRUCTION	*/ dom_normalize_node_end,
+		/* DOM_NODE_COMMENT		*/ dom_normalize_node_end,
+		/* DOM_NODE_DOCUMENT		*/ dom_normalize_node_end,
+		/* DOM_NODE_DOCUMENT_TYPE	*/ dom_normalize_node_end,
+		/* DOM_NODE_DOCUMENT_FRAGMENT	*/ dom_normalize_node_end,
+		/* DOM_NODE_NOTATION		*/ dom_normalize_node_end,
+	}
+};
+
+struct dom_config *
+add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags)
+{
+	struct dom_config *config;
+
+	config = mem_calloc(1, sizeof(*config));
+	if (!config) return NULL;
+
+	config->flags = flags;
+
+	if (add_dom_stack_context(stack, config, &dom_config_normalizer_context))
+		return config;
+
+	mem_free(config);
+
+	return NULL;
+}
diff --git a/src/dom/configuration.h b/src/dom/configuration.h
new file mode 100644
index 00000000..267f4cc6
--- /dev/null
+++ b/src/dom/configuration.h
@@ -0,0 +1,90 @@
+#ifndef EL__DOM_CONFIGURATION_H
+#define EL__DOM_CONFIGURATION_H
+
+struct dom_node;
+struct dom_stack;
+
+/* API Doc :: dom-config */
+
+/** DOM Configuration
+ * 
+ * The DOMConfiguration interface represents the configuration of a document.
+ * Using the configuration, it is possible to change the behaviour of how
+ * document normalization is done, such as replacing the CDATASection nodes
+ * with Text nodes.
+ *
+ * Note: Parameters are similar to features and properties used in SAX2 [SAX].
+ *
+ * The following list of parameters defined in the DOM: */
+
+enum dom_config_flag {
+	/** "cdata-sections"
+	 *
+	 * The default is true and will keep CDATASection nodes in the
+	 * document. When false, CDATASection nodes in the document are
+	 * transformed into Text nodes. The new Text node is then combined with
+	 * any adjacent Text node. */
+	DOM_CONFIG_CDATA_SECTIONS = 1,
+
+	/** "comments"
+	 *
+	 * If true (the default) keep Comment nodes in the document, else
+	 * discard them. */
+	DOM_CONFIG_COMMENTS = 2,
+
+	/** "element-content-whitespace"
+	 * 
+	 * The default is true and will keep all whitespaces in the document.
+	 * When false, discard all Text nodes that contain only whitespaces. */
+	DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE = 4,
+
+	/** "entities"
+	 *
+	 * When true (the default) keep EntityReference nodes in the document.
+	 * When false, remove all EntityReference nodes from the document,
+	 * putting the entity expansions directly in their place. Text nodes
+	 * are normalized. Only unexpanded entity references are kept in the
+	 * document. Note: This parameter does not affect Entity nodes. */
+	DOM_CONFIG_ENTITIES = 8,
+
+	/** "normalize-characters"
+	 *
+	 * The default is false, not to perform character normalization, else
+	 * fully normalized the characters in the document as defined in
+	 * appendix B of [XML 1.1]. */
+	DOM_CONFIG_NORMALIZE_CHARACTERS = 16,
+
+	/** "unknown"
+	 *
+	 * If false (default) nothing is done, else elements and attributes
+	 * that are not known according to the built-in node info are
+	 * discarded. */
+	DOM_CONFIG_UNKNOWN = 32,
+
+	/** "normalize-whitespace"
+	 *
+	 * If false (default) nothing is done, else all nodes are discarded
+	 * once they have been traversed. */
+	DOM_CONFIG_NORMALIZE_WHITESPACE = 64,
+};
+
+struct dom_error;
+
+struct dom_config {
+	enum dom_config_flag flags; /*: DOM configuration flags. */
+
+	/** FIXME: "error-handler"
+	 *
+	 * Contains an error handler. If an error is encountered in the
+	 * document, this handler is called. When called, DOMError.relatedData
+	 * will contain the closest node to where the error occurred. If the
+	 * implementation is unable to determine the node where the error
+	 * occurs, DOMError.relatedData will contain the Document node.
+	 */
+	void (*error_handler)(struct dom_config *, struct dom_error *);
+};
+
+struct dom_config *
+add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags);
+
+#endif

From 1d52d67e506ca8a3fc45edbf99ae8614425ca1d3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 07:11:02 +0100
Subject: [PATCH 012/204] Add get_dom_node_child() which searches for a node
 with given type

---
 src/document/dom/renderer.c | 43 ++++++-------------------------------
 src/dom/node.c              | 42 ++++++++++++++++++++++++++++++++++++
 src/dom/node.h              | 18 +++++++++++-----
 3 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 10e034e9..0f04574d 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -796,48 +796,17 @@ dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 	return DOM_STACK_CODE_OK;
 }
 
-static struct dom_string *
-get_rss_node_text(struct dom_node *node)
-{
-	struct dom_node *child;
-	int index;
-
-	if (!node->data.element.children)
-		return NULL;
-
-	foreach_dom_node (node->data.element.children, child, index) {
-		if (child->type == DOM_NODE_TEXT)
-			return &child->string;
-	}
-
-	return NULL;
-}
-
-static struct dom_node *
-get_rss_child(struct dom_node *parent, enum rss_element_type type)
-{
-	struct dom_node *node;
-	int index;
-
-	if (!parent->data.element.children)
-		return NULL;
-
-	foreach_dom_node (parent->data.element.children, node, index) {
-		if (node->type == DOM_NODE_ELEMENT
-		    && type == node->data.element.type)
-			return node;
-	}
-
-	return NULL;
-}
-
 
 static struct dom_string *
 get_rss_text(struct dom_node *node, enum rss_element_type type)
 {
-	node = get_rss_child(node, type);
+	node = get_dom_node_child(node, DOM_NODE_ELEMENT, type);
 
-	return node ? get_rss_node_text(node) : NULL;
+	if (!node) return NULL;
+
+	node = get_dom_node_child(node, DOM_NODE_TEXT, 0);
+
+	return node ? &node->string: NULL;
 }
 
 static void
diff --git a/src/dom/node.c b/src/dom/node.c
index 8d86a7a1..9995c223 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -267,6 +267,48 @@ get_dom_node_prev(struct dom_node *node)
 	return NULL;
 }
 
+struct dom_node *
+get_dom_node_child(struct dom_node *parent, enum dom_node_type type,
+		   int16_t subtype)
+{
+	struct dom_node_list **list;
+	struct dom_node *node;
+	int index;
+
+	list = get_dom_node_list_by_type(parent, type);
+	if (!list) return NULL;
+
+	foreach_dom_node (*list, node, index) {
+		if (node->type != type)
+			continue;
+
+		if (!subtype) return node;
+
+		switch (type) {
+		case DOM_NODE_ELEMENT:
+			if (node->data.element.type == subtype)
+				return node;
+			break;
+
+		case DOM_NODE_ATTRIBUTE:
+			if (node->data.attribute.type == subtype)
+				return node;
+			break;
+
+		case DOM_NODE_PROCESSING_INSTRUCTION:
+			if (node->data.attribute.type == subtype)
+				return node;
+			break;
+
+		default:
+			return node;
+		}
+	}
+
+	return NULL;
+}
+
+
 /* Nodes */
 
 struct dom_node *
diff --git a/src/dom/node.h b/src/dom/node.h
index 3e5e94c8..9f4d2cfb 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -246,6 +246,11 @@ int get_dom_node_map_index(struct dom_node_list *list, struct dom_node *node);
 /* Returns the previous sibling to the node. */
 struct dom_node *get_dom_node_prev(struct dom_node *node);
 
+/* Returns first text node of the element or NULL. */
+struct dom_node *
+get_dom_node_child(struct dom_node *node, enum dom_node_type child_type,
+		   int16_t child_subtype);
+
 /* Looks up the @node_map for a node matching the requested type and name.
  * The @subtype maybe be 0 indication unknown subtype and only name should be
  * tested else it will indicate either the element or attribute private
@@ -307,17 +312,17 @@ struct dom_string *get_dom_node_value(struct dom_node *node);
 /* Returns the name used for identifying the node type. */
 struct dom_string *get_dom_node_type_name(enum dom_node_type type);
 
-/* Based on the type of the parent and the node return a proper list
+/* Based on the type of the parent and the node type return a proper list
  * or NULL. This is useful when adding a node to a parent node. */
 static inline struct dom_node_list **
-get_dom_node_list(struct dom_node *parent, struct dom_node *node)
+get_dom_node_list_by_type(struct dom_node *parent, enum dom_node_type type)
 {
 	switch (parent->type) {
 	case DOM_NODE_DOCUMENT:
 		return &parent->data.document.children;
 
 	case DOM_NODE_ELEMENT:
-		switch (node->type) {
+		switch (type) {
 		case DOM_NODE_ATTRIBUTE:
 			return &parent->data.element.map;
 
@@ -326,7 +331,7 @@ get_dom_node_list(struct dom_node *parent, struct dom_node *node)
 		}
 
 	case DOM_NODE_DOCUMENT_TYPE:
-		switch (node->type) {
+		switch (type) {
 		case DOM_NODE_ENTITY:
 			return &parent->data.document_type.entities;
 
@@ -338,7 +343,7 @@ get_dom_node_list(struct dom_node *parent, struct dom_node *node)
 		}
 
 	case DOM_NODE_PROCESSING_INSTRUCTION:
-		switch (node->type) {
+		switch (type) {
 		case DOM_NODE_ATTRIBUTE:
 			return &parent->data.proc_instruction.map;
 
@@ -351,4 +356,7 @@ get_dom_node_list(struct dom_node *parent, struct dom_node *node)
 	}
 }
 
+#define get_dom_node_list(parent, node) \
+	get_dom_node_list_by_type(parent, (node)->type)
+
 #endif

From bb9b4437fa6bc939749c2912702f1d788ba16763 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 11:40:13 +0100
Subject: [PATCH 013/204] - FSP protocol

---
 Makefile.config.in        |   1 +
 configure.in              |  18 ++
 features.conf             |   7 +
 src/protocol/Makefile     |   1 +
 src/protocol/fsp/Makefile |   6 +
 src/protocol/fsp/fsp.c    | 341 ++++++++++++++++++++++++++++++++++++++
 src/protocol/fsp/fsp.h    |  16 ++
 src/protocol/protocol.c   |   5 +
 src/protocol/protocol.h   |   1 +
 9 files changed, 396 insertions(+)
 create mode 100644 src/protocol/fsp/Makefile
 create mode 100644 src/protocol/fsp/fsp.c
 create mode 100644 src/protocol/fsp/fsp.h

diff --git a/Makefile.config.in b/Makefile.config.in
index 583d8b15..c83fccf7 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -114,6 +114,7 @@ CONFIG_EXMODE = @CONFIG_EXMODE@
 CONFIG_FASTMEM = @CONFIG_FASTMEM@
 CONFIG_FINGER = @CONFIG_FINGER@
 CONFIG_FORMHIST = @CONFIG_FORMHIST@
+CONFIG_FSP = @CONFIG_FSP@
 CONFIG_FTP = @CONFIG_FTP@
 CONFIG_GLOBHIST = @CONFIG_GLOBHIST@
 CONFIG_GNUTLS = @CONFIG_GNUTLS@
diff --git a/configure.in b/configure.in
index e70b85e4..80bb9d00 100644
--- a/configure.in
+++ b/configure.in
@@ -1132,6 +1132,24 @@ EL_ARG_DEPEND(CONFIG_CGI, cgi, [HAVE_SETENV_OR_PUTENV:yes], [Local CGI],
 EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol],
 	      [  --enable-finger         enable finger protocol support])
 
+dnl ===================================================================
+dnl FSP protocol
+dnl ===================================================================
+
+EL_ARG_ENABLE(CONFIG_FSP, fsp, [FSP protocol],
+	      [  --enable-fsp            enable FSP protocol support])
+
+if test "x${enable_fsp}" != xno; then
+	AC_CHECK_HEADERS(fsplib.h, CONFIG_FSP=yes, CONFIG_FSP=no)
+
+	if test "$CONFIG_FSP" = yes; then
+		AC_CHECK_LIB(fsplib, fsp_open_session, CONFIG_FSP=yes, CONFIG_FSP=no)
+		if test "$CONFIG_FSP" = yes; then
+			LIBS="$LIBS -lfsplib"
+		fi
+	fi
+fi
+
 EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
 	      [  --disable-ftp           disable ftp protocol support])
 
diff --git a/features.conf b/features.conf
index e725316b..c19ce563 100644
--- a/features.conf
+++ b/features.conf
@@ -297,6 +297,13 @@ CONFIG_DATA=yes
 
 CONFIG_FINGER=no
 
+### FSP protocol
+#
+# See: http://fsp.sourceforge.net/
+#
+# Default: disabled
+
+CONFIG_FSP=no
 
 ### File Transfer Protocol Support
 #
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 9c49a21c..f4e83fdb 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_BITTORRENT)	+= bittorrent
 SUBDIRS-$(CONFIG_FINGER)	+= finger
+SUBDIRS-$(CONFIG_FSP)		+= fsp
 SUBDIRS-$(CONFIG_FTP)		+= ftp
 SUBDIRS-$(CONFIG_GOPHER)	+= gopher
 SUBDIRS-$(CONFIG_NNTP)		+= nntp
diff --git a/src/protocol/fsp/Makefile b/src/protocol/fsp/Makefile
new file mode 100644
index 00000000..87341f6e
--- /dev/null
+++ b/src/protocol/fsp/Makefile
@@ -0,0 +1,6 @@
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
+
+OBJS = fsp.o
+
+include $(top_srcdir)/Makefile.lib
diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
new file mode 100644
index 00000000..6f1d3d3c
--- /dev/null
+++ b/src/protocol/fsp/fsp.c
@@ -0,0 +1,341 @@
+/* Internal FSP protocol implementation */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* Needed for asprintf() */
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <errno.h>
+#include <fsplib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* FreeBSD needs this before resource.h */
+#endif
+#include <sys/types.h> /* FreeBSD needs this before resource.h */
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h> /* OS/2 needs this after sys/types.h */
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "elinks.h"
+
+#include "cache/cache.h"
+#include "config/options.h"
+#include "intl/gettext/libintl.h"
+#include "main/module.h"
+#include "main/select.h"
+#include "network/connection.h"
+#include "network/socket.h"
+#include "osdep/osdep.h"
+#include "protocol/protocol.h"
+#include "protocol/fsp/fsp.h"
+#include "protocol/uri.h"
+#include "util/memory.h"
+#include "util/snprintf.h"
+#include "util/string.h"
+
+
+struct option_info fsp_options[] = {
+	INIT_OPT_TREE("protocol", N_("FSP"),
+		"fsp", 0,
+		N_("FSP specific options.")),
+
+	INIT_OPT_BOOL("protocol.fsp", N_("Sort entries"),
+		"sort", 0, 1,
+		N_("Whether sort entries in directory listings.")),
+
+	NULL_OPTION_INFO,
+};
+
+struct module fsp_protocol_module = struct_module(
+	/* name: */		N_("FSP"),
+	/* options: */		fsp_options,
+	/* hooks: */		NULL,
+	/* submodules: */	NULL,
+	/* data: */		NULL,
+	/* init: */		NULL,
+	/* done: */		NULL
+);
+
+
+struct fsp_info {
+	int init;
+};
+
+static void
+fsp_error(unsigned char *error)
+{
+	puts(error);
+	exit(1);
+}
+
+static int
+compare(FSP_RDENTRY *a, FSP_RDENTRY *b)
+{
+	int res = ((b->type == FSP_RDTYPE_DIR) - (a->type == FSP_RDTYPE_DIR));
+
+	if (res)
+		return res;
+	return strcmp(a->name, b->name);
+}
+
+
+static void
+sort_and_display_entries(FSP_DIR *dir)
+{
+	FSP_RDENTRY fentry, *fresult, *table = NULL;
+	int size = 0;
+	int i;
+	unsigned char dircolor[8];
+
+	if (get_opt_bool("document.browse.links.color_dirs")) {
+		color_to_string(get_opt_color("document.colors.dirs"),
+			(unsigned char *) &dircolor);
+	} else {
+		dircolor[0] = 0;
+	}
+
+	while (!fsp_readdir_native(dir, &fentry, &fresult)) {
+		FSP_RDENTRY *new_table;
+
+		if (!fresult) break;
+		if (!strcmp(fentry.name, "."))
+			continue;
+		new_table = mem_realloc(table, (size + 1) * sizeof(*table));
+		if (!new_table)
+			continue;
+		table = new_table;
+		memcpy(&table[size], &fentry, sizeof(fentry));
+		size++;
+	}
+	qsort(table, size, sizeof(fentry),
+	 (int (*)(const void *, const void *)) compare);
+
+	for (i = 0; i < size; i++) {
+		printf("%10d\t<a href=\"%s\">", table[i].size, table[i].name);
+		if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+			printf("<font color=\"%s\"><b>", dircolor);
+		}
+		printf("%s", table[i].name);
+		if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+			printf("</b></font>");
+		}
+		puts("</a>");
+	}
+}
+
+static void
+fsp_directory(FSP_SESSION *ses, struct uri *uri)
+{
+	struct string buf;
+	FSP_DIR *dir;
+	unsigned char *data = get_uri_string(uri, URI_DATA);
+
+	if (!init_string(&buf))
+		fsp_error("Out of memory");
+
+	add_to_string(&buf, "fsp://");
+	if (uri->passwordlen) {
+		add_to_string(&buf, "u:");
+		add_bytes_to_string(&buf, uri->password, uri->passwordlen);
+		add_char_to_string(&buf, '@');
+	}
+	add_bytes_to_string(&buf, uri->host, uri->hostlen);
+	if (uri->portlen) {
+		add_char_to_string(&buf, ':');
+		add_bytes_to_string(&buf, uri->port, uri->portlen);
+	}
+	add_char_to_string(&buf, '/');
+	if (uri->datalen) {
+		add_bytes_to_string(&buf, uri->data, uri->datalen);
+		add_char_to_string(&buf, '/');
+	}
+
+	printf("<html><head><title>%s</title><base href=\"%s\">"
+	"</head><body><pre>", buf.source, buf.source);
+
+	dir = fsp_opendir(ses, data);
+	if (!dir) goto end;
+
+	if (get_opt_bool("protocol.fsp.sort")) {
+		sort_and_display_entries(dir);
+	} else {
+		FSP_RDENTRY fentry, *fresult;
+		unsigned char dircolor[8];
+
+		if (get_opt_bool("document.browse.links.color_dirs")) {
+			color_to_string(get_opt_color("document.colors.dirs"),
+				(unsigned char *) &dircolor);
+		} else {
+			dircolor[0] = 0;
+		}
+		
+		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
+			if (!fresult) break;
+			printf("%10d\t<a href=\"%s\">", fentry.size, fentry.name);
+			if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+				printf("<font color=\"%s\"><b>", dircolor);
+			}
+			printf("%s", fentry.name);
+			if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+				printf("</b></font>");
+			}
+			puts("</a>");
+		}
+		fsp_closedir(dir);
+	}
+end:
+	puts("</pre></body></html>");
+	fsp_close_session(ses);
+	exit(0);
+}
+
+#define READ_SIZE	4096
+
+static void
+do_fsp(struct connection *conn)
+{
+	struct stat sb;
+	struct uri *uri = conn->uri;
+	unsigned char *host = get_uri_string(uri, URI_HOST);
+	unsigned char *password = get_uri_string(uri, URI_PASSWORD);
+	unsigned char *data = get_uri_string(uri, URI_DATA);
+	unsigned short port = (unsigned short)get_uri_port(uri);
+	FSP_SESSION *ses = fsp_open_session(host, port, password);
+
+	if (!ses)
+		fsp_error("Session initialization failed.");
+	if (fsp_stat(ses, data, &sb))
+		fsp_error("File not found.");
+	if (S_ISDIR(sb.st_mode))
+		fsp_directory(ses, uri);
+	else { /* regular file */
+		char buf[4096];
+		FSP_FILE *file = fsp_fopen(ses, data, "r");
+		int r;
+
+		if (!file)
+			fsp_error("fsp_fopen error.");
+
+		while ((r = fsp_fread(buf, 1, READ_SIZE, file)) > 0)
+			fwrite(buf, 1, r, stdout);
+		fsp_fclose(file);
+		fsp_close_session(ses);
+		exit(0);
+	}
+}
+
+static void
+fsp_got_data(struct socket *socket, struct read_buffer *rb)
+{
+	int len = rb->length;
+	struct connection *conn = socket->conn;
+
+	if (len < 0) {
+		abort_connection(conn, -errno);
+		return;
+	}
+	if (len == 0) {
+		if (conn->from)
+			normalize_cache_entry(conn->cached, conn->from);
+		close_socket(socket);
+		abort_connection(conn, S_OK);
+		return;
+	}
+
+	conn->socket->state = SOCKET_END_ONCLOSE;
+	conn->received += len;
+	if (add_fragment(conn->cached, conn->from, rb->data, len) == 1)
+		conn->tries = 0;
+	conn->from += len;
+	kill_buffer_data(rb, len);
+	read_from_socket(socket, rb, S_TRANS, fsp_got_data);
+}
+
+#undef READ_SIZE
+
+
+/* Close all non-terminal file descriptors. */
+static void
+close_all_non_term_fd(void)
+{
+	int n;
+	int max = 1024;
+#ifdef RLIMIT_NOFILE
+	struct rlimit lim;
+
+	if (!getrlimit(RLIMIT_NOFILE, &lim))
+		max = lim.rlim_max;
+#endif
+	for (n = 3; n < max; n++)
+		close(n);
+}
+
+void
+fsp_protocol_handler(struct connection *conn)
+{
+	int fsp_pipe[2] = { -1, -1 };
+	int cpid;
+	struct read_buffer *buf;
+
+	if (c_pipe(fsp_pipe)) {
+		int s_errno = errno;
+
+		if (fsp_pipe[0] >= 0) close(fsp_pipe[0]);
+		if (fsp_pipe[1] >= 0) close(fsp_pipe[1]);
+		abort_connection(conn, -s_errno);
+		return;
+	}
+
+	conn->cached = get_cache_entry(conn->uri);
+	if (!conn->cached) {
+		abort_connection(conn, S_OUT_OF_MEM);
+		return;
+	}
+	conn->from = 0;
+	conn->unrestartable = 1;
+
+	cpid = fork();
+	if (cpid == -1) {
+		int s_errno = errno;
+
+		close(fsp_pipe[0]);
+		close(fsp_pipe[1]);
+		retry_connection(conn, -s_errno);
+		return;
+	}
+
+	if (!cpid) {
+		close(1);
+		dup2(fsp_pipe[1], 1);
+		close(0);
+		dup2(open("/dev/null", O_RDONLY), 0);
+		close(2);
+		dup2(open("/dev/null", O_RDONLY), 2);
+		close(fsp_pipe[0]);
+
+		close_all_non_term_fd();
+		do_fsp(conn);
+		
+	} else {
+		conn->socket->fd = fsp_pipe[0];
+		close(fsp_pipe[1]);
+		buf = alloc_read_buffer(conn->socket);
+		if (!buf) {
+			close(fsp_pipe[0]);
+			abort_connection(conn, S_OUT_OF_MEM);
+			return;
+		}
+		read_from_socket(conn->socket, buf, S_CONN, fsp_got_data);
+	}
+}
diff --git a/src/protocol/fsp/fsp.h b/src/protocol/fsp/fsp.h
new file mode 100644
index 00000000..b5b9087e
--- /dev/null
+++ b/src/protocol/fsp/fsp.h
@@ -0,0 +1,16 @@
+
+#ifndef EL__PROTOCOL_FSP_FSP_H
+#define EL__PROTOCOL_FSP_FSP_H
+
+#include "main/module.h"
+#include "protocol/protocol.h"
+
+extern struct module fsp_protocol_module;
+
+#ifdef CONFIG_FSP
+extern protocol_handler_T fsp_protocol_handler;
+#else
+#define fsp_protocol_handler NULL
+#endif
+
+#endif
diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c
index 388b5b67..9ab10da8 100644
--- a/src/protocol/protocol.c
+++ b/src/protocol/protocol.c
@@ -31,6 +31,7 @@
 #include "protocol/data.h"
 #include "protocol/file/file.h"
 #include "protocol/finger/finger.h"
+#include "protocol/fsp/fsp.h"
 #include "protocol/ftp/ftp.h"
 #include "protocol/gopher/gopher.h"
 #include "protocol/http/http.h"
@@ -57,6 +58,7 @@ static const struct protocol_backend protocol_backends[] = {
 	{ "data",	   0, data_protocol_handler,		0, 0, 1, 0 },
 	{ "file",	   0, file_protocol_handler,		1, 0, 0, 0 },
 	{ "finger",	  79, finger_protocol_handler,		1, 1, 0, 0 },
+	{ "fsp",	  21, fsp_protocol_handler,		1, 1, 0, 0 },
 	{ "ftp",	  21, ftp_protocol_handler,		1, 1, 0, 0 },
 	{ "gopher",	  70, gopher_protocol_handler,		1, 1, 0, 0 },
 	{ "http",	  80, http_protocol_handler,		1, 1, 0, 0 },
@@ -276,6 +278,9 @@ static struct module *protocol_submodules[] = {
 #ifdef CONFIG_FINGER
 	&finger_protocol_module,
 #endif
+#ifdef CONFIG_FSP
+	&fsp_protocol_module,
+#endif
 #ifdef CONFIG_FTP
 	&ftp_protocol_module,
 #endif
diff --git a/src/protocol/protocol.h b/src/protocol/protocol.h
index 614c2173..c39e794c 100644
--- a/src/protocol/protocol.h
+++ b/src/protocol/protocol.h
@@ -14,6 +14,7 @@ enum protocol {
 	PROTOCOL_DATA,
 	PROTOCOL_FILE,
 	PROTOCOL_FINGER,
+	PROTOCOL_FSP,
 	PROTOCOL_FTP,
 	PROTOCOL_GOPHER,
 	PROTOCOL_HTTP,

From 04b253eef9884904e5b44194465fe28f5634a575 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 11:45:17 +0100
Subject: [PATCH 014/204] Make PHP 5 happy.

---
 src/protocol/file/cgi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/protocol/file/cgi.c b/src/protocol/file/cgi.c
index 67d8744a..30ed2a07 100644
--- a/src/protocol/file/cgi.c
+++ b/src/protocol/file/cgi.c
@@ -150,6 +150,7 @@ set_vars(struct connection *conn, unsigned char *script)
 	if (env_set("SCRIPT_NAME", script, -1)) return -1;
 	if (env_set("SCRIPT_FILENAME", script, -1)) return -1;
 	if (env_set("PATH_TRANSLATED", script, -1)) return -1;
+	if (env_set("REDIRECT_STATUS", "1", -1)) return -1;
 
 	/* From now on, just HTTP-like headers are being set. Missing variables
 	 * due to full environment are not a problem according to the CGI/1.1

From 8782b016594d6db1ade35865367de5f50d1d8643 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 13:51:08 +0100
Subject: [PATCH 015/204] thisobj is for function object, self is for object

---
 src/ecmascript/see/form.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index ca8fd1b8..c650e555 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -350,7 +350,7 @@ js_input_click(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
 	struct session *ses = doc_view->session;
-	struct js_input *input = (struct js_input *)thisobj;
+	struct js_input *input = (struct js_input *)self;
 	struct form_state *fs = input->fs;
 	struct form_control *fc;
 	int linknum;
@@ -384,7 +384,7 @@ js_input_focus(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
 	struct session *ses = doc_view->session;
-	struct js_input *input = (struct js_input *)thisobj;
+	struct js_input *input = (struct js_input *)self;
 	struct form_state *fs = input->fs;
 	struct form_control *fc;
 	int linknum;
@@ -502,7 +502,7 @@ js_form_elems_item(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
-	struct js_form_elems *jsfe = (struct js_form_elems *)thisobj;
+	struct js_form_elems *jsfe = (struct js_form_elems *)self;
 	struct js_form *parent_form = jsfe->parent;
 	struct form_view *fv = parent_form->fv;
 	struct form *form = find_form_by_form_view(document, fv);
@@ -544,7 +544,7 @@ js_form_elems_namedItem(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
-	struct js_form_elems *jsfe = (struct js_form_elems *)thisobj;
+	struct js_form_elems *jsfe = (struct js_form_elems *)self;
 	struct js_form *parent_form = jsfe->parent;
 	struct form_view *fv = parent_form->fv;
 	struct form *form = find_form_by_form_view(document, fv);
@@ -902,7 +902,7 @@ js_form_reset(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct global_object *g = (struct global_object *)interp;
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
-	struct js_form *js_form = (struct js_form *)thisobj;
+	struct js_form *js_form = (struct js_form *)self;
 	struct form_view *fv = js_form->fv;
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 
@@ -923,7 +923,7 @@ js_form_submit(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct session *ses = doc_view->session;
-	struct js_form *js_form = (struct js_form *)thisobj;
+	struct js_form *js_form = (struct js_form *)self;
 	struct form_view *fv = js_form->fv;
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 

From b8126ea9de737e2d8f7a544b3b54be202fd23126 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 14:14:14 +0100
Subject: [PATCH 016/204] Introduced ecmascript submodules

---
 src/ecmascript/ecmascript.c   | 18 +++++++++++++++++-
 src/ecmascript/see.c          | 10 ++++++++++
 src/ecmascript/see.h          |  1 +
 src/ecmascript/spidermonkey.c | 10 ++++++++++
 src/ecmascript/spidermonkey.h |  1 +
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/ecmascript/ecmascript.c b/src/ecmascript/ecmascript.c
index 718786ff..8948eab0 100644
--- a/src/ecmascript/ecmascript.c
+++ b/src/ecmascript/ecmascript.c
@@ -24,6 +24,12 @@
 #include "viewer/text/form.h" /* <-ecmascript_reset_state() */
 #include "viewer/text/vs.h"
 
+#ifdef CONFIG_ECMASCRIPT_SEE
+#include "ecmascript/see.h"
+#elif defined(CONFIG_SPIDERMONKEY)
+#include "ecmascript/spidermonkey.h"
+#endif
+
 
 /* TODO: We should have some kind of ACL for the scripts - i.e. ability to
  * disallow the scripts to open new windows (or so that the windows are always
@@ -133,11 +139,21 @@ ecmascript_timeout_dialog(struct terminal *term, int max_exec_time)
 
 }
 
+static struct module *ecmascript_modules[] = {
+#ifdef CONFIG_ECMASCRIPT_SEE
+	&see_module,
+#elif defined(CONFIG_SPIDERMONKEY)
+	&spidermonkey_module,
+#endif
+	NULL,
+};
+
+
 struct module ecmascript_module = struct_module(
 	/* name: */		N_("ECMAScript"),
 	/* options: */		ecmascript_options,
 	/* events: */		NULL,
-	/* submodules: */	NULL,
+	/* submodules: */	ecmascript_modules,
 	/* data: */		NULL,
 	/* init: */		ecmascript_init,
 	/* done: */		ecmascript_done
diff --git a/src/ecmascript/see.c b/src/ecmascript/see.c
index 6f203b40..4f353a79 100644
--- a/src/ecmascript/see.c
+++ b/src/ecmascript/see.c
@@ -240,3 +240,13 @@ see_eval_boolback(struct ecmascript_interpreter *interpreter,
 	}
 	return res;
 }
+
+struct module see_module = struct_module(
+	/* name: */		"SEE",
+	/* options: */		NULL,
+	/* events: */		NULL,
+	/* submodules: */	NULL,
+	/* data: */		NULL,
+	/* init: */		NULL,
+	/* done: */		NULL
+);
diff --git a/src/ecmascript/see.h b/src/ecmascript/see.h
index 206be2cb..8d75c6e2 100644
--- a/src/ecmascript/see.h
+++ b/src/ecmascript/see.h
@@ -14,4 +14,5 @@ void see_eval(struct ecmascript_interpreter *interpreter, struct string *code);
 unsigned char *see_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
 int see_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
 
+extern struct module see_module;
 #endif
diff --git a/src/ecmascript/spidermonkey.c b/src/ecmascript/spidermonkey.c
index 0f21054f..00ca51e9 100644
--- a/src/ecmascript/spidermonkey.c
+++ b/src/ecmascript/spidermonkey.c
@@ -376,3 +376,13 @@ spidermonkey_eval_boolback(struct ecmascript_interpreter *interpreter,
 
 	return jsval_to_boolean(ctx, &rval);
 }
+
+struct module spidermonkey_module = struct_module(
+	/* name: */		"SpiderMonkey",
+	/* options: */		NULL,
+	/* events: */		NULL,
+	/* submodules: */	NULL,
+	/* data: */		NULL,
+	/* init: */		NULL,
+	/* done: */		NULL
+);
diff --git a/src/ecmascript/spidermonkey.h b/src/ecmascript/spidermonkey.h
index a0241cd8..b9f2b635 100644
--- a/src/ecmascript/spidermonkey.h
+++ b/src/ecmascript/spidermonkey.h
@@ -14,4 +14,5 @@ void spidermonkey_eval(struct ecmascript_interpreter *interpreter, struct string
 unsigned char *spidermonkey_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
 int spidermonkey_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
 
+extern struct module spidermonkey_module;
 #endif

From 5a3f77fbe2dd2f0bce7f73cf8f5701561985425a Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 14:16:13 +0100
Subject: [PATCH 017/204] Removed obsolete CGI script. From now there is native
 FSP support.

---
 contrib/cgi/Makefile   |   2 -
 contrib/cgi/README.FSP |   8 --
 contrib/cgi/fspcgi.c   | 172 -----------------------------------------
 3 files changed, 182 deletions(-)
 delete mode 100644 contrib/cgi/Makefile
 delete mode 100644 contrib/cgi/README.FSP
 delete mode 100644 contrib/cgi/fspcgi.c

diff --git a/contrib/cgi/Makefile b/contrib/cgi/Makefile
deleted file mode 100644
index 9881520a..00000000
--- a/contrib/cgi/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-fspcgi:	fspcgi.o
-	$(CC) -o $@ $< -lfsplib
diff --git a/contrib/cgi/README.FSP b/contrib/cgi/README.FSP
deleted file mode 100644
index 537befc3..00000000
--- a/contrib/cgi/README.FSP
+++ /dev/null
@@ -1,8 +0,0 @@
-To use this CGI script you need to build fspcgi and copy the executable
-to your cgi directory.  In ELinks, you can then use this URL:
-
-	file:///"path_to_fspcgi"?host:port/path_to_file_or_directory
-
-You can find more info about the FSP protocol at
-
-	http://fsp.sourceforge.net/
diff --git a/contrib/cgi/fspcgi.c b/contrib/cgi/fspcgi.c
deleted file mode 100644
index afbc5261..00000000
--- a/contrib/cgi/fspcgi.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* CGI script for FSP protocol support */
-
-#include <ctype.h>
-#include <fsplib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-char *pname, *query;
-
-struct fq {
-	char *password;
-	char *host;
-	char *path;
-	unsigned short port;
-} data;
-
-static void
-error(const char *str)
-{
-	printf("Content-Type: text/plain\r\nConnection: close\r\n\r\n");
-	puts(str);
-	printf("%s\n", query);
-	exit(1);
-}
-
-static void
-process_directory(FSP_SESSION *ses)
-{
-	char buf[1024];
-	FSP_DIR *dir;
-	/* TODO: password */
-
-	snprintf(buf, sizeof(buf), "file://%s?%s:%d%s/", pname, data.host,
-		data.port, data.path);
-	printf("Content-Type: text/html\r\n\r\n");
-	printf("<html><head><title>%s</title></head><body>\n", buf);
-	dir = fsp_opendir(ses, data.path);
-	if (dir) {
-		FSP_RDENTRY fentry, *fresult;
-
-		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
-			if (!fresult) break;
-			printf("<a href=\"%s%s\">%s</a><br>\n", buf, fentry.name, fentry.name);
-		}
-		fsp_closedir(dir);
-	}	
-	puts("</body></html>");
-	fsp_close_session(ses);
-	exit(0);
-}
-
-static void
-process_data(void)
-{
-	FSP_SESSION *ses = fsp_open_session(data.host, data.port, data.password);
-	struct stat sb;
-
-	if (!ses) error("Session initialization failed.");
-	if (fsp_stat(ses, data.path, &sb)) error("File not found.");
-	if (S_ISDIR(sb.st_mode)) process_directory(ses);
-	else { /* regular file */
-		char buf[4096];
-		FSP_FILE *file = fsp_fopen(ses, data.path, "r");
-		int r;
-
-		if (!file) error("fsp_fopen error.");
-		printf("Content-Type: application/octet-stream\r\nContent-Length: %d\r\n"
-			"Connection: close\r\n\r\n", sb.st_size);
-		while ((r = fsp_fread(buf, 1, 4096, file)) > 0) fwrite(buf, 1, r, stdout);
-		fsp_fclose(file);
-		fsp_close_session(ses);
-		exit(0);
-	}
-}
-
-static void
-process_query(void)
-{
-	char *at = strchr(query, '@');
-	char *colon;
-	char *slash;
-
-	if (at) {
-		*at = '\0';
-		data.password = strdup(query);
-		query = at + 1;
-	}
-	colon = strchr(query, ':');
-	if (colon) {
-		*colon = '\0';
-		data.host = strdup(query);
-		data.port = atoi(colon + 1);
-		slash = strchr(colon + 1, '/');
-		if (slash) {
-			data.path = strdup(slash);
-		} else {
-			data.path = "/";
-		}
-	} else {
-		data.port = 21;
-		slash = strchr(query, '/');
-		if (slash) {
-			*slash = '\0';
-			data.host = strdup(query);
-			*slash = '/';
-			data.path = strdup(slash);
-		} else {
-			data.host = strdup(query);
-			data.path = "/";
-		}
-	}
-	process_data();
-}
-
-static inline int
-unhx(register unsigned char a)
-{
-	if (isdigit(a)) return a - '0';
-	if (a >= 'a' && a <= 'f') return a - 'a' + 10;
-	if (a >= 'A' && a <= 'F') return a - 'A' + 10;
-	return -1;
-}
-
-static void
-decode_query(char *src)
-{
-	char *dst = src;
-	char c;
-
-	do {
-		c = *src++;
-
-		if (c == '%') {
-			int x1 = unhx(*src);
-
-			if (x1 >= 0) {
-				int x2 = unhx(*(src + 1));
-
-				if (x2 >= 0) {
-					x1 = (x1 << 4) + x2;
-					if (x1 != 0) { /* don't allow %00 */
-						c = (unsigned char) x1;
-						src += 2;
-					}
-				}
-			}	
-
-		} else if (c == '+') {
-			c = ' ';
-		}
-
-		*dst++ = c;
-	} while (c != '\0');
-}
-
-int
-main(int argc, char **argv)
-{
-	char *q = getenv("QUERY_STRING");
-
-	if (!q) return 1;
-	pname = argv[0];
-	query = strdup(q);
-	if (!query) return 2;
-	decode_query(query);
-	process_query();
-	return 0;
-}

From 6cd9a11fdca46601ba79c6cc74d2e46cc23a5820 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 16 Jan 2006 14:32:13 +0100
Subject: [PATCH 018/204] Use frame->name instead of target avoiding possible
 segfault.

---
 src/ecmascript/see/window.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 462a2544..bfe37e35 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -117,10 +117,14 @@ static void
 delayed_goto_uri_frame(void *data)
 {
 	struct delayed_open *deo = data;
+	struct frame *frame;
 
 	assert(deo);
-	goto_uri_frame(deo->ses, deo->uri, deo->target, CACHE_MODE_NORMAL);
+	frame = ses_find_frame(deo->ses, deo->target);
+	if (frame)
+		goto_uri_frame(deo->ses, deo->uri, frame->name, CACHE_MODE_NORMAL);
 	done_uri(deo->uri);
+	mem_free(deo->target);
 	mem_free(deo);
 }
 
@@ -326,11 +330,13 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 			deo->ses = ses;
 			deo->uri = get_uri_reference(uri);
 			deo->target = target;
+			/* target will be freed in delayed_goto_uri_frame */
 			register_bottom_half(delayed_goto_uri_frame, deo);
 			goto end;
 		}
 	}
 
+	mem_free_if(target);
 	if (!get_cmd_opt_bool("no-connect")
 	    && !get_cmd_opt_bool("no-home")
 	    && !get_cmd_opt_bool("anonymous")
@@ -350,7 +356,6 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 	}
 
 end:
-	mem_free_if(target);
 	done_uri(uri);
 
 }

From 1082c85bd080a56a15819755ccd60c09d98941ae Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Mon, 16 Jan 2006 18:53:56 +0000
Subject: [PATCH 019/204] Fix GITweb smartprefix blob, tree, and history
 commands.

---
 contrib/smjs/smartprefixes_common.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/smjs/smartprefixes_common.js b/contrib/smjs/smartprefixes_common.js
index 1ea9af17..65f5fb05 100644
--- a/contrib/smjs/smartprefixes_common.js
+++ b/contrib/smjs/smartprefixes_common.js
@@ -58,7 +58,7 @@ function cvsweb (base, project, url)
 /* javascript:gitweb("http://pasky.or.cz/gitweb.cgi", "elinks.git", "%s"); */
 function gitweb(base, project, url)
 {
-	var parts = url.match(/^(search|summary|shortlog|log|commit|commitdiff|tree|tag)(\s(.*))?/);
+	var parts = url.match(/^(search|summary|shortlog|log|blob|commit|commitdiff|history|tree|tag)(\s(.*))?/);
 	var query = '?p=' + project;
 
 	if (parts) {
@@ -67,6 +67,8 @@ function gitweb(base, project, url)
 		/* If the extra arg is not for searching assume it is an ID. */
 		if (parts[1] == 'search' && parts[3])
 			query += ';s=' + escape(parts[3]);
+		else if ((parts[1] == 'blob' || parts[1] == 'history' || parts[1] == 'tree') && parts[3])
+			query += ';f=' + escape(parts[3]);
 		else if (parts[3])
 			query += ';h=' + escape(parts[3]);
 

From 7df751ab5967a3d770783537c0cb445b67f162c1 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 20:06:15 +0100
Subject: [PATCH 020/204] Paste the first few lines of fsp.sf.net into the FSP
 description

---
 features.conf | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/features.conf b/features.conf
index c19ce563..061c5ddb 100644
--- a/features.conf
+++ b/features.conf
@@ -297,9 +297,17 @@ CONFIG_DATA=yes
 
 CONFIG_FINGER=no
 
-### FSP protocol
+### File Servive Protocol
 #
-# See: http://fsp.sourceforge.net/
+# File Service Protocol (FSP) is a very lightweight UDP based protocol for
+# transferring files. FSP has many benefits over FTP, mainly for running
+# anonymous archives. FSP protocol is valuable in all kinds of environments
+# because it is one of the only TCP/IP protocols that is not aggressive about
+# bandwidth, while still being sufficiently fault tolerant.
+#
+# FSP is what anonymous FTP *should* be!
+#
+# See http://fsp.sourceforge.net/ for more info.
 #
 # Default: disabled
 

From 1f68492d57279a6aa3479c79db105219d0cb1d82 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Mon, 16 Jan 2006 19:18:33 +0000
Subject: [PATCH 021/204] Move delayed_goto_uri_frame to src/session/task.c

Until the last change in src/ecmascript/see/window.c, the two copies
of delayed_goto_uri_frame in src/ecmascript/spidermonkey/window.c and
in src/ecmascript/see/window.c were identical. That change applies to
both versions, so move the newer one to src/session/task.c and eliminate
the duplication. Also move struct delayed_open to src/session/session.h.
---
 src/ecmascript/see/window.c          | 22 ----------------------
 src/ecmascript/spidermonkey/window.c | 17 -----------------
 src/session/session.h                |  7 +++++++
 src/session/task.c                   | 15 +++++++++++++++
 src/session/task.h                   |  1 +
 5 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index bfe37e35..fbf1b406 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -49,7 +49,6 @@
 static struct js_window_object *js_get_global_object(void *);
 static struct js_window_object *js_try_resolve_frame(struct document_view *, unsigned char *);
 static void delayed_open(void *);
-static void delayed_goto_uri_frame(void *);
 static void window_get(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *, struct SEE_value *);
 static void window_put(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *, struct SEE_value *, int);
 static int window_canput(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *);
@@ -59,12 +58,6 @@ static void js_window_open(struct SEE_interpreter *, struct SEE_object *, struct
 
 void location_goto(struct document_view *, unsigned char *);
 
-struct delayed_open {
-	struct session *ses;
-	struct uri *uri;
-	unsigned char *target;
-};
-
 struct SEE_objectclass js_window_object_class = {
 	NULL,
 	window_get,
@@ -113,21 +106,6 @@ delayed_open(void *data)
 	mem_free(deo);
 }
 
-static void
-delayed_goto_uri_frame(void *data)
-{
-	struct delayed_open *deo = data;
-	struct frame *frame;
-
-	assert(deo);
-	frame = ses_find_frame(deo->ses, deo->target);
-	if (frame)
-		goto_uri_frame(deo->ses, deo->uri, frame->name, CACHE_MODE_NORMAL);
-	done_uri(deo->uri);
-	mem_free(deo->target);
-	mem_free(deo);
-}
-
 
 
 static void
diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index ad0017c1..1bac6eeb 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -289,12 +289,6 @@ window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 	return JS_TRUE;
 }
 
-struct delayed_open {
-	struct session *ses;
-	struct uri *uri;
-	unsigned char *target;
-};
-
 static void
 delayed_open(void *data)
 {
@@ -306,17 +300,6 @@ delayed_open(void *data)
 	mem_free(deo);
 }
 
-static void
-delayed_goto_uri_frame(void *data)
-{
-	struct delayed_open *deo = data;
-
-	assert(deo);
-	goto_uri_frame(deo->ses, deo->uri, deo->target, CACHE_MODE_NORMAL);
-	done_uri(deo->uri);
-	mem_free(deo);
-}
-
 static JSBool
 window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
diff --git a/src/session/session.h b/src/session/session.h
index 1d16faf6..bed30279 100644
--- a/src/session/session.h
+++ b/src/session/session.h
@@ -20,6 +20,13 @@ struct terminal;
 struct uri;
 struct window;
 
+/* Used by delayed_open and delayed_goto_uri_frame. */
+struct delayed_open {
+	struct session *ses;
+	struct uri *uri;
+	unsigned char *target;
+};
+
 enum remote_session_flags {
 	SES_REMOTE_NEW_TAB = 1,
 	SES_REMOTE_NEW_WINDOW = 2,
diff --git a/src/session/task.c b/src/session/task.c
index 5297ca90..81c8142a 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -662,6 +662,21 @@ goto_uri_frame(struct session *ses, struct uri *uri,
 	follow_url(ses, uri, target, TASK_FORWARD, cache_mode, 1);
 }
 
+void
+delayed_goto_uri_frame(void *data)
+{
+	struct delayed_open *deo = data;
+	struct frame *frame;
+
+	assert(deo);
+	frame = ses_find_frame(deo->ses, deo->target);
+	if (frame)
+		goto_uri_frame(deo->ses, deo->uri, frame->name, CACHE_MODE_NORMAL);
+	done_uri(deo->uri);
+	mem_free(deo->target);
+	mem_free(deo);
+}
+
 /* menu_func_T */
 void
 map_selected(struct terminal *term, void *ld_, void *ses_)
diff --git a/src/session/task.h b/src/session/task.h
index e1a7c9a8..f61747bb 100644
--- a/src/session/task.h
+++ b/src/session/task.h
@@ -27,6 +27,7 @@ struct uri *get_hooked_uri(unsigned char *uristring, struct session *ses, unsign
 
 void goto_uri(struct session *ses, struct uri *uri);
 void goto_uri_frame(struct session *, struct uri *, unsigned char *, enum cache_mode);
+void delayed_goto_uri_frame(void *);
 void goto_url(struct session *, unsigned char *);
 void goto_url_with_hook(struct session *, unsigned char *);
 int goto_url_home(struct session *ses);

From 466bb18be09d2024257b46f01dcbbfa3f5190714 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Mon, 16 Jan 2006 19:28:03 +0000
Subject: [PATCH 022/204] Move delayed_open to src/terminal/tab.c

The two copies of delayed_open in src/ecmascript/spidermonkey/window.c
and in src/ecmascript/see/window.c are identical, so move them
to src/terminal/tab.c and eliminate the duplication.
---
 src/ecmascript/see/window.c          | 13 -------------
 src/ecmascript/spidermonkey/window.c | 11 -----------
 src/terminal/tab.c                   | 11 +++++++++++
 src/terminal/tab.h                   |  1 +
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index fbf1b406..51cfa45e 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -48,7 +48,6 @@
 
 static struct js_window_object *js_get_global_object(void *);
 static struct js_window_object *js_try_resolve_frame(struct document_view *, unsigned char *);
-static void delayed_open(void *);
 static void window_get(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *, struct SEE_value *);
 static void window_put(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *, struct SEE_value *, int);
 static int window_canput(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *);
@@ -95,18 +94,6 @@ js_try_resolve_frame(struct document_view *doc_view, unsigned char *id)
 }
 
 
-static void
-delayed_open(void *data)
-{
-	struct delayed_open *deo = data;
-
-	assert(deo);
-	open_uri_in_new_tab(deo->ses, deo->uri, 0, 0);
-	done_uri(deo->uri);
-	mem_free(deo);
-}
-
-
 
 static void
 window_get(struct SEE_interpreter *interp, struct SEE_object *o,
diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index 1bac6eeb..3661caf0 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -289,17 +289,6 @@ window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 	return JS_TRUE;
 }
 
-static void
-delayed_open(void *data)
-{
-	struct delayed_open *deo = data;
-
-	assert(deo);
-	open_uri_in_new_tab(deo->ses, deo->uri, 0, 0);
-	done_uri(deo->uri);
-	mem_free(deo);
-}
-
 static JSBool
 window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index 02b8409f..94db8135 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -239,6 +239,17 @@ open_uri_in_new_tab(struct session *ses, struct uri *uri, int in_background,
 	init_session(based ? ses : NULL, ses->tab->term, uri, in_background);
 }
 
+void
+delayed_open(void *data)
+{
+	struct delayed_open *deo = data;
+
+	assert(deo);
+	open_uri_in_new_tab(deo->ses, deo->uri, 0, 0);
+	done_uri(deo->uri);
+	mem_free(deo);
+}
+
 void
 open_current_link_in_new_tab(struct session *ses, int in_background)
 {
diff --git a/src/terminal/tab.h b/src/terminal/tab.h
index 2fa38bd5..2fbc6e72 100644
--- a/src/terminal/tab.h
+++ b/src/terminal/tab.h
@@ -25,6 +25,7 @@ void close_all_tabs_but_current(struct session *ses);
 	((win)->type != WINDOW_NORMAL && (win) != get_current_tab((win->term)))
 
 void open_uri_in_new_tab(struct session *ses, struct uri *uri, int in_background, int based);
+void delayed_open(void *);
 void open_current_link_in_new_tab(struct session *ses, int in_background);
 
 void move_current_tab(struct session *ses, int direction);

From 9e592e2131463659aaa8c3a1598b4d615e8cd5b2 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 22:03:31 +0100
Subject: [PATCH 023/204] A few changes to improve configuration of FSP

 - Use EL_ARG_DEPENDS(), the other way ended up in undefined symbols
   errors with --enable-fsp and no fsplib.
 - Also check for -lfsp in addition to -lfsplib.
 - This could probably also use a --with-fsplib or something to specify the
   path, had problems with that too, because fsplib-0.7 installed into
   /usr/local, ...
---
 configure.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 80bb9d00..48b52614 100644
--- a/configure.in
+++ b/configure.in
@@ -1136,20 +1136,25 @@ dnl ===================================================================
 dnl FSP protocol
 dnl ===================================================================
 
-EL_ARG_ENABLE(CONFIG_FSP, fsp, [FSP protocol],
-	      [  --enable-fsp            enable FSP protocol support])
-
 if test "x${enable_fsp}" != xno; then
-	AC_CHECK_HEADERS(fsplib.h, CONFIG_FSP=yes, CONFIG_FSP=no)
+	AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
 
-	if test "$CONFIG_FSP" = yes; then
-		AC_CHECK_LIB(fsplib, fsp_open_session, CONFIG_FSP=yes, CONFIG_FSP=no)
-		if test "$CONFIG_FSP" = yes; then
+	if test "$HAVE_FSPLIB" = yes; then
+		AC_CHECK_LIB(fsplib, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
+		if test "$HAVE_FSPLIB" = yes; then
 			LIBS="$LIBS -lfsplib"
+		else
+			AC_CHECK_LIB(fsp, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
+			if test "$HAVE_FSPLIB" = yes; then
+				LIBS="$LIBS -lfsp"
+			fi
 		fi
 	fi
 fi
 
+EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol],
+	      [  --enable-fsp            enable FSP protocol support])
+
 EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
 	      [  --disable-ftp           disable ftp protocol support])
 

From 20c9b6a94159d3e8e3c7bde51e6b2fc62034c933 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 22:12:32 +0100
Subject: [PATCH 024/204] Fix typo in the FSP conf title

---
 features.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features.conf b/features.conf
index 061c5ddb..f05ed006 100644
--- a/features.conf
+++ b/features.conf
@@ -297,7 +297,7 @@ CONFIG_DATA=yes
 
 CONFIG_FINGER=no
 
-### File Servive Protocol
+### File Service Protocol
 #
 # File Service Protocol (FSP) is a very lightweight UDP based protocol for
 # transferring files. FSP has many benefits over FTP, mainly for running

From 0955086a6f9e8728e49e7ced13b224056959751e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 23:32:27 +0100
Subject: [PATCH 025/204] Move close_all_non_term_fd() shared by SMB and FSP to
 protocol/common

Stick a note near the OBJS sorting that it is there also to filter out
duplicates, which are now occuring with SMB and FSP compiled in.
---
 Makefile.lib           |  3 ++-
 src/protocol/Makefile  |  2 ++
 src/protocol/fsp/fsp.c | 26 ++------------------------
 src/protocol/smb/smb.c | 25 ++-----------------------
 4 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index fc7a40a2..a064af6e 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -93,7 +93,8 @@ endif
 #############################################################################
 # Internal build rules
 
-# All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o
+# All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o.
+# Sort them to filter out duplicated and get uniform order.
 LIB_O_DEPS = \
  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index f4e83fdb..6f4af60e 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -13,6 +13,8 @@ SUBDIRS-$(CONFIG_URI_REWRITE)	+= rewrite
 SUBDIRS = auth file http
 
 OBJS-$(CONFIG_DATA)		+= data.o
+OBJS-$(CONFIG_FSP)		+= common.o
+OBJS-$(CONFIG_SMB)		+= common.o
 
 OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o
 
diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 6f1d3d3c..26aaa61b 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -13,13 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h> /* FreeBSD needs this before resource.h */
-#endif
-#include <sys/types.h> /* FreeBSD needs this before resource.h */
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
 #endif
@@ -37,6 +30,7 @@
 #include "network/connection.h"
 #include "network/socket.h"
 #include "osdep/osdep.h"
+#include "protocol/common.h"
 #include "protocol/protocol.h"
 #include "protocol/fsp/fsp.h"
 #include "protocol/uri.h"
@@ -265,22 +259,6 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 #undef READ_SIZE
 
 
-/* Close all non-terminal file descriptors. */
-static void
-close_all_non_term_fd(void)
-{
-	int n;
-	int max = 1024;
-#ifdef RLIMIT_NOFILE
-	struct rlimit lim;
-
-	if (!getrlimit(RLIMIT_NOFILE, &lim))
-		max = lim.rlim_max;
-#endif
-	for (n = 3; n < max; n++)
-		close(n);
-}
-
 void
 fsp_protocol_handler(struct connection *conn)
 {
@@ -326,7 +304,7 @@ fsp_protocol_handler(struct connection *conn)
 
 		close_all_non_term_fd();
 		do_fsp(conn);
-		
+	
 	} else {
 		conn->socket->fd = fsp_pipe[0];
 		close(fsp_pipe[1]);
diff --git a/src/protocol/smb/smb.c b/src/protocol/smb/smb.c
index 3d37af96..62550e31 100644
--- a/src/protocol/smb/smb.c
+++ b/src/protocol/smb/smb.c
@@ -12,13 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h> /* FreeBSD needs this before resource.h */
-#endif
-#include <sys/types.h> /* FreeBSD needs this before resource.h */
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
 #endif
@@ -36,6 +30,7 @@
 #include "network/connection.h"
 #include "network/socket.h"
 #include "osdep/osdep.h"
+#include "protocol/common.h"
 #include "protocol/protocol.h"
 #include "protocol/smb/smb.h"
 #include "protocol/uri.h"
@@ -525,22 +520,6 @@ bye:
 }
 
 
-/* Close all non-terminal file descriptors. */
-static void
-close_all_non_term_fd(void)
-{
-	int n;
-	int max = 1024;
-#ifdef RLIMIT_NOFILE
-	struct rlimit lim;
-
-	if (!getrlimit(RLIMIT_NOFILE, &lim))
-		max = lim.rlim_max;
-#endif
-	for (n = 3; n < max; n++)
-		close(n);
-}
-
 void
 smb_protocol_handler(struct connection *conn)
 {

From bb12fbca378484d0098f9752d112c87a4338676b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 16 Jan 2006 23:42:17 +0100
Subject: [PATCH 026/204] Add protocol/common files ;)

---
 src/protocol/common.c | 37 +++++++++++++++++++++++++++++++++++++
 src/protocol/common.h |  7 +++++++
 2 files changed, 44 insertions(+)
 create mode 100644 src/protocol/common.c
 create mode 100644 src/protocol/common.h

diff --git a/src/protocol/common.c b/src/protocol/common.c
new file mode 100644
index 00000000..2195a9d1
--- /dev/null
+++ b/src/protocol/common.c
@@ -0,0 +1,37 @@
+/* Shared protocol functions */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h> /* FreeBSD needs this before resource.h */
+#endif
+#include <sys/types.h> /* FreeBSD needs this before resource.h */
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "elinks.h"
+
+#include "protocol/common.h"
+
+
+/* Close all non-terminal file descriptors. */
+void
+close_all_non_term_fd(void)
+{
+	int n;
+	int max = 1024;
+#ifdef RLIMIT_NOFILE
+	struct rlimit lim;
+
+	if (!getrlimit(RLIMIT_NOFILE, &lim))
+		max = lim.rlim_max;
+#endif
+	for (n = 3; n < max; n++)
+		close(n);
+}
diff --git a/src/protocol/common.h b/src/protocol/common.h
new file mode 100644
index 00000000..1f43b790
--- /dev/null
+++ b/src/protocol/common.h
@@ -0,0 +1,7 @@
+#ifndef EL__PROTOCOL_COMMON_H
+#define EL__PROTOCOL_COMMON_H
+
+/* Close all non-terminal file descriptors. */
+void close_all_non_term_fd(void);
+
+#endif

From 8fe86eac0b732f63edace9956e546245e87539c6 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Mon, 16 Jan 2006 23:50:34 +0100
Subject: [PATCH 027/204] Typo fix.

---
 src/protocol/fsp/fsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 26aaa61b..92ebef3c 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -46,7 +46,7 @@ struct option_info fsp_options[] = {
 
 	INIT_OPT_BOOL("protocol.fsp", N_("Sort entries"),
 		"sort", 0, 1,
-		N_("Whether sort entries in directory listings.")),
+		N_("Whether to sort entries in directory listings.")),
 
 	NULL_OPTION_INFO,
 };

From 491654975da6f63607bafa73a94d583eb63744c1 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Mon, 16 Jan 2006 23:51:02 +0100
Subject: [PATCH 028/204] Trim trailing whitespaces.

---
 src/protocol/fsp/fsp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 92ebef3c..62817060 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -173,7 +173,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 		} else {
 			dircolor[0] = 0;
 		}
-		
+
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
 			printf("%10d\t<a href=\"%s\">", fentry.size, fentry.name);
@@ -304,7 +304,7 @@ fsp_protocol_handler(struct connection *conn)
 
 		close_all_non_term_fd();
 		do_fsp(conn);
-	
+
 	} else {
 		conn->socket->fd = fsp_pipe[0];
 		close(fsp_pipe[1]);

From 3cb9af2f41d652287e1e514ab54e9ff8df809165 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Tue, 17 Jan 2006 00:04:10 +0100
Subject: [PATCH 029/204] French translation was updated.

---
 po/fr.po | 77 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 00dafd7e..5a237a2b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-10 23:00+0100\n"
-"PO-Revision-Date: 2006-01-10 23:01+0100\n"
+"POT-Creation-Date: 2006-01-17 00:01+0100\n"
+"PO-Revision-Date: 2006-01-17 00:02+0100\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Pressez espace pour d
 #: src/bfu/msgbox.c:189 src/config/dialogs.c:57 src/config/dialogs.c:391
 #: src/cookies/dialogs.c:354 src/dialogs/edit.c:97 src/dialogs/info.c:133
 #: src/dialogs/options.c:210 src/dialogs/options.c:290 src/mime/dialogs.c:129
-#: src/protocol/auth/dialogs.c:110 src/protocol/protocol.c:231
+#: src/protocol/auth/dialogs.c:110 src/protocol/protocol.c:233
 #: src/scripting/lua/core.c:377 src/scripting/lua/core.c:457
 #: src/session/session.c:792 src/viewer/text/search.c:1593
 msgid "~OK"
@@ -187,7 +187,7 @@ msgid "Digital clock in the status bar."
 msgstr "Horloge digitale dans la barre de status."
 
 #: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1118
-#: src/config/options.inc:1125 src/ecmascript/ecmascript.c:39
+#: src/config/options.inc:1125 src/ecmascript/ecmascript.c:45
 #: src/globhist/globhist.c:63 src/mime/backend/mailcap.c:93
 #: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80
 msgid "Enable"
@@ -1796,7 +1796,7 @@ msgid "Description"
 msgstr "Description"
 
 #: src/config/dialogs.c:320 src/protocol/bittorrent/dialogs.c:594
-#: src/protocol/protocol.c:225 src/session/session.c:282
+#: src/protocol/protocol.c:227 src/session/session.c:282
 #: src/session/session.c:954 src/viewer/text/textarea.c:331
 #: src/viewer/text/textarea.c:338
 msgid "Error"
@@ -5358,31 +5358,31 @@ msgstr ""
 "Laisser à \"\" pour utiliser le style initial du document."
 
 #. name:
-#: src/ecmascript/ecmascript.c:35 src/ecmascript/ecmascript.c:137
+#: src/ecmascript/ecmascript.c:41 src/ecmascript/ecmascript.c:153
 msgid "ECMAScript"
 msgstr "ECMAScript"
 
-#: src/ecmascript/ecmascript.c:37
+#: src/ecmascript/ecmascript.c:43
 msgid "ECMAScript options."
 msgstr "Options d'ECMAScript."
 
-#: src/ecmascript/ecmascript.c:41
+#: src/ecmascript/ecmascript.c:47
 msgid "Whether to run those scripts inside of documents."
 msgstr "Exécuter ou non ces scripts présents dans les documents."
 
-#: src/ecmascript/ecmascript.c:43
+#: src/ecmascript/ecmascript.c:49
 msgid "Script error reporting"
 msgstr "Rapport d'erreur de script"
 
-#: src/ecmascript/ecmascript.c:45
+#: src/ecmascript/ecmascript.c:51
 msgid "Open a message box when a script reports an error."
 msgstr "Ouvrir une boîte de message quand un script produit une erreur."
 
-#: src/ecmascript/ecmascript.c:47
+#: src/ecmascript/ecmascript.c:53
 msgid "Ignore <noscript> content"
 msgstr "Ignorer le contenu de <noscript>"
 
-#: src/ecmascript/ecmascript.c:49
+#: src/ecmascript/ecmascript.c:55
 msgid ""
 "Whether to ignore content enclosed by the <noscript> tag\n"
 "when ECMAScript is enabled."
@@ -5390,29 +5390,29 @@ msgstr ""
 "Ignorer ou non le contenu du tag <noscript> quand ECMAScript\n"
 "est actif."
 
-#: src/ecmascript/ecmascript.c:52
+#: src/ecmascript/ecmascript.c:58
 msgid "Maximum execution time"
 msgstr "Temps maximal d'exécution"
 
-#: src/ecmascript/ecmascript.c:54
+#: src/ecmascript/ecmascript.c:60
 msgid "Maximum execution time in seconds for a script."
 msgstr "Temps maximal pour l'exécution d'un script, en secondes."
 
-#: src/ecmascript/ecmascript.c:56
+#: src/ecmascript/ecmascript.c:62
 msgid "Pop-up window blocking"
 msgstr "Blocage des fenêtres Javascript (popups)"
 
-#: src/ecmascript/ecmascript.c:58
+#: src/ecmascript/ecmascript.c:64
 msgid "Whether to disallow scripts to open new windows or tabs."
 msgstr ""
 "Interdire ou non l'ouverture de fenêtres ou d'onglets\n"
 "par les scripts."
 
-#: src/ecmascript/ecmascript.c:126
+#: src/ecmascript/ecmascript.c:132
 msgid "JavaScript Emergency"
 msgstr "Alerte JavaScript"
 
-#: src/ecmascript/ecmascript.c:128
+#: src/ecmascript/ecmascript.c:134
 #, c-format
 msgid ""
 "A script embedded in the current document was running\n"
@@ -5425,7 +5425,7 @@ msgstr ""
 "qu'il y a un bogue dans ce script et que cela aurait pû\n"
 "bloquer ELinks, l'exécution du script a donc été interrompue."
 
-#: src/ecmascript/see/window.c:242 src/ecmascript/spidermonkey/window.c:286
+#: src/ecmascript/see/window.c:215 src/ecmascript/spidermonkey/window.c:286
 msgid "JavaScript Alert"
 msgstr "Alerte JavaScript"
 
@@ -5784,7 +5784,7 @@ msgstr "Turque"
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: src/main/interlink.c:325 src/main/select.c:255
+#: src/main/interlink.c:329 src/main/select.c:255
 #, c-format
 msgid "The call to %s failed: %d (%s)"
 msgstr "L'appel à %s a échoué: %d (%s)"
@@ -7220,6 +7220,23 @@ msgstr "File"
 msgid "Finger"
 msgstr "Finger"
 
+#. name:
+#: src/protocol/fsp/fsp.c:43 src/protocol/fsp/fsp.c:55
+msgid "FSP"
+msgstr "FSP"
+
+#: src/protocol/fsp/fsp.c:45
+msgid "FSP specific options."
+msgstr "Options du protocole FSP."
+
+#: src/protocol/fsp/fsp.c:47
+msgid "Sort entries"
+msgstr "Trier les entrées"
+
+#: src/protocol/fsp/fsp.c:49
+msgid "Whether to sort entries in directory listings."
+msgstr "Trier ou non les entrées des répertoires."
+
 #. name:
 #: src/protocol/ftp/ftp.c:55 src/protocol/ftp/ftp.c:85
 msgid "FTP"
@@ -7573,25 +7590,25 @@ msgstr ""
 "Toutes les entrées possibles peuvent être lues dans le dialogue\n"
 "Info. En-têtes."
 
-#: src/protocol/protocol.c:227
+#: src/protocol/protocol.c:229
 #, c-format
 msgid "This version of ELinks does not contain %s protocol support"
 msgstr ""
 "Cette version de ELinks ne contient pas le support pour le protocole %s"
 
-#: src/protocol/protocol.c:258
+#: src/protocol/protocol.c:260
 msgid "Protocols"
 msgstr "Protocoles"
 
-#: src/protocol/protocol.c:260
+#: src/protocol/protocol.c:262
 msgid "Protocol specific options."
 msgstr "Options des protocoles."
 
-#: src/protocol/protocol.c:262
+#: src/protocol/protocol.c:264
 msgid "No-proxy domains"
 msgstr "Domaines ignorés en ce qui concerne les proxys"
 
-#: src/protocol/protocol.c:264
+#: src/protocol/protocol.c:266
 msgid ""
 "Comma separated list of domains for which the proxy (HTTP/FTP)\n"
 "should be disabled. Optionally, a port can be specified for some\n"
@@ -7604,7 +7621,7 @@ msgstr ""
 "NO_PROXY sera utilisé."
 
 #. name:
-#: src/protocol/protocol.c:300
+#: src/protocol/protocol.c:305
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -7731,19 +7748,19 @@ msgid "URI rewrite"
 msgstr "Ré-écriture d'URI"
 
 #. name:
-#: src/protocol/smb/smb.c:72 src/protocol/smb/smb.c:84
+#: src/protocol/smb/smb.c:67 src/protocol/smb/smb.c:79
 msgid "SMB"
 msgstr "SMB"
 
-#: src/protocol/smb/smb.c:74
+#: src/protocol/smb/smb.c:69
 msgid "SAMBA specific options."
 msgstr "Options spécifiques de SAMBA."
 
-#: src/protocol/smb/smb.c:76
+#: src/protocol/smb/smb.c:71
 msgid "Credentials"
 msgstr "Authentification"
 
-#: src/protocol/smb/smb.c:78
+#: src/protocol/smb/smb.c:73
 msgid "Credentials file passed to smbclient via -A option."
 msgstr "Fichier d'authentification passé à smbclient via l'option -A."
 

From 54863e537f9228b05fce7d1cab7138cc5226b399 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 00:06:24 +0100
Subject: [PATCH 030/204] Minor space cleanups; use pid_t; abort_connection()
 will close_socket()

---
 src/protocol/fsp/fsp.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 26aaa61b..74eb040c 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -156,7 +156,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	}
 
 	printf("<html><head><title>%s</title><base href=\"%s\">"
-	"</head><body><pre>", buf.source, buf.source);
+	       "</head><body><pre>", buf.source, buf.source);
 
 	dir = fsp_opendir(ses, data);
 	if (!dir) goto end;
@@ -173,7 +173,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 		} else {
 			dircolor[0] = 0;
 		}
-		
+
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
 			printf("%10d\t<a href=\"%s\">", fentry.size, fentry.name);
@@ -239,10 +239,10 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 		abort_connection(conn, -errno);
 		return;
 	}
+
 	if (len == 0) {
 		if (conn->from)
 			normalize_cache_entry(conn->cached, conn->from);
-		close_socket(socket);
 		abort_connection(conn, S_OK);
 		return;
 	}
@@ -253,6 +253,7 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 		conn->tries = 0;
 	conn->from += len;
 	kill_buffer_data(rb, len);
+
 	read_from_socket(socket, rb, S_TRANS, fsp_got_data);
 }
 
@@ -263,7 +264,7 @@ void
 fsp_protocol_handler(struct connection *conn)
 {
 	int fsp_pipe[2] = { -1, -1 };
-	int cpid;
+	pid_t cpid;
 	struct read_buffer *buf;
 
 	if (c_pipe(fsp_pipe)) {
@@ -304,7 +305,7 @@ fsp_protocol_handler(struct connection *conn)
 
 		close_all_non_term_fd();
 		do_fsp(conn);
-	
+
 	} else {
 		conn->socket->fd = fsp_pipe[0];
 		close(fsp_pipe[1]);

From 28fbb9317be65395cd879df2386ad5e3ae823e61 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 00:40:27 +0100
Subject: [PATCH 031/204] Simplify URI string grapping; make dir listing more
 like FTP; use READ_SIZE

---
 src/protocol/fsp/fsp.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 4cc191f8..1d4e50d2 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -34,6 +34,7 @@
 #include "protocol/protocol.h"
 #include "protocol/fsp/fsp.h"
 #include "protocol/uri.h"
+#include "util/conv.h"
 #include "util/memory.h"
 #include "util/snprintf.h"
 #include "util/string.h"
@@ -133,30 +134,17 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 {
 	struct string buf;
 	FSP_DIR *dir;
+	unsigned char *uristring = get_uri_string(uri, URI_PUBLIC);
 	unsigned char *data = get_uri_string(uri, URI_DATA);
 
-	if (!init_string(&buf))
+	if (!uristring || !data || !init_string(&buf))
 		fsp_error("Out of memory");
 
-	add_to_string(&buf, "fsp://");
-	if (uri->passwordlen) {
-		add_to_string(&buf, "u:");
-		add_bytes_to_string(&buf, uri->password, uri->passwordlen);
-		add_char_to_string(&buf, '@');
-	}
-	add_bytes_to_string(&buf, uri->host, uri->hostlen);
-	if (uri->portlen) {
-		add_char_to_string(&buf, ':');
-		add_bytes_to_string(&buf, uri->port, uri->portlen);
-	}
-	add_char_to_string(&buf, '/');
-	if (uri->datalen) {
-		add_bytes_to_string(&buf, uri->data, uri->datalen);
-		add_char_to_string(&buf, '/');
-	}
+	add_html_to_string(&buf, uristring, strlen(uristring));
 
 	printf("<html><head><title>%s</title><base href=\"%s\">"
-	       "</head><body><pre>", buf.source, buf.source);
+	       "</head><body><h2>FSP directory %s</h2><pre>",
+	       buf.source, uristring, buf.source);
 
 	dir = fsp_opendir(ses, data);
 	if (!dir) goto end;
@@ -189,7 +177,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 		fsp_closedir(dir);
 	}
 end:
-	puts("</pre></body></html>");
+	puts("</pre><hr></body></html>");
 	fsp_close_session(ses);
 	exit(0);
 }
@@ -214,7 +202,7 @@ do_fsp(struct connection *conn)
 	if (S_ISDIR(sb.st_mode))
 		fsp_directory(ses, uri);
 	else { /* regular file */
-		char buf[4096];
+		char buf[READ_SIZE];
 		FSP_FILE *file = fsp_fopen(ses, data, "r");
 		int r;
 

From 864745b55e0ebb30cab010a0d8a9677d0d8b3e52 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Tue, 17 Jan 2006 00:48:25 +0100
Subject: [PATCH 032/204] Make 8-bytes buffer more obvious.

---
 src/util/color.c | 2 +-
 src/util/color.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/color.c b/src/util/color.c
index a9f258f9..0926fcef 100644
--- a/src/util/color.c
+++ b/src/util/color.c
@@ -148,7 +148,7 @@ get_color_string(color_T color, unsigned char hexcolor[8])
 }
 
 void
-color_to_string(color_T color, unsigned char str[])
+color_to_string(color_T color, unsigned char str[8])
 {
 	snprintf(str, 8, "#%06lx", (unsigned long) color);
 }
diff --git a/src/util/color.h b/src/util/color.h
index 4c2db0de..5e0240c8 100644
--- a/src/util/color.h
+++ b/src/util/color.h
@@ -21,7 +21,7 @@ unsigned char *get_color_string(color_T color, unsigned char hexcolor[8]);
 
 /* Translate rgb color to string in #rrggbb format. str should be a pointer to
  * a 8 bytes memory space. */
-void color_to_string(color_T color, unsigned char str[]);
+void color_to_string(color_T color, unsigned char str[8]);
 
 /* Fastfind lookup management. */
 void init_colors_lookup(void);

From c7bdf621524ab236a495f932f6e8b9e11eec0971 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 00:54:06 +0100
Subject: [PATCH 033/204] Remove unused fsp_info struct; use sizeof(*table);
 fix dir entry hiliting

---
 src/protocol/fsp/fsp.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 1d4e50d2..4f7663b2 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -63,10 +63,6 @@ struct module fsp_protocol_module = struct_module(
 );
 
 
-struct fsp_info {
-	int init;
-};
-
 static void
 fsp_error(unsigned char *error)
 {
@@ -113,16 +109,16 @@ sort_and_display_entries(FSP_DIR *dir)
 		memcpy(&table[size], &fentry, sizeof(fentry));
 		size++;
 	}
-	qsort(table, size, sizeof(fentry),
+	qsort(table, size, sizeof(*table),
 	 (int (*)(const void *, const void *)) compare);
 
 	for (i = 0; i < size; i++) {
 		printf("%10d\t<a href=\"%s\">", table[i].size, table[i].name);
-		if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+		if (table[i].type == FSP_RDTYPE_DIR && *dircolor) {
 			printf("<font color=\"%s\"><b>", dircolor);
 		}
 		printf("%s", table[i].name);
-		if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+		if (table[i].type == FSP_RDTYPE_DIR && *dircolor) {
 			printf("</b></font>");
 		}
 		puts("</a>");

From 3133db347496e98f9968c11637dddcbdca710df6 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Tue, 17 Jan 2006 01:18:45 +0100
Subject: [PATCH 034/204] Use elinks_ulongcat() instead of snprintf().

---
 src/util/color.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/util/color.c b/src/util/color.c
index 0926fcef..92abadb1 100644
--- a/src/util/color.c
+++ b/src/util/color.c
@@ -13,6 +13,7 @@
 #include "elinks.h"
 
 #include "util/color.h"
+#include "util/conv.h"
 #include "util/fastfind.h"
 #include "util/string.h"
 
@@ -150,5 +151,6 @@ get_color_string(color_T color, unsigned char hexcolor[8])
 void
 color_to_string(color_T color, unsigned char str[8])
 {
-	snprintf(str, 8, "#%06lx", (unsigned long) color);
+	str[0]='#';
+	elinks_ulongcat(&str[1], NULL, (unsigned long) color, 6, '0', 16, 0);
 }

From 836744ea84154476641d18875be1c019ccc7b119 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Tue, 17 Jan 2006 03:15:56 +0000
Subject: [PATCH 035/204] js_window_open: Fix extra free that I just introduced

Assign deo->target a copy of target instead of target itself because
delayed_goto_uri_frame frees deo->target and SpiderMonkey owns target.

Reported by Jonas.
---
 src/ecmascript/see/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 51cfa45e..41729329 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -294,7 +294,7 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 		if (deo) {
 			deo->ses = ses;
 			deo->uri = get_uri_reference(uri);
-			deo->target = target;
+			deo->target = stracpy(target);
 			/* target will be freed in delayed_goto_uri_frame */
 			register_bottom_half(delayed_goto_uri_frame, deo);
 			goto end;

From ed73a5c9b31c2bf5eb16a83c8cf46156d18e143e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 16:50:15 +0100
Subject: [PATCH 036/204] Make code2doc use the buildsystem echoing

---
 doc/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index f5edabb2..1706b631 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -116,6 +116,9 @@ quiet_cmd_conf2doc = ' [$(LINK_COLOR)CONF2DOC$(END_COLOR)]   $(RELPATH)$@'
 quiet_cmd_keys2doc = ' [$(LINK_COLOR)KEYS2DOC$(END_COLOR)]   $(RELPATH)$@'
       cmd_keys2doc = $(LOCALES) $(KEYS2DOC) $(KBDBIND) $@ > $@
 
+quiet_cmd_code2doc = ' [$(LINK_COLOR)CODE2DOC$(END_COLOR)]   $(RELPATH)$@'
+      cmd_code2doc = $(LOCALES) $(CODE2DOC) $< > $@
+
 features.txt: $(FEATURES) $(CONF2DOC)
 	$(call cmd,conf2doc)
 
@@ -133,10 +136,10 @@ API = $(shell find $(top_srcdir)/src/ -name '*.h' -exec grep -q 'API Doc' \{\} \
 endif
 
 define api_doc
+API_TXT += api/$(2).txt
 api/$(2).txt: $(1) $(CODE2DOC)
 	@test -d api || $(MKINSTALLDIRS) api
-	@$(CODE2DOC) $(1) > $$@
-API_TXT += api/$(2).txt
+	$$(call cmd,code2doc)
 endef
 
 api_name = $(shell sed -n 's/.*API Doc\s*::\s*\([^ 	]*\).*/\1/p' < $(1))

From 9e3ba8736f1f195a58a7b782170dc667809e093b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 16:53:15 +0100
Subject: [PATCH 037/204] Fix test program dependency on it's own .o by using a
 template

---
 Makefile.lib | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index a064af6e..69eb35fb 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -48,7 +48,7 @@ quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
 			    `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
 
    quiet_cmd_link = '    [$(LINK_COLOR)LINK$(END_COLOR)]   $(RELPATH)$@'
-         cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(2) $(LIBS)
+         cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
  quiet_cmd_sparse = '    [SPARSE]   $(RELPATH)$(2)'
        cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)
@@ -178,14 +178,14 @@ ifdef TEST_PROGS
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
 TESTDEPS += $(TESTDEPS-yes)
 
+define test_prog
+$(1): $(1).o $(TESTDEPS)
+	$$(call cmd,link)
+endef
+
 TESTS = $(wildcard $(srcdir)test-*)
 
-$(TEST_PROGS): $(TESTDEPS)
-	$(call cmd,link,$@.o)
-
-# We cannot use $$@.o in the rule above so ensure that all test programs are
-# built before linking.
-$(TESTS): $(addsuffix .o,$(TEST_PROGS)) $(TEST_PROGS)
+$(TESTS): $(TEST_PROGS)
 	@echo "*** $(notdir $@) ***"; \
 	$(call shellquote,$(SHELL)) $@ $(TEST_OPTS)
 
@@ -198,6 +198,8 @@ CLEAN += $(TEST_PROGS) $(addsuffix .o,$(TEST_PROGS))
 clean-default: clean-test
 endif
 
+$(foreach prog,$(TEST_PROGS),$(eval $(call test_prog,$(prog))))
+
 .PHONY: $(TESTS)
 .NOPARALLEL:
 

From 2cd151c5c573247e467ea007e8f4a5933c194853 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 16:55:10 +0100
Subject: [PATCH 038/204] Add parse_dom_config() which converts a textual
 config list to flags

---
 src/dom/configuration.c | 48 +++++++++++++++++++++++++++++++++++++++++
 src/dom/configuration.h |  3 +++
 2 files changed, 51 insertions(+)

diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index f43690b8..352bea74 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -298,3 +298,51 @@ add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags)
 
 	return NULL;
 }
+
+struct dom_config_info {
+	struct dom_string name;
+	enum dom_config_flag flag;
+};
+
+#define DOM_CONFIG(name, flag) \
+	{ INIT_DOM_STRING(name, -1), (flag) }
+
+static struct dom_config_info dom_config_info[] = {
+	DOM_CONFIG("cdata-sections",		DOM_CONFIG_CDATA_SECTIONS),
+	DOM_CONFIG("comments",			DOM_CONFIG_COMMENTS),
+	DOM_CONFIG("element-content-whitespace",DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE),
+	DOM_CONFIG("entities",			DOM_CONFIG_ENTITIES),
+	DOM_CONFIG("normalize-characters",	DOM_CONFIG_NORMALIZE_CHARACTERS),
+	DOM_CONFIG("unknown",			DOM_CONFIG_UNKNOWN),
+	DOM_CONFIG("normalize-whitespace",	DOM_CONFIG_NORMALIZE_WHITESPACE),
+};
+
+static enum dom_config_flag
+get_dom_config_flag(struct dom_string *name)
+{
+	int i;
+
+	for (i = 0; i < sizeof_array(dom_config_info); i++)
+		if (!dom_string_casecmp(&dom_config_info[i].name, name))
+			return dom_config_info[i].flag;
+
+	return 0;
+}
+
+enum dom_config_flag
+parse_dom_config(unsigned char *flaglist, unsigned char separator)
+{
+	enum dom_config_flag flags = 0;
+
+	while (flaglist) {
+		unsigned char *end = separator ? strchr(flaglist, separator) : NULL;
+		int length = end ? flaglist - end : strlen(flaglist);
+		struct dom_string name = INIT_DOM_STRING(flaglist, length);
+
+		flags |= get_dom_config_flag(&name);
+		if (end) end++;
+		flaglist = end;
+	}
+
+	return flags;
+}
diff --git a/src/dom/configuration.h b/src/dom/configuration.h
index 267f4cc6..0436ba5a 100644
--- a/src/dom/configuration.h
+++ b/src/dom/configuration.h
@@ -87,4 +87,7 @@ struct dom_config {
 struct dom_config *
 add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags);
 
+enum dom_config_flag
+parse_dom_config(unsigned char *flaglist, unsigned char separator);
+
 #endif

From 34b12d21bd79cbe099d74af6792d0f180cd4d9d1 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 17 Jan 2006 16:58:19 +0100
Subject: [PATCH 039/204] Upgrade to use dom_stack_codes in the callbacks

---
 src/dom/test/sgml-parser.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index e8ea8fe7..28c5bd6c 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -97,7 +97,7 @@ print_indent(struct dom_stack *stack)
 	printf("%.*s", get_indent_offset(stack), indent_string);
 }
 
-static void
+static enum dom_stack_code
 sgml_parser_test_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *value = &node->string;
@@ -105,15 +105,17 @@ sgml_parser_test_tree(struct dom_stack *stack, struct dom_node *node, void *data
 
 	/* Always print the URI for identification. */
 	if (update_number_of_lines(stack))
-		return;
+		return DOM_STACK_CODE_OK;
 
 	print_indent(stack);
 	printf("%.*s: %.*s\n",
 		name->length, name->string,
 		value->length, value->string);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+static enum dom_stack_code
 sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -122,7 +124,7 @@ sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *d
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return;
+		return DOM_STACK_CODE_OK;
 
 	name	= get_dom_node_name(node);
 	id	= get_dom_node_type_name(node->type);
@@ -133,9 +135,11 @@ sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *d
 		name->length, name->string);
 	print_dom_node_value(node);
 	printf("\n");
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+static enum dom_stack_code
 sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -143,7 +147,7 @@ sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return;
+		return DOM_STACK_CODE_OK;
 
 	name	= get_dom_node_name(node);
 
@@ -152,9 +156,11 @@ sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data
 		name->length, name->string);
 	print_dom_node_value(node);
 	printf("\n");
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+static enum dom_stack_code
 sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -163,7 +169,7 @@ sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *da
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return;
+		return DOM_STACK_CODE_OK;
 
 	name	= get_dom_node_name(node);
 	id	= get_dom_node_type_name(node->type);
@@ -171,9 +177,11 @@ sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *da
 	print_indent(stack);
 	printf("%.*s: %.*s\n",
 		id->length, id->string, name->length, name->string);
+
+	return DOM_STACK_CODE_OK;
 }
 
-static void
+static enum dom_stack_code
 sgml_parser_test_end(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = stack->contexts[0]->data;
@@ -182,6 +190,8 @@ sgml_parser_test_end(struct dom_stack *stack, struct dom_node *node, void *data)
 	    && !(parser->flags & SGML_PARSER_DETECT_ERRORS)) {
 		printf("%d\n", number_of_lines);
 	}
+
+	return DOM_STACK_CODE_OK;
 }
 
 struct dom_stack_context_info sgml_parser_test_context_info = {

From 2de1a840a685ea289de928673387a7a0b33800c6 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Tue, 17 Jan 2006 20:29:48 +0100
Subject: [PATCH 040/204] I was wrong. self is function object, thisobj is
 peculiar object

---
 src/ecmascript/see/form.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index c650e555..edc62365 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -350,7 +350,7 @@ js_input_click(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
 	struct session *ses = doc_view->session;
-	struct js_input *input = (struct js_input *)self;
+	struct js_input *input = (struct js_input *)thisobj;
 	struct form_state *fs = input->fs;
 	struct form_control *fc;
 	int linknum;
@@ -384,7 +384,7 @@ js_input_focus(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
 	struct session *ses = doc_view->session;
-	struct js_input *input = (struct js_input *)self;
+	struct js_input *input = (struct js_input *)thisobj;
 	struct form_state *fs = input->fs;
 	struct form_control *fc;
 	int linknum;
@@ -502,7 +502,7 @@ js_form_elems_item(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
-	struct js_form_elems *jsfe = (struct js_form_elems *)self;
+	struct js_form_elems *jsfe = (struct js_form_elems *)thisobj;
 	struct js_form *parent_form = jsfe->parent;
 	struct form_view *fv = parent_form->fv;
 	struct form *form = find_form_by_form_view(document, fv);
@@ -544,7 +544,7 @@ js_form_elems_namedItem(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
-	struct js_form_elems *jsfe = (struct js_form_elems *)self;
+	struct js_form_elems *jsfe = (struct js_form_elems *)thisobj;
 	struct js_form *parent_form = jsfe->parent;
 	struct form_view *fv = parent_form->fv;
 	struct form *form = find_form_by_form_view(document, fv);
@@ -603,10 +603,10 @@ form_elems_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		}
 		SEE_SET_STRING(&argv, p);
 		if (string[0] >= '0' && string[1] <= '9') {
-			js_form_elems_item(interp, o, o, 1,
+			js_form_elems_item(interp, jsfe->item, o, 1,
 			 (struct SEE_value **)&argv, res);
 		} else {
-			js_form_elems_namedItem(interp, o, o, 1,
+			js_form_elems_namedItem(interp, jsfe->namedItem, o, 1,
 			 (struct SEE_value **)&argv, res);
 		}
 		mem_free(string);
@@ -630,7 +630,7 @@ js_forms_item(struct SEE_interpreter *interp, struct SEE_object *self,
 {
 	struct global_object *g = (struct global_object *)interp;
 	struct view_state *vs = g->win->vs;
-	struct js_forms_object *fo = (struct js_forms_object *)self;
+	struct js_forms_object *fo = (struct js_forms_object *)thisobj;
 	struct js_document_object *doc = fo->parent;
 	struct form_view *fv;
 	unsigned char *string;
@@ -668,7 +668,7 @@ js_forms_namedItem(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct document *document = doc_view->document;
-	struct js_forms_object *fo = (struct js_forms_object *)self;
+	struct js_forms_object *fo = (struct js_forms_object *)thisobj;
 	struct js_document_object *doc = fo->parent;
 	struct form *form;
 	unsigned char *string;
@@ -724,10 +724,10 @@ forms_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		}
 		SEE_SET_STRING(argv1, p);
 		if (string[0] >= '0' && string[0] <= '9') {
-			js_forms_item(interp, o, fo->item, 1,
+			js_forms_item(interp, fo->item, o, 1,
 			 (struct SEE_value **)&argv1, res);
 		} else {
-			js_forms_namedItem(interp, o, fo->namedItem, 1,
+			js_forms_namedItem(interp, fo->namedItem, o, 1,
 			 (struct SEE_value **)&argv1, res);
 		}
 		mem_free(string);
@@ -902,7 +902,7 @@ js_form_reset(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct global_object *g = (struct global_object *)interp;
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
-	struct js_form *js_form = (struct js_form *)self;
+	struct js_form *js_form = (struct js_form *)thisobj;
 	struct form_view *fv = js_form->fv;
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 
@@ -923,7 +923,7 @@ js_form_submit(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = g->win->vs;
 	struct document_view *doc_view = vs->doc_view;
 	struct session *ses = doc_view->session;
-	struct js_form *js_form = (struct js_form *)self;
+	struct js_form *js_form = (struct js_form *)thisobj;
 	struct form_view *fv = js_form->fv;
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 

From 095e440270d44f07186abf06388a685187502218 Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 18 Jan 2006 18:11:29 +0100
Subject: [PATCH 041/204] Used protocol/common.h in CGI

---
 src/protocol/file/cgi.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/protocol/file/cgi.c b/src/protocol/file/cgi.c
index 30ed2a07..ddca7136 100644
--- a/src/protocol/file/cgi.c
+++ b/src/protocol/file/cgi.c
@@ -26,6 +26,7 @@
 #include "network/socket.h"
 #include "osdep/osdep.h"
 #include "osdep/sysname.h"
+#include "protocol/common.h"
 #include "protocol/file/cgi.h"
 #include "protocol/http/http.h"
 #include "protocol/uri.h"
@@ -335,8 +336,6 @@ execute_cgi(struct connection *conn)
 		goto end0;
 	}
 	if (!pid) { /* CGI script */
-		int i;
-
 		if (set_vars(conn, script)) {
 			_exit(1);
 		}
@@ -345,9 +344,7 @@ execute_cgi(struct connection *conn)
 			_exit(2);
 		}
 		/* We implicitly chain stderr to ELinks' stderr. */
-		for (i = 3; i < 1024; i++) {
-			close(i);
-		}
+		close_all_non_term_fd();
 
 		last_slash[-1] = 0; set_cwd(script); last_slash[-1] = '/';
 		if (execl(script, script, NULL)) {

From bf3faa5c2b530204190f0cf3119b702ebb807d2e Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 18 Jan 2006 20:08:50 +0100
Subject: [PATCH 042/204] There is no reason to "stracpy" already allocated
 string.

---
 src/ecmascript/see/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 41729329..51cfa45e 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -294,7 +294,7 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 		if (deo) {
 			deo->ses = ses;
 			deo->uri = get_uri_reference(uri);
-			deo->target = stracpy(target);
+			deo->target = target;
 			/* target will be freed in delayed_goto_uri_frame */
 			register_bottom_half(delayed_goto_uri_frame, deo);
 			goto end;

From 1d65718ace9a1387d58866ac074ce37d76e8d7ed Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 18 Jan 2006 20:16:17 +0100
Subject: [PATCH 043/204] When there is no frame with given name do
 goto_uri_frame using static buffer.

---
 src/session/task.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/session/task.c b/src/session/task.c
index 81c8142a..115c9a42 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -672,6 +672,13 @@ delayed_goto_uri_frame(void *data)
 	frame = ses_find_frame(deo->ses, deo->target);
 	if (frame)
 		goto_uri_frame(deo->ses, deo->uri, frame->name, CACHE_MODE_NORMAL);
+	else {
+		static unsigned char buf[256];
+
+		strncpy(buf, deo->target, 256);
+		buf[255] = '\0';
+		goto_uri_frame(deo->ses, deo->uri, buf, CACHE_MODE_NORMAL);
+	}
 	done_uri(deo->uri);
 	mem_free(deo->target);
 	mem_free(deo);

From 958b0d308d32918c3c3dc0fdb3be74ab1e4a7626 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 18 Jan 2006 20:26:01 +0000
Subject: [PATCH 044/204] Re-introduce the stracpy in the correct place

See commit 836744ea84154476641d18875be1c019ccc7b119 and commit
bf3faa5c2b530204190f0cf3119b702ebb807d2e.
---
 src/ecmascript/spidermonkey/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index 3661caf0..4a6b1790 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -342,7 +342,7 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		if (deo) {
 			deo->ses = ses;
 			deo->uri = get_uri_reference(uri);
-			deo->target = target;
+			deo->target = stracpy(target);
 			register_bottom_half(delayed_goto_uri_frame, deo);
 			boolean_to_jsval(ctx, rval, 1);
 			goto end;

From 3b5724edd5ca5e99c960e8d0450d03475d1da52f Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 18 Jan 2006 20:38:33 +0000
Subject: [PATCH 045/204] look_for_link: simplify string

Use stracpy(empty_string_or_(target_base)) instead of
null_or_stracpy(target_base) and then stracpy("") if that returns NULL.
---
 src/document/html/parser.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/document/html/parser.c b/src/document/html/parser.c
index 1969b6f1..5d13dae9 100644
--- a/src/document/html/parser.c
+++ b/src/document/html/parser.c
@@ -533,8 +533,7 @@ look_for_link(unsigned char **pos, unsigned char *eof, struct menu_item **menu,
 	}
 
 	target = get_target(options, attr);
-	if (!target) target = null_or_stracpy(target_base);
-	if (!target) target = stracpy("");
+	if (!target) target = stracpy(empty_string_or_(target_base));
 	if (!target) {
 		mem_free_if(label);
 		return 1;

From 7f076a8832cc729d1759be4e6060ee0cda47e953 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 18 Jan 2006 21:50:43 +0100
Subject: [PATCH 046/204] Also compile in protocol/common when CGI is enabled

---
 src/protocol/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 6f4af60e..71c65df7 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -13,6 +13,7 @@ SUBDIRS-$(CONFIG_URI_REWRITE)	+= rewrite
 SUBDIRS = auth file http
 
 OBJS-$(CONFIG_DATA)		+= data.o
+OBJS-$(CONFIG_CGI)		+= common.o
 OBJS-$(CONFIG_FSP)		+= common.o
 OBJS-$(CONFIG_SMB)		+= common.o
 

From c97b4be9b9a32e08f843e446eca08910fc9415eb Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 18 Jan 2006 21:53:13 +0100
Subject: [PATCH 047/204] Move SUBDIRS and OBJS defining before their
 conditional defining

---
 src/protocol/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 71c65df7..c4bee068 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -1,6 +1,8 @@
 top_builddir=../..
 include $(top_builddir)/Makefile.config
 
+SUBDIRS = auth file http
+
 SUBDIRS-$(CONFIG_BITTORRENT)	+= bittorrent
 SUBDIRS-$(CONFIG_FINGER)	+= finger
 SUBDIRS-$(CONFIG_FSP)		+= fsp
@@ -10,13 +12,11 @@ SUBDIRS-$(CONFIG_NNTP)		+= nntp
 SUBDIRS-$(CONFIG_SMB)		+= smb
 SUBDIRS-$(CONFIG_URI_REWRITE)	+= rewrite
 
-SUBDIRS = auth file http
+OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o
 
 OBJS-$(CONFIG_DATA)		+= data.o
 OBJS-$(CONFIG_CGI)		+= common.o
 OBJS-$(CONFIG_FSP)		+= common.o
 OBJS-$(CONFIG_SMB)		+= common.o
 
-OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o
-
 include $(top_srcdir)/Makefile.lib

From ba4551433901c7bb69be25a78f83bbeabb0254d8 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 00:14:50 +0100
Subject: [PATCH 048/204] Change the SMJS scripting module name to Spidermonkey
 ECMAScript

---
 src/scripting/smjs/smjs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripting/smjs/smjs.c b/src/scripting/smjs/smjs.c
index 397636e0..18221fe4 100644
--- a/src/scripting/smjs/smjs.c
+++ b/src/scripting/smjs/smjs.c
@@ -12,7 +12,7 @@
 
 
 struct module smjs_scripting_module = struct_module(
-	/* name: */		"ECMAScript scripting engine",
+	/* name: */		"Spidermonkey ECMAScript",
 	/* options: */		NULL,
 	/* events: */		smjs_scripting_hooks,
 	/* submodules: */	NULL,

From dcff602f702f27fe6e2ae8d772db22a65693b653 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 01:23:54 +0100
Subject: [PATCH 049/204] Fix the build order of OBJS; broken by my recent
 'cleanups'

---
 Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index 69eb35fb..f283b370 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -108,7 +108,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
 ifneq ($(strip $(OBJS)),)
 -include $(DEP_FILES)
-OBJS += $(LIB_O_NAME)
+ALL_OBJS = $(LIB_O_DEPS) $(LIB_O_NAME)
 endif
 
 %.o: $(srcdir)%.c
@@ -127,7 +127,7 @@ CLEAN += $(PROG) $(OBJS)
 #############################################################################
 # The main default rules
 
-all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5) .vimrc
+all-default: $(ALL_OBJS) $(PROGS) $(MAN1) $(MAN5) .vimrc
 
 # Ensure that Makefiles in subdirs are created before we recursive into them
 init-recursive: init-default

From 359d8350507b18ad16b3d5c36236d58f5c82a556 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 01:24:42 +0100
Subject: [PATCH 050/204] Handle the logic for util/scanner in the Makefile;
 less CONFIG_* variables

---
 Makefile.config.in | 1 -
 configure.in       | 6 ------
 src/util/Makefile  | 3 ++-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index c83fccf7..85386320 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -144,7 +144,6 @@ CONFIG_OS_UNIX = @CONFIG_OS_UNIX@
 CONFIG_OS_WIN32 = @CONFIG_OS_WIN32@
 CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@
 CONFIG_POD2HTML = @CONFIG_POD2HTML@
-CONFIG_SCANNER = @CONFIG_SCANNER@
 CONFIG_SCRIPTING = @CONFIG_SCRIPTING@
 CONFIG_SCRIPTING_GUILE = @CONFIG_SCRIPTING_GUILE@
 CONFIG_SCRIPTING_LUA = @CONFIG_SCRIPTING_LUA@
diff --git a/configure.in b/configure.in
index 48b52614..2ef54920 100644
--- a/configure.in
+++ b/configure.in
@@ -1247,12 +1247,6 @@ fi
 
 AC_SUBST(CONFIG_SHA1)
 
-if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes;
-then
-	EL_CONFIG(CONFIG_SCANNER, [Built-in scanner])
-fi
-AC_SUBST(CONFIG_SCANNER)
-
 AC_ARG_ENABLE(weehoofooboomookerchoo,
               [
     Also check out the features.conf file for more information about features!
diff --git a/src/util/Makefile b/src/util/Makefile
index e0ea7cf8..727a8a8b 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -7,7 +7,8 @@ not = $(if $(findstring yes,$(1)),no,yes)
 
 OBJS-$(CONFIG_DEBUG)		 += memdebug.o
 OBJS-$(CONFIG_MD5)		 += md5.o
-OBJS-$(CONFIG_SCANNER)		 += scanner.o
+OBJS-$(CONFIG_CSS)		 += scanner.o
+OBJS-$(CONFIG_DOM)		 += scanner.o
 OBJS-$(CONFIG_SHA1)		 += sha1.o
 OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
 

From 206037eaa497aa9e369e5594b3a58c3c9b4b7237 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 02:08:07 +0100
Subject: [PATCH 051/204] Handle the logic for util/{md5,sha1} in the Makefile

---
 Makefile.config.in |  2 --
 configure.in       | 23 -----------------------
 src/util/Makefile  | 25 +++++++++++++++++++------
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 85386320..4c297dc3 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -131,7 +131,6 @@ CONFIG_LEDS = @CONFIG_LEDS@
 CONFIG_MAILCAP = @CONFIG_MAILCAP@
 CONFIG_MANUAL = @CONFIG_MANUAL@
 CONFIG_MARKS = @CONFIG_MARKS@
-CONFIG_MD5 = @CONFIG_MD5@
 CONFIG_MIMETYPES = @CONFIG_MIMETYPES@
 CONFIG_MOUSE = @CONFIG_MOUSE@
 CONFIG_NNTP = @CONFIG_NNTP@
@@ -151,7 +150,6 @@ CONFIG_SCRIPTING_PERL = @CONFIG_SCRIPTING_PERL@
 CONFIG_SCRIPTING_PYTHON = @CONFIG_SCRIPTING_PYTHON@
 CONFIG_SCRIPTING_RUBY = @CONFIG_SCRIPTING_RUBY@
 CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
-CONFIG_SHA1 = @CONFIG_SHA1@
 CONFIG_SMALL = @CONFIG_SMALL@
 CONFIG_SMB = @CONFIG_SMB@
 CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
diff --git a/configure.in b/configure.in
index 2ef54920..33dca15f 100644
--- a/configure.in
+++ b/configure.in
@@ -1224,29 +1224,6 @@ EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs],
 EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
 
-if test "$CONFIG_OPENSSL" != yes &&
-   test "$CONFIG_GNUTLS_OPENSSL_COMPAT" != yes ||
-   test "$CONFIG_OWN_LIBC" = yes;
-then
-	AC_MSG_CHECKING(for built-in MD5 support)
-	AC_MSG_RESULT(yes)
-	EL_CONFIG(CONFIG_MD5, [Built-in MD5])
-fi
-
-AC_SUBST(CONFIG_MD5)
-
-if test "$CONFIG_BITTORRENT" = yes; then
-	if test "$CONFIG_OPENSSL" != yes ||
-	   test "$CONFIG_OWN_LIBC" = yes;
-	then
-		AC_MSG_CHECKING(for built-in SHA1 support)
-		AC_MSG_RESULT(yes)
-		EL_CONFIG(CONFIG_SHA1, [Built-in SHA1])
-	fi
-fi
-
-AC_SUBST(CONFIG_SHA1)
-
 AC_ARG_ENABLE(weehoofooboomookerchoo,
               [
     Also check out the features.conf file for more information about features!
diff --git a/src/util/Makefile b/src/util/Makefile
index 727a8a8b..00fb2cf7 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -5,12 +5,25 @@ include $(top_builddir)/Makefile.config
 # Usage $(call not,$(CONFIG_FOO))
 not = $(if $(findstring yes,$(1)),no,yes)
 
-OBJS-$(CONFIG_DEBUG)		 += memdebug.o
-OBJS-$(CONFIG_MD5)		 += md5.o
-OBJS-$(CONFIG_CSS)		 += scanner.o
-OBJS-$(CONFIG_DOM)		 += scanner.o
-OBJS-$(CONFIG_SHA1)		 += sha1.o
-OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
+OBJS-$(call not,$(CONFIG_SMALL))	 += fastfind.o
+OBJS-$(CONFIG_CSS)			 += scanner.o
+OBJS-$(CONFIG_DEBUG)			 += memdebug.o
+OBJS-$(CONFIG_DOM)			 += scanner.o
+OBJS-$(CONFIG_MD5)			 += md5.o
+
+# Use own MD5 implementation if testing libc or there's no OpenSSL
+# (either the real thing or GNUTLS compat wrappers).
+OBJS-$(CONFIG_OWN_LIBC)			 += md5.o
+ifeq ($(CONFIG_GNUTLS_OPENSSL_COMPAT),no)
+OBJS-$(call not,$(CONFIG_OPENSSL))	 += md5.o
+endif
+
+ifeq ($(CONFIG_BITTORRENT),yes)
+# BitTorrent is the only user. Compile in SHA1 if testing libc or
+# there is no OpenSSL. The GNUTLS OpenSSL wrappers doesn't have it.
+OBJS-$(CONFIG_OWN_LIBC)			 += sha1.o
+OBJS-$(call not,$(CONFIG_OPENSSL))	 += sha1.o
+endif
 
 OBJS = \
  base64.o \

From 16ff8a444faca5be04d14fdc3529432b022d69ad Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 02:15:56 +0100
Subject: [PATCH 052/204] Move setting of TEST_LIB to Makefile.lib

---
 Makefile.config.in | 3 ---
 Makefile.lib       | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 4c297dc3..3b7122a7 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -43,9 +43,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-TEST_LIB=$(top_srcdir)/test/libtest.sh
-export TEST_LIB
-
 host = @host@
 
 ASCIIDOC = @ASCIIDOC@
diff --git a/Makefile.lib b/Makefile.lib
index f283b370..cde5a597 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -178,6 +178,9 @@ ifdef TEST_PROGS
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
 TESTDEPS += $(TESTDEPS-yes)
 
+TEST_LIB=$(top_srcdir)/test/libtest.sh
+export TEST_LIB
+
 define test_prog
 $(1): $(1).o $(TESTDEPS)
 	$$(call cmd,link)

From 045605e2c5e05fcaf611a06534dcaac63fdd1166 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 02:23:01 +0100
Subject: [PATCH 053/204] Remove some suspiciously looking empty lines

---
 INSTALL | 2 --
 1 file changed, 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index f40f4bb2..39ed5e34 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,9 +26,7 @@ from GIT in it, use the command:
 	$ cg clone -s check_file_SITES_for_value_of_this
 
   Note that if you obtained the sources directly from GIT, you NEED to run
-
 ./autogen.sh!  (It should be enough to do it once - however, if you have build
-
 problems, try running this first.) Also, you obviously need GNU make and
 autoconf installed on your system (note that autoconf-2.13 is supported, newer
 ones may cause problems thanks to the autoconf developers who don't know how to

From cbee5661447e23b58f2952c91f19fa4bd7d800e9 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 04:25:11 +0100
Subject: [PATCH 054/204] Increase the max length of filenames to 15 for the
 LOG_* system

---
 src/util/error.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/error.c b/src/util/error.c
index b645b1e6..e2d5408e 100644
--- a/src/util/error.c
+++ b/src/util/error.c
@@ -192,7 +192,7 @@ done_log(void)
 		       loctime);
 	errbuf[len] = '\0';
 
-	fprintf(log_file, "[%-5s %-13s %4s]: Log stopped at %s\n\n\n",
+	fprintf(log_file, "[%-5s %-15s %4s]: Log stopped at %s\n\n\n",
 		"", "", "", errbuf);
 
 	fclose(log_file);
@@ -224,7 +224,7 @@ elinks_log(unsigned char *msg, unsigned char *file, int line,
 			       loctime);
 		errbuf[len] = '\0';
 
-		fprintf(log_file, "\n\n[%-5s %-13s %4s]: Log started at %s\n",
+		fprintf(log_file, "\n\n[%-5s %-15s %4s]: Log started at %s\n",
 			"type", "file", "line", errbuf);
 
 		atexit(done_log);
@@ -238,7 +238,7 @@ elinks_log(unsigned char *msg, unsigned char *file, int line,
 
 	va_start(params, fmt);
 
-	snprintf(errbuf, sizeof(errbuf), "[%-5s %-13s %4d]: %s",
+	snprintf(errbuf, sizeof(errbuf), "[%-5s %-15s %4d]: %s",
 		 msg, file, line,  fmt);
 
 	vfprintf(log_file, errbuf, params);

From 44074061fa9d9def7865d652640084494e2cbd91 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 04:33:07 +0100
Subject: [PATCH 055/204] Make the link to the old manual 'accessible' in the
 HTML versions

---
 doc/manual.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.txt b/doc/manual.txt
index ed9a9716..9cdbc3a5 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -14,7 +14,7 @@ command-line arguments. The built-in documentation is sure to be up-to-date.
 There was a complete (or, for the most part complete) manual for Links 0.82 at
 one time, and you can still find it at:
 
-	http://links.sourceforge.net/docs/manual-0.82-en/index.html
+ - http://links.sourceforge.net/docs/manual-0.82-en/index.html[]
 
 While large parts of it do not apply anymore, you may still find some relevant
 information there.

From 126ae8c76441b9024370814b89e4659cd36ad3f6 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 04:50:10 +0100
Subject: [PATCH 056/204] #include dom/node.h instead of dom/stack.h

---
 src/dom/sgml/sgml.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/sgml/sgml.h b/src/dom/sgml/sgml.h
index f3c064e7..34e941e6 100644
--- a/src/dom/sgml/sgml.h
+++ b/src/dom/sgml/sgml.h
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "dom/stack.h"
+#include "dom/node.h"
 #include "dom/string.h"
 
 /* The flags stored in the attribute sgml node info data */

From fe43bf8a4f5894ab693c18064a847bb90089e842 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 04:51:33 +0100
Subject: [PATCH 057/204] Fix leaks in the DOM stack tracer

---
 src/dom/stack.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/dom/stack.c b/src/dom/stack.c
index 3597593c..61bd75a6 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -532,8 +532,7 @@ dom_stack_trace_id_leaf(struct dom_stack *stack, struct dom_node *node, void *da
 		id->length, id->string, name->length, name->string,
 		value.length, value.string);
 
-	if (is_dom_string_set(&value))
-		done_dom_string(&value);
+	done_dom_string(&value);
 
 	return DOM_STACK_CODE_OK;
 }
@@ -555,8 +554,7 @@ dom_stack_trace_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 		name->length, name->string,
 		value.length, value.string);
 
-	if (is_dom_string_set(&value))
-		done_dom_string(&value);
+	done_dom_string(&value);
 
 	return DOM_STACK_CODE_OK;
 }

From 7fe214fbb2b18b271f9fa26220b95f7aa60bc233 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 19 Jan 2006 04:54:30 +0100
Subject: [PATCH 058/204] Fix text node appending; fix DOM configuration parser

---
 src/dom/configuration.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index 352bea74..fb8f8c92 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -184,14 +184,13 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		break;
 
 	case DOM_NODE_TEXT:
-		if (config->flags & DOM_CONFIG_NORMALIZE_CHARACTERS) {
-			code = append_node_text(config, node);
-
-		} else if (!(config->flags & DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE)
-			   && node->data.text.only_space) {
+		if (!(config->flags & DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE)
+		    && node->data.text.only_space) {
 			/* Discard all Text nodes that contain
 			 * whitespaces in element content]. */
 			code = DOM_STACK_CODE_FREE_NODE;
+		} else {
+			code = append_node_text(config, node);
 		}
 		break;
 
@@ -336,7 +335,7 @@ parse_dom_config(unsigned char *flaglist, unsigned char separator)
 
 	while (flaglist) {
 		unsigned char *end = separator ? strchr(flaglist, separator) : NULL;
-		int length = end ? flaglist - end : strlen(flaglist);
+		int length = end ? end - flaglist : strlen(flaglist);
 		struct dom_string name = INIT_DOM_STRING(flaglist, length);
 
 		flags |= get_dom_config_flag(&name);

From 22e647813e6b3cd2e770317f0710a86795051d28 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 02:06:41 +0100
Subject: [PATCH 059/204] Fix DOM_CONFIG_NORMALIZE_WHITESPACE comment

---
 src/dom/configuration.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/dom/configuration.h b/src/dom/configuration.h
index 0436ba5a..f323c386 100644
--- a/src/dom/configuration.h
+++ b/src/dom/configuration.h
@@ -63,8 +63,9 @@ enum dom_config_flag {
 
 	/** "normalize-whitespace"
 	 *
-	 * If false (default) nothing is done, else all nodes are discarded
-	 * once they have been traversed. */
+	 * If false (default) nothing is done, else all text nodes are
+	 * normalized so that sequences of space characters are changed to
+	 * being only a single space. */
 	DOM_CONFIG_NORMALIZE_WHITESPACE = 64,
 };
 

From cc61578fcb1f6351db760be425ab42d80aa34ea7 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 02:07:24 +0100
Subject: [PATCH 060/204] Fix node pushing in walk_dom_nodes()

---
 src/dom/stack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/stack.c b/src/dom/stack.c
index 61bd75a6..328a7ef4 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -420,7 +420,7 @@ walk_dom_nodes(struct dom_stack *stack, struct dom_node *root)
 		if (is_dom_node_list_member(list, wstate->index)) {
 			struct dom_node *child = list->entries[wstate->index++];
 
-			if (push_dom_node(stack, child))
+			if (push_dom_node(stack, child) == DOM_STACK_CODE_OK)
 				continue;
 		}
 

From 2eba71d95bb24708338ad3991b3027a126896f00 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 02:08:46 +0100
Subject: [PATCH 061/204] Add support for testing normalization using the DOM
 configuration module

---
 src/dom/test/sgml-parser.c                |  46 ++++-
 src/dom/test/test-dom-configuration-basic | 236 ++++++++++++++++++++++
 2 files changed, 278 insertions(+), 4 deletions(-)
 create mode 100755 src/dom/test/test-dom-configuration-basic

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 28c5bd6c..0032db85 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -11,6 +11,7 @@
 
 #include "elinks.h"
 
+#include "dom/configuration.h"
 #include "dom/node.h"
 #include "dom/sgml/parser.h"
 #include "dom/stack.h"
@@ -260,7 +261,10 @@ main(int argc, char *argv[])
 	struct sgml_parser *parser;
 	enum sgml_document_type doctype = SGML_DOCTYPE_HTML;
 	enum sgml_parser_flag flags = 0;
+	enum sgml_parser_type type = SGML_PARSER_STREAM;
 	enum sgml_parser_code code = 0;
+	enum dom_config_flag normalize_flags = 0;
+	int normalize = 0;
 	int complete = 1;
 	struct dom_string uri = INIT_DOM_STRING("dom://test", -1);
 	struct dom_string source = INIT_DOM_STRING("(no source)", -1);
@@ -298,6 +302,20 @@ main(int argc, char *argv[])
 				set_dom_string(&source, argv[i], strlen(argv[i]));
 			}
 
+		} else if (!strncmp(arg, "normalize", 9)) {
+			arg += 9;
+			if (*arg == '=') {
+				arg++;
+			} else {
+				i++;
+				if (i >= argc)
+					die("--normalize expects a string");
+				arg = argv[i];
+			}
+			normalize = 1;
+			normalize_flags = parse_dom_config(arg, ',');
+			type = SGML_PARSER_TREE;
+
 		} else if (!strcmp(arg, "print-lines")) {
 			flags |= SGML_PARSER_COUNT_LINES;
 
@@ -316,11 +334,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	parser = init_sgml_parser(SGML_PARSER_STREAM, doctype, &uri, flags);
+	parser = init_sgml_parser(type, doctype, &uri, flags);
 	if (!parser) return 1;
 
 	parser->error_func = sgml_error_function;
-	add_dom_stack_context(&parser->stack, NULL, &sgml_parser_test_context_info);
+	if (normalize)
+		add_dom_config_normalizer(&parser->stack, normalize_flags);
+	else
+		add_dom_stack_context(&parser->stack, NULL, &sgml_parser_test_context_info);
 
 	code = parse_sgml(parser, source.string, source.length, complete);
 	if (parser->root) {
@@ -330,13 +351,30 @@ main(int argc, char *argv[])
 
 		get_dom_stack_state(&parser->stack, root_offset)->immutable = 0;
 
-		/* For SGML_PARSER_STREAM this will free the DOM
-		 * root node. */
 		while (!dom_stack_is_empty(&parser->stack))
 			pop_dom_node(&parser->stack);
+
+		if (normalize) {
+			struct dom_stack stack;
+
+			/* Note, that we cannot free nodes when walking the DOM
+			 * tree since walk_dom_node() uses an index to traverse
+			 * the tree. */
+			init_dom_stack(&stack, DOM_STACK_FLAG_NONE);
+			/* XXX: This context needs to be added first because it
+			 * assumes the parser can be accessed via
+			 * stack->contexts[0].data. */
+			add_dom_stack_context(&stack, parser, &sgml_parser_test_context_info);
+			walk_dom_nodes(&stack, parser->root);
+			done_dom_stack(&stack);
+			done_dom_node(parser->root);
+		}
 	}
 
 	done_sgml_parser(parser);
+#ifdef DEBUG_MEMLEAK
+	check_memory_leaks();
+#endif
 
 	return code;
 }
diff --git a/src/dom/test/test-dom-configuration-basic b/src/dom/test/test-dom-configuration-basic
new file mode 100755
index 00000000..cd217b1e
--- /dev/null
+++ b/src/dom/test/test-dom-configuration-basic
@@ -0,0 +1,236 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Jonas Fonseca
+#
+
+test_description='Test the DOM configuration module
+
+This test checks that the normalization performed by the DOM configuration
+is done correctly.
+'
+
+. "$TEST_LIB"
+
+test_normalize_output_equals () {
+	desc="$1"; shift
+	config="$1"; shift
+	src="$1"; shift
+	out="$1"; shift
+
+	URI="test:$(echo "$desc" | sed '
+		s/^[ \t]*\[[^]]*\][ \t]*//;
+		s/[:., \t][:., \t]*/-/g;
+		s/_/-/g;
+		# *cough*
+		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
+		s/[^a-zA-Z0-9-]//g;')"
+
+	sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^  //' > output
+	echo "#document: $URI" > expected
+	echo "$out" | sed -n '2,$p' >> expected
+
+	test_expect_success "$desc" 'cmp output expected' 
+}
+
+
+## Config strings ###########################################################
+
+NOOP='cdata-sections,comments,element-content-whitespace,entities'
+NOCOMMENTS='cdata-sections,element-content-whitespace,entities'
+CDATA2TEXT='comments,element-content-whitespace,entities'
+ENTITIES='cdata-section,comments,element-content-whitespace'
+NOWSTEXT='cdata-section,comments,entities'
+NORM1=''
+
+
+## No-ops ###################################################################
+
+test_normalize_output_equals \
+'Normalization no-op.' \
+"$NOOP" \
+'<roswell>   <![CDATA[|  that  |]]><!-- ends -->  well</roswell>' \
+'
+element: roswell
+  #text:    
+  #cdata-section: |  that  |
+  #comment:  ends 
+  #text:   well'
+
+test_normalize_output_equals \
+'Keep comments.' \
+"$NOOP" \
+'and<!-- comment:1 -->or<!-- comment:2 -->' \
+'
+#text: and
+#comment:  comment:1 
+#text: or
+#comment:  comment:2 '
+
+test_normalize_output_equals \
+'Keep CDATA sections ' \
+"$NOOP" \
+'<![CDATA[and]]>or<![CDATA[maybe]]>' \
+'
+#cdata-section: and
+#text: or
+#cdata-section: maybe'
+
+
+## Comments #################################################################
+
+test_normalize_output_equals \
+'Remove comments. (I)' \
+"$NOCOMMENTS" \
+"<no><!-- comment -->?</no>" \
+'
+element: no
+  #text: ?'
+
+test_normalize_output_equals \
+'Remove comments. (II)' \
+"$NOCOMMENTS" \
+'<!-- comment:1 -->and<!-- comment:2 -->' \
+'
+#text: and'
+
+test_normalize_output_equals \
+'Remove comments. (III)' \
+"$NOCOMMENTS" \
+'nothing to see <!-- comment -->here' \
+'
+#text: nothing to see here'
+
+
+## Entities #################################################################
+
+# Entities should be shown 'verbatim' here after expansion.
+
+test_normalize_output_equals \
+'Expand entities. (I)' \
+"$ENTITIES" \
+'a&lt;b&gt;c' \
+'
+#text: a&lt;b&gt;c'
+
+test_normalize_output_equals \
+'Expand entities. (II)' \
+"$ENTITIES" \
+'&bad-entity&good-entity;' \
+'
+#text: &bad-entity;&good-entity;'
+
+test_normalize_output_equals \
+'Expand entities. (III)' \
+"$ENTITIES" \
+'<a>&b;</a>' \
+'
+element: a
+  #text: &b;'
+
+
+## CDATA Sections ###########################################################
+
+test_normalize_output_equals \
+'Replace CDATA section with text. (I)' \
+"$CDATA2TEXT" \
+'<![CDATA[a small text snippet]]>' \
+'
+#text: a small text snippet'
+
+test_normalize_output_equals \
+'Replace CDATA section with text. (II)' \
+"$CDATA2TEXT" \
+'<![CDATA[a small]]> <![CDATA[text snippet]]>' \
+'
+#text: a small text snippet'
+
+test_normalize_output_equals \
+'Replace CDATA section with text. (III)' \
+"$CDATA2TEXT" \
+'before <![CDATA[and]]> after' \
+'
+#text: before and after'
+
+
+## Element Content Whitespace ###############################################
+
+test_normalize_output_equals \
+'Remove element content whitespace. (I)' \
+"$NOWSTEXT" \
+'<a>
+	<b>some text</b>
+</a>' \
+'
+element: a
+  element: b
+    #text: some text' \
+
+# I haven't read the specs about this thing, for now it just blasts all
+# space-only text nodes. Probably not the wanted behaviour all of the time.
+# --jonas
+test_normalize_output_equals \
+'Remove element content whitespace. (II)' \
+"$NOWSTEXT" \
+'<e>space between &this; &that; gets removed</e>' \
+'
+element: e
+  #text: space between 
+  entity-reference: this
+  entity-reference: that
+  #text:  gets removed'
+
+
+## Mixes ####################################################################
+
+test_normalize_output_equals \
+'Normalization mix #1. (I)' \
+"$NORM1" \
+'before <![CDATA[and]]> after &some;<!--comments--> remain' \
+'
+#text: before and after &some; remain'
+
+test_normalize_output_equals \
+'Normalization mix #1. (II)' \
+"$NORM1" \
+'<!--a-->b&c;  <![CDATA[d]]>' \
+'
+#text: b&c;d'
+
+
+## Special ELinks Extensions ################################################
+
+test_normalize_output_equals \
+'Remove unknown (HTML) elements and attributes. (I)' \
+"$NOOP,unknown" \
+'<html wack="..."><title w00t="...">where?<doit>here!</doit></title></html>' \
+'
+element: html
+  element: title
+    #text: where?' \
+
+test_normalize_output_equals \
+'Remove unknown (HTML) elements and attributes. (II)' \
+"$NOOP,unknown" \
+'<x y=""><z></z></x> aint no HTML' \
+'
+#text:  aint no HTML' \
+
+test_normalize_output_equals \
+'Normalize whitespace. (I)' \
+"$NOOP,normalize-whitespace" \
+'Here    is      a
+
+
+
+lot of     useless	space.' \
+'
+#text: Here is a lot of useless space.' \
+
+test_normalize_output_equals \
+'Normalize whitespace. (II)' \
+"$CDATA2TEXT,normalize-whitespace" \
+'Could we <![CDATA[    please     ]]> read that again?' \
+'
+#text: Could we please read that again?' \
+
+test_done

From 943cbd1bc6c4b92e6fb96472e32cfb6a9ece3ca4 Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Fri, 20 Jan 2006 15:26:57 +0100
Subject: [PATCH 062/204] Do not link against -ljs when SEE is used and
 sm-scripting is disabled

---
 configure.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 33dca15f..fd43d0e7 100644
--- a/configure.in
+++ b/configure.in
@@ -583,10 +583,9 @@ if test -z "$disable_spidermonkey"; then
 fi
 
 AC_MSG_RESULT($cf_result)
+EL_RESTORE_FLAGS
 
-if test "$cf_result" != yes; then
-	EL_RESTORE_FLAGS
-else
+if test "$cf_result" = yes; then
 	EL_CONFIG(CONFIG_SPIDERMONKEY, [SpiderMonkey])
 
 	CFLAGS="$CFLAGS_X"
@@ -621,6 +620,12 @@ else
 	CONFIG_SCRIPTING_SPIDERMONKEY=no
 fi
 
+EL_CONFIG_DEPENDS(CONFIG_SPIDERMONKEY, [CONFIG_ECMASCRIPT_SMJS CONFIG_SCRIPTING_SPIDERMONKEY], [SpiderMonkey])
+if test "x$CONFIG_SPIDERMONKEY" = xyes; then
+	LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
+	CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
+	CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
+fi
 
 dnl ===================================================================
 dnl Check for Guile, optional even if installed.

From 4570c4976ed825e69a01d720d6c56ef14482f8c1 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 15:56:40 +0100
Subject: [PATCH 063/204] Use CONFIG_ECMASCRIPT_SMJS in favour of
 CONFIG_SPIDERMONKEY, specificity!

---
 src/ecmascript/ecmascript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/ecmascript.c b/src/ecmascript/ecmascript.c
index 8948eab0..27ec5469 100644
--- a/src/ecmascript/ecmascript.c
+++ b/src/ecmascript/ecmascript.c
@@ -26,7 +26,7 @@
 
 #ifdef CONFIG_ECMASCRIPT_SEE
 #include "ecmascript/see.h"
-#elif defined(CONFIG_SPIDERMONKEY)
+#elif defined(CONFIG_ECMASCRIPT_SMJS)
 #include "ecmascript/spidermonkey.h"
 #endif
 
@@ -142,7 +142,7 @@ ecmascript_timeout_dialog(struct terminal *term, int max_exec_time)
 static struct module *ecmascript_modules[] = {
 #ifdef CONFIG_ECMASCRIPT_SEE
 	&see_module,
-#elif defined(CONFIG_SPIDERMONKEY)
+#elif defined(CONFIG_ECMASCRIPT_SMJS)
 	&spidermonkey_module,
 #endif
 	NULL,

From 98e51edde0136f80d103729a9e0152c447a8a78e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 16:17:09 +0100
Subject: [PATCH 064/204] Don't contaminate CFLAGS with stuff from RUBY_CFLAGS

---
 config/m4/ruby.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/m4/ruby.m4 b/config/m4/ruby.m4
index 35513248..a6485548 100644
--- a/config/m4/ruby.m4
+++ b/config/m4/ruby.m4
@@ -90,16 +90,17 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
 	fi
 fi
 
+EL_RESTORE_FLAGS
+
 if test "$CONFIG_SCRIPTING_RUBY" != "yes"; then
 	if test -n "$CONFIG_SCRIPTING_RUBY_WITHVAL" &&
 	   test "$CONFIG_SCRIPTING_RUBY_WITHVAL" != no; then
 		AC_MSG_ERROR([Ruby not found])
 	fi
-	EL_RESTORE_FLAGS
 else
 	EL_CONFIG(CONFIG_SCRIPTING_RUBY, [Ruby])
 
-	CFLAGS="$CFLAGS_X"
+	LIBS="$LIBS $RUBY_LIBS"
 	AC_SUBST(RUBY_CFLAGS)
 	AC_SUBST(RUBY_LIBS)
 fi

From e960992d06f3d3365ec192caa8fd4da7ff672bfb Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 20 Jan 2006 16:31:59 +0100
Subject: [PATCH 065/204] Try to cleanup the spidermonkey configuring

Remove the entry in features.log all devoted to spidermonkey.
---
 configure.in | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/configure.in b/configure.in
index fd43d0e7..6dd1c8ee 100644
--- a/configure.in
+++ b/configure.in
@@ -507,6 +507,8 @@ AC_ARG_WITH(see, [  --with-see              enable Simple Ecmascript Engine (SEE
 
 AC_MSG_CHECKING([for SEE])
 
+CONFIG_ECMASCRIPT_SEE=no
+
 if test "$enable_see" = "yes"; then
 	AC_MSG_RESULT(yes);
 	## Based on the SEE_FLAGS macro.
@@ -529,7 +531,6 @@ if test "$enable_see" = "yes"; then
 		CPPFLAGS="$CPPFLAGS $SEE_CFLAGS"
 		EL_CONFIG(CONFIG_ECMASCRIPT_SEE, [SEE])
 		AC_SUBST(SEE_CFLAGS)
-		AC_SUBST(CONFIG_ECMASCRIPT_SEE)
 	else
 		if test -n "$withval" && test "x$withval" != xno; then
 			AC_MSG_ERROR([SEE not found])
@@ -583,25 +584,19 @@ if test -z "$disable_spidermonkey"; then
 fi
 
 AC_MSG_RESULT($cf_result)
+CONFIG_SPIDERMONKEY="$cf_result"
 EL_RESTORE_FLAGS
 
-if test "$cf_result" = yes; then
-	EL_CONFIG(CONFIG_SPIDERMONKEY, [SpiderMonkey])
-
-	CFLAGS="$CFLAGS_X"
-	AC_SUBST(SPIDERMONKEY_LIBS)
-	AC_SUBST(SPIDERMONKEY_CFLAGS)
-fi
-
-if test "$CONFIG_SPIDERMONKEY" = yes &&
-   test "$CONFIG_ECMASCRIPT_SEE" != yes; then
+if test "x$CONFIG_SPIDERMONKEY" = xyes &&
+   test "x$CONFIG_ECMASCRIPT_SEE" != xyes; then
 	EL_CONFIG(CONFIG_ECMASCRIPT_SMJS, [SpiderMonkey document scripting])
+else
+	CONFIG_ECMASCRIPT_SMJS=no
 fi
 
-AC_SUBST(CONFIG_SPIDERMONKEY)
-AC_SUBST(CONFIG_ECMASCRIPT_SMJS)
-
 EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_ECMASCRIPT_SEE CONFIG_ECMASCRIPT_SMJS], [ECMAScript (JavaScript)])
+AC_SUBST(CONFIG_ECMASCRIPT_SEE)
+AC_SUBST(CONFIG_ECMASCRIPT_SMJS)
 
 
 dnl ===================================================================
@@ -620,11 +615,12 @@ else
 	CONFIG_SCRIPTING_SPIDERMONKEY=no
 fi
 
-EL_CONFIG_DEPENDS(CONFIG_SPIDERMONKEY, [CONFIG_ECMASCRIPT_SMJS CONFIG_SCRIPTING_SPIDERMONKEY], [SpiderMonkey])
-if test "x$CONFIG_SPIDERMONKEY" = xyes; then
-	LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
-	CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
-	CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
+if test "x$CONFIG_ECMASCRIPT_SMJS" = xyes ||
+   test "x$CONFIG_SCRIPTING_SPIDERMONKEY" = xyes; then
+	LIBS="$LIBS $SPIDERMONKEY_LIBS"
+	AC_SUBST(SPIDERMONKEY_LIBS)
+	AC_SUBST(SPIDERMONKEY_CFLAGS)
+	AC_SUBST(CONFIG_SPIDERMONKEY)
 fi
 
 dnl ===================================================================

From 91e8fdf34b6a2246a4b1b55657b2c45886282b2b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Jan 2006 08:28:57 +0100
Subject: [PATCH 066/204] Fix the EPLF FTP parser test to run FreeBSD

---
 src/protocol/ftp/test-ftp-parser | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocol/ftp/test-ftp-parser b/src/protocol/ftp/test-ftp-parser
index 8cdd536d..860056dd 100644
--- a/src/protocol/ftp/test-ftp-parser
+++ b/src/protocol/ftp/test-ftp-parser
@@ -81,10 +81,10 @@ drwxrwxr-x               folder        2 May 10  1996 network\r\n"
 
 test_ftp_response_expect_success \
 'EPLF responses' \
-$'
-+i8388621.48594,m825718503,r,s280,\tdjb.html\r\n
-+i8388621.50690,m824255907,/,\t514\r\n
-+i8388621.48598,m824253270,r,s612,\t514.html\r\n'
+"
++i8388621.48594,m825718503,r,s280,	djb.html\r\n
++i8388621.50690,m824255907,/,	514\r\n
++i8388621.48598,m824253270,r,s612,	514.html\r\n"
 
 #############################################################################
 #

From 3f659f78767f69cc6c96c07cadf0236c64c83b3d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Jan 2006 08:32:17 +0100
Subject: [PATCH 067/204] Fix the mailcap test program's dependency on gettext

---
 src/mime/backend/Makefile  | 1 +
 src/mime/backend/mailcap.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile
index eb9300cc..909bf1dd 100644
--- a/src/mime/backend/Makefile
+++ b/src/mime/backend/Makefile
@@ -26,6 +26,7 @@ TESTDEPS = \
  $(top_builddir)/src/util/string.o \
  $(top_builddir)/src/util/time.o
 
+TESTDEPS-$(CONFIG_NLS)	 += $(top_builddir)/src/intl/gettext/lib.o
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/mime/backend/mailcap.c b/src/mime/backend/mailcap.c
index e3eccec5..136cc0ee 100644
--- a/src/mime/backend/mailcap.c
+++ b/src/mime/backend/mailcap.c
@@ -684,7 +684,8 @@ struct module mailcap_mime_module = struct_module(
 /* Some ugly shortcuts for getting defined symbols to work. */
 int default_mime_backend,
     install_signal_handler,
-    mimetypes_mime_backend;
+    mimetypes_mime_backend,
+    program;
 struct list_head terminals;
 
 void die(const char *msg, ...)

From d5f6f198b16ce7ed38e48bd110fe824a0fea4c6d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Jan 2006 08:37:13 +0100
Subject: [PATCH 068/204] Abandon usage of $(eval) for test dependency

They lead to problems with FreeBSD's gmake.
---
 Makefile.lib | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index cde5a597..f0219e10 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -181,10 +181,12 @@ TESTDEPS += $(TESTDEPS-yes)
 TEST_LIB=$(top_srcdir)/test/libtest.sh
 export TEST_LIB
 
-define test_prog
-$(1): $(1).o $(TESTDEPS)
-	$$(call cmd,link)
-endef
+# This does the work for the next rule. It is a very general rule
+# but as long as we don't put test programs in src/ it should work.
+%: %.o $(TESTDEPS)
+	$(call cmd,link)
+
+$(TEST_PROGS): $(addsuffix .o,$(TEST_PROGS)) $(TESTDEPS)
 
 TESTS = $(wildcard $(srcdir)test-*)
 
@@ -201,8 +203,6 @@ CLEAN += $(TEST_PROGS) $(addsuffix .o,$(TEST_PROGS))
 clean-default: clean-test
 endif
 
-$(foreach prog,$(TEST_PROGS),$(eval $(call test_prog,$(prog))))
-
 .PHONY: $(TESTS)
 .NOPARALLEL:
 

From 384a2d66e5bea985a8ddfe5b285f7ab7c397d14b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Jan 2006 08:44:19 +0100
Subject: [PATCH 069/204] Fix inclusion of header files after CONFIG_{MD5,SHA1}
 were removed

Fixes: 206037eaa497aa9e369e5594b3a58c3c9b4b7237
---
 src/util/Makefile | 3 ++-
 src/util/md5.h    | 8 +++++---
 src/util/sha1.h   | 8 +++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/util/Makefile b/src/util/Makefile
index 00fb2cf7..9c3f47a8 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -1,6 +1,8 @@
 top_builddir=../..
 include $(top_builddir)/Makefile.config
 
+INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
+
 # Reverse a CONFIG_* string
 # Usage $(call not,$(CONFIG_FOO))
 not = $(if $(findstring yes,$(1)),no,yes)
@@ -9,7 +11,6 @@ OBJS-$(call not,$(CONFIG_SMALL))	 += fastfind.o
 OBJS-$(CONFIG_CSS)			 += scanner.o
 OBJS-$(CONFIG_DEBUG)			 += memdebug.o
 OBJS-$(CONFIG_DOM)			 += scanner.o
-OBJS-$(CONFIG_MD5)			 += md5.o
 
 # Use own MD5 implementation if testing libc or there's no OpenSSL
 # (either the real thing or GNUTLS compat wrappers).
diff --git a/src/util/md5.h b/src/util/md5.h
index 7c29c927..f4f7f4c4 100644
--- a/src/util/md5.h
+++ b/src/util/md5.h
@@ -3,12 +3,14 @@
 
 /* Optionally MD5 support can depend on external implementation when linking
  * against a SSL library that supports it. */
-#ifndef CONFIG_MD5
-#if defined(CONFIG_OPENSSL)
+#if defined(CONFIG_OWN_LIBC)
+#define CONFIG_MD5 1
+#elif defined(CONFIG_OPENSSL)
 #include <openssl/md5.h>
 #elif defined(CONFIG_GNUTLS_OPENSSL_COMPAT)
 #include <gnutls/openssl.h>
-#endif
+#else
+#define CONFIG_MD5 1
 #endif
 
 /* GNU TLS doesn't define this */
diff --git a/src/util/sha1.h b/src/util/sha1.h
index c344c255..9948a3a7 100644
--- a/src/util/sha1.h
+++ b/src/util/sha1.h
@@ -36,10 +36,12 @@
 
 /* Optionally SHA1 support can depend on external implementation when linking
  * against a SSL library that supports it. */
-#ifndef CONFIG_SHA1
-#if defined(CONFIG_OPENSSL)
+#if defined(CONFIG_OWN_LIBC)
+#define CONFIG_SHA1 1
+#elif defined(CONFIG_OPENSSL)
 #include <openssl/sha.h>
-#endif
+#else
+#define CONFIG_SHA1 1
 #endif
 
 #ifndef SHA_DIGEST_LENGTH

From 20f587a7251581366e8430c7f81fa36f52b4a653 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 21 Jan 2006 20:46:37 +0100
Subject: [PATCH 070/204] Do not link -lfsplib when FSP is not enabled

---
 configure.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.in b/configure.in
index 6dd1c8ee..818932b1 100644
--- a/configure.in
+++ b/configure.in
@@ -1136,6 +1136,7 @@ EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol],
 dnl ===================================================================
 dnl FSP protocol
 dnl ===================================================================
+EL_SAVE_FLAGS
 
 if test "x${enable_fsp}" != xno; then
 	AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
@@ -1156,6 +1157,10 @@ fi
 EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol],
 	      [  --enable-fsp            enable FSP protocol support])
 
+if test "x$CONFIG_FSP" = xno; then
+	EL_RESTORE_FLAGS
+fi
+
 EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
 	      [  --disable-ftp           disable ftp protocol support])
 

From d18809522ed7242ac9bfaab9a72a0b23b9d46f1c Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 21 Jan 2006 21:33:23 +0100
Subject: [PATCH 071/204] Make elinks tcc (tiny C compiler) friendly. If you
 want to try tcc use CC=tcc ./configure and make LD=tcc. I built ELinks with
 tcc, but ELinks segfaults.

---
 src/main/object.h        | 5 +++--
 src/network/connection.c | 2 +-
 src/network/connection.h | 4 ++--
 src/network/dns.c        | 4 ++--
 src/network/state.c      | 2 +-
 src/protocol/ftp/ftp.c   | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/object.h b/src/main/object.h
index e19c5800..ea206220 100644
--- a/src/main/object.h
+++ b/src/main/object.h
@@ -15,8 +15,9 @@ struct object {
 };
 
 #define OBJECT_HEAD(type)						\
-	LIST_HEAD(type);						\
-	struct object object;
+	type *next;							\
+	type *prev;							\
+	struct object object
 
 struct object_head {
 	OBJECT_HEAD(struct object *);
diff --git a/src/network/connection.c b/src/network/connection.c
index b28a9630..2eac88e2 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -847,7 +847,7 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 	struct cache_entry *cached;
 	struct connection *conn;
 	struct uri *proxy_uri, *proxied_uri;
-	enum connection_state connection_state = S_OK;
+	int connection_state = S_OK;
 
 	if (download) {
 		download->conn = NULL;
diff --git a/src/network/connection.h b/src/network/connection.h
index 621d3c1e..0069f0ba 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -86,8 +86,8 @@ int has_keepalive_connection(struct connection *);
 void add_keepalive_connection(struct connection *conn, long timeout_in_seconds,
 			      void (*done)(struct connection *));
 
-void abort_connection(struct connection *, int);
-void retry_connection(struct connection *, int);
+void abort_connection(struct connection *, enum connection_state);
+void retry_connection(struct connection *, enum connection_state);
 
 void change_connection(struct download *old, struct download *new,
 		       enum connection_priority newpri, int interrupt);
diff --git a/src/network/dns.c b/src/network/dns.c
index 9a308380..3075fdcd 100644
--- a/src/network/dns.c
+++ b/src/network/dns.c
@@ -77,7 +77,7 @@ static struct dnsquery *dns_queue = NULL;
 
 static INIT_LIST_HEAD(dns_cache);
 
-static void done_dns_lookup(struct dnsquery *query, int res);
+static void done_dns_lookup(struct dnsquery *query, enum dns_result res);
 
 
 /* DNS cache management: */
@@ -136,7 +136,7 @@ del_dns_cache_entry(struct dnsentry *dnsentry)
 
 /* Synchronous DNS lookup management: */
 
-int
+enum dns_result
 do_real_lookup(unsigned char *name, struct sockaddr_storage **addrs, int *addrno,
 	       int in_thread)
 {
diff --git a/src/network/state.c b/src/network/state.c
index 4f0833c8..5dfe6fcc 100644
--- a/src/network/state.c
+++ b/src/network/state.c
@@ -140,7 +140,7 @@ static INIT_LIST_HEAD(strerror_buf); /* struct strerror_val */
  * It never returns NULL (if one changes that, be warn that
  * callers may not test for this condition) --Zas */
 unsigned char *
-get_state_message(int state, struct terminal *term)
+get_state_message(enum connection_state state, struct terminal *term)
 {
 	unsigned char *e;
 	struct strerror_val *s;
diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index ae07b7c3..439279df 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -126,7 +126,7 @@ static void ftp_pass_info(struct socket *, struct read_buffer *);
 static void ftp_retr_file(struct socket *, struct read_buffer *);
 static void ftp_got_final_response(struct socket *, struct read_buffer *);
 static void got_something_from_data_connection(struct connection *);
-static void ftp_end_request(struct connection *, int);
+static void ftp_end_request(struct connection *, enum connection_state);
 static struct ftp_connection_info *add_file_cmd_to_str(struct connection *);
 static void ftp_data_accept(struct connection *conn);
 

From 61c43faacc3672fa4910f21c0909892a71741263 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 21 Jan 2006 22:19:22 +0100
Subject: [PATCH 072/204] Do not include see/see.h in header files

---
 src/ecmascript/see/input.h   | 4 +++-
 src/ecmascript/see/strings.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/input.h b/src/ecmascript/see/input.h
index d2d4755b..78236e52 100644
--- a/src/ecmascript/see/input.h
+++ b/src/ecmascript/see/input.h
@@ -1,7 +1,9 @@
 #ifndef EL__ECMASCRIPT_SEE_INPUT_H
 #define EL__ECMASCRIPT_SEE_INPUT_H
 
-#include <see/see.h>
+struct SEE_interpreter;
+struct SEE_string;
+struct SEE_value;
 
 struct SEE_input *SEE_input_elinks(struct SEE_interpreter *, unsigned char *);
 unsigned char *SEE_string_to_unsigned_char(struct SEE_string *);
diff --git a/src/ecmascript/see/strings.h b/src/ecmascript/see/strings.h
index 75f254a9..df253aa4 100644
--- a/src/ecmascript/see/strings.h
+++ b/src/ecmascript/see/strings.h
@@ -2,7 +2,7 @@
 #ifndef EL__ECMASCRIPT_SEE_STRINGS_H
 #define EL__ECMASCRIPT_SEE_STRINGS_H
 
-#include <see/see.h>
+struct SEE_string;
 
 void init_intern_strings(void);
 

From 7e6f3986026e2cfd92fe01691f9f494621686a9a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 22 Jan 2006 06:18:40 +0100
Subject: [PATCH 073/204] Revert OBJECT_HEAD() part of tcc cleanups

The LIST_HEAD() change to OBJECT_HEAD() doesn't work when debuging is
enabled.

Fixes: d18809522ed7242ac9bfaab9a72a0b23b9d46f1c
---
 src/main/object.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/object.h b/src/main/object.h
index ea206220..2d77b285 100644
--- a/src/main/object.h
+++ b/src/main/object.h
@@ -15,8 +15,7 @@ struct object {
 };
 
 #define OBJECT_HEAD(type)						\
-	type *next;							\
-	type *prev;							\
+	LIST_HEAD(type);						\
 	struct object object
 
 struct object_head {

From e117e41f99c990a1746b6d751de99a231b0c4902 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 22 Jan 2006 06:20:58 +0100
Subject: [PATCH 074/204] List native FSP protocol, SEE ecmascript and crappy
 RSS renderer under NEWS

---
 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 61b28556..b98c4830 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ You can see the complete list of recent changes, bugfixes and new features in
 the link:http://pasky.or.cz/gitweb.cgi[gitweb interface]. See the ChangeLog
 file for details.
 
+ELinks now:
+-----------
+
+* Native FSP protocol support (replaces CGI program in contrib/fsp/)
+* SEE Ecmascript backend
+* Minimalistic RSS renderer
+
 ELinks 0.11.0 (Elated):
 -----------------------
 

From c204af75fe019a6b5e90f7def2d8f855f063d1eb Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 25 Jan 2006 11:50:46 +0100
Subject: [PATCH 075/204] Because of gradual rendering window.open is called
 many times with the same arguments. This workaround remembers 8 last opened
 URLs and do not let open them again.

---
 src/ecmascript/see/window.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 51cfa45e..e284ed77 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -231,7 +231,8 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 	unsigned char *url, *url2;
 	struct uri *uri;
 	struct SEE_value url_value, target_value;
-	static struct SEE_string *url_string = NULL, *target_string = NULL;
+	static struct SEE_string *url_string[8], *target_string[8];
+	static int indeks;
 #if 0
 	static time_t ratelimit_start;
 	static int ratelimit_count;
@@ -262,14 +263,19 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 #endif
 	SEE_ToString(interp, argv[0], &url_value);
 	if (argc > 1) {
+		int i;
+
 		SEE_ToString(interp, argv[1], &target_value);
-		if (url_string && target_string &&
-		 !SEE_string_cmp(url_value.u.string, url_string)
-		 && !SEE_string_cmp(target_value.u.string, target_string)) {
-		 	return;
+		for (i = 0; i < 8; i++) {
+			if (url_string[i] && target_string[i]) {
+				if (!SEE_string_cmp(url_value.u.string, url_string[i])
+				 && !SEE_string_cmp(target_value.u.string, target_string[i]))
+				 	return;
+			}
 		}
-		url_string = url_value.u.string;
-		target_string = target_value.u.string;
+		url_string[indeks] = url_value.u.string;
+		target_string[indeks] = target_value.u.string;
+		indeks = (indeks + 1) & 7;
 	}
 	url = SEE_string_to_unsigned_char(url_value.u.string);
 	if (!url) return;

From 8a4a18796bd930207d5454566294ad8ab9544e6d Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 25 Jan 2006 15:36:31 +0000
Subject: [PATCH 076/204] Add a rewrite rule for video.google.com to
 automatically play videos

From the file:

   Play videos at video.google.com with minimal niggling. Just follow
   the link from the front page or the search page, and the video will
   automatically be loaded.
---
 contrib/smjs/google_video.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 contrib/smjs/google_video.js

diff --git a/contrib/smjs/google_video.js b/contrib/smjs/google_video.js
new file mode 100644
index 00000000..c89d2adb
--- /dev/null
+++ b/contrib/smjs/google_video.js
@@ -0,0 +1,15 @@
+/* Play videos at video.google.com with minimal niggling. Just follow the link
+ * from the front page or the search page, and the video will automatically
+ * be loaded. */
+function load_google_video(cached) {
+	if (cached.uri.match(/^http:\/\/video.google.com\/videoplay/)) {
+		var re;
+		re = /(<object data="\/googleplayer.swf\?videoUrl=)(.*?)(\&)/;
+		var uri = cached.content.match(re)[2];
+
+		if (uri) elinks.location = unescape(uri);
+	}
+
+	return true;
+}
+elinks.preformat_html_hooks.push(load_google_video);

From 8391080201b8242929e8d8ff1a342059a4ec741a Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 25 Jan 2006 15:50:51 +0000
Subject: [PATCH 077/204] Reflow some logic in google_video.js.

---
 contrib/smjs/google_video.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/smjs/google_video.js b/contrib/smjs/google_video.js
index c89d2adb..ed9770d9 100644
--- a/contrib/smjs/google_video.js
+++ b/contrib/smjs/google_video.js
@@ -2,13 +2,12 @@
  * from the front page or the search page, and the video will automatically
  * be loaded. */
 function load_google_video(cached) {
-	if (cached.uri.match(/^http:\/\/video.google.com\/videoplay/)) {
-		var re;
-		re = /(<object data="\/googleplayer.swf\?videoUrl=)(.*?)(\&)/;
-		var uri = cached.content.match(re)[2];
+	if (!cached.uri.match(/^http:\/\/video.google.com\/videoplay/))
+		return true;
+	var re = /(<object data="\/googleplayer.swf\?videoUrl=)(.*?)(\&)/;
+	var uri = cached.content.match(re)[2];
 
-		if (uri) elinks.location = unescape(uri);
-	}
+	if (uri) elinks.location = unescape(uri);
 
 	return true;
 }

From 4fda3ba8285b81bfaee14f55eaf9f891b606cd77 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 25 Jan 2006 15:52:19 +0000
Subject: [PATCH 078/204] Use <meta> refresh instead of elinks.location method.

Instead of assigning the URI for the video to elinks.location, instead
create a <meta> tag to automatically load the video. This way, the video
will still be automatically loaded when the document is loaded from cache.
---
 contrib/smjs/google_video.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/smjs/google_video.js b/contrib/smjs/google_video.js
index ed9770d9..f267941f 100644
--- a/contrib/smjs/google_video.js
+++ b/contrib/smjs/google_video.js
@@ -4,10 +4,13 @@
 function load_google_video(cached) {
 	if (!cached.uri.match(/^http:\/\/video.google.com\/videoplay/))
 		return true;
-	var re = /(<object data="\/googleplayer.swf\?videoUrl=)(.*?)(\&)/;
-	var uri = cached.content.match(re)[2];
 
-	if (uri) elinks.location = unescape(uri);
+	var re = /(<object data="\/googleplayer.swf\?videoUrl=)(.*?)(\&.*?<\/object>)/;
+	var match = cached.content.match(re);
+	var url = unescape(match[2]);
+	var meta = '<meta http-equiv="refresh" content="1; url=' + url + '" />';
+
+	cached.content = cached.content.replace(/<head>/, "<head>" + meta);
 
 	return true;
 }

From f6f66a28c873839600d85164f267ae9fbc1e3bbe Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 25 Jan 2006 17:03:15 +0100
Subject: [PATCH 079/204] Fix warning: variable xxx might be clobbered by
 longjmp or vfork, that occur with gcc 2.95.3.

---
 src/ecmascript/see.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see.c b/src/ecmascript/see.c
index 4f353a79..e751ecf0 100644
--- a/src/ecmascript/see.c
+++ b/src/ecmascript/see.c
@@ -197,7 +197,10 @@ see_eval_stringback(struct ecmascript_interpreter *interpreter,
 	struct SEE_input *input = SEE_input_elinks(interp, code->source);
 	SEE_try_context_t try_ctxt;
 	struct SEE_value result;
-	unsigned char *string = NULL;
+	/* 'volatile' qualifier prevents register allocation which fixes:
+	 *  warning: variable 'xxx' might be clobbered by 'longjmp' or 'vfork'
+	 */
+	unsigned char *volatile string = NULL;
 
 	g->exec_start = time(NULL);
 	SEE_TRY(interp, try_ctxt) {
@@ -222,7 +225,10 @@ see_eval_boolback(struct ecmascript_interpreter *interpreter,
 	struct SEE_input *input = SEE_input_elinks(interp, code->source);
 	SEE_try_context_t try_ctxt;
 	struct SEE_value result;
-	SEE_int32_t res = 0;
+	/* 'volatile' qualifier prevents register allocation which fixes:
+	 *  warning: variable 'xxx' might be clobbered by 'longjmp' or 'vfork'
+	 */
+	SEE_int32_t volatile res = 0;
 
 	g->exec_start = time(NULL);
 	SEE_TRY(interp, try_ctxt) {

From cf8de457829d80457f8e3a5325d55abe8e7bec90 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 25 Jan 2006 17:20:47 +0100
Subject: [PATCH 080/204] Cleanup and tidy up window.open workaround.

---
 src/ecmascript/see/window.c | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index e284ed77..d6821e49 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -231,8 +231,6 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 	unsigned char *url, *url2;
 	struct uri *uri;
 	struct SEE_value url_value, target_value;
-	static struct SEE_string *url_string[8], *target_string[8];
-	static int indeks;
 #if 0
 	static time_t ratelimit_start;
 	static int ratelimit_count;
@@ -263,20 +261,34 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 #endif
 	SEE_ToString(interp, argv[0], &url_value);
 	if (argc > 1) {
+		/* Because of gradual rendering window.open is called many
+		 * times with the same arguments.
+		 * This workaround remembers NUMBER_OF_URLS_TO_REMEMBER last
+		 * opened URLs and do not let open them again.
+		 */
+#define NUMBER_OF_URLS_TO_REMEMBER 8
+		static struct {
+			struct SEE_string *url;
+			struct SEE_string *target;
+		} strings[NUMBER_OF_URLS_TO_REMEMBER];
+		static int indeks = 0;
 		int i;
 
 		SEE_ToString(interp, argv[1], &target_value);
-		for (i = 0; i < 8; i++) {
-			if (url_string[i] && target_string[i]) {
-				if (!SEE_string_cmp(url_value.u.string, url_string[i])
-				 && !SEE_string_cmp(target_value.u.string, target_string[i]))
-				 	return;
-			}
+		for (i = 0; i < NUMBER_OF_URLS_TO_REMEMBER; i++) {
+			if (!(strings[i].url && strings[i].target))
+				continue;
+			if (!SEE_string_cmp(url_value.u.string, strings[i].url)
+			    && !SEE_string_cmp(target_value.u.string, strings[i].target))
+			 	return;
 		}
-		url_string[indeks] = url_value.u.string;
-		target_string[indeks] = target_value.u.string;
-		indeks = (indeks + 1) & 7;
+		strings[indeks].url = url_value.u.string;
+		strings[indeks].target = target_value.u.string;
+		indeks++;
+		if (indeks >= NUMBER_OF_URLS_TO_REMEMBER) indeks = 0;
+#undef NUMBER_OF_URLS_TO_REMEMBER
 	}
+
 	url = SEE_string_to_unsigned_char(url_value.u.string);
 	if (!url) return;
 

From afb45aace5d88dda7c6922b57b6e0b899ef7879e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 25 Jan 2006 18:18:01 +0100
Subject: [PATCH 081/204] Add support for scanning comment endings such as
 '--!>' correctly

---
 src/dom/sgml/scanner.c              | 20 ++++++++++++++------
 src/dom/test/test-sgml-parser-basic |  9 ++++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index a372c9a5..af90a27b 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -368,12 +368,20 @@ skip_sgml_comment(struct dom_scanner *scanner, unsigned char **string,
 		/* It is always safe to access index -2 and -1 here since we
 		 * are supposed to have '<!--' before this is called. We do
 		 * however need to check that the '-->' are not overlapping any
-		 * preceeding '-'. */
-		if (pos[-2] == '-' && pos[-1] == '-' && &pos[-2] >= *string) {
-			length = pos - *string - 2;
-			*possibly_incomplete = 0;
-			pos++;
-			break;
+		 * preceeding '-'. Additionally also handle the quirky '--!>'
+		 * end sometimes found. */
+		if (pos[-2] == '-') {
+			if (pos[-1] == '-' && &pos[-2] >= *string) {
+				length = pos - *string - 2;
+				*possibly_incomplete = 0;
+				pos++;
+				break;
+			} else if (pos[-1] == '!' && pos[-3] == '-' && &pos[-3] >= *string) {
+				length = pos - *string - 3;
+				*possibly_incomplete = 0;
+				pos++;
+				break;
+			}
 		}
 	}
 
diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index a203a78a..1a22b7fe 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -93,11 +93,18 @@ test_output_equals \
 #text: u'
 
 test_output_equals \
-'Parse bad comment.' \
+'Parse bad comment. (I)' \
 '<!--->s' \
 '
 #comment: ->s'
 
+test_output_equals \
+'Parse bad comment. (II)' \
+'<!--a--!>bad comment' \
+'
+#comment: a
+#text: bad comment'
+
 test_output_equals \
 'Parse empty notation.' \
 '<!>s' \

From ea2d7a3325b772f68980525df70597cf6dc23e12 Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 25 Jan 2006 20:19:55 +0100
Subject: [PATCH 082/204] Simplification.

---
 src/session/task.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/session/task.c b/src/session/task.c
index 115c9a42..001dcd42 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -673,11 +673,7 @@ delayed_goto_uri_frame(void *data)
 	if (frame)
 		goto_uri_frame(deo->ses, deo->uri, frame->name, CACHE_MODE_NORMAL);
 	else {
-		static unsigned char buf[256];
-
-		strncpy(buf, deo->target, 256);
-		buf[255] = '\0';
-		goto_uri_frame(deo->ses, deo->uri, buf, CACHE_MODE_NORMAL);
+		goto_uri_frame(deo->ses, deo->uri, NULL, CACHE_MODE_NORMAL);
 	}
 	done_uri(deo->uri);
 	mem_free(deo->target);

From e5dbbff3980c3b156b0f078a3c32d0db51b3a97c Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 25 Jan 2006 22:22:10 +0100
Subject: [PATCH 083/204] Set returned value.

---
 src/ecmascript/see/form.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index edc62365..6971752c 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -336,6 +336,8 @@ js_input_blur(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
 	     struct SEE_value *res)
 {
+	checktime(interp);
+	SEE_SET_BOOLEAN(res, 0);
 	/* We are a text-mode browser and there *always* has to be something
 	 * selected.  So we do nothing for now. (That was easy.) */
 }
@@ -390,6 +392,7 @@ js_input_focus(struct SEE_interpreter *interp, struct SEE_object *self,
 	int linknum;
 
 	checktime(interp);
+	SEE_SET_BOOLEAN(res, 0);
 	assert(fs);
 	fc = find_form_control(document, fs);
 	assert(fc);
@@ -409,6 +412,7 @@ js_input_select(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_value *res)
 {
 	checktime(interp);
+	SEE_SET_BOOLEAN(res, 0);
 	/* We support no text selecting yet.  So we do nothing for now.
 	 * (That was easy, too.) */
 }

From 89a95a5fc58d2f6b8aed0941814d0d823c38c3ac Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 25 Jan 2006 23:13:10 +0100
Subject: [PATCH 084/204] Rename enum html_element_type to
 html_element_mortality_type

This name is reserved for DOM.
---
 src/document/html/parser.c       | 2 +-
 src/document/html/parser.h       | 6 +++---
 src/document/html/parser/stack.c | 2 +-
 src/document/html/parser/stack.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/document/html/parser.c b/src/document/html/parser.c
index 5d13dae9..59b14b22 100644
--- a/src/document/html/parser.c
+++ b/src/document/html/parser.c
@@ -659,7 +659,7 @@ get_image_map(unsigned char *head, unsigned char *pos, unsigned char *eof,
 
 struct html_element *
 init_html_parser_state(struct html_context *html_context,
-                       enum html_element_type type,
+                       enum html_element_mortality_type type,
                        int align, int margin, int width)
 {
 	html_stack_dup(html_context, type);
diff --git a/src/document/html/parser.h b/src/document/html/parser.h
index fc3dc3b8..fa178aa4 100644
--- a/src/document/html/parser.h
+++ b/src/document/html/parser.h
@@ -102,7 +102,7 @@ struct par_attrib {
 };
 
 /* HTML parser stack mortality info */
-enum html_element_type {
+enum html_element_mortality_type {
 	/* Elements of this type can not be removed from the stack. This type
 	 * is created by the renderer when formatting a HTML part. */
 	ELEMENT_IMMORTAL,
@@ -122,7 +122,7 @@ enum html_element_type {
 struct html_element {
 	LIST_HEAD(struct html_element);
 
-	enum html_element_type type;
+	enum html_element_mortality_type type;
 
 	struct text_attrib attr;
 	struct par_attrib parattr;
@@ -173,7 +173,7 @@ init_html_parser(struct uri *uri, struct document_options *options,
 		                  ...));
 
 void done_html_parser(struct html_context *html_context);
-struct html_element *init_html_parser_state(struct html_context *html_context, enum html_element_type type, int align, int margin, int width);
+struct html_element *init_html_parser_state(struct html_context *html_context, enum html_element_mortality_type type, int align, int margin, int width);
 void done_html_parser_state(struct html_context *html_context,
                             struct html_element *element);
 
diff --git a/src/document/html/parser/stack.c b/src/document/html/parser/stack.c
index 34d1a339..1978b224 100644
--- a/src/document/html/parser/stack.c
+++ b/src/document/html/parser/stack.c
@@ -127,7 +127,7 @@ kill_html_stack_item(struct html_context *html_context, struct html_element *e)
 
 
 void
-html_stack_dup(struct html_context *html_context, enum html_element_type type)
+html_stack_dup(struct html_context *html_context, enum html_element_mortality_type type)
 {
 	struct html_element *e;
 	struct html_element *ep = html_context->stack.next;
diff --git a/src/document/html/parser/stack.h b/src/document/html/parser/stack.h
index 6c245623..754166f7 100644
--- a/src/document/html/parser/stack.h
+++ b/src/document/html/parser/stack.h
@@ -10,7 +10,7 @@ struct html_element *search_html_stack(struct html_context *html_context,
                                        unsigned char *name);
 
 void html_stack_dup(struct html_context *html_context,
-                    enum html_element_type type);
+                    enum html_element_mortality_type type);
 
 void kill_html_stack_item(struct html_context *html_context,
                           struct html_element *e);

From bea1a0c559d3aedee00696c01e3c12acf9cf2d99 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 25 Jan 2006 23:16:30 +0100
Subject: [PATCH 085/204] Handle <base href=""> for HTML source rendering

Requested by witekfl.
---
 src/document/dom/renderer.c | 48 ++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 0f04574d..131f30eb 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -25,6 +25,7 @@
 #include "dom/configuration.h"
 #include "dom/scanner.h"
 #include "dom/sgml/parser.h"
+#include "dom/sgml/html/html.h"
 #include "dom/sgml/rss/rss.h"
 #include "dom/node.h"
 #include "dom/stack.h"
@@ -40,11 +41,14 @@
 
 
 struct dom_renderer {
+	enum sgml_document_type doctype;
 	struct document *document;
 
 	struct conv_table *convert_table;
 	enum convert_string_mode convert_mode;
 
+	struct uri *base_uri;
+
 	unsigned char *source;
 	unsigned char *end;
 
@@ -109,6 +113,7 @@ init_dom_renderer(struct dom_renderer *renderer, struct document *document,
 	renderer->source	= buffer->source;
 	renderer->end		= buffer->source + buffer->length;
 	renderer->position	= renderer->source;
+	renderer->base_uri	= get_uri_reference(document->uri);
 
 #ifdef HAVE_REGEX_H
 	if (renderer->document->options.plain_display_links) {
@@ -368,7 +373,7 @@ add_dom_link(struct dom_renderer *renderer, unsigned char *string, int length,
 	                           CSM_DEFAULT, NULL, NULL, NULL);
 	if (!uristring) return NULL;
 
-	where = join_urls(document->uri, uristring);
+	where = join_urls(renderer->base_uri, uristring);
 
 	mem_free(uristring);
 
@@ -560,6 +565,27 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
 	return DOM_STACK_CODE_OK;
 }
 
+static void
+set_base_uri(struct dom_renderer *renderer, unsigned char *value, size_t valuelen)
+{
+	unsigned char *href = memacpy(value, valuelen);
+	unsigned char *uristring;
+	struct uri *uri;
+
+	if (!href) return;
+	uristring = join_urls(renderer->base_uri, href);
+	mem_free(href);
+
+	if (!uristring) return;
+	uri = get_uri(uristring, 0);
+	mem_free(uristring);
+
+	if (!uri) return;
+
+	done_uri(renderer->base_uri);
+	renderer->base_uri = uri;
+}
+
 enum dom_stack_code
 render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
@@ -614,6 +640,12 @@ render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void
 				break;
 			}
 
+			if (renderer->doctype == SGML_DOCTYPE_HTML
+			    && node->data.attribute.type == HTML_ATTRIBUTE_HREF
+			    && node->parent->data.element.type == HTML_ELEMENT_BASE) {
+				set_base_uri(renderer, value, valuelen - skips);
+			}
+
 			add_dom_link(renderer, value, valuelen - skips,
 				     value, valuelen - skips);
 
@@ -941,7 +973,6 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	struct dom_renderer renderer;
 	struct conv_table *convert_table;
 	struct sgml_parser *parser;
-	enum sgml_document_type doctype;
  	enum sgml_parser_type parser_type;
 	unsigned char *string = struri(cached->uri);
 	size_t length = strlen(string);
@@ -965,32 +996,32 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 
 	/* FIXME: Refactor the doctype lookup. */
 	if (!strcasecmp("application/rss+xml", cached->content_type)) {
-		doctype = SGML_DOCTYPE_RSS;
+		renderer.doctype = SGML_DOCTYPE_RSS;
 
 	} else if (!strcasecmp("application/docbook+xml", cached->content_type)) {
-		doctype = SGML_DOCTYPE_DOCBOOK;
+		renderer.doctype = SGML_DOCTYPE_DOCBOOK;
 
 	} else if (!strcasecmp("application/xbel+xml", cached->content_type)
 		   || !strcasecmp("application/x-xbel", cached->content_type)
 		   || !strcasecmp("application/xbel", cached->content_type)) {
-		doctype = SGML_DOCTYPE_XBEL;
+		renderer.doctype = SGML_DOCTYPE_XBEL;
 
 	} else {
 		assertm(!strcasecmp("text/html", cached->content_type)
 			|| !strcasecmp("application/xhtml+xml", cached->content_type),
 			"Couldn't resolve doctype '%s'", cached->content_type);
 
-		doctype = SGML_DOCTYPE_HTML;
+		renderer.doctype = SGML_DOCTYPE_HTML;
 	}
 
-	parser = init_sgml_parser(parser_type, doctype, &uri, 0);
+	parser = init_sgml_parser(parser_type, renderer.doctype, &uri, 0);
   	if (!parser) return;
 
 	if (document->options.plain) {
 		add_dom_stack_context(&parser->stack, &renderer,
 				      &dom_source_renderer_context_info);
 
-	} else if (doctype == SGML_DOCTYPE_RSS) {
+	} else if (renderer.doctype == SGML_DOCTYPE_RSS) {
 		add_dom_stack_context(&parser->stack, &renderer,
 				      &dom_rss_renderer_context_info);
 		add_dom_config_normalizer(&parser->stack, RSS_CONFIG_FLAGS); 
@@ -1014,5 +1045,6 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	if (renderer.find_url)
 		regfree(&renderer.url_regex);
 #endif
+	done_uri(renderer.base_uri);
 	done_sgml_parser(parser);
 }

From f47daa2291e154e8b02ce21aa67c125ff75af45f Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Thu, 26 Jan 2006 14:34:11 +0100
Subject: [PATCH 086/204] Use slashes after directories. Blocks are not used
 where there is only one instruction

---
 src/protocol/fsp/fsp.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 4f7663b2..97700dcb 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -113,14 +113,13 @@ sort_and_display_entries(FSP_DIR *dir)
 	 (int (*)(const void *, const void *)) compare);
 
 	for (i = 0; i < size; i++) {
-		printf("%10d\t<a href=\"%s\">", table[i].size, table[i].name);
-		if (table[i].type == FSP_RDTYPE_DIR && *dircolor) {
+		printf("%10d\t<a href=\"%s%s\">", table[i].size, table[i].name,
+			table[i].type == FSP_RDTYPE_DIR ? "/" : "");
+		if (table[i].type == FSP_RDTYPE_DIR && *dircolor)
 			printf("<font color=\"%s\"><b>", dircolor);
-		}
 		printf("%s", table[i].name);
-		if (table[i].type == FSP_RDTYPE_DIR && *dircolor) {
+		if (table[i].type == FSP_RDTYPE_DIR && *dircolor)
 			printf("</b></font>");
-		}
 		puts("</a>");
 	}
 }
@@ -160,14 +159,13 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
-			printf("%10d\t<a href=\"%s\">", fentry.size, fentry.name);
-			if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+			printf("%10d\t<a href=\"%s%s\">", fentry.size,
+			 fentry.name, fentry.type == FSP_RDTYPE_DIR ? "/" : "");
+			if (fentry.type == FSP_RDTYPE_DIR && *dircolor)
 				printf("<font color=\"%s\"><b>", dircolor);
-			}
 			printf("%s", fentry.name);
-			if (fentry.type == FSP_RDTYPE_DIR && *dircolor) {
+			if (fentry.type == FSP_RDTYPE_DIR && *dircolor)
 				printf("</b></font>");
-			}
 			puts("</a>");
 		}
 		fsp_closedir(dir);

From 8d4f44f2f16d51e147df1dde7355d5da85a41115 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Thu, 26 Jan 2006 18:20:13 +0100
Subject: [PATCH 087/204] Content-Type handling

---
 src/mime/mime.c        |  6 +++
 src/mime/mime.h        |  3 ++
 src/protocol/fsp/fsp.c | 93 +++++++++++++++++++++++++++++++++++-------
 3 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/src/mime/mime.c b/src/mime/mime.c
index 37372911..bbeca78b 100644
--- a/src/mime/mime.c
+++ b/src/mime/mime.c
@@ -224,6 +224,12 @@ get_cache_header_content_type(struct cache_entry *cached)
 	return NULL;
 }
 
+unsigned char *
+get_default_content_type(void)
+{
+	return get_default_mime_type();
+}
+
 unsigned char *
 get_content_type(struct cache_entry *cached)
 {
diff --git a/src/mime/mime.h b/src/mime/mime.h
index 779ed3b8..8584ee4f 100644
--- a/src/mime/mime.h
+++ b/src/mime/mime.h
@@ -20,6 +20,9 @@ extern struct module mime_module;
  * scanning the uri for extensions. */
 unsigned char *get_content_type(struct cache_entry *cached);
 
+/* Default mime type */
+unsigned char *get_default_content_type(void);
+
 /* Guess content type by looking at configurations of the given @extension */
 unsigned char *get_extension_content_type(unsigned char *extension);
 
diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 97700dcb..53c3527f 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -27,6 +27,7 @@
 #include "intl/gettext/libintl.h"
 #include "main/module.h"
 #include "main/select.h"
+#include "mime/mime.h"
 #include "network/connection.h"
 #include "network/socket.h"
 #include "osdep/osdep.h"
@@ -135,6 +136,8 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	if (!uristring || !data || !init_string(&buf))
 		fsp_error("Out of memory");
 
+	fprintf(stderr, "text/html");
+	fclose(stderr);
 	add_html_to_string(&buf, uristring, strlen(uristring));
 
 	printf("<html><head><title>%s</title><base href=\"%s\">"
@@ -176,6 +179,31 @@ end:
 	exit(0);
 }
 
+static unsigned char *
+get_content_type_uri(struct uri *uri)
+{
+	unsigned char *extension = get_extension_from_uri(uri);
+
+	if (extension) {
+		unsigned char *ctype;
+		/* XXX:	A little hack for making extension handling case
+		 * insensitive. We could probably do it better by making
+		 * guess_encoding() case independent the real problem however
+		 * is with default (via option system) and mimetypes resolving
+		 * doing that option and hash lookup will not be easy to
+		 * convert. --jonas */
+		convert_to_lowercase(extension, strlen(extension));
+
+		ctype = get_extension_content_type(extension);
+		if (ctype && *ctype) {
+			return ctype;
+		}
+	}
+
+	return get_default_content_type();
+
+}
+
 #define READ_SIZE	4096
 
 static void
@@ -200,6 +228,8 @@ do_fsp(struct connection *conn)
 		FSP_FILE *file = fsp_fopen(ses, data, "r");
 		int r;
 
+		fprintf(stderr, "%s", get_content_type_uri(uri));
+		fclose(stderr);
 		if (!file)
 			fsp_error("fsp_fopen error.");
 
@@ -222,14 +252,14 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 		return;
 	}
 
-	if (len == 0) {
+	if (!len) {
 		if (conn->from)
 			normalize_cache_entry(conn->cached, conn->from);
 		abort_connection(conn, S_OK);
 		return;
 	}
 
-	conn->socket->state = SOCKET_END_ONCLOSE;
+	socket->state = SOCKET_END_ONCLOSE;
 	conn->received += len;
 	if (add_fragment(conn->cached, conn->from, rb->data, len) == 1)
 		conn->tries = 0;
@@ -239,6 +269,35 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 	read_from_socket(socket, rb, S_TRANS, fsp_got_data);
 }
 
+static void
+fsp_got_header(struct socket *socket, struct read_buffer *rb)
+{
+	int len = rb->length;
+	struct connection *conn = socket->conn;
+	struct read_buffer *buf;
+
+	conn->cached = get_cache_entry(conn->uri);
+	if (!conn->cached) {
+		close(socket->fd);
+		close(conn->data_socket->fd);
+		abort_connection(conn, S_OUT_OF_MEM);
+		return;
+	}
+	socket->state = SOCKET_END_ONCLOSE;
+	if (len <= 0) goto end;
+	rb->data[len] = '\0';
+	mem_free_set(&conn->cached->content_type, stracpy(rb->data));
+end:
+	buf = alloc_read_buffer(conn->data_socket);
+	if (!buf) {
+		close(socket->fd);
+		close(conn->data_socket->fd);
+		abort_connection(conn, S_OUT_OF_MEM);
+		return;
+	}
+	read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data); 
+}
+
 #undef READ_SIZE
 
 
@@ -246,23 +305,19 @@ void
 fsp_protocol_handler(struct connection *conn)
 {
 	int fsp_pipe[2] = { -1, -1 };
+	int header_pipe[2] = { -1, -1 };
 	pid_t cpid;
-	struct read_buffer *buf;
 
-	if (c_pipe(fsp_pipe)) {
+	if (c_pipe(fsp_pipe) || c_pipe(header_pipe)) {
 		int s_errno = errno;
 
 		if (fsp_pipe[0] >= 0) close(fsp_pipe[0]);
 		if (fsp_pipe[1] >= 0) close(fsp_pipe[1]);
+		if (header_pipe[0] >= 0) close(header_pipe[0]);
+		if (header_pipe[1] >= 0) close(header_pipe[1]);
 		abort_connection(conn, -s_errno);
 		return;
 	}
-
-	conn->cached = get_cache_entry(conn->uri);
-	if (!conn->cached) {
-		abort_connection(conn, S_OUT_OF_MEM);
-		return;
-	}
 	conn->from = 0;
 	conn->unrestartable = 1;
 
@@ -272,6 +327,8 @@ fsp_protocol_handler(struct connection *conn)
 
 		close(fsp_pipe[0]);
 		close(fsp_pipe[1]);
+		close(header_pipe[0]);
+		close(header_pipe[1]);
 		retry_connection(conn, -s_errno);
 		return;
 	}
@@ -282,21 +339,27 @@ fsp_protocol_handler(struct connection *conn)
 		close(0);
 		dup2(open("/dev/null", O_RDONLY), 0);
 		close(2);
-		dup2(open("/dev/null", O_RDONLY), 2);
+		dup2(header_pipe[1], 2);
 		close(fsp_pipe[0]);
+		close(header_pipe[0]);
 
 		close_all_non_term_fd();
 		do_fsp(conn);
 
 	} else {
-		conn->socket->fd = fsp_pipe[0];
+		struct read_buffer *buf2;
+
+		conn->data_socket->fd = fsp_pipe[0];
+		conn->socket->fd = header_pipe[0];
 		close(fsp_pipe[1]);
-		buf = alloc_read_buffer(conn->socket);
-		if (!buf) {
+		close(header_pipe[1]);
+		buf2 = alloc_read_buffer(conn->socket);
+		if (!buf2) {
 			close(fsp_pipe[0]);
+			close(header_pipe[0]);
 			abort_connection(conn, S_OUT_OF_MEM);
 			return;
 		}
-		read_from_socket(conn->socket, buf, S_CONN, fsp_got_data);
+		read_from_socket(conn->socket, buf2, S_CONN, fsp_got_header);
 	}
 }

From e8030e09fd4e51e51b7d62bcd711b3a9723ac2a1 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Thu, 26 Jan 2006 18:35:58 +0100
Subject: [PATCH 088/204] Set text/plain for errors

---
 src/protocol/fsp/fsp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 53c3527f..d343d8e1 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -67,6 +67,7 @@ struct module fsp_protocol_module = struct_module(
 static void
 fsp_error(unsigned char *error)
 {
+	fprintf(stderr, "text/plain");
 	puts(error);
 	exit(1);
 }

From 3824ea99a77767be0aabf7cbe882827c183f821d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 01:06:59 +0100
Subject: [PATCH 089/204] Mention API docs, and how to build them

---
 doc/README | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/doc/README b/doc/README
index d47ae375..abb383c9 100644
--- a/doc/README
+++ b/doc/README
@@ -57,7 +57,8 @@ in this directory or it's children.
    submitting patches etc., thus every aspiring developer should take the
    pains to read through it, do not forget to also look for README and similar
    text files in the subdirectories containing the relevant sources for
-   detailed notes regarding given modules/subsystems.
+   detailed notes regarding given modules/subsystems. Additionally, it is
+   possible to build API docs. More about this below.
 
 	The Lua Scripting Book ...................... lua-scripting.txt
 	Events Reference Sheet ...................... events.txt
@@ -94,7 +95,10 @@ and the following man page formats:
  - HTML (asciidoc)
  - man / groff (asciidoc + xmlto)
 
-Note: You do not need to build manpages. They are shipped with ELinks.
+Note: You do not need to build manpages. They are shipped with ELinks. However,
+if you want to have the manpages to match your local configuration and changes
+you can rebuild them (this is mostly an issue with elinks.conf(5) which might
+otherwise contain options that is not supported by the version you install.
 
 Note: You must first build the ELinks binary for "make all-docs" to work
 successfully. The binary is used for getting option documentation.
@@ -103,6 +107,43 @@ The documentation can be installed with:
 
 	$ make install-doc
 
+Building API documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is some starting effort to make it possible to build HTML documentation
+of the APIs presented by the different modules and subsystems in ELinks. To
+build API documentation run:
+
+	$ make api
+
+in the doc/ directory. The API documentation can then be found in the doc/api/
+directory.
+
+NOTE: Currently only few files provides API docs and there is no over-all
+structure of the various APIs.
+
+The API toolchain uses a Perl script (doc/tools/code2doc) to extract info from
+header files and generate text files with AsciiDoc markup. The text files are
+then converted to HTML with AsciiDoc.
+
+To get an idea of how the code markup works take a look at src/dom/stack.h.
+It has a small tag saying that it provides API docs for the dom-stack module:
+
+	/* API Doc :: dom-stack */
+
+The API doc markup should be pretty straight forward. Here is an example of the
+basic structure:
+
+	/** <title>
+	 *
+	 * <content>
+	 */
+
+Only text in comments starting with '/**' are used. If the comment immediately
+preceeds a declaration of some struct, enum, typedef, function, or macro, the
+name of the declared identifier will be used when creating the output to create
+anchors which can be referred to using ref:[].
+
 
 Contributing
 ------------

From 20baf3b207470659314961db54be7ee4bcd3e342 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 02:32:06 +0100
Subject: [PATCH 090/204] Newer versions of AsciiDoc (7.0.5 atleast) needs to
 be passed --unsafe

Detect this in configure and set ASCIIDOC_FLAGS accordingly.
---
 Makefile.config.in | 1 +
 configure.in       | 7 +++++++
 doc/Makefile       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 3b7122a7..af505807 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -46,6 +46,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 host = @host@
 
 ASCIIDOC = @ASCIIDOC@
+ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CC = @CC@
diff --git a/configure.in b/configure.in
index 818932b1..e8f2b268 100644
--- a/configure.in
+++ b/configure.in
@@ -66,6 +66,12 @@ if test "x$CONFIG_DOC" != xno; then
 		EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc])
 		EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)])
 		EL_CONFIG(MAN_ASCIIDOC, [HTML])
+
+		echo > config.asciidoc-unsafe.txt
+		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >&/dev/null; then
+			ASCIIDOC_FLAGS=--unsafe
+		fi
+		rm config.asciidoc-unsafe.*
 	fi
 
 	AC_PATH_PROGS(XMLTO, "xmlto")
@@ -87,6 +93,7 @@ if test "x$CONFIG_DOC" != xno; then
 	fi
 fi
 
+AC_SUBST(ASCIIDOC_FLAGS)
 AC_SUBST(CONFIG_ASCIIDOC)
 AC_SUBST(CONFIG_POD2HTML)
 AC_SUBST(CONFIG_XMLTO)
diff --git a/doc/Makefile b/doc/Makefile
index 1706b631..872fbeb6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,7 +13,7 @@ HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html
 PDF_DIR  = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf
 
 ASCIIDOC_CONF  = $(srcdir)asciidoc.conf
-ASCIIDOC_FLAGS = -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
+ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
 
 #############################################################################
 # Build files

From c4d22f9c24bf65cc88dcf75e86f276195df35725 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 02:32:48 +0100
Subject: [PATCH 091/204] Fix shell scripts to work better with FreeBSD's sed

---
 doc/tools/help2doc | 6 +++---
 doc/tools/keys2doc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/tools/help2doc b/doc/tools/help2doc
index 2b48da28..1f8e4937 100755
--- a/doc/tools/help2doc
+++ b/doc/tools/help2doc
@@ -138,9 +138,9 @@ do
 
 		[a-z_-]*[.a-z_-]*)
 			parse_description=1
-			path="`echo $line | sed -e 's/\([a-z-][^ ]*\).*/\1/'`"
-			typeid="`echo $line | sed -e 's/[ ]*[a-z-][^ ]* \([^ ]*\).*/\1/'`"
-			default="`echo \"$line\" | sed -e 's/[^(]*(\(.*\))/\1/'`"
+			path="$(echo "$line" | sed -e 's/\([a-z-][^ ]*\).*/\1/')"
+			typeid="$(echo "$line" | sed -n 's/[ ]*[a-z-][^ ]* \([^ ]*\).*/\1/p')"
+			default="$(echo "$line" | sed -n 's/.*[^(]*(\(.*\))/\1/p')"
 			print_option_type "$path" "$typeid" "$default"
 			if test "$typeid" = "<num>";
 			then
diff --git a/doc/tools/keys2doc b/doc/tools/keys2doc
index 5e95eebc..eee3e046 100755
--- a/doc/tools/keys2doc
+++ b/doc/tools/keys2doc
@@ -75,7 +75,7 @@ print_keymap_defaults()
 	| while read entry
 	do
 		entry=$(echo "$entry" | sed 's/.*{ { //' | sed 's/ }//')
-		key=$(echo "$entry" | sed "s/\(KBD_[^,]*\|'.*'\),.*/\1/")
+		key=$(echo "$entry" | sed "s/.*\(KBD_[^,]*\|'.*'\),.*/\1/")
 		modifier=$(echo "$entry" | sed "s/.*KBD_MOD_\([A-Z_]*\).*/\1/")
 		action=$(echo "$entry" | sed "s/.*,.*\(ACT_$KEYMAP\)_\([A-Z_]*\).*/\2/")
 		action=$(grep " $action," "$CONFIGDIR/actions-$keymap.inc" \
@@ -83,7 +83,7 @@ print_keymap_defaults()
 
 		case "$key" in
 		KBD_*)
-			key=$(grep $key $KBDBIND \
+			key=$(grep "$key" $KBDBIND \
 			    | grep '^[[:space:]]{ "' \
 			    | sed 's/.*"\([^"]*\)".*/\1/')
 			;;

From c18740b30de7e2cfa3932bb893d3fc9cfc05a98b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 02:52:44 +0100
Subject: [PATCH 092/204] Revert FreeBSD sed changes; they don't work for GNU
 sed

---
 doc/tools/help2doc | 6 +++---
 doc/tools/keys2doc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/tools/help2doc b/doc/tools/help2doc
index 1f8e4937..2b48da28 100755
--- a/doc/tools/help2doc
+++ b/doc/tools/help2doc
@@ -138,9 +138,9 @@ do
 
 		[a-z_-]*[.a-z_-]*)
 			parse_description=1
-			path="$(echo "$line" | sed -e 's/\([a-z-][^ ]*\).*/\1/')"
-			typeid="$(echo "$line" | sed -n 's/[ ]*[a-z-][^ ]* \([^ ]*\).*/\1/p')"
-			default="$(echo "$line" | sed -n 's/.*[^(]*(\(.*\))/\1/p')"
+			path="`echo $line | sed -e 's/\([a-z-][^ ]*\).*/\1/'`"
+			typeid="`echo $line | sed -e 's/[ ]*[a-z-][^ ]* \([^ ]*\).*/\1/'`"
+			default="`echo \"$line\" | sed -e 's/[^(]*(\(.*\))/\1/'`"
 			print_option_type "$path" "$typeid" "$default"
 			if test "$typeid" = "<num>";
 			then
diff --git a/doc/tools/keys2doc b/doc/tools/keys2doc
index eee3e046..5e95eebc 100755
--- a/doc/tools/keys2doc
+++ b/doc/tools/keys2doc
@@ -75,7 +75,7 @@ print_keymap_defaults()
 	| while read entry
 	do
 		entry=$(echo "$entry" | sed 's/.*{ { //' | sed 's/ }//')
-		key=$(echo "$entry" | sed "s/.*\(KBD_[^,]*\|'.*'\),.*/\1/")
+		key=$(echo "$entry" | sed "s/\(KBD_[^,]*\|'.*'\),.*/\1/")
 		modifier=$(echo "$entry" | sed "s/.*KBD_MOD_\([A-Z_]*\).*/\1/")
 		action=$(echo "$entry" | sed "s/.*,.*\(ACT_$KEYMAP\)_\([A-Z_]*\).*/\2/")
 		action=$(grep " $action," "$CONFIGDIR/actions-$keymap.inc" \
@@ -83,7 +83,7 @@ print_keymap_defaults()
 
 		case "$key" in
 		KBD_*)
-			key=$(grep "$key" $KBDBIND \
+			key=$(grep $key $KBDBIND \
 			    | grep '^[[:space:]]{ "' \
 			    | sed 's/.*"\([^"]*\)".*/\1/')
 			;;

From 9d91994f3cc7118612a37e8af5f20437423b1609 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 07:41:42 +0100
Subject: [PATCH 093/204] Propone updating the scanner->state until
 incompleteness has been checked

That way the scanner state is meaningful when resuming during incremental
parsing.
---
 src/dom/sgml/scanner.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index af90a27b..f4a6578a 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -439,6 +439,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 	enum sgml_token_type type = SGML_TOKEN_GARBAGE;
 	int real_length = -1;
 	int possibly_incomplete = 1;
+	enum sgml_scanner_state scanner_state = scanner->state;
 
 	token->string.string = string++;
 
@@ -451,7 +452,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			string--;
 			real_length = 0;
 			type = SGML_TOKEN_TAG_END;
-			scanner->state = SGML_STATE_TEXT;
+			scanner_state = SGML_STATE_TEXT;
 
 			/* We are creating a 'virtual' that has no source. */
 			possibly_incomplete = 0;
@@ -476,8 +477,8 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 					/* We found the end. */
 					possibly_incomplete = 0;
 				}
-				scanner->state = SGML_STATE_ELEMENT;
 				type = SGML_TOKEN_ELEMENT_BEGIN;
+				scanner_state = SGML_STATE_ELEMENT;
 			}
 
 		} else if (*string == '!') {
@@ -527,7 +528,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 
 			type = map_dom_scanner_string(scanner, pos, string, base);
 
-			scanner->state = SGML_STATE_PROC_INST;
+			scanner_state = SGML_STATE_PROC_INST;
 
 			real_length = string - token->string.string;
 			skip_sgml_space(scanner, &string);
@@ -563,8 +564,9 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 				possibly_incomplete = 0;
 			}
 
-			if (type != SGML_TOKEN_GARBAGE)
-				scanner->state = SGML_STATE_TEXT;
+			if (type != SGML_TOKEN_GARBAGE) {
+				scanner_state = SGML_STATE_TEXT;
+			}
 
 		} else {
 			/* Alien < > stuff so ignore it */
@@ -594,7 +596,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 
 		type = SGML_TOKEN_TAG_END;
 		assert(scanner->state == SGML_STATE_ELEMENT);
-		scanner->state = SGML_STATE_TEXT;
+		scanner_state = SGML_STATE_TEXT;
 
 	} else if (first_char == '/') {
 		/* We allow '/' inside elements and only consider it as an end
@@ -611,7 +613,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			real_length = 0;
 			type = SGML_TOKEN_ELEMENT_EMPTY_END;
 			assert(scanner->state == SGML_STATE_ELEMENT);
-			scanner->state = SGML_STATE_TEXT;
+			scanner_state = SGML_STATE_TEXT;
 
 			/* We found the end. */
 			possibly_incomplete = 0;
@@ -678,6 +680,10 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 		}
 	}
 
+	/* Only apply the state change if the token was not abandoned because
+	 * it was incomplete. */
+	scanner->state = scanner_state;
+
 	token->type = type;
 	token->string.length = real_length >= 0 ? real_length : string - token->string.string;
 	token->precedence = get_sgml_precedence(type);

From b25cd27232312563ab36fa5235fafc2eed274d8e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 07:47:17 +0100
Subject: [PATCH 094/204] Add support incremental parsing

That is, add the last parts that saves and resumes previous incomplete
parsing states. Now the parsing stack push handler checks if the parent has
a resume flag set. When set, the incomplete fragment to resume is restored
and the new source fragment appended and parsing is continued.
---
 src/dom/sgml/parser.c | 88 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 75 insertions(+), 13 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 26a021fa..bda43c5c 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -412,8 +412,6 @@ parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 	if (!node || push_dom_node(&parser->parsing, node) != DOM_STACK_CODE_OK)
 		return SGML_PARSER_CODE_MEM_ALLOC;
 
-	pop_dom_node(&parser->parsing);
-
 	return parser->code;
 }
 
@@ -429,7 +427,9 @@ parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 struct sgml_parsing_state {
 	struct dom_scanner scanner;
 	struct dom_node *node;
+	struct dom_string incomplete;
 	size_t depth;
+	unsigned int resume:1;
 };
 
 enum dom_stack_code
@@ -441,13 +441,67 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 	int complete = !!(parser->flags & SGML_PARSER_COMPLETE);
 	int incremental = !!(parser->flags & SGML_PARSER_INCREMENTAL);
 	int detect_errors = !!(parser->flags & SGML_PARSER_DETECT_ERRORS);
+	struct dom_string *string = &node->string;
+	struct dom_scanner_token *token;
+	struct dom_string incomplete;
+	enum sgml_scanner_state scanner_state = SGML_STATE_TEXT;
 
 	parsing->depth = parser->stack.depth;
-	get_dom_stack_top(&parser->stack)->immutable = 1;
-	init_dom_scanner(&parsing->scanner, &sgml_scanner_info, &node->string,
-			 SGML_STATE_TEXT, count_lines, complete, incremental,
+
+	if (stack->depth > 1) {
+		struct sgml_parsing_state *parent = &parsing[-1];
+
+		if (parent->resume) {
+			assert(is_dom_string_set(&parent->incomplete));
+
+			if (!add_to_dom_string(&parent->incomplete,
+					       string->string, string->length)) {
+				parser->code = SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_STACK_CODE_OK;
+			}
+
+			string = &parent->incomplete;
+			scanner_state = parent->scanner.state;
+
+			/* Pop down to the parent. */
+			parsing = parent;
+			parsing->resume = 0;
+			pop_dom_node(stack);
+		}
+	}
+
+	init_dom_scanner(&parsing->scanner, &sgml_scanner_info, string,
+			 scanner_state, count_lines, complete, incremental,
 			 detect_errors);
-	parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
+
+	{
+		int immutable = get_dom_stack_top(&parser->stack)->immutable;
+
+		get_dom_stack_top(&parser->stack)->immutable = 1;
+		parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
+		get_dom_stack_top(&parser->stack)->immutable = !!immutable;
+	}
+
+	if (complete || parser->code != SGML_PARSER_CODE_INCOMPLETE) {
+		pop_dom_node(&parser->parsing);
+		return DOM_STACK_CODE_OK;
+	}
+
+	token = get_dom_scanner_token(&parsing->scanner);
+	assert(token && token->type == SGML_TOKEN_INCOMPLETE);
+
+	string = &token->string;
+
+	set_dom_string(&incomplete, NULL, 0);
+
+	if (!init_dom_string(&incomplete, string->string, string->length)) {
+		parser->code = SGML_PARSER_CODE_MEM_ALLOC;
+		return DOM_STACK_CODE_OK;
+	}
+
+	done_dom_string(&parsing->incomplete);
+	set_dom_string(&parsing->incomplete, incomplete.string, incomplete.length);
+	parsing->resume = 1;
 
 	return DOM_STACK_CODE_OK;
 }
@@ -458,14 +512,20 @@ sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 	struct sgml_parser *parser = get_sgml_parser(stack);
 	struct sgml_parsing_state *parsing = data;
 
-	/* Pop the stack back to the state it was in. This includes cleaning
-	 * away even immutable states left on the stack. */
-	while (parsing->depth < parser->stack.depth) {
-		get_dom_stack_top(&parser->stack)->immutable = 0;
-		pop_dom_node(&parser->stack);
+	/* Only clean up the stack if complete so that we get proper nesting. */
+	if (parser->flags & SGML_PARSER_COMPLETE) {
+		/* Pop the stack back to the state it was in. This includes cleaning
+		 * away even immutable states left on the stack. */
+		while (parsing->depth < parser->stack.depth) {
+			get_dom_stack_top(&parser->stack)->immutable = 0;
+			pop_dom_node(&parser->stack);
+		}
+		/* It's bigger than when calling done_sgml_parser() in the middle of an
+		 * incomplete parsing. */
+		assert(parsing->depth == parser->stack.depth);
 	}
 
-	assert(parsing->depth == parser->stack.depth);
+	done_dom_string(&parsing->incomplete);
 
 	return DOM_STACK_CODE_OK;
 }
@@ -611,8 +671,10 @@ init_sgml_parser(enum sgml_parser_type type, enum sgml_document_type doctype,
 void
 done_sgml_parser(struct sgml_parser *parser)
 {
-	done_dom_stack(&parser->stack);
+	while (!dom_stack_is_empty(&parser->parsing))
+		pop_dom_node(&parser->parsing);
 	done_dom_stack(&parser->parsing);
+	done_dom_stack(&parser->stack);
 	done_dom_string(&parser->uri);
 	mem_free(parser);
 }

From 0f8aa77ebbb2d040739f0b4fcf416fa72762eb39 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 27 Jan 2006 07:49:15 +0100
Subject: [PATCH 095/204] Add test for incremental SGML parsing

It is a loop that parses the same small document with various read sizes.
The sgml-parser program is updated to take --stdin option taking a the read
size as a required parameter.
---
 src/dom/test/sgml-parser.c                | 62 ++++++++++++++++++++---
 src/dom/test/test-sgml-parser-incremental | 49 ++++++++++++++++++
 2 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100755 src/dom/test/test-sgml-parser-incremental

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 0032db85..320758a6 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -266,6 +266,7 @@ main(int argc, char *argv[])
 	enum dom_config_flag normalize_flags = 0;
 	int normalize = 0;
 	int complete = 1;
+	size_t read_stdin = 0;
 	struct dom_string uri = INIT_DOM_STRING("dom://test", -1);
 	struct dom_string source = INIT_DOM_STRING("(no source)", -1);
 	int i;
@@ -302,6 +303,20 @@ main(int argc, char *argv[])
 				set_dom_string(&source, argv[i], strlen(argv[i]));
 			}
 
+		} else if (!strncmp(arg, "stdin", 5)) {
+			arg += 5;
+			if (*arg == '=') {
+				arg++;
+				read_stdin = atoi(arg);
+				set_dom_string(&source, arg, strlen(arg));
+			} else {
+				i++;
+				if (i >= argc)
+					die("--stdin expects a number");
+				read_stdin = atoi(argv[i]);
+			}
+			flags |= SGML_PARSER_INCREMENTAL;
+
 		} else if (!strncmp(arg, "normalize", 9)) {
 			arg += 9;
 			if (*arg == '=') {
@@ -343,16 +358,49 @@ main(int argc, char *argv[])
 	else
 		add_dom_stack_context(&parser->stack, NULL, &sgml_parser_test_context_info);
 
-	code = parse_sgml(parser, source.string, source.length, complete);
+	if (read_stdin > 0) {
+		unsigned char *buffer;
+
+		buffer = mem_alloc(read_stdin);
+		if (!buffer)
+			die("Cannot allocate buffer");
+
+		complete = 0;
+
+		while (!complete) {
+			size_t size = fread(buffer, 1, read_stdin, stdin);
+
+			if (ferror(stdin))
+				die("error reading from stdin");
+
+			complete = feof(stdin);
+
+			code = parse_sgml(parser, buffer, size, complete);
+			switch (code) {
+			case SGML_PARSER_CODE_OK:
+				break;
+
+			case SGML_PARSER_CODE_INCOMPLETE:
+				if (!complete) break;
+				/* Error */
+			default:
+				complete = 1;
+			}
+		}
+
+		mem_free(buffer);
+
+	} else {
+		code = parse_sgml(parser, source.string, source.length, complete);
+	}
+
 	if (parser->root) {
-		size_t root_offset = parser->stack.depth - 1;
+		assert(!complete || parser->stack.depth > 0);
 
-		assert(!complete || root_offset == 0);
-
-		get_dom_stack_state(&parser->stack, root_offset)->immutable = 0;
-
-		while (!dom_stack_is_empty(&parser->stack))
+		while (!dom_stack_is_empty(&parser->stack)) {
+			get_dom_stack_top(&parser->stack)->immutable = 0;
 			pop_dom_node(&parser->stack);
+		}
 
 		if (normalize) {
 			struct dom_stack stack;
diff --git a/src/dom/test/test-sgml-parser-incremental b/src/dom/test/test-sgml-parser-incremental
new file mode 100755
index 00000000..a9896e52
--- /dev/null
+++ b/src/dom/test/test-sgml-parser-incremental
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Jonas Fonseca
+#
+
+test_description='Test incremental parsing of SGML documents.
+
+This test checks if the SGML parser correctly recovers during incremental
+parsing.
+'
+
+. "$TEST_LIB"
+
+test_output_equals () {
+	desc="$1"; shift
+	size="$1"; shift
+	src="$1"; shift
+	out="$1"; shift
+
+	URI="test:$(echo "$desc" | sed '
+		s/^[ \t]*\[[^]]*\][ \t]*//;
+		s/[:., \t][:., \t]*/-/g;
+		s/_/-/g;
+		# *cough*
+		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
+		s/[^a-zA-Z0-9-]//g;')"
+
+	echo "$src" | sgml-parser --uri "$URI" --stdin "$size" \
+	| sed -e 's/^  //' | sed -n '$d;p' > output
+	echo "#document: $URI" > expected
+	echo "$out" | sed -n '2,$p' >> expected
+
+	test_expect_success "$desc" 'cmp output expected' 
+}
+
+for i in 25 20 15 10 9 8 7 6 5 4 3 2 1; do
+	test_output_equals \
+	"Incrementally parse a small document reading $i bytes at a time." \
+	"$i" \
+	'<html><body><p>Hello World!</p></body></html>' \
+	'
+element: html
+  element: body
+    element: p
+      #text: Hello World!'
+
+done
+
+test_done

From 6761b3995d9e148893184f8c08d28d7b62fd931c Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 10:08:19 +0100
Subject: [PATCH 096/204] Avoided code duplication

---
 src/ecmascript/ecmascript.c   | 106 ++++++++++++++++++++++++++++++++--
 src/ecmascript/see.c          |  73 -----------------------
 src/ecmascript/spidermonkey.c |  74 ------------------------
 3 files changed, 100 insertions(+), 153 deletions(-)

diff --git a/src/ecmascript/ecmascript.c b/src/ecmascript/ecmascript.c
index 27ec5469..1ec1a87e 100644
--- a/src/ecmascript/ecmascript.c
+++ b/src/ecmascript/ecmascript.c
@@ -12,6 +12,8 @@
 #include "document/document.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
+#include "ecmascript/see.h"
+#include "ecmascript/spidermonkey.h"
 #include "intl/gettext/libintl.h"
 #include "main/module.h"
 #include "protocol/uri.h"
@@ -24,12 +26,6 @@
 #include "viewer/text/form.h" /* <-ecmascript_reset_state() */
 #include "viewer/text/vs.h"
 
-#ifdef CONFIG_ECMASCRIPT_SEE
-#include "ecmascript/see.h"
-#elif defined(CONFIG_ECMASCRIPT_SMJS)
-#include "ecmascript/spidermonkey.h"
-#endif
-
 
 /* TODO: We should have some kind of ACL for the scripts - i.e. ability to
  * disallow the scripts to open new windows (or so that the windows are always
@@ -66,6 +62,104 @@ static struct option_info ecmascript_options[] = {
 	NULL_OPTION_INFO,
 };
 
+void
+ecmascript_init(struct module *module)
+{
+#ifdef CONFIG_ECMASCRIPT_SEE
+	see_init();
+#else
+	spidermonkey_init();
+#endif
+}
+
+void
+ecmascript_done(struct module *module)
+{
+#ifdef CONFIG_ECMASCRIPT_SEE
+	see_done();
+#else
+	spidermonkey_done();
+#endif
+}
+
+struct ecmascript_interpreter *
+ecmascript_get_interpreter(struct view_state *vs)
+{
+	struct ecmascript_interpreter *interpreter;
+
+	assert(vs);
+
+	interpreter = mem_calloc(1, sizeof(*interpreter));
+	if (!interpreter)
+		return NULL;
+
+	interpreter->vs = vs;
+	init_list(interpreter->onload_snippets);
+#ifdef CONFIG_ECMASCRIPT_SEE
+	see_get_interpreter(interpreter);
+#else
+	spidermonkey_get_interpreter(interpreter);
+#endif
+	return interpreter;
+}
+
+void
+ecmascript_put_interpreter(struct ecmascript_interpreter *interpreter)
+{
+	assert(interpreter);
+#ifdef CONFIG_ECMASCRIPT_SEE
+	see_put_interpreter(interpreter);
+#else
+	spidermonkey_put_interpreter(interpreter);
+#endif
+	free_string_list(&interpreter->onload_snippets);
+	interpreter->vs->ecmascript = NULL;
+	mem_free(interpreter);
+}
+
+void
+ecmascript_eval(struct ecmascript_interpreter *interpreter,
+                struct string *code)
+{
+	if (!get_ecmascript_enable())
+		return;
+	assert(interpreter);
+#ifdef CONFIG_ECMASCRIPT_SEE
+	see_eval(interpreter, code);
+#else
+	spidermonkey_eval(interpreter, code);
+#endif
+}
+
+unsigned char *
+ecmascript_eval_stringback(struct ecmascript_interpreter *interpreter,
+			   struct string *code)
+{
+	if (!get_ecmascript_enable())
+		return NULL;
+	assert(interpreter);
+#ifdef CONFIG_ECMASCRIPT_SEE
+	return see_eval_stringback(interpreter, code);
+#else
+	return spidermonkey_eval_stringback(interpreter, code);
+#endif
+}
+
+int
+ecmascript_eval_boolback(struct ecmascript_interpreter *interpreter,
+			 struct string *code)
+{
+	if (!get_ecmascript_enable())
+		return -1;
+	assert(interpreter);
+#ifdef CONFIG_ECMASCRIPT_SEE
+	return see_eval_boolback(interpreter, code);
+#else
+	return spidermonkey_eval_boolback(interpreter, code);
+#endif
+}
+
+
 void
 ecmascript_reset_state(struct view_state *vs)
 {
diff --git a/src/ecmascript/see.c b/src/ecmascript/see.c
index e751ecf0..d8654853 100644
--- a/src/ecmascript/see.c
+++ b/src/ecmascript/see.c
@@ -56,79 +56,6 @@
 
 /* TODO? Are there any which need to be implemented? */
 
-
-
-/*** The ELinks interface */
-
-void
-ecmascript_init(struct module *module)
-{
-	see_init();
-}
-
-void
-ecmascript_done(struct module *module)
-{
-	see_done();
-}
-
-struct ecmascript_interpreter *
-ecmascript_get_interpreter(struct view_state *vs)
-{
-	struct ecmascript_interpreter *interpreter;
-
-	assert(vs);
-
-	interpreter = mem_calloc(1, sizeof(*interpreter));
-	if (!interpreter)
-		return NULL;
-
-	interpreter->vs = vs;
-	init_list(interpreter->onload_snippets);
-	see_get_interpreter(interpreter);
-
-	return interpreter;
-}
-
-void
-ecmascript_put_interpreter(struct ecmascript_interpreter *interpreter)
-{
-	assert(interpreter);
-	see_put_interpreter(interpreter);
-	free_string_list(&interpreter->onload_snippets);
-	mem_free(interpreter);
-}
-
-void
-ecmascript_eval(struct ecmascript_interpreter *interpreter,
-                struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return;
-	assert(interpreter);
-	see_eval(interpreter, code);
-}
-
-unsigned char *
-ecmascript_eval_stringback(struct ecmascript_interpreter *interpreter,
-			   struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return NULL;
-	assert(interpreter);
-	return see_eval_stringback(interpreter, code);
-}
-
-int
-ecmascript_eval_boolback(struct ecmascript_interpreter *interpreter,
-			 struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return -1;
-	assert(interpreter);
-	return see_eval_boolback(interpreter, code);
-}
-
 void
 see_init(void)
 {
diff --git a/src/ecmascript/spidermonkey.c b/src/ecmascript/spidermonkey.c
index 00ca51e9..5d2aad3f 100644
--- a/src/ecmascript/spidermonkey.c
+++ b/src/ecmascript/spidermonkey.c
@@ -55,82 +55,8 @@
 
 /* TODO? Are there any which need to be implemented? */
 
-
-
-/*** The ELinks interface */
-
 static JSRuntime *jsrt;
 
-void
-ecmascript_init(struct module *module)
-{
-	spidermonkey_init();
-}
-
-void
-ecmascript_done(struct module *module)
-{
-	spidermonkey_done();
-}
-
-struct ecmascript_interpreter *
-ecmascript_get_interpreter(struct view_state *vs)
-{
-	struct ecmascript_interpreter *interpreter;
-
-	assert(vs);
-
-	interpreter = mem_calloc(1, sizeof(*interpreter));
-	if (!interpreter)
-		return NULL;
-
-	interpreter->vs = vs;
-	init_list(interpreter->onload_snippets);
-	spidermonkey_get_interpreter(interpreter);
-
-	return interpreter;
-}
-
-void
-ecmascript_put_interpreter(struct ecmascript_interpreter *interpreter)
-{
-	assert(interpreter);
-	spidermonkey_put_interpreter(interpreter);
-	free_string_list(&interpreter->onload_snippets);
-	mem_free(interpreter);
-}
-
-void
-ecmascript_eval(struct ecmascript_interpreter *interpreter,
-                struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return;
-	assert(interpreter);
-	spidermonkey_eval(interpreter, code);
-}
-
-unsigned char *
-ecmascript_eval_stringback(struct ecmascript_interpreter *interpreter,
-			   struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return NULL;
-	assert(interpreter);
-	return spidermonkey_eval_stringback(interpreter, code);
-}
-
-int
-ecmascript_eval_boolback(struct ecmascript_interpreter *interpreter,
-			 struct string *code)
-{
-	if (!get_ecmascript_enable())
-		return -1;
-	assert(interpreter);
-	return spidermonkey_eval_boolback(interpreter, code);
-}
-
-
 static void
 error_reporter(JSContext *ctx, const char *message, JSErrorReport *report)
 {

From 2f0490cb04fb4208aa321fb9d74ecf5309f662ae Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 10:26:58 +0100
Subject: [PATCH 097/204] Eval embedded scripts at once

---
 src/document/document.h            |  3 +++
 src/document/html/parser/general.c | 24 ++++++++++++++++++++++++
 src/document/renderer.c            |  8 ++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/document/document.h b/src/document/document.h
index 845c15fb..7f357fe0 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -16,6 +16,7 @@ struct frame_desc;
 struct frameset_desc;
 struct module;
 struct screen_char;
+struct view_state;
 
 /* Nodes are used for marking areas of text on the document canvas as
  * searchable. */
@@ -147,6 +148,8 @@ struct document {
 	 * dependencies between the various entries so nothing gets removed
 	 * unneeded. */
 	struct uri_list ecmascript_imports;
+	/* For ecmascript access */
+	struct view_state *vs;
 #endif
 #ifdef CONFIG_CSS
 	/* FIXME: We should externally maybe using cache_entry store the
diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index f34cf008..9a854a8f 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -17,6 +17,7 @@
 
 #include "config/options.h"
 #include "document/css/apply.h"
+#include "document/document.h"
 #include "document/html/frames.h"
 #include "document/html/parser/general.h"
 #include "document/html/parser/link.h"
@@ -26,6 +27,7 @@
 #include "document/html/renderer.h"
 #include "document/html/tables.h"
 #include "document/options.h"
+#include "ecmascript/ecmascript.h"
 #include "intl/charsets.h"
 #include "protocol/uri.h"
 #include "terminal/draw.h"
@@ -37,6 +39,7 @@
 #include "util/memdebug.h"
 #include "util/memory.h"
 #include "util/string.h"
+#include "viewer/text/vs.h"
 
 /* Unsafe macros */
 #include "document/html/internal.h"
@@ -343,8 +346,29 @@ imported:
 	}
 
 	if (html_context->part->document && *html != '^') {
+		struct string code, ret;
+		struct part *part = html_context->part;
+		struct document *document = part->document;
+		struct view_state *vs = document->vs;
+		struct ecmascript_interpreter *interpreter = vs->ecmascript;
+
+		if (!interpreter) {
+			ecmascript_reset_state(vs);
+			interpreter = vs->ecmascript;
+		}
+		if (!interpreter) return;
+
+		if (!init_string(&code) || !init_string(&ret))
+			return;
+		add_bytes_to_string(&code, html, *end - html);
+
+		ecmascript_eval(interpreter, &code);
+		done_string(&code);
+	
+#if 0
 		add_to_string_list(&html_context->part->document->onload_snippets,
 		                   html, *end - html);
+#endif
 	}
 #endif
 }
diff --git a/src/document/renderer.c b/src/document/renderer.c
index ad458caa..4ec6163c 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -284,7 +284,6 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 	    options->gradual_rerendering, struri(vs->uri),
 	    doc_view, doc_view->name, vs);
 #endif
-
 	name = doc_view->name;
 	doc_view->name = NULL;
 
@@ -328,13 +327,18 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 	document = get_cached_document(cached, options);
 	if (document) {
 		doc_view->document = document;
+#ifdef CONFIG_ECMASCRIPT
+		document->vs = vs;
+#endif
 	} else {
 		document = init_document(cached, options);
 		if (!document) return;
 		doc_view->document = document;
 
 		shrink_memory(0);
-
+#ifdef CONFIG_ECMASCRIPT
+		document->vs = vs;
+#endif
 		render_encoded_document(cached, document);
 		sort_links(document);
 		if (!document->title) {

From 62d42380f8dfd91c36bf54950f3630f37997b363 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 12:07:45 +0100
Subject: [PATCH 098/204] Added ret param for document.write

---
 src/document/html/parser/general.c | 2 +-
 src/document/renderer.c            | 4 ++--
 src/ecmascript/ecmascript.c        | 6 +++---
 src/ecmascript/ecmascript.h        | 4 +++-
 src/ecmascript/see.c               | 5 ++++-
 src/ecmascript/see.h               | 2 +-
 src/ecmascript/see/window.h        | 1 +
 src/ecmascript/spidermonkey.c      | 5 ++++-
 src/ecmascript/spidermonkey.h      | 2 +-
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 9a854a8f..c96b79cf 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -362,7 +362,7 @@ imported:
 			return;
 		add_bytes_to_string(&code, html, *end - html);
 
-		ecmascript_eval(interpreter, &code);
+		ecmascript_eval(interpreter, &code, &ret);
 		done_string(&code);
 	
 #if 0
diff --git a/src/document/renderer.c b/src/document/renderer.c
index 4ec6163c..37946032 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -129,7 +129,7 @@ process_snippets(struct ecmascript_interpreter *interpreter,
 
 		if (*string->source != '^') {
 			/* Evaluate <script>code</script> snippet */
-			ecmascript_eval(interpreter, string);
+			ecmascript_eval(interpreter, string, NULL);
 			continue;
 		}
 
@@ -194,7 +194,7 @@ process_snippets(struct ecmascript_interpreter *interpreter,
 		if (fragment) {
 			struct string code = INIT_STRING(fragment->data, fragment->length);
 
-			ecmascript_eval(interpreter, &code);
+			ecmascript_eval(interpreter, &code, NULL);
 		}
 	}
 }
diff --git a/src/ecmascript/ecmascript.c b/src/ecmascript/ecmascript.c
index 1ec1a87e..065c65c1 100644
--- a/src/ecmascript/ecmascript.c
+++ b/src/ecmascript/ecmascript.c
@@ -119,15 +119,15 @@ ecmascript_put_interpreter(struct ecmascript_interpreter *interpreter)
 
 void
 ecmascript_eval(struct ecmascript_interpreter *interpreter,
-                struct string *code)
+                struct string *code, struct string *ret)
 {
 	if (!get_ecmascript_enable())
 		return;
 	assert(interpreter);
 #ifdef CONFIG_ECMASCRIPT_SEE
-	see_eval(interpreter, code);
+	see_eval(interpreter, code, ret);
 #else
-	spidermonkey_eval(interpreter, code);
+	spidermonkey_eval(interpreter, code, ret);
 #endif
 }
 
diff --git a/src/ecmascript/ecmascript.h b/src/ecmascript/ecmascript.h
index 58429e03..002683e1 100644
--- a/src/ecmascript/ecmascript.h
+++ b/src/ecmascript/ecmascript.h
@@ -18,6 +18,8 @@ struct view_state;
 struct ecmascript_interpreter {
 	struct view_state *vs;
 	void *backend_data;
+	/* Used by document.write() */
+	struct string *ret;
 	time_t exec_start;
 
 	/* This is a cross-rerenderings accumulator of
@@ -57,7 +59,7 @@ void ecmascript_put_interpreter(struct ecmascript_interpreter *interpreter);
 
 void ecmascript_reset_state(struct view_state *vs);
 
-void ecmascript_eval(struct ecmascript_interpreter *interpreter, struct string *code);
+void ecmascript_eval(struct ecmascript_interpreter *interpreter, struct string *code, struct string *ret);
 unsigned char *ecmascript_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
 /* Returns -1 if undefined. */
 int ecmascript_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
diff --git a/src/ecmascript/see.c b/src/ecmascript/see.c
index d8654853..dbe1aeba 100644
--- a/src/ecmascript/see.c
+++ b/src/ecmascript/see.c
@@ -96,7 +96,7 @@ see_put_interpreter(struct ecmascript_interpreter *interpreter)
 
 void
 see_eval(struct ecmascript_interpreter *interpreter,
-                  struct string *code)
+                  struct string *code, struct string *ret)
 {
 
 	struct SEE_interpreter *interp = interpreter->backend_data;
@@ -106,6 +106,7 @@ see_eval(struct ecmascript_interpreter *interpreter,
 	struct SEE_value result;
 
 	g->exec_start = time(NULL);
+	g->ret = ret;
 	SEE_TRY(interp, try_ctxt) {
 		SEE_Global_eval(interp, input, &result);
 	}
@@ -130,6 +131,7 @@ see_eval_stringback(struct ecmascript_interpreter *interpreter,
 	unsigned char *volatile string = NULL;
 
 	g->exec_start = time(NULL);
+	g->ret = NULL;
 	SEE_TRY(interp, try_ctxt) {
 		SEE_Global_eval(interp, input, &result);
 		if (SEE_VALUE_GET_TYPE(&result) != SEE_NULL)
@@ -158,6 +160,7 @@ see_eval_boolback(struct ecmascript_interpreter *interpreter,
 	SEE_int32_t volatile res = 0;
 
 	g->exec_start = time(NULL);
+	g->ret = NULL;
 	SEE_TRY(interp, try_ctxt) {
 		SEE_Global_eval(interp, input, &result);
 		/* history.back() returns SEE_NULL */
diff --git a/src/ecmascript/see.h b/src/ecmascript/see.h
index 8d75c6e2..0c7a08b5 100644
--- a/src/ecmascript/see.h
+++ b/src/ecmascript/see.h
@@ -10,7 +10,7 @@ void see_done();
 void *see_get_interpreter(struct ecmascript_interpreter *interpreter);
 void see_put_interpreter(struct ecmascript_interpreter *interpreter);
 
-void see_eval(struct ecmascript_interpreter *interpreter, struct string *code);
+void see_eval(struct ecmascript_interpreter *interpreter, struct string *code, struct string *ret);
 unsigned char *see_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
 int see_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
 
diff --git a/src/ecmascript/see/window.h b/src/ecmascript/see/window.h
index 0e52e651..f7a7e4d1 100644
--- a/src/ecmascript/see/window.h
+++ b/src/ecmascript/see/window.h
@@ -17,6 +17,7 @@ struct js_window_object {
 struct global_object {
 	struct SEE_interpreter interp;
 	struct js_window_object *win;
+	struct string *ret;
 	int exec_start;
 	int max_exec_time;
 };
diff --git a/src/ecmascript/spidermonkey.c b/src/ecmascript/spidermonkey.c
index 5d2aad3f..85d7e9d3 100644
--- a/src/ecmascript/spidermonkey.c
+++ b/src/ecmascript/spidermonkey.c
@@ -239,7 +239,7 @@ spidermonkey_put_interpreter(struct ecmascript_interpreter *interpreter)
 
 void
 spidermonkey_eval(struct ecmascript_interpreter *interpreter,
-                  struct string *code)
+                  struct string *code, struct string *ret)
 {
 	JSContext *ctx;
 	jsval rval;
@@ -247,6 +247,7 @@ spidermonkey_eval(struct ecmascript_interpreter *interpreter,
 	assert(interpreter);
 	ctx = interpreter->backend_data;
 	setup_safeguard(interpreter, ctx);
+	interpreter->ret = ret;
 	JS_EvaluateScript(ctx, JS_GetGlobalObject(ctx),
 	                  code->source, code->length, "", 0, &rval);
 }
@@ -262,6 +263,7 @@ spidermonkey_eval_stringback(struct ecmascript_interpreter *interpreter,
 	assert(interpreter);
 	ctx = interpreter->backend_data;
 	setup_safeguard(interpreter, ctx);
+	interpreter->ret = NULL;
 	if (JS_EvaluateScript(ctx, JS_GetGlobalObject(ctx),
 			      code->source, code->length, "", 0, &rval)
 	    == JS_FALSE) {
@@ -287,6 +289,7 @@ spidermonkey_eval_boolback(struct ecmascript_interpreter *interpreter,
 	assert(interpreter);
 	ctx = interpreter->backend_data;
 	setup_safeguard(interpreter, ctx);
+	interpreter->ret = NULL;
 	ret = JS_EvaluateScript(ctx, JS_GetGlobalObject(ctx),
 			  code->source, code->length, "", 0, &rval);
 	if (ret == 2) { /* onClick="history.back()" */
diff --git a/src/ecmascript/spidermonkey.h b/src/ecmascript/spidermonkey.h
index b9f2b635..e0920229 100644
--- a/src/ecmascript/spidermonkey.h
+++ b/src/ecmascript/spidermonkey.h
@@ -10,7 +10,7 @@ void spidermonkey_done();
 void *spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter);
 void spidermonkey_put_interpreter(struct ecmascript_interpreter *interpreter);
 
-void spidermonkey_eval(struct ecmascript_interpreter *interpreter, struct string *code);
+void spidermonkey_eval(struct ecmascript_interpreter *interpreter, struct string *code, struct string *ret);
 unsigned char *spidermonkey_eval_stringback(struct ecmascript_interpreter *interpreter, struct string *code);
 int spidermonkey_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
 

From 2551fe3525dc01445cf6709823c3b77d5d868785 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 12:41:35 +0100
Subject: [PATCH 099/204] Render html written by document.write. I'm not sure
 if format_html_part is called right way

---
 src/document/html/parser/general.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index c96b79cf..ee94aa33 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -364,7 +364,13 @@ imported:
 
 		ecmascript_eval(interpreter, &code, &ret);
 		done_string(&code);
-	
+		if (!ret.length) return;
+
+		format_html_part(html_context, ret.source, ret.source + ret.length,
+		 par_format.align, par_format.leftmargin, part->box.width,
+		 document, part->box.x, part->box.y, NULL, part->link_num);
+
+		done_string(&ret);
 #if 0
 		add_to_string_list(&html_context->part->document->onload_snippets,
 		                   html, *end - html);

From 8bf45d0ecee4e9919065465f5ef0d3a3f4fe5d2c Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 13:29:38 +0100
Subject: [PATCH 100/204] Spidermonkey's document.write and document.writeln
 defined. They work, but rendering doesn't work

---
 src/document/html/parser/general.c     |  5 ++--
 src/ecmascript/spidermonkey/document.c | 32 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index ee94aa33..672d27c7 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -366,8 +366,9 @@ imported:
 		done_string(&code);
 		if (!ret.length) return;
 
-		format_html_part(html_context, ret.source, ret.source + ret.length,
-		 par_format.align, par_format.leftmargin, part->box.width,
+		part = format_html_part(html_context, ret.source,
+		 ret.source + ret.length, par_format.align,
+		 par_format.leftmargin, document->options.box.width,
 		 document, part->box.x, part->box.y, NULL, part->link_num);
 
 		done_string(&ret);
diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c
index 052ea113..961fa8d2 100644
--- a/src/ecmascript/spidermonkey/document.c
+++ b/src/ecmascript/spidermonkey/document.c
@@ -192,19 +192,25 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 }
 
 static JSBool document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+static JSBool document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
 const JSFunctionSpec document_funcs[] = {
 	{ "write",		document_write,		1 },
+	{ "writeln",		document_writeln,	1 },
 	{ NULL }
 };
 
 static JSBool
 document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
-#ifdef CONFIG_LEDS
 	struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
-#endif
+	struct string *ret = interpreter->ret;
 
+	if (argc >= 1 && ret) {
+		unsigned char *code = jsval_to_string(ctx, &argv[0]);
+
+		add_to_string(ret, code);
+	}
 	/* XXX: I don't know about you, but I have *ENOUGH* of those 'Undefined
 	 * function' errors, I want to see just the useful ones. So just
 	 * lighting a led and going away, no muss, no fuss. --pasky */
@@ -220,3 +226,25 @@ document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
 
 	return JS_TRUE;
 }
+
+static JSBool
+document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+	struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
+	struct string *ret = interpreter->ret;
+
+	if (argc >= 1 && ret) {
+		unsigned char *code = jsval_to_string(ctx, &argv[0]);
+
+		add_to_string(ret, code);
+		add_char_to_string(ret, '\n');
+	}
+
+#ifdef CONFIG_LEDS
+	set_led_value(interpreter->vs->doc_view->session->status.ecmascript_led, 'J');
+#endif
+
+	boolean_to_jsval(ctx, rval, 0);
+
+	return JS_TRUE;
+}

From 9c9fa1d81c8086e39901a298ecb88dfd8079f8b1 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 14:55:53 +0100
Subject: [PATCH 101/204] Defined document.write and document.writeln for SEE

---
 src/document/html/parser/general.c |  1 +
 src/ecmascript/see/document.c      | 47 +++++++++++++++++++++++++++++-
 src/ecmascript/see/document.h      |  1 +
 src/ecmascript/see/strings.c       |  4 +++
 src/ecmascript/see/strings.h       |  1 +
 5 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 672d27c7..4a14fffe 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -366,6 +366,7 @@ imported:
 		done_string(&code);
 		if (!ret.length) return;
 
+		/* FIXME: it doesn't work */
 		part = format_html_part(html_context, ret.source,
 		 ret.source + ret.length, par_format.align,
 		 par_format.leftmargin, document->options.box.width,
diff --git a/src/ecmascript/see/document.c b/src/ecmascript/see/document.c
index d73f74ef..70b54d90 100644
--- a/src/ecmascript/see/document.c
+++ b/src/ecmascript/see/document.c
@@ -51,6 +51,7 @@ static void document_put(struct SEE_interpreter *, struct SEE_object *, struct S
 static int document_canput(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *);
 static int document_hasproperty(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *);
 static void js_document_write(struct SEE_interpreter *, struct SEE_object *, struct SEE_object *, int, struct SEE_value **, struct SEE_value *);
+static void js_document_writeln(struct SEE_interpreter *, struct SEE_object *, struct SEE_object *, int, struct SEE_value **, struct SEE_value *);
 
 void location_goto(struct document_view *, unsigned char *);
 
@@ -140,6 +141,8 @@ document_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		SEE_SET_OBJECT(res, doc->forms);
 	} else if (p == s_write) {
 		SEE_SET_OBJECT(res, doc->write);
+	} else if (p == s_writeln) {
+		SEE_SET_OBJECT(res, doc->writeln);
 	} else {
 		struct form *form;
 		unsigned char *string = SEE_string_to_unsigned_char(p);
@@ -204,10 +207,51 @@ js_document_write(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
 	     struct SEE_value *res)
 {
-#ifdef CONFIG_LEDS
 	struct global_object *g = (struct global_object *)interp;
 	struct view_state *vs = g->win->vs;
+	struct string *ret = g->ret;
 
+	if (argc >= 1 && ret) {
+		unsigned char *code = SEE_value_to_unsigned_char(interp, argv[0]);
+
+		if (code) {
+			add_to_string(ret, code);
+			mem_free(code);
+		}
+	}
+#ifdef CONFIG_LEDS
+	/* XXX: I don't know about you, but I have *ENOUGH* of those 'Undefined
+	 * function' errors, I want to see just the useful ones. So just
+	 * lighting a led and going away, no muss, no fuss. --pasky */
+	/* TODO: Perhaps we can introduce ecmascript.error_report_unsupported
+	 * -> "Show information about the document using some valid,
+	 *  nevertheless unsupported methods/properties." --pasky too */
+
+	set_led_value(vs->doc_view->session->status.ecmascript_led, 'J');
+#endif
+	checktime(interp);
+	SEE_SET_BOOLEAN(res, 0);
+}
+
+static void
+js_document_writeln(struct SEE_interpreter *interp, struct SEE_object *self,
+	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
+	     struct SEE_value *res)
+{
+	struct global_object *g = (struct global_object *)interp;
+	struct view_state *vs = g->win->vs;
+	struct string *ret = g->ret;
+
+	if (argc >= 1 && ret) {
+		unsigned char *code = SEE_value_to_unsigned_char(interp, argv[0]);
+
+		if (code) {
+			add_to_string(ret, code);
+			mem_free(code);
+			add_char_to_string(ret, '\n');
+		}
+	}
+#ifdef CONFIG_LEDS
 	/* XXX: I don't know about you, but I have *ENOUGH* of those 'Undefined
 	 * function' errors, I want to see just the useful ones. So just
 	 * lighting a led and going away, no muss, no fuss. --pasky */
@@ -258,4 +302,5 @@ init_js_document_object(struct ecmascript_interpreter *interpreter)
 	SEE_OBJECT_PUT(interp, interp->Global, s_document, &v, 0);
 
 	doc->write = SEE_cfunction_make(interp, js_document_write, s_write, 1);
+	doc->writeln = SEE_cfunction_make(interp, js_document_writeln, s_writeln, 1);
 }
diff --git a/src/ecmascript/see/document.h b/src/ecmascript/see/document.h
index 1fde46eb..34eb0ee5 100644
--- a/src/ecmascript/see/document.h
+++ b/src/ecmascript/see/document.h
@@ -6,6 +6,7 @@ struct ecmascript_interpreter;
 struct js_document_object {
 	struct SEE_object object;
 	struct SEE_object *write;
+	struct SEE_object *writeln;
 	struct SEE_object *forms;
 };
 
diff --git a/src/ecmascript/see/strings.c b/src/ecmascript/see/strings.c
index a42d34ea..4963424e 100644
--- a/src/ecmascript/see/strings.c
+++ b/src/ecmascript/see/strings.c
@@ -71,6 +71,7 @@ struct SEE_string *s_referrer;
 struct SEE_string *s_title;
 struct SEE_string *s_url;
 struct SEE_string *s_write;
+struct SEE_string *s_writeln;
 
 struct SEE_string *s_Mozilla;
 struct SEE_string *s_ELinks_;
@@ -228,6 +229,8 @@ init_intern_strings(void)
 	static struct SEE_string S_url = SEE_STRING_DECL(SA_url);
 	static SEE_char_t SA_write[] = {'w','r','i','t','e'};
 	static struct SEE_string S_write = SEE_STRING_DECL(SA_write);
+	static SEE_char_t SA_writeln[] = {'w','r','i','t','e','l','n'};
+	static struct SEE_string S_writeln = SEE_STRING_DECL(SA_writeln);
 
 	static SEE_char_t SA_Mozilla[] = {'M','o','z','i','l','l','a'};
 	static struct SEE_string S_Mozilla = SEE_STRING_DECL(SA_Mozilla);
@@ -354,6 +357,7 @@ init_intern_strings(void)
 	SEE_intern_global(s_title = &S_title);
 	SEE_intern_global(s_url = &S_url);
 	SEE_intern_global(s_write = &S_write);
+	SEE_intern_global(s_writeln = &S_writeln);
 
 	SEE_intern_global(s_Mozilla = &S_Mozilla);
 	SEE_intern_global(s_ELinks_ = &S_ELinks_);
diff --git a/src/ecmascript/see/strings.h b/src/ecmascript/see/strings.h
index df253aa4..b0824971 100644
--- a/src/ecmascript/see/strings.h
+++ b/src/ecmascript/see/strings.h
@@ -77,6 +77,7 @@ extern struct SEE_string *s_referrer;
 extern struct SEE_string *s_title;
 extern struct SEE_string *s_url;
 extern struct SEE_string *s_write;
+extern struct SEE_string *s_writeln;
 
 extern struct SEE_string *s_Mozilla;
 extern struct SEE_string *s_ELinks_;

From b1b66db850bb23cb24abf0ed02acaa2519ea3023 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 16:54:39 +0100
Subject: [PATCH 102/204] Success. document.write works for me.

---
 src/document/html/parser/general.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 4a14fffe..91588e87 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -367,10 +367,9 @@ imported:
 		if (!ret.length) return;
 
 		/* FIXME: it doesn't work */
-		part = format_html_part(html_context, ret.source,
-		 ret.source + ret.length, par_format.align,
-		 par_format.leftmargin, document->options.box.width,
-		 document, part->box.x, part->box.y, NULL, part->link_num);
+		html_top->invisible = 0;
+		parse_html(ret.source, ret.source + ret.length, part, NULL,
+			   html_context);
 
 		done_string(&ret);
 #if 0

From 7a6a5918fe523b8aec1e2d22439b00bbf5375fe4 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Fri, 27 Jan 2006 16:55:41 +0100
Subject: [PATCH 103/204] Test file for document.write

---
 test/ecmascript/document_write.html | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 test/ecmascript/document_write.html

diff --git a/test/ecmascript/document_write.html b/test/ecmascript/document_write.html
new file mode 100644
index 00000000..2721529a
--- /dev/null
+++ b/test/ecmascript/document_write.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+<a href="history.html">history.html</a><br/>
+<script type="text/javascript">
+document.writeln('<a href="ontest.html">Test</a><br/>');
+document.write('<a href="infinite2.html">infinite2.html</a><br/>');
+</script>
+<a href="onload.html">onload.html</a><br/>
+</body>
+</html>

From a2376609e31b219b8e3a4effe8bb9c4456521699 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 00:50:06 +0100
Subject: [PATCH 104/204] Expand the testing of incremental parsing

There are still some bugs to resolve.
---
 src/dom/test/test-sgml-parser-incremental | 238 +++++++++++++++++++++-
 1 file changed, 227 insertions(+), 11 deletions(-)

diff --git a/src/dom/test/test-sgml-parser-incremental b/src/dom/test/test-sgml-parser-incremental
index a9896e52..aa6ea64b 100755
--- a/src/dom/test/test-sgml-parser-incremental
+++ b/src/dom/test/test-sgml-parser-incremental
@@ -11,9 +11,8 @@ parsing.
 
 . "$TEST_LIB"
 
-test_output_equals () {
+test_incremental_parsing () {
 	desc="$1"; shift
-	size="$1"; shift
 	src="$1"; shift
 	out="$1"; shift
 
@@ -25,25 +24,242 @@ test_output_equals () {
 		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
 		s/[^a-zA-Z0-9-]//g;')"
 
-	echo "$src" | sgml-parser --uri "$URI" --stdin "$size" \
-	| sed -e 's/^  //' | sed -n '$d;p' > output
 	echo "#document: $URI" > expected
 	echo "$out" | sed -n '2,$p' >> expected
 
-	test_expect_success "$desc" 'cmp output expected' 
+	for size in 1 2 3 4 5 6 7 8 9 10 15 20 25 50; do
+		echo -n "$src" | sgml-parser --uri "$URI" --stdin "$size" \
+		| sed -e 's/^  //' > output
+
+		test_run_ 'cmp output expected'
+		if [ "$?" != 0 -o "$eval_ret" != 0 ]
+		then
+			test_failure_ "$desc" "($size bytes)"
+			return
+		fi
+	done
+
+	test_ok_ "$desc"
 }
 
-for i in 25 20 15 10 9 8 7 6 5 4 3 2 1; do
-	test_output_equals \
-	"Incrementally parse a small document reading $i bytes at a time." \
-	"$i" \
-	'<html><body><p>Hello World!</p></body></html>' \
+test_incremental_parsing \
+"Parse a small document." \
+'<html><body><p>Hello World!</p></body></html>' \
 	'
 element: html
   element: body
     element: p
       #text: Hello World!'
 
-done
+test_incremental_parsing \
+'Parse elements.' \
+'<root><child attr="value" /><child2></><child3 >a</></root>' \
+'
+element: root
+  element: child
+    attribute: attr -> value
+  element: child2
+  element: child3
+    #text: a'
+
+test_incremental_parsing \
+'Parse tag soup elements.' \
+'<parent attr="value" <child:1></><child:2</>a</parent>' \
+'
+element: parent
+  attribute: attr -> value
+  element: child:1
+  element: child:2
+  #text: a'
+
+test_incremental_parsing \
+'Parse an enclosed comment.' \
+'<root><!-- Hello World! --></root>' \
+'
+element: root
+  #comment:  Hello World! '
+
+test_incremental_parsing \
+'Parse comment combinations. (I)' \
+'<root><!-- <!-- -- > --><!--foo--><!----></root>' \
+'
+element: root
+  #comment:  <!-- -- > 
+  #comment: foo
+  #comment: '
+
+test_incremental_parsing \
+'Parse comment combinations. (II).' \
+'<! -- comment -->s<!-->-->t<!----->u' \
+'
+#comment:  comment 
+#text: s
+#comment: >
+#text: t
+#comment: -
+#text: u'
+
+test_incremental_parsing \
+'Parse bad comment. (I)' \
+'<!--->s' \
+'
+#comment: ->s'
+
+test_incremental_parsing \
+'Parse bad comment. (II)' \
+'<!--a--!>bad comment' \
+'
+#comment: a
+#text: bad comment'
+
+test_incremental_parsing \
+'Parse empty notation.' \
+'<!>s' \
+'
+#text: s'
+
+test_incremental_parsing \
+'Parse an enclosed CDATA section.' \
+'<root><![CDATA[...] ]>...]]></root>' \
+'
+element: root
+  #cdata-section: ...] ]>...'
+
+test_incremental_parsing \
+'Parse non-enclosed CDATA section.' \
+'<![CDATA[...]]>' \
+'
+#cdata-section: ...'
+
+test_incremental_parsing \
+'Parse a bad CDATA section.' \
+'<![CDATA[...' \
+'
+#cdata-section: ...'
+
+test_incremental_parsing \
+'Parse attributes.' \
+'<root lang="fr" attr name="value with &foo; <stuff"></root>' \
+'
+element: root
+  attribute: lang -> fr
+  attribute: attr -> 
+  attribute: name -> value with &foo; <stuff'
+
+test_incremental_parsing \
+'Parse attributes with garbage.' \
+"<root a=b c='d' e'f' g= h i = j k =></root>" \
+'
+element: root
+  attribute: a -> b
+  attribute: c -> d
+  attribute: g -> h
+  attribute: i -> j
+  attribute: k -> ' 
+
+test_incremental_parsing \
+'Parse attribute with non-quoted values.' \
+'<root color=#abc path=/to/%61-&\one";files/>...' \
+'
+element: root
+  attribute: color -> #abc
+  attribute: path -> /to/%61-&\one";files
+#text: ...'
+
+test_incremental_parsing \
+'Parse entity references.' \
+'&amp;-&#42;' \
+'
+entity-reference: amp
+#text: -
+entity-reference: #42'
+
+# Just how these should be gracefully handled is not clear to me.
+test_incremental_parsing \
+'Parse badly formatted entity references.' \
+'& m33p;-&.:-copy;-&;-&#;-&#xx;' \
+'
+#text: & m33p;
+#text: -
+entity-reference: .:-copy
+#text: -
+#text: &;
+#text: -
+entity-reference: #
+#text: -
+entity-reference: #xx'
+
+test_incremental_parsing \
+'Parse processing instructions.' \
+'<?xml encoding="UTF8"?>
+...
+<?ecmascript
+var val=2;
+?>' \
+'
+proc-instruction: xml -> encoding="UTF8"
+  attribute: encoding -> UTF8
+#text: \n...\n
+proc-instruction: ecmascript -> var val=2;\n'
+
+test_incremental_parsing \
+'Parse XML processing instructions.' \
+'<?xml version="1.0" />?><?xml />-' \
+'
+proc-instruction: xml -> version="1.0" />
+  attribute: version -> 1.0
+proc-instruction: xml -> />-'
+
+test_incremental_parsing \
+'Parse XML stylesheet processing instructions.' \
+'<?xml-stylesheet type="text/xsl" href="url"?>' \
+'
+proc-instruction: xml-stylesheet -> type="text/xsl" href="url"
+  attribute: type -> text/xsl
+  attribute: href -> url'
+
+test_incremental_parsing \
+'Parse exotic processing instructions.' \
+'<?xml ?+>+?>-?>-<?js?>-<??>-' \
+'
+proc-instruction: xml -> ?+>+
+#text: -?>-
+proc-instruction: js -> 
+#text: -
+proc-instruction:  -> 
+#text: -'
+
+test_incremental_parsing \
+'Parse incorrect processing instructions.' \
+'<?js<?>-<?<??>-<?xml <=";&?>-<?' \
+'
+proc-instruction: js -> <
+#text: -
+proc-instruction:  -> <?
+#text: -
+proc-instruction: xml -> <=";&
+#text: -'
+
+test_incremental_parsing \
+'Parse incorrect processing instructions (II).' \
+'<?><?' \
+'
+proc-instruction:  -> ><?'
+
+test_incremental_parsing \
+'Skip spaces not inside text.' \
+'<
+root
+ns:attr                      
+=
+"value"
+><?	
+	target	
+ data?><	/	root	>' \
+'
+element: root
+  attribute: ns:attr -> value
+  proc-instruction: target -> data'
+
 
 test_done

From bccf5512d608b22c85acbc33342bfff02d10be65 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 00:56:48 +0100
Subject: [PATCH 105/204] Force an incomplete token for quoted attribute values
 when there's no end

---
 src/dom/sgml/scanner.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index f4a6578a..13a517ee 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -641,6 +641,10 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			/* We found the end. */
 			possibly_incomplete = 0;
 
+		} else if (scanner->check_complete && scanner->incomplete) {
+			/* Force an incomplete token. */
+			string = scanner->end;
+
 		} else if (is_sgml_attribute(*string)) {
 			token->string.string++;
 			scan_sgml_attribute(scanner, string);

From 74728cab059572ea897912f3ffe695b480407ed0 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:00:28 +0100
Subject: [PATCH 106/204] Also set the node subtype for <?xml-stylesheet?>

---
 src/dom/node.h        | 5 ++---
 src/dom/sgml/parser.c | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/dom/node.h b/src/dom/node.h
index 9f4d2cfb..f7de061b 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -151,9 +151,8 @@ enum dom_proc_instruction_type {
 	DOM_PROC_INSTRUCTION,
 
 	/* Keep this group sorted */
-	DOM_PROC_INSTRUCTION_DBHTML,	/* DocBook toolchain instruction */
-	DOM_PROC_INSTRUCTION_ELINKS,	/* Internal instruction hook */
-	DOM_PROC_INSTRUCTION_XML,	/* XML instructions */
+	DOM_PROC_INSTRUCTION_XML,		/* XML header */
+	DOM_PROC_INSTRUCTION_XML_STYLESHEET,	/* XML stylesheet link */
 
 	DOM_PROC_INSTRUCTION_TYPES
 };
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index bda43c5c..c8511d56 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -117,6 +117,10 @@ add_sgml_proc_instruction(struct dom_stack *stack, struct dom_scanner_token *tar
 		node->data.proc_instruction.type = DOM_PROC_INSTRUCTION_XML;
 		break;
 
+	case SGML_TOKEN_PROCESS_XML_STYLESHEET:
+		node->data.proc_instruction.type = DOM_PROC_INSTRUCTION_XML_STYLESHEET;
+		break;
+
 	case SGML_TOKEN_PROCESS:
 	default:
 		node->data.proc_instruction.type = DOM_PROC_INSTRUCTION;

From 1e104afbbab980e83d4f1d7cb6481100265ef85a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:05:42 +0100
Subject: [PATCH 107/204] Improve error checking when adding nodes

Fail with SGML_PARSER_CODE_MEM_ALLOC.
---
 src/dom/sgml/parser.c | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index c8511d56..03f3f0c1 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -74,7 +74,7 @@ add_sgml_element(struct dom_stack *stack, struct dom_scanner_token *token)
 }
 
 
-static inline void
+static inline struct dom_node *
 add_sgml_attribute(struct dom_stack *stack,
 		   struct dom_scanner_token *token, struct dom_scanner_token *valtoken)
 {
@@ -96,9 +96,11 @@ add_sgml_attribute(struct dom_stack *stack,
 		node->data.attribute.quoted = 1;
 
 	if (!node || push_dom_node(stack, node) != DOM_STACK_CODE_OK)
-		return;
+		return NULL;
 
 	pop_dom_node(stack);
+
+	return node;
 }
 
 static inline struct dom_node *
@@ -132,19 +134,21 @@ add_sgml_proc_instruction(struct dom_stack *stack, struct dom_scanner_token *tar
 	return NULL;
 }
 
-static inline void
+static inline struct dom_node *
 add_sgml_node(struct dom_stack *stack, enum dom_node_type type, struct dom_scanner_token *token)
 {
 	struct dom_node *parent = get_dom_stack_top(stack)->node;
 	struct dom_node *node = add_dom_node(parent, type, &token->string);
 
-	if (!node) return;
+	if (!node) return NULL;
 
 	if (token->type == SGML_TOKEN_SPACE)
 		node->data.text.only_space = 1;
 
 	if (push_dom_node(stack, node) == DOM_STACK_CODE_OK)
 		pop_dom_node(stack);
+
+	return node;
 }
 
 
@@ -214,7 +218,8 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 				token = NULL;
 			}
 
-			add_sgml_attribute(stack, &name, token);
+			if (!add_sgml_attribute(stack, &name, token))
+				return SGML_PARSER_CODE_MEM_ALLOC;
 
 			/* Skip the value token */
 			if (token)
@@ -254,15 +259,8 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 		switch (token->type) {
 		case SGML_TOKEN_ELEMENT:
 		case SGML_TOKEN_ELEMENT_BEGIN:
-			if (!add_sgml_element(stack, token)) {
-				if (token->type == SGML_TOKEN_ELEMENT) {
-					skip_dom_scanner_token(scanner);
-					break;
-				}
-
-				skip_sgml_tokens(scanner, SGML_TOKEN_TAG_END);
-				break;
-			}
+			if (!add_sgml_element(stack, token))
+				return SGML_PARSER_CODE_MEM_ALLOC;
 
 			if (token->type == SGML_TOKEN_ELEMENT_BEGIN) {
 				enum sgml_parser_code code;
@@ -305,7 +303,8 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			break;
 
 		case SGML_TOKEN_NOTATION_COMMENT:
-			add_sgml_node(stack, DOM_NODE_COMMENT, token);
+			if (!add_sgml_node(stack, DOM_NODE_COMMENT, token))
+				return SGML_PARSER_CODE_MEM_ALLOC;
 			skip_dom_scanner_token(scanner);
 			break;
 
@@ -318,7 +317,8 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			break;
 
 		case SGML_TOKEN_CDATA_SECTION:
-			add_sgml_node(stack, DOM_NODE_CDATA_SECTION, token);
+			if (!add_sgml_node(stack, DOM_NODE_CDATA_SECTION, token))
+				return SGML_PARSER_CODE_MEM_ALLOC;
 			skip_dom_scanner_token(scanner);
 			break;
 
@@ -339,9 +339,10 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			/* Fall-through */
 
 		case SGML_TOKEN_PROCESS_DATA:
-			if (add_sgml_proc_instruction(stack, &target, token)
-			    && (target.type == SGML_TOKEN_PROCESS_XML
-			        || target.type == SGML_TOKEN_PROCESS_XML_STYLESHEET)
+			if (!add_sgml_proc_instruction(stack, &target, token))
+				return SGML_PARSER_CODE_MEM_ALLOC;
+			if ((target.type == SGML_TOKEN_PROCESS_XML
+			     || target.type == SGML_TOKEN_PROCESS_XML_STYLESHEET)
 			    && token->string.length > 0) {
 				/* Parse the <?xml data="attributes"?>. */
 				struct dom_scanner attr_scanner;

From 9e7b0d4fa31da8d1dbc0c468928312212439afc1 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:09:05 +0100
Subject: [PATCH 108/204] Remove assertion logic from parse_sgml_attributes()

They are getting out of hand and making it hard to use the function in
'unusual' situations (like when resuming parsing inside elements).
---
 src/dom/sgml/parser.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 03f3f0c1..598a4433 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -170,13 +170,6 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 {
 	struct dom_scanner_token name;
 
-	assert(dom_scanner_has_tokens(scanner)
-	       && (get_dom_scanner_token(scanner)->type == SGML_TOKEN_ELEMENT_BEGIN
-	           || (get_dom_stack_top(stack)->node->type == DOM_NODE_PROCESSING_INSTRUCTION)));
-
-	if (get_dom_scanner_token(scanner)->type == SGML_TOKEN_ELEMENT_BEGIN)
-		skip_dom_scanner_token(scanner);
-
 	while (dom_scanner_has_tokens(scanner)) {
 		struct dom_scanner_token *token = get_dom_scanner_token(scanner);
 
@@ -265,6 +258,8 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			if (token->type == SGML_TOKEN_ELEMENT_BEGIN) {
 				enum sgml_parser_code code;
 
+				skip_dom_scanner_token(scanner);
+
 				code = parse_sgml_attributes(stack, scanner);
 				if (code != SGML_PARSER_CODE_OK)
 					return code;

From c6e83d1d9c4ee844a0727727f7152362e0a6635a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:12:03 +0100
Subject: [PATCH 109/204] Assert parsing depth >= parser stack depth

Like the comment says popping parsing nodes during incremental parsing
might trigger this.
---
 src/dom/sgml/parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 598a4433..1ba15970 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -522,7 +522,7 @@ sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 		}
 		/* It's bigger than when calling done_sgml_parser() in the middle of an
 		 * incomplete parsing. */
-		assert(parsing->depth == parser->stack.depth);
+		assert(parsing->depth >= parser->stack.depth);	
 	}
 
 	done_dom_string(&parsing->incomplete);

From 4ab1dde8741c43de7af317231a126cc7e1a6146e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:21:02 +0100
Subject: [PATCH 110/204] Preserve the scanner state when it is not the
 'default' state

This is necessary to make it possible to resume parsing of element
attributes. Allows the incomplete string in the parsing state struct to
be unset.
---
 src/dom/sgml/parser.c | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 1ba15970..82158438 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -452,15 +452,19 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 		struct sgml_parsing_state *parent = &parsing[-1];
 
 		if (parent->resume) {
-			assert(is_dom_string_set(&parent->incomplete));
+			if (is_dom_string_set(&parent->incomplete)) {
 
-			if (!add_to_dom_string(&parent->incomplete,
-					       string->string, string->length)) {
-				parser->code = SGML_PARSER_CODE_MEM_ALLOC;
-				return DOM_STACK_CODE_OK;
+				if (!add_to_dom_string(&parent->incomplete,
+						       string->string,
+						       string->length)) {
+
+					parser->code = SGML_PARSER_CODE_MEM_ALLOC;
+					return DOM_STACK_CODE_OK;
+				}
+
+				string = &parent->incomplete;
 			}
 
-			string = &parent->incomplete;
 			scanner_state = parent->scanner.state;
 
 			/* Pop down to the parent. */
@@ -474,19 +478,31 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 			 scanner_state, count_lines, complete, incremental,
 			 detect_errors);
 
-	{
-		int immutable = get_dom_stack_top(&parser->stack)->immutable;
-
-		get_dom_stack_top(&parser->stack)->immutable = 1;
+	if (scanner_state == SGML_STATE_ELEMENT) {
+		parser->code = parse_sgml_attributes(&parser->stack, &parsing->scanner);
+		if (parser->code == SGML_PARSER_CODE_OK)
+			parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
+	} else {
 		parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
-		get_dom_stack_top(&parser->stack)->immutable = !!immutable;
 	}
 
-	if (complete || parser->code != SGML_PARSER_CODE_INCOMPLETE) {
+	if (complete) {
 		pop_dom_node(&parser->parsing);
 		return DOM_STACK_CODE_OK;
 	}
 
+	if (parser->code != SGML_PARSER_CODE_INCOMPLETE) {
+		/* No need to preserve the default scanner state. */
+		if (parsing->scanner.state == SGML_STATE_TEXT) {
+			pop_dom_node(&parser->parsing);
+			return DOM_STACK_CODE_OK;
+		}
+
+		done_dom_string(&parsing->incomplete);
+		parsing->resume = 1;
+		return DOM_STACK_CODE_OK;
+	}
+
 	token = get_dom_scanner_token(&parsing->scanner);
 	assert(token && token->type == SGML_TOKEN_INCOMPLETE);
 

From e5e06764c4345b279bde1d6f44749ddffb90740c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 01:40:56 +0100
Subject: [PATCH 111/204] Improve checks for incompleteness when parsing
 attributes

Check whether there are '=' and value tokens before handling them. If there
is any doubt the whole attribute structure is 'pushed back' into the
stream. That way incremental parsing will not add the value as a new
attribute because the name token was handled in the previous parsing run.
---
 src/dom/sgml/parser.c | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 82158438..22f35cac 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -165,6 +165,37 @@ call_sgml_error_function(struct dom_stack *stack, struct dom_scanner_token *toke
 	return parser->error_func(parser, &token->string, line);
 }
 
+/* Appends to or 'creates' an incomplete token. This can be used to
+ * force tokens back into the 'stream' if they require that later tokens
+ * are available.
+ *
+ * NOTE: You can only do this for tokens that are not stripped of markup such
+ * as identifiers. */
+static enum sgml_parser_code
+check_sgml_incomplete(struct dom_scanner *scanner,
+		      struct dom_scanner_token *start,
+		      struct dom_scanner_token *token)
+{
+	if (token && token->type == SGML_TOKEN_INCOMPLETE) {
+		token->string.length += token->string.string - start->string.string;
+		token->string.string = start->string.string;
+		return 1;
+
+	} else if (!token && scanner->check_complete && scanner->incomplete) {
+		size_t left = scanner->end - start->string.string;
+
+		assert(left > 0);
+
+		token = scanner->current = scanner->table;
+		scanner->tokens = 1;
+		token->type = SGML_TOKEN_INCOMPLETE;
+		set_dom_string(&token->string, start->string.string, left);
+		return 1;
+	}
+
+	return 0;
+}
+
 static inline enum sgml_parser_code
 parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 {
@@ -195,7 +226,7 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 				/* If the token is not a valid value token
 				 * ignore it. */
 				token = get_next_dom_scanner_token(scanner);
-				if (token && token->type == SGML_TOKEN_INCOMPLETE)
+				if (check_sgml_incomplete(scanner, &name, token))
 					return SGML_PARSER_CODE_INCOMPLETE;
 
 				if (token
@@ -204,7 +235,7 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 				    && token->type != SGML_TOKEN_STRING)
 					token = NULL;
 
-			} else if (token && token->type == SGML_TOKEN_INCOMPLETE) {
+			} else if (check_sgml_incomplete(scanner, &name, token)) {
 				return SGML_PARSER_CODE_INCOMPLETE;
 
 			} else {

From bae3b581464a38281e44a6434d7f24580bd8e633 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sat, 28 Jan 2006 01:58:00 +0100
Subject: [PATCH 112/204] Fix a potential memleak.

---
 src/document/html/parser/general.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 91588e87..af2e8d55 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -364,7 +364,10 @@ imported:
 
 		ecmascript_eval(interpreter, &code, &ret);
 		done_string(&code);
-		if (!ret.length) return;
+		if (!ret.length) {
+			done_string(&ret);
+			return;
+		}
 
 		/* FIXME: it doesn't work */
 		html_top->invisible = 0;

From 5114c9d1104501c7ae9b1e00e22a406a339d8156 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sat, 28 Jan 2006 01:59:22 +0100
Subject: [PATCH 113/204] Trim trailing whitespaces.

---
 src/document/dom/renderer.c | 2 +-
 src/dom/configuration.h     | 4 ++--
 src/protocol/fsp/fsp.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 131f30eb..451e21fb 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -1024,7 +1024,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	} else if (renderer.doctype == SGML_DOCTYPE_RSS) {
 		add_dom_stack_context(&parser->stack, &renderer,
 				      &dom_rss_renderer_context_info);
-		add_dom_config_normalizer(&parser->stack, RSS_CONFIG_FLAGS); 
+		add_dom_config_normalizer(&parser->stack, RSS_CONFIG_FLAGS);
 	}
 
 	/* FIXME: When rendering this way we don't really care about the code.
diff --git a/src/dom/configuration.h b/src/dom/configuration.h
index f323c386..ad0bdb31 100644
--- a/src/dom/configuration.h
+++ b/src/dom/configuration.h
@@ -7,7 +7,7 @@ struct dom_stack;
 /* API Doc :: dom-config */
 
 /** DOM Configuration
- * 
+ *
  * The DOMConfiguration interface represents the configuration of a document.
  * Using the configuration, it is possible to change the behaviour of how
  * document normalization is done, such as replacing the CDATASection nodes
@@ -33,7 +33,7 @@ enum dom_config_flag {
 	DOM_CONFIG_COMMENTS = 2,
 
 	/** "element-content-whitespace"
-	 * 
+	 *
 	 * The default is true and will keep all whitespaces in the document.
 	 * When false, discard all Text nodes that contain only whitespaces. */
 	DOM_CONFIG_ELEMENT_CONTENT_WHITESPACE = 4,
diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index d343d8e1..4696657c 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -296,7 +296,7 @@ end:
 		abort_connection(conn, S_OUT_OF_MEM);
 		return;
 	}
-	read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data); 
+	read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data);
 }
 
 #undef READ_SIZE

From d92a074e40175834721592a94e2127f909717f67 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 03:21:27 +0100
Subject: [PATCH 114/204] Fix parsing of '<a< b>' where the scanner didn't
 rewind to the proper place

Add test for this tag soup combo.
---
 src/dom/sgml/scanner.c              |  4 ++--
 src/dom/test/test-sgml-parser-basic | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 13a517ee..656fad20 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -449,13 +449,13 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 		if (scanner->state == SGML_STATE_ELEMENT) {
 			/* Already inside an element so insert a tag end token
 			 * and continue scanning in next iteration. */
-			string--;
-			real_length = 0;
 			type = SGML_TOKEN_TAG_END;
 			scanner_state = SGML_STATE_TEXT;
 
 			/* We are creating a 'virtual' that has no source. */
 			possibly_incomplete = 0;
+			string = token->string.string;
+			real_length = 0;
 
 		} else if (is_sgml_ident(*string)) {
 			token->string.string = string;
diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index 1a22b7fe..f19f158e 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -56,7 +56,7 @@ element: root
     #text: a'
 
 test_output_equals \
-'Parse tag soup elements.' \
+'Parse tag soup elements. (I)' \
 '<parent attr="value" <child:1></><child:2</>a</parent>' \
 '
 element: parent
@@ -65,6 +65,14 @@ element: parent
   element: child:2
   #text: a'
 
+test_output_equals \
+'Parse tag soup elements. (II)' \
+'< a >< b < c / >< / >' \
+'
+element: a
+  element: b
+    element: c'
+
 test_output_equals \
 'Parse an enclosed comment.' \
 '<root><!-- Hello World! --></root>' \

From 00c4e0bfa22b5555e4eb6bdd1e0ff9d1d934f5a3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 03:23:06 +0100
Subject: [PATCH 115/204] Do not attempt to read *string when string ==
 scanner->end

There might be other places that needs to be reviewd for this.
---
 src/dom/sgml/scanner.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 656fad20..359a095f 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -457,6 +457,9 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			string = token->string.string;
 			real_length = 0;
 
+		} else if (string == scanner->end) {
+			/* It is incomplete. */
+
 		} else if (is_sgml_ident(*string)) {
 			token->string.string = string;
 			scan_sgml(scanner, string, SGML_CHAR_IDENT);

From 823c5945241feccce636bc93b0260f25f3210b58 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 03:24:16 +0100
Subject: [PATCH 116/204] Use ssize_t instead of size_t for length since it
 must carry a signed value

---
 src/dom/sgml/scanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 359a095f..19df8fce 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -705,7 +705,7 @@ scan_sgml_proc_inst_token(struct dom_scanner *scanner, struct dom_scanner_token
 {
 	unsigned char *string = scanner->position;
 	/* The length can be empty for '<??>'. */
-	size_t length = -1;
+	ssize_t length = -1;
 
 	token->string.string = string;
 

From 95c1de23158baa807bb66026fc5687acbea5a4dc Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 03:35:36 +0100
Subject: [PATCH 117/204] Fix handling of incomplete processing instructions

When doing incremental rendering we now require the whole thing to be there
and that there is room for two tokens in the scanner token table.  This is
necessary because we have to generate both a processing target token and a
processing data token to make life simpler for the parser.

Remove processing instruction data case label from the main parser loop. It
is safer this way since it already assumes that the processing target token
has been stored.
---
 src/dom/sgml/parser.c  |  1 -
 src/dom/sgml/scanner.c | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 22f35cac..bd9e6b9e 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -364,7 +364,6 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			assert(token->type == SGML_TOKEN_PROCESS_DATA);
 			/* Fall-through */
 
-		case SGML_TOKEN_PROCESS_DATA:
 			if (!add_sgml_proc_instruction(stack, &target, token))
 				return SGML_PARSER_CODE_MEM_ALLOC;
 			if ((target.type == SGML_TOKEN_PROCESS_XML
diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 19df8fce..e2e7c5db 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -543,6 +543,29 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 				possibly_incomplete = 0;
 			}
 
+			if (scanner->check_complete && scanner->incomplete) {
+				/* We need to fit both the process target token
+				 * and the process data token into the scanner
+				 * table. */
+				if (token + 1 >= scanner->table + DOM_SCANNER_TOKENS) {
+					possibly_incomplete = 1;
+
+				} else if (!possibly_incomplete) {
+					/* FIXME: We do this twice. */
+					for (pos = string + 1;
+					     (pos = skip_sgml_chars(scanner, pos, '>'));
+					     pos++) {
+						if (pos[-1] == '?')
+							break;
+					}
+					if (!pos)
+						possibly_incomplete = 1;
+				}
+
+				if (possibly_incomplete)
+					string = scanner->end;
+			}
+
 		} else if (*string == '/') {
 			string++;
 			skip_sgml_space(scanner, &string);
@@ -707,7 +730,7 @@ scan_sgml_proc_inst_token(struct dom_scanner *scanner, struct dom_scanner_token
 	/* The length can be empty for '<??>'. */
 	ssize_t length = -1;
 
-	token->string.string = string;
+	token->string.string = string++;
 
 	/* Figure out where the processing instruction ends. This doesn't use
 	 * skip_sgml() since we MUST ignore precedence here to allow '<' inside

From 495fb2805be29e4bd8249144c9fbe51d7fc7df1a Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sat, 28 Jan 2006 03:23:17 +0000
Subject: [PATCH 118/204] SMJS: Give user scripts access to the view_state

Introduce the view_state object to ECMAScript with properties .uri and
.plain and pass the current view_state to preformat hooks.
---
 contrib/smjs/google_video.js           |   2 +-
 contrib/smjs/hooks.js                  |   8 +-
 src/scripting/smjs/Makefile            |   2 +-
 src/scripting/smjs/hooks.c             |  16 +++-
 src/scripting/smjs/view_state_object.c | 109 +++++++++++++++++++++++++
 src/scripting/smjs/view_state_object.h |   9 ++
 6 files changed, 137 insertions(+), 9 deletions(-)
 create mode 100644 src/scripting/smjs/view_state_object.c
 create mode 100644 src/scripting/smjs/view_state_object.h

diff --git a/contrib/smjs/google_video.js b/contrib/smjs/google_video.js
index f267941f..46b5ee19 100644
--- a/contrib/smjs/google_video.js
+++ b/contrib/smjs/google_video.js
@@ -1,7 +1,7 @@
 /* Play videos at video.google.com with minimal niggling. Just follow the link
  * from the front page or the search page, and the video will automatically
  * be loaded. */
-function load_google_video(cached) {
+function load_google_video(cached, vs) {
 	if (!cached.uri.match(/^http:\/\/video.google.com\/videoplay/))
 		return true;
 
diff --git a/contrib/smjs/hooks.js b/contrib/smjs/hooks.js
index 875904d3..d4516c71 100644
--- a/contrib/smjs/hooks.js
+++ b/contrib/smjs/hooks.js
@@ -8,9 +8,9 @@ elinks.keymaps.main["@"] = function () {
 };
 
 elinks.preformat_html_hooks = new Array();
-elinks.preformat_html = function (cached) {
+elinks.preformat_html = function (cached, vs) {
 	for (var i in elinks.preformat_html_hooks)
-		if (!elinks.preformat_html_hooks[i](cached))
+		if (!elinks.preformat_html_hooks[i](cached, vs))
 			return false;
 
 	return true;
@@ -36,13 +36,13 @@ elinks.follow_url_hook = function (url) {
 	return url;
 };
 
-function root_w00t(cached) {
+function root_w00t(cached, vs) {
 	cached.content = cached.content.replace(/root/g, "w00t");
 	return true;
 };
 elinks.preformat_html_hooks.push(root_w00t);
 
-function mangle_deb_bugnumbers(cached) {
+function mangle_deb_bugnumbers(cached, vs) {
 	if (!cached.uri.match(/^[a-z0-9]+:\/\/[a-z0-9A-Z.-]+debian\.org/)
 	    && !cached.uri.match(/changelog\.Debian/))
 		return true;
diff --git a/src/scripting/smjs/Makefile b/src/scripting/smjs/Makefile
index 7ff12a14..1689f478 100644
--- a/src/scripting/smjs/Makefile
+++ b/src/scripting/smjs/Makefile
@@ -4,6 +4,6 @@ include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 OBJS = smjs.o core.o global_object.o hooks.o elinks_object.o cache_object.o \
-       bookmarks.o keybinding.o
+       view_state_object.o bookmarks.o keybinding.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/scripting/smjs/hooks.c b/src/scripting/smjs/hooks.c
index 91a768a4..03097ef0 100644
--- a/src/scripting/smjs/hooks.c
+++ b/src/scripting/smjs/hooks.c
@@ -12,10 +12,13 @@
 #include "main/event.h"
 #include "main/module.h"
 #include "scripting/smjs/cache_object.h"
+#include "scripting/smjs/view_state_object.h"
 #include "scripting/smjs/core.h"
 #include "scripting/smjs/elinks_object.h"
 #include "scripting/smjs/hooks.h"
+#include "session/location.h"
 #include "session/session.h"
+#include "viewer/text/vs.h"
 
 
 static enum evhook_status
@@ -88,8 +91,8 @@ script_hook_pre_format_html(va_list ap, void *data)
 	struct session *ses = va_arg(ap, struct session *);
 	struct cache_entry *cached = va_arg(ap, struct cache_entry *);
 	enum evhook_status ret = EVENT_HOOK_STATUS_NEXT;
-	JSObject *cache_entry_object;
-	jsval args[1], rval;
+	JSObject *cache_entry_object, *view_state_object = JSVAL_NULL;
+	jsval args[2], rval;
 
 	evhook_use_params(ses && cached);
 
@@ -97,13 +100,20 @@ script_hook_pre_format_html(va_list ap, void *data)
 
 	smjs_ses = ses;
 
+	if (have_location(ses)) {
+		struct view_state *vs = &cur_loc(ses)->vs;
+
+		view_state_object = smjs_get_view_state_object(vs);
+	}
+
 	cache_entry_object = smjs_get_cache_entry_object(cached);
 	if (!cache_entry_object) goto end;
 
 	args[0] = OBJECT_TO_JSVAL(cache_entry_object);
+	args[1] = OBJECT_TO_JSVAL(view_state_object);
 
 	if (JS_TRUE == smjs_invoke_elinks_object_method("preformat_html",
-	                                                args, 1, &rval))
+	                                                args, 2, &rval))
 		if (JS_FALSE == JSVAL_TO_BOOLEAN(rval))
 			ret = EVENT_HOOK_STATUS_LAST;
 
diff --git a/src/scripting/smjs/view_state_object.c b/src/scripting/smjs/view_state_object.c
new file mode 100644
index 00000000..a40457e7
--- /dev/null
+++ b/src/scripting/smjs/view_state_object.c
@@ -0,0 +1,109 @@
+/* Exports struct view_state to the world of ECMAScript */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "elinks.h"
+
+#include "ecmascript/spidermonkey/util.h"
+#include "protocol/uri.h"
+#include "scripting/smjs/view_state_object.h"
+#include "scripting/smjs/core.h"
+#include "util/error.h"
+#include "util/memory.h"
+#include "viewer/text/vs.h"
+
+enum view_state_prop {
+	VIEW_STATE_PLAIN,
+	VIEW_STATE_URI,
+};
+
+static const JSPropertySpec view_state_props[] = {
+	{ "plain", VIEW_STATE_PLAIN, JSPROP_ENUMERATE },
+	{ "uri",   VIEW_STATE_URI,   JSPROP_ENUMERATE | JSPROP_READONLY },
+	{ NULL }
+};
+
+static JSBool
+view_state_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
+{
+	struct view_state *vs = JS_GetPrivate(ctx, obj);
+
+	undef_to_jsval(ctx, vp);
+
+	if (!JSVAL_IS_INT(id))
+		return JS_FALSE;
+
+	switch (JSVAL_TO_INT(id)) {
+	case VIEW_STATE_PLAIN:
+		*vp = INT_TO_JSVAL(vs->plain);
+
+		return JS_TRUE;
+	case VIEW_STATE_URI:
+		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx,
+		                                        struri(vs->uri)));
+
+		return JS_TRUE;
+	default:
+		INTERNAL("Invalid ID %d in view_state_get_property().",
+		         JSVAL_TO_INT(id));
+	}
+
+	return JS_FALSE;
+}
+
+static JSBool
+view_state_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
+{
+	struct view_state *vs = JS_GetPrivate(ctx, obj);
+
+	if (!JSVAL_IS_INT(id))
+		return JS_FALSE;
+
+	switch (JSVAL_TO_INT(id)) {
+	case VIEW_STATE_PLAIN: {
+		vs->plain = atol(jsval_to_string(ctx, vp));
+
+		return JS_TRUE;
+	}
+	default:
+		INTERNAL("Invalid ID %d in view_state_set_property().",
+		         JSVAL_TO_INT(id));
+	}
+
+	return JS_FALSE;
+}
+
+static const JSClass view_state_class = {
+	"view_state",
+	JSCLASS_HAS_PRIVATE,
+	JS_PropertyStub, JS_PropertyStub,
+	view_state_get_property, view_state_set_property,
+	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+JSObject *
+smjs_get_view_state_object(struct view_state *vs)
+{
+	JSObject *view_state_object;
+
+	assert(smjs_ctx);
+
+	view_state_object = JS_NewObject(smjs_ctx,
+	                                  (JSClass *) &view_state_class,
+	                                  NULL, NULL);
+
+	if (!view_state_object) return NULL;
+
+	if (JS_FALSE == JS_SetPrivate(smjs_ctx, view_state_object, vs))
+		return NULL;
+
+	if (JS_FALSE == JS_DefineProperties(smjs_ctx, view_state_object,
+	                               (JSPropertySpec *) view_state_props))
+		return NULL;
+
+	return view_state_object;
+}
diff --git a/src/scripting/smjs/view_state_object.h b/src/scripting/smjs/view_state_object.h
new file mode 100644
index 00000000..daf770eb
--- /dev/null
+++ b/src/scripting/smjs/view_state_object.h
@@ -0,0 +1,9 @@
+#ifndef EL__SCRIPTING_SMJS_VIEW_STATE_OBJECT_H
+#define EL__SCRIPTING_SMJS_VIEW_STATE_OBJECT_H
+
+struct view_state;
+
+JSObject *smjs_get_view_state_object(struct view_state *vs);
+
+#endif
+

From 2e9d433402d44eafa1630e10760b2635a5d6072b Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sat, 28 Jan 2006 03:27:41 +0000
Subject: [PATCH 119/204] SMJS: mangle_deb_bugnumbers: add <pre>; set rendered
 view

Use the newly available view_state object to change to rendered view
and wrap everything in <pre> ... </pre> if the document MIME type is
text/plain.
---
 contrib/smjs/hooks.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/smjs/hooks.js b/contrib/smjs/hooks.js
index d4516c71..0278e46f 100644
--- a/contrib/smjs/hooks.js
+++ b/contrib/smjs/hooks.js
@@ -55,7 +55,14 @@ function mangle_deb_bugnumbers(cached, vs) {
 	/* Debian Policy Manual 4.4 footnote 16 */
 	var closes_re = /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/gi;
 
-	cached.content = cached.content.replace(closes_re, rewrite_closes_fn);
+	var new_content = cached.content.replace(closes_re, rewrite_closes_fn);
+	if (cached.content_type == 'text/plain') {
+		cached.content = '<pre>' + new_content + '</pre>';
+		vs.plain = "0";
+	} else {
+		cached.content = new_content;
+	}
+
 
 	return true;
 }

From 24a9d103b4ee5ede577297bf49db93b83f8860a0 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 04:09:31 +0100
Subject: [PATCH 120/204] DOM: Add allocated flag to struct dom_node; replaces
 subtype flags

Prepare for handling of allocated strings in the various nodes.
---
 src/dom/configuration.c | 10 +++++-----
 src/dom/node.c          | 17 ++++++++++++++---
 src/dom/node.h          |  9 +++------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index fb8f8c92..b228f02e 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -44,11 +44,11 @@ normalize_text_node_whitespace(struct dom_node *node)
 		}
 	}
 
-	if (node->data.text.allocated)
+	if (node->allocated)
 		done_dom_string(&node->string);
 
 	set_dom_string(&node->string, string.string, string.length);
-	node->data.text.allocated = 1;
+	node->allocated = 1;
 
 	return DOM_STACK_CODE_OK;
 
@@ -74,14 +74,14 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 		set_dom_string(&dest, NULL, 0);
 
 	} else {
-		if (prev->data.text.allocated) {
+		if (prev->allocated) {
 			copy_struct(&dest, &prev->string);
 		} else {
 			set_dom_string(&dest, NULL, 0);
 			if (!add_to_dom_string(&dest, prev->string.string, prev->string.length))
 				return DOM_STACK_CODE_ERROR_MEM_ALLOC;
 			set_dom_string(&prev->string, dest.string, dest.length);
-			prev->data.text.allocated = 1;
+			prev->allocated = 1;
 		}
 	}
 
@@ -135,7 +135,7 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 
 		node->type = DOM_NODE_TEXT;
 		memset(&node->data, 0, sizeof(node->data));
-		node->data.text.allocated = 1;
+		node->allocated = 1;
 		copy_struct(&node->string, &dest);
 
 		if ((config->flags & DOM_CONFIG_NORMALIZE_WHITESPACE)
diff --git a/src/dom/node.c b/src/dom/node.c
index 9995c223..913397ae 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -202,7 +202,7 @@ struct dom_node *
 get_dom_node_map_entry(struct dom_node_list *list, enum dom_node_type type,
 		       uint16_t subtype, struct dom_string *name)
 {
-	struct dom_node node = { type, INIT_DOM_STRING(name->string, name->length) };
+	struct dom_node node = { type, 0, INIT_DOM_STRING(name->string, name->length) };
 	struct dom_node_search search = INIT_DOM_NODE_SEARCH(&node, list);
 
 	if (subtype) {
@@ -359,8 +359,10 @@ done_dom_node_data(struct dom_node *node)
 
 	switch (node->type) {
 	case DOM_NODE_ATTRIBUTE:
-		if (data->attribute.allocated)
+		if (node->allocated) {
 			done_dom_string(&node->string);
+			done_dom_string(&data->attribute.value);
+		}
 		break;
 
 	case DOM_NODE_DOCUMENT:
@@ -380,16 +382,25 @@ done_dom_node_data(struct dom_node *node)
 
 		if (data->element.map)
 			done_dom_node_list(data->element.map);
+
+		if (node->allocated)
+			done_dom_string(&node->string);
 		break;
 
 	case DOM_NODE_TEXT:
-		if (data->text.allocated)
+	case DOM_NODE_CDATA_SECTION:
+	case DOM_NODE_ENTITY_REFERENCE:
+		if (node->allocated)
 			done_dom_string(&node->string);
 		break;
 
 	case DOM_NODE_PROCESSING_INSTRUCTION:
 		if (data->proc_instruction.map)
 			done_dom_node_list(data->proc_instruction.map);
+		if (node->allocated) {
+			done_dom_string(&node->string);
+			done_dom_string(&data->proc_instruction.instruction);
+		}
 		break;
 
 	default:
diff --git a/src/dom/node.h b/src/dom/node.h
index f7de061b..f1816dce 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -115,9 +115,6 @@ struct dom_attribute_node {
 	 * it added from the document source. */
 	unsigned int specified:1;
 
-	/* Was the node->string allocated */
-	unsigned int allocated:1;
-
 	/* Has the node->string been converted to internal charset. */
 	unsigned int converted:1;
 
@@ -140,9 +137,6 @@ struct dom_text_node {
 	 * In order to quickly identify such nodes this member is used. */
 	unsigned int only_space:1;
 
-	/* Was the node->string allocated */
-	unsigned int allocated:1;
-
 	/* Has the node->string been converted to internal charset. */
 	unsigned int converted:1;
 };
@@ -197,6 +191,9 @@ struct dom_node {
 	/* The type of the node */
 	uint16_t type; /* -> enum dom_node_type */
 
+	/* Was the node string allocated? */
+	unsigned int allocated:1;
+
 	/* Can contain either stuff like element name or for attributes the
 	 * attribute name. */
 	struct dom_string string;

From b6b6d3c67e16da25565b4a3a9a76abf2fbc1bb3c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 04:48:12 +0100
Subject: [PATCH 121/204] DOM: Allocate all node strings when doing incremental
 rendering

This changes init_dom_node_() to take an allocated argument saying whether
to allocate or not. If the value is -1, node->allocated will be set to the
value of node->parent->allocated. This way the value is inherited like we
do it in the menu code. It should be a sane default since we eventually
want not to rely on the 'underlying' source of the document and there will
be less variables to pass around.
---
 src/dom/node.c        | 39 +++++++++++++++++++++------------------
 src/dom/node.h        | 40 ++++++++++++++++++++++++++++++++--------
 src/dom/sgml/parser.c | 12 +++++++-----
 3 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/dom/node.c b/src/dom/node.c
index 913397ae..d0ac956a 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -314,7 +314,7 @@ get_dom_node_child(struct dom_node *parent, enum dom_node_type type,
 struct dom_node *
 init_dom_node_(unsigned char *file, int line,
 		struct dom_node *parent, enum dom_node_type type,
-		struct dom_string *string)
+		struct dom_string *string, int allocated)
 {
 #ifdef DEBUG_MEMLEAK
 	struct dom_node *node = debug_mem_calloc(file, line, 1, sizeof(*node));
@@ -326,7 +326,6 @@ init_dom_node_(unsigned char *file, int line,
 
 	node->type   = type;
 	node->parent = parent;
-	copy_dom_string(&node->string, string);
 
 	if (parent) {
 		struct dom_node_list **list = get_dom_node_list(parent, node);
@@ -343,6 +342,22 @@ init_dom_node_(unsigned char *file, int line,
 			done_dom_node(node);
 			return NULL;
 		}
+
+		/* Make it possible to add a node to a parent without
+		 * allocating the strings. */
+		node->allocated = allocated < 0 ? parent->allocated : !!allocated;
+
+	} else if (allocated >= 0) {
+			node->allocated = !!allocated;
+	}
+
+	if (node->allocated) {
+		if (!init_dom_string(&node->string, string->string, string->length)) {
+			done_dom_node(node);
+			return NULL;
+		}
+	} else {
+		copy_dom_string(&node->string, string);
 	}
 
 	return node;
@@ -359,10 +374,8 @@ done_dom_node_data(struct dom_node *node)
 
 	switch (node->type) {
 	case DOM_NODE_ATTRIBUTE:
-		if (node->allocated) {
-			done_dom_string(&node->string);
+		if (node->allocated)
 			done_dom_string(&data->attribute.value);
-		}
 		break;
 
 	case DOM_NODE_DOCUMENT:
@@ -382,31 +395,21 @@ done_dom_node_data(struct dom_node *node)
 
 		if (data->element.map)
 			done_dom_node_list(data->element.map);
-
-		if (node->allocated)
-			done_dom_string(&node->string);
-		break;
-
-	case DOM_NODE_TEXT:
-	case DOM_NODE_CDATA_SECTION:
-	case DOM_NODE_ENTITY_REFERENCE:
-		if (node->allocated)
-			done_dom_string(&node->string);
 		break;
 
 	case DOM_NODE_PROCESSING_INSTRUCTION:
 		if (data->proc_instruction.map)
 			done_dom_node_list(data->proc_instruction.map);
-		if (node->allocated) {
-			done_dom_string(&node->string);
+		if (node->allocated)
 			done_dom_string(&data->proc_instruction.instruction);
-		}
 		break;
 
 	default:
 		break;
 	}
 
+	if (node->allocated)
+		done_dom_string(&node->string);
 	mem_free(node);
 }
 
diff --git a/src/dom/node.h b/src/dom/node.h
index f1816dce..32948ea1 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -256,12 +256,21 @@ get_dom_node_map_entry(struct dom_node_list *node_map,
 		       enum dom_node_type type, uint16_t subtype,
 		       struct dom_string *name);
 
+/* Removes the node and all its children and free()s itself */
+void done_dom_node(struct dom_node *node);
+
+/* The allocated argument is used as the value of node->allocated if >= 0.
+ * Use -1 to default node->allocated to the value of parent->allocated. */
 struct dom_node *
 init_dom_node_(unsigned char *file, int line,
 		struct dom_node *parent, enum dom_node_type type,
-		struct dom_string *string);
-#define init_dom_node(type, string) init_dom_node_(__FILE__, __LINE__, NULL, type, string)
-#define add_dom_node(parent, type, string) init_dom_node_(__FILE__, __LINE__, parent, type, string)
+		struct dom_string *string, int allocated);
+
+#define init_dom_node(type, string, allocated) \
+	init_dom_node_(__FILE__, __LINE__, NULL, type, string, allocated)
+
+#define add_dom_node(parent, type, string) \
+	init_dom_node_(__FILE__, __LINE__, parent, type, string, -1)
 
 #define add_dom_element(parent, string) \
 	add_dom_node(parent, DOM_NODE_ELEMENT, string)
@@ -273,7 +282,16 @@ add_dom_attribute(struct dom_node *parent, struct dom_string *name,
 	struct dom_node *node = add_dom_node(parent, DOM_NODE_ATTRIBUTE, name);
 
 	if (node && value) {
-		copy_dom_string(&node->data.attribute.value, value);
+		struct dom_string *str = &node->data.attribute.value;
+
+		if (node->allocated) {
+			if (!init_dom_string(str, value->string, value->length)) {
+				done_dom_node(node);
+				return NULL;
+			}
+		} else {
+			copy_dom_string(str, value);
+		}
 	}
 
 	return node;
@@ -286,15 +304,21 @@ add_dom_proc_instruction(struct dom_node *parent, struct dom_string *string,
 	struct dom_node *node = add_dom_node(parent, DOM_NODE_PROCESSING_INSTRUCTION, string);
 
 	if (node && instruction) {
-		copy_dom_string(&node->data.proc_instruction.instruction, instruction);
+		struct dom_string *str = &node->data.proc_instruction.instruction;
+
+		if (node->allocated) {
+			if (!init_dom_string(str, instruction->string, instruction->length)) {
+				done_dom_node(node);
+				return NULL;
+			}
+		} else {
+			copy_dom_string(str, instruction);
+		}
 	}
 
 	return node;
 }
 
-/* Removes the node and all its children and free()s itself */
-void done_dom_node(struct dom_node *node);
-
 /* Compare two nodes returning non-zero if they differ. */
 int dom_node_casecmp(struct dom_node *node1, struct dom_node *node2);
 
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index bd9e6b9e..217b2115 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -35,11 +35,13 @@
  * information like node subtypes and SGML parser state information. */
 
 static inline struct dom_node *
-add_sgml_document(struct dom_stack *stack, struct dom_string *string)
+add_sgml_document(struct sgml_parser *parser)
 {
-	struct dom_node *node = init_dom_node(DOM_NODE_DOCUMENT, string);
+	int allocated = parser->flags & SGML_PARSER_INCREMENTAL;
+	struct dom_node *node;
 
-	if (node && push_dom_node(stack, node) == DOM_STACK_CODE_OK)
+	node = init_dom_node(DOM_NODE_DOCUMENT, &parser->uri, allocated);
+	if (node && push_dom_node(&parser->stack, node) == DOM_STACK_CODE_OK)
 		return node;
 
 	return NULL;
@@ -432,13 +434,13 @@ parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 		parser->flags |= SGML_PARSER_COMPLETE;
 
 	if (!parser->root) {
-		parser->root = add_sgml_document(&parser->stack, &parser->uri);
+		parser->root = add_sgml_document(parser);
 		if (!parser->root)
 			return SGML_PARSER_CODE_MEM_ALLOC;
 		get_dom_stack_top(&parser->stack)->immutable = 1;
 	}
 
-	node = init_dom_node(DOM_NODE_TEXT, &source);
+	node = init_dom_node(DOM_NODE_TEXT, &source, 0);
 	if (!node || push_dom_node(&parser->parsing, node) != DOM_STACK_CODE_OK)
 		return SGML_PARSER_CODE_MEM_ALLOC;
 

From c6ba201e0c7c06f844f0379205869d69d243e310 Mon Sep 17 00:00:00 2001
From: Eric Wald <eswald@gmail.com>
Date: Sat, 28 Jan 2006 05:18:01 +0100
Subject: [PATCH 122/204] CONTRIB: Add ftplugin for setting Vim to the ELinks
 coding style

This will replace the .vimrc infrastructure currently used, which is
considered insecure.
---
 contrib/vim/c_elinks.vim | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 contrib/vim/c_elinks.vim

diff --git a/contrib/vim/c_elinks.vim b/contrib/vim/c_elinks.vim
new file mode 100644
index 00000000..51af0172
--- /dev/null
+++ b/contrib/vim/c_elinks.vim
@@ -0,0 +1,15 @@
+" Setting Vim to support the ELinks coding style
+"
+" To use this file, drop it in ~/.vim/ftplugin and set filetype plugin on.
+" Finally, make sure the path to the source directory contains the word
+" 'elinks', for example ~/src/elinks/.
+"
+" For .h files, link it as cpp_elinks.vim or define c_syntax_for_h in ~/.vimrc.
+" For .inc files, let g:filetype_inc = 'c' in ~/.vimrc.
+
+if expand('%:p:h') =~ '.*elinks.*'
+  setlocal shiftwidth=8
+  setlocal tabstop=8
+  setlocal softtabstop=0
+  setlocal noexpandtab
+endif

From 6a592b073c7ee33fac98e6d71f0561311ac2f0e2 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 05:25:02 +0100
Subject: [PATCH 123/204] BUILD: Do not create .vimrc files

They are considered insecure, use the newly added ftplugin instead. This
also removes the config/vimrc master file.
---
 Makefile.lib | 9 ++-------
 config/vimrc | 8 --------
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 config/vimrc

diff --git a/Makefile.lib b/Makefile.lib
index f0219e10..b0953760 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -127,12 +127,12 @@ CLEAN += $(PROG) $(OBJS)
 #############################################################################
 # The main default rules
 
-all-default: $(ALL_OBJS) $(PROGS) $(MAN1) $(MAN5) .vimrc
+all-default: $(ALL_OBJS) $(PROGS) $(MAN1) $(MAN5)
 
 # Ensure that Makefiles in subdirs are created before we recursive into them
 init-recursive: init-default
 
-init-default: .vimrc
+init-default:
 	@$(foreach subdir,$(sort $(SUBDIRS)), \
 		$(MKINSTALLDIRS) $(subdir) >/dev/null; \
 		test -e "$(subdir)/Makefile" \
@@ -164,11 +164,6 @@ ifdef MAN5
 		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man5);)
 endif
 
-.vimrc: $(top_srcdir)/Makefile.lib
-	@{ echo ':set runtimepath+=.'; \
-	   echo ':runtime $(top_srcdir)/config/vimrc'; \
-	} > .vimrc
-
 ##############################################################################
 # Auto-testing infrastructure
 
diff --git a/config/vimrc b/config/vimrc
deleted file mode 100644
index 59c5edc2..00000000
--- a/config/vimrc
+++ /dev/null
@@ -1,8 +0,0 @@
-" Master vimrc file for the ELinks project
-
-:set shiftwidth=8
-:set tabstop=8
-:set softtabstop=0
-:set noexpandtab
-
-au BufNewFile,BufRead *.inc setf c

From 6e4c80a29ef5a35c35e4de6773aa74d9c9f6df9f Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 08:37:58 +0100
Subject: [PATCH 124/204] Avoid memleak

---
 src/document/html/parser/general.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 91588e87..43315fa7 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -358,13 +358,19 @@ imported:
 		}
 		if (!interpreter) return;
 
-		if (!init_string(&code) || !init_string(&ret))
+		if (!init_string(&code)) return;
+		if (!init_string(&ret)) {
+			done_string(&code);
 			return;
+		}
 		add_bytes_to_string(&code, html, *end - html);
 
 		ecmascript_eval(interpreter, &code, &ret);
 		done_string(&code);
-		if (!ret.length) return;
+		if (!ret.length) {
+			done_string(&ret);
+			return;
+		}
 
 		/* FIXME: it doesn't work */
 		html_top->invisible = 0;

From 9cc9db4e24e54499e3736d14563ee2721012d724 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 11:17:22 +0100
Subject: [PATCH 125/204] Handling onsubmit

---
 src/document/forms.c               |  1 +
 src/document/forms.h               |  1 +
 src/document/html/parser/forms.c   |  2 +-
 src/ecmascript/see/form.c          |  2 +-
 src/ecmascript/spidermonkey/form.c |  2 +-
 src/viewer/text/form.c             |  8 ++++--
 src/viewer/text/form.h             |  2 +-
 src/viewer/text/link.c             | 44 ++++++++++++++++++++++++++++--
 8 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/document/forms.c b/src/document/forms.c
index 1397a741..6eefac52 100644
--- a/src/document/forms.c
+++ b/src/document/forms.c
@@ -91,6 +91,7 @@ done_form(struct form *form)
 
 	mem_free_if(form->action);
 	mem_free_if(form->name);
+	mem_free_if(form->onsubmit);
 	mem_free_if(form->target);
 
 	foreach (fc, form->items) {
diff --git a/src/document/forms.h b/src/document/forms.h
index 8ebf4ed7..601e8e2e 100644
--- a/src/document/forms.h
+++ b/src/document/forms.h
@@ -32,6 +32,7 @@ struct form {
 
 	unsigned char *action;
 	unsigned char *name;
+	unsigned char *onsubmit;
 	unsigned char *target;
 	enum form_method method;
 
diff --git a/src/document/html/parser/forms.c b/src/document/html/parser/forms.c
index 5e464b38..6e63f96d 100644
--- a/src/document/html/parser/forms.c
+++ b/src/document/html/parser/forms.c
@@ -69,7 +69,7 @@ html_form(struct html_context *html_context, unsigned char *a,
 		}
 		mem_free(al);
 	}
-
+	form->onsubmit = get_attr_val(a, "onsubmit", html_context->options);
 	al = get_attr_val(a, "name", html_context->options);
 	if (al) form->name = al;
 
diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index 6971752c..908ec4f8 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -933,7 +933,7 @@ js_form_submit(struct SEE_interpreter *interp, struct SEE_object *self,
 
 	assert(form);
 	checktime(interp);
-	submit_given_form(ses, doc_view, form);
+	submit_given_form(ses, doc_view, form, 0);
 	SEE_SET_BOOLEAN(res, 0);
 }
 
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index feea2a0d..f089c64f 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -805,7 +805,7 @@ form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 
 	assert(form);
-	submit_given_form(ses, doc_view, form);
+	submit_given_form(ses, doc_view, form, 0);
 
 	boolean_to_jsval(ctx, rval, 0);
 
diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index 48100c0e..7f4bf9e4 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -1102,7 +1102,8 @@ submit_form(struct session *ses, struct document_view *doc_view, int do_reload)
 }
 
 void
-submit_given_form(struct session *ses, struct document_view *doc_view, struct form *form)
+submit_given_form(struct session *ses, struct document_view *doc_view,
+		  struct form *form, int do_reload)
 {
 /* Added support for submitting forms in hidden
  * links in 1.285, commented code can safely be removed once we have made sure the new
@@ -1125,11 +1126,12 @@ submit_given_form(struct session *ses, struct document_view *doc_view, struct fo
 	if (!list_empty(form->items)) {
 		struct form_control *fc = (struct form_control *)form->items.next;
 		struct uri *uri;
+		enum cache_mode mode = do_reload ? CACHE_MODE_FORCE_RELOAD : CACHE_MODE_NORMAL;
 
 		if (!fc) return;
 		uri = get_form_uri(ses, doc_view, fc);
 		if (!uri) return;
-		goto_uri_frame(ses, uri, form->target, CACHE_MODE_NORMAL);
+		goto_uri_frame(ses, uri, form->target, mode);
 		done_uri(uri);
 	}
 }
@@ -1140,7 +1142,7 @@ auto_submit_form(struct session *ses)
 	struct document *document = ses->doc_view->document;
 
 	if (!list_empty(document->forms))
-		submit_given_form(ses, ses->doc_view, document->forms.next);
+		submit_given_form(ses, ses->doc_view, document->forms.next, 0);
 }
 
 
diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index e71329ec..1bf47982 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -88,7 +88,7 @@ void draw_forms(struct terminal *term, struct document_view *doc_view);
 
 enum frame_event_status reset_form(struct session *ses, struct document_view *doc_view, int a);
 enum frame_event_status submit_form(struct session *ses, struct document_view *doc_view, int do_reload);
-void submit_given_form(struct session *ses, struct document_view *doc_view, struct form *form);
+void submit_given_form(struct session *ses, struct document_view *doc_view, struct form *form, int do_reload);
 void auto_submit_form(struct session *ses);
 void do_reset_form(struct document_view *doc_view, struct form *form);
 
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 75d382a5..f28e81e5 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -854,6 +854,40 @@ get_link_uri(struct session *ses, struct document_view *doc_view,
 	}
 }
 
+static void
+try_submit_given_form(struct session *ses, struct document_view *doc_view,
+			struct form *form, int do_reload)
+{
+#ifdef CONFIG_ECMASCRIPT
+	if (form->onsubmit) {
+		struct string code;
+
+		if (init_string(&code)) {
+			struct view_state *vs = doc_view->vs;
+			struct ecmascript_interpreter *interpreter;
+			int res = 1;
+			unsigned char *ret = form->onsubmit;
+
+			if (vs->ecmascript_fragile)
+				ecmascript_reset_state(vs);
+			interpreter = vs->ecmascript;
+			assert(interpreter);
+#ifdef CONFIG_ECMASCRIPT_SEE
+			/* SEE doesn't like return outside functions */
+			while ((ret = strstr(ret, "return "))) {
+				while (*ret != ' ') *ret++ = ' ';
+			}
+#endif
+			add_to_string(&code, form->onsubmit);
+			res = ecmascript_eval_boolback(interpreter, &code);
+			done_string(&code);
+			if (!res) return;
+		}
+	}
+#endif
+	submit_given_form(ses, doc_view, form, do_reload);
+}
+
 struct link *
 goto_current_link(struct session *ses, struct document_view *doc_view, int do_reload)
 {
@@ -866,9 +900,13 @@ goto_current_link(struct session *ses, struct document_view *doc_view, int do_re
 	link = get_current_link(doc_view);
 	if (!link) return NULL;
 
-	if (link_is_form(link))
-		uri = get_form_uri(ses, doc_view, get_link_form_control(link));
-	else
+	if (link_is_form(link)) {
+		struct form_control *fc = link->data.form_control;
+		struct form *form = fc->form;
+
+		try_submit_given_form(ses, doc_view, form, do_reload);
+		return link;
+	} else
 		uri = get_link_uri(ses, doc_view, link);
 
 	if (!uri) return NULL;

From 997f61bb32a61486cb3966c96725a2aa3d670e23 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 12:07:00 +0100
Subject: [PATCH 126/204] Use document_view instead of view_state. It is safer
 probably

---
 src/document/document.h            |  4 ++--
 src/document/html/parser/general.c | 13 +++++++------
 src/document/renderer.c            |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/document/document.h b/src/document/document.h
index 7f357fe0..93608ab6 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -11,12 +11,12 @@
 
 struct cache_entry;
 struct document_refresh;
+struct document_view;
 struct form_control;
 struct frame_desc;
 struct frameset_desc;
 struct module;
 struct screen_char;
-struct view_state;
 
 /* Nodes are used for marking areas of text on the document canvas as
  * searchable. */
@@ -149,7 +149,7 @@ struct document {
 	 * unneeded. */
 	struct uri_list ecmascript_imports;
 	/* For ecmascript access */
-	struct view_state *vs;
+	struct document_view *doc_view;
 #endif
 #ifdef CONFIG_CSS
 	/* FIXME: We should externally maybe using cache_entry store the
diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 43315fa7..3b71aba7 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -18,6 +18,7 @@
 #include "config/options.h"
 #include "document/css/apply.h"
 #include "document/document.h"
+#include "document/view.h"
 #include "document/html/frames.h"
 #include "document/html/parser/general.h"
 #include "document/html/parser/link.h"
@@ -349,14 +350,14 @@ imported:
 		struct string code, ret;
 		struct part *part = html_context->part;
 		struct document *document = part->document;
-		struct view_state *vs = document->vs;
-		struct ecmascript_interpreter *interpreter = vs->ecmascript;
+		struct document_view *doc_view = document->doc_view;
+		struct view_state *vs = doc_view->vs;
+		struct ecmascript_interpreter *interpreter;
 
-		if (!interpreter) {
+		if (vs->ecmascript_fragile)
 			ecmascript_reset_state(vs);
-			interpreter = vs->ecmascript;
-		}
-		if (!interpreter) return;
+		interpreter = vs->ecmascript;
+		assert(interpreter);
 
 		if (!init_string(&code)) return;
 		if (!init_string(&ret)) {
diff --git a/src/document/renderer.c b/src/document/renderer.c
index 37946032..708be184 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -328,7 +328,7 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 	if (document) {
 		doc_view->document = document;
 #ifdef CONFIG_ECMASCRIPT
-		document->vs = vs;
+		document->doc_view = doc_view;
 #endif
 	} else {
 		document = init_document(cached, options);
@@ -337,7 +337,7 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 
 		shrink_memory(0);
 #ifdef CONFIG_ECMASCRIPT
-		document->vs = vs;
+		document->doc_view = doc_view;
 #endif
 		render_encoded_document(cached, document);
 		sort_links(document);

From 52d3a6411dfbbde866ed3c973740a598ec07f125 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 14:13:41 +0100
Subject: [PATCH 127/204] Sort links when necessary

---
 src/document/document.h       | 1 +
 src/document/dom/renderer.c   | 1 +
 src/document/forms.c          | 3 +++
 src/document/html/renderer.c  | 1 +
 src/document/plain/renderer.c | 2 +-
 src/document/renderer.c       | 6 +++---
 src/document/renderer.h       | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/document/document.h b/src/document/document.h
index 93608ab6..e24ea6c5 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -188,6 +188,7 @@ struct document {
 	color_T bgcolor;
 
 	enum cp_status cp_status;
+	unsigned int links_sorted:1; /* whether links are already sorted */
 };
 
 #define document_has_frames(document_) ((document_) && (document_)->frame_desc)
diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 451e21fb..8f5cd1a2 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -408,6 +408,7 @@ add_dom_link(struct dom_renderer *renderer, unsigned char *string, int length,
 	}
 
 	document->nlinks++;
+	document->links_sorted = 0;
 
 	return link;
 }
diff --git a/src/document/forms.c b/src/document/forms.c
index 6eefac52..328c70d8 100644
--- a/src/document/forms.c
+++ b/src/document/forms.c
@@ -14,6 +14,7 @@
 #include "bfu/listmenu.h"
 #include "document/document.h"
 #include "document/forms.h"
+#include "document/renderer.h"
 #include "util/error.h"
 #include "util/lists.h"
 #include "util/memory.h"
@@ -131,6 +132,8 @@ get_form_control_link(struct document *document, struct form_control *fc)
 	if (fc->type == FC_HIDDEN)
 		return -1;
 
+	if (!document->links_sorted) sort_links(document);
+
 	for (link = 0; link < document->nlinks; link++)
 		if (fc == get_link_form_control(&document->links[link]))
 			return link;
diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index 54226934..8e4fc224 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -1049,6 +1049,7 @@ new_link(struct html_context *html_context, unsigned char *name, int namelen)
 
 	init_link_event_hooks(html_context, link);
 
+	document->links_sorted = 0;
 	return link;
 }
 
diff --git a/src/document/plain/renderer.c b/src/document/plain/renderer.c
index cdbad84f..7adf15fa 100644
--- a/src/document/plain/renderer.c
+++ b/src/document/plain/renderer.c
@@ -102,7 +102,7 @@ add_document_link(struct document *document, unsigned char *uri, int length,
 	}
 
 	document->nlinks++;
-
+	document->links_sorted = 0;
 	return link;
 }
 
diff --git a/src/document/renderer.c b/src/document/renderer.c
index 708be184..e6ddec68 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -39,8 +39,6 @@
 #include "viewer/text/vs.h"
 
 
-static void sort_links(struct document *document);
-
 #ifdef CONFIG_ECMASCRIPT
 /* XXX: This function is de facto obsolete, since we do not need to copy
  * snippets around anymore (we process them in one go after the document is
@@ -496,7 +494,7 @@ comp_links(struct link *l1, struct link *l2)
 	return (l1->number - l2->number);
 }
 
-static void
+void
 sort_links(struct document *document)
 {
 	int i;
@@ -505,6 +503,7 @@ sort_links(struct document *document)
 	if_assert_failed return;
 	if (!document->nlinks) return;
 
+	if (document->links_sorted) return;
 	assert(document->links);
 	if_assert_failed return;
 
@@ -544,6 +543,7 @@ sort_links(struct document *document)
 				document->lines1[j] = &document->links[i];
 		}
 	}
+	document->links_sorted = 1;
 }
 
 struct conv_table *
diff --git a/src/document/renderer.h b/src/document/renderer.h
index 2d94d206..8cc828d7 100644
--- a/src/document/renderer.h
+++ b/src/document/renderer.h
@@ -12,6 +12,6 @@ struct view_state;
 void render_document(struct view_state *, struct document_view *, struct document_options *);
 void render_document_frames(struct session *ses, int no_cache);
 struct conv_table *get_convert_table(unsigned char *head, int to_cp, int default_cp, int *from_cp, enum cp_status *cp_status, int ignore_server_cp);
-
+void sort_links(struct document *document);
 
 #endif

From 7c7541f4d12eab497fe8e85ee989d936ecd4a970 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 14:15:55 +0100
Subject: [PATCH 128/204] parent, self and top are the same since now

---
 src/ecmascript/see/window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index d6821e49..b75dcad8 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -105,8 +105,9 @@ window_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	checktime(interp);
 	if (p == s_closed) {
 		SEE_SET_BOOLEAN(res, 0);
-	} else if (p == s_self) {
+	} else if (p == s_self || p == s_parent || p == s_top) {
 		SEE_SET_OBJECT(res, o);
+#if 0		
 	} else if (p == s_parent || p == s_top) {
 		struct document_view *doc_view = vs->doc_view;
 		struct document_view *top_view = doc_view->session->doc_view;
@@ -131,7 +132,7 @@ window_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		if (compare_uri(vs->uri, top_view->vs->uri, URI_HOST)) {
 			SEE_SET_OBJECT(res, (struct SEE_object *)newjsframe);
 		}
-
+#endif
 	} else if (p == s_alert) {
 		SEE_SET_OBJECT(res, win->alert);
 	} else if (p == s_open) {

From 03c467bcbfbc30a56e0da3c6d39f653ab9e64701 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 15:03:19 +0100
Subject: [PATCH 129/204] Move URI normalization to the test library

---
 src/dom/test/test-dom-configuration-basic |  8 +-------
 src/dom/test/test-sgml-parser-basic       |  8 +-------
 src/dom/test/test-sgml-parser-incremental |  8 +-------
 test/libtest.sh                           | 13 ++++++++++++-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/dom/test/test-dom-configuration-basic b/src/dom/test/test-dom-configuration-basic
index cd217b1e..08381888 100755
--- a/src/dom/test/test-dom-configuration-basic
+++ b/src/dom/test/test-dom-configuration-basic
@@ -17,13 +17,7 @@ test_normalize_output_equals () {
 	src="$1"; shift
 	out="$1"; shift
 
-	URI="test:$(echo "$desc" | sed '
-		s/^[ \t]*\[[^]]*\][ \t]*//;
-		s/[:., \t][:., \t]*/-/g;
-		s/_/-/g;
-		# *cough*
-		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
-		s/[^a-zA-Z0-9-]//g;')"
+	URI="test:$(normalize "$desc")"
 
 	sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^  //' > output
 	echo "#document: $URI" > expected
diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index f19f158e..f81495e9 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -16,13 +16,7 @@ test_output_equals () {
 	src="$1"; shift
 	out="$1"; shift
 
-	URI="test:$(echo "$desc" | sed '
-		s/^[ \t]*\[[^]]*\][ \t]*//;
-		s/[:., \t][:., \t]*/-/g;
-		s/_/-/g;
-		# *cough*
-		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
-		s/[^a-zA-Z0-9-]//g;')"
+	URI="test:$(normalize "$desc")"
 
 	sgml-parser --uri "$URI" --src "$src" | sed 's/^  //' > output
 	echo "#document: $URI" > expected
diff --git a/src/dom/test/test-sgml-parser-incremental b/src/dom/test/test-sgml-parser-incremental
index aa6ea64b..1e520d06 100755
--- a/src/dom/test/test-sgml-parser-incremental
+++ b/src/dom/test/test-sgml-parser-incremental
@@ -16,13 +16,7 @@ test_incremental_parsing () {
 	src="$1"; shift
 	out="$1"; shift
 
-	URI="test:$(echo "$desc" | sed '
-		s/^[ \t]*\[[^]]*\][ \t]*//;
-		s/[:., \t][:., \t]*/-/g;
-		s/_/-/g;
-		# *cough*
-		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
-		s/[^a-zA-Z0-9-]//g;')"
+	URI="test:$(normalize "$desc")"
 
 	echo "#document: $URI" > expected
 	echo "$out" | sed -n '2,$p' >> expected
diff --git a/test/libtest.sh b/test/libtest.sh
index 12de5c92..a16e4577 100755
--- a/test/libtest.sh
+++ b/test/libtest.sh
@@ -15,7 +15,7 @@ export LANG LC_ALL PAGER TZ
 # test_description='Description of this test...
 # This test checks if command xyzzy does the right thing...
 # '
-# . ./test-lib.sh
+# . "$TEST_LIB
 
 error () {
 	echo "* error: $*"
@@ -27,6 +27,17 @@ say () {
 	echo "* $*"
 }
 
+normalize () {
+	echo "$@" | sed '
+		s/^[ \t]*\[[^]]*\][ \t]*//;
+		s/[:., \t][:., \t]*/-/g;
+		s/_/-/g;
+		# *cough*
+		y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
+		s/[^a-zA-Z0-9-]//g;'
+}
+
+
 test "${test_description}" != "" ||
 error "Test script did not set test_description."
 

From c223f6ce9418f5688da55320f906b81a152394d7 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 15:12:49 +0100
Subject: [PATCH 130/204] Sed the expected output instead of the output from
 sgml-parser

---
 src/dom/test/test-dom-configuration-basic | 4 ++--
 src/dom/test/test-sgml-parser-basic       | 4 ++--
 src/dom/test/test-sgml-parser-incremental | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/dom/test/test-dom-configuration-basic b/src/dom/test/test-dom-configuration-basic
index 08381888..dd118f40 100755
--- a/src/dom/test/test-dom-configuration-basic
+++ b/src/dom/test/test-dom-configuration-basic
@@ -19,9 +19,9 @@ test_normalize_output_equals () {
 
 	URI="test:$(normalize "$desc")"
 
-	sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^  //' > output
+	sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" > output
 	echo "#document: $URI" > expected
-	echo "$out" | sed -n '2,$p' >> expected
+	echo "$out" | sed -n '2,$p' | sed 's/^/  /' >> expected
 
 	test_expect_success "$desc" 'cmp output expected' 
 }
diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index f81495e9..989366be 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -18,9 +18,9 @@ test_output_equals () {
 
 	URI="test:$(normalize "$desc")"
 
-	sgml-parser --uri "$URI" --src "$src" | sed 's/^  //' > output
+	sgml-parser --uri "$URI" --src "$src" > output
 	echo "#document: $URI" > expected
-	echo "$out" | sed -n '2,$p' >> expected
+	echo "$out" | sed -n '2,$p' | sed 's/^/  /' >> expected
 
 	test_expect_success "$desc" 'cmp output expected' 
 }
diff --git a/src/dom/test/test-sgml-parser-incremental b/src/dom/test/test-sgml-parser-incremental
index 1e520d06..81038b83 100755
--- a/src/dom/test/test-sgml-parser-incremental
+++ b/src/dom/test/test-sgml-parser-incremental
@@ -19,11 +19,10 @@ test_incremental_parsing () {
 	URI="test:$(normalize "$desc")"
 
 	echo "#document: $URI" > expected
-	echo "$out" | sed -n '2,$p' >> expected
+	echo "$out" | sed -n '2,$p' | sed -e 's/^/  /' >> expected
 
 	for size in 1 2 3 4 5 6 7 8 9 10 15 20 25 50; do
-		echo -n "$src" | sgml-parser --uri "$URI" --stdin "$size" \
-		| sed -e 's/^  //' > output
+		echo -n "$src" | sgml-parser --uri "$URI" --stdin "$size" > output
 
 		test_run_ 'cmp output expected'
 		if [ "$?" != 0 -o "$eval_ret" != 0 ]
@@ -39,7 +38,7 @@ test_incremental_parsing () {
 test_incremental_parsing \
 "Parse a small document." \
 '<html><body><p>Hello World!</p></body></html>' \
-	'
+'
 element: html
   element: body
     element: p

From 71871edd434797b07448ca0fd68d41c191ab156d Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 17:08:45 +0100
Subject: [PATCH 131/204] Maybe this time it won't crash

---
 src/ecmascript/see/form.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index 908ec4f8..cbb6c9e8 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -441,9 +441,11 @@ js_get_input_object(struct SEE_interpreter *interp, struct js_form *jsform,
 	struct js_input *jsinput;
 
 	checktime(interp);
+
+#if 0
 	if (fs->ecmascript_obj)
 		return fs->ecmascript_obj;
-
+#endif
 	/* jsform ('form') is input's parent */
 	/* FIXME: That is NOT correct since the real containing element
 	 * should be its parent, but gimme DOM first. --pasky */
@@ -943,9 +945,10 @@ struct js_form *js_get_form_object(struct SEE_interpreter *interp,
 	struct js_form *js_form;
 
 	checktime(interp);
+#if 0
 	if (fv->ecmascript_obj)
 		return fv->ecmascript_obj;
-
+#endif
 	/* jsdoc ('document') is fv's parent */
 	/* FIXME: That is NOT correct since the real containing element
 	 * should be its parent, but gimme DOM first. --pasky */

From 20f5b76bb2ce3a93e0649f79f49327ff66d61063 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 18:26:45 +0100
Subject: [PATCH 132/204] ECMASCRIPT: Fix unused SEE specific variables when
 using spidermonkey

---
 src/viewer/text/link.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index f28e81e5..87276bce 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -866,16 +866,19 @@ try_submit_given_form(struct session *ses, struct document_view *doc_view,
 			struct view_state *vs = doc_view->vs;
 			struct ecmascript_interpreter *interpreter;
 			int res = 1;
-			unsigned char *ret = form->onsubmit;
 
 			if (vs->ecmascript_fragile)
 				ecmascript_reset_state(vs);
 			interpreter = vs->ecmascript;
 			assert(interpreter);
 #ifdef CONFIG_ECMASCRIPT_SEE
-			/* SEE doesn't like return outside functions */
-			while ((ret = strstr(ret, "return "))) {
-				while (*ret != ' ') *ret++ = ' ';
+			{
+				unsigned char *ret = form->onsubmit;
+
+				/* SEE doesn't like return outside functions */
+				while ((ret = strstr(ret, "return "))) {
+					while (*ret != ' ') *ret++ = ' ';
+				}
 			}
 #endif
 			add_to_string(&code, form->onsubmit);

From 645689f1aa4ca6c5eeb30f753daababf8d7a39f5 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 19:57:40 +0100
Subject: [PATCH 133/204] I have no idea why it is still crashing. This is last
 attempt today to fix it

---
 src/ecmascript/see/window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index b75dcad8..b4ea566f 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -269,6 +269,7 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 		 */
 #define NUMBER_OF_URLS_TO_REMEMBER 8
 		static struct {
+			struct SEE_interpreter *interp;
 			struct SEE_string *url;
 			struct SEE_string *target;
 		} strings[NUMBER_OF_URLS_TO_REMEMBER];
@@ -277,12 +278,15 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 
 		SEE_ToString(interp, argv[1], &target_value);
 		for (i = 0; i < NUMBER_OF_URLS_TO_REMEMBER; i++) {
-			if (!(strings[i].url && strings[i].target))
+			if (!(strings[i].url && strings[i].target
+				&& strings[i].interp))
 				continue;
-			if (!SEE_string_cmp(url_value.u.string, strings[i].url)
+			if (strings[i].interp == interp
+			    && !SEE_string_cmp(url_value.u.string, strings[i].url)
 			    && !SEE_string_cmp(target_value.u.string, strings[i].target))
 			 	return;
 		}
+		strings[indeks].interp = interp;
 		strings[indeks].url = url_value.u.string;
 		strings[indeks].target = target_value.u.string;
 		indeks++;

From 669d4af154e95233891dc5ba397c37b45dab02b1 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 20:54:11 +0100
Subject: [PATCH 134/204] Compilation fixes

---
 src/scripting/python/core.c  | 2 ++
 src/scripting/python/core.h  | 4 ----
 src/scripting/python/hooks.c | 6 +++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/scripting/python/core.c b/src/scripting/python/core.c
index 43d058cd..5e08016e 100644
--- a/src/scripting/python/core.c
+++ b/src/scripting/python/core.c
@@ -17,6 +17,8 @@
 #include "util/file.h"
 #include "util/string.h"
 
+#include <Python.h>
+
 PyObject *pDict, *pModule;
 
 void
diff --git a/src/scripting/python/core.h b/src/scripting/python/core.h
index 20d4d7f0..00b08dee 100644
--- a/src/scripting/python/core.h
+++ b/src/scripting/python/core.h
@@ -2,12 +2,8 @@
 #ifndef EL__SCRIPTING_PYTHON_CORE_H
 #define EL__SCRIPTING_PYTHON_CORE_H
 
-#include <Python.h>
-
 struct module;
 
-extern PyObject *pDict, *pModule;
-
 void init_python(struct module *module);
 void cleanup_python(struct module *module);
 
diff --git a/src/scripting/python/hooks.c b/src/scripting/python/hooks.c
index 53427f5d..6a92ffdf 100644
--- a/src/scripting/python/hooks.c
+++ b/src/scripting/python/hooks.c
@@ -16,9 +16,13 @@
 #include "session/session.h"
 #include "util/string.h"
 
+#include <Python.h>
+
 /* The events that will trigger the functions below and what they are expected
  * to do is explained in doc/events.txt */
 
+extern PyObject *pDict, *pModule;
+
 static void
 do_script_hook_goto_url(struct session *ses, unsigned char **url)
 {
@@ -117,7 +121,7 @@ do_script_hook_pre_format_html(unsigned char *url, struct cache_entry *cached,
 			if (str) {
 				int len = PyString_Size(pValue); /* strlen(str); */
 
-				add_fragment(cached, 0, (unsigned char *) str, len);
+				add_fragment(cached, 0, str, len);
 				normalize_cache_entry(cached, len);
 			}
 			Py_DECREF(pValue);

From 5bcb1309da45a37ba9902b136b4b64420d1fd8f2 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sat, 28 Jan 2006 20:21:09 +0000
Subject: [PATCH 135/204] Use enum connection_state

Use enum connection_state instead of int in load_uri,
proxy_uri, get_proxy_worker, and get_proxy_uri. See commit
d18809522ed7242ac9bfaab9a72a0b23b9d46f1c. I hope that satisfies TCC.
---
 src/network/connection.c | 2 +-
 src/protocol/proxy.c     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 2eac88e2..b28a9630 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -847,7 +847,7 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 	struct cache_entry *cached;
 	struct connection *conn;
 	struct uri *proxy_uri, *proxied_uri;
-	int connection_state = S_OK;
+	enum connection_state connection_state = S_OK;
 
 	if (download) {
 		download->conn = NULL;
diff --git a/src/protocol/proxy.c b/src/protocol/proxy.c
index 987c6d9a..f52cf2b0 100644
--- a/src/protocol/proxy.c
+++ b/src/protocol/proxy.c
@@ -16,6 +16,7 @@
 #include "config/options.h"
 #include "main/event.h"
 #include "network/connection.h"
+#include "network/state.h"
 #include "protocol/protocol.h"
 #include "protocol/proxy.h"
 #include "protocol/uri.h"
@@ -53,7 +54,8 @@ proxy_probe_no_proxy(unsigned char *url, unsigned char *no_proxy)
 }
 
 static struct uri *
-proxy_uri(struct uri *uri, unsigned char *proxy, int *connection_state)
+proxy_uri(struct uri *uri, unsigned char *proxy,
+          enum connection_state *connection_state)
 {
 	struct string string;
 
@@ -114,7 +116,8 @@ get_protocol_proxy(unsigned char *opt,
 }
 
 static struct uri *
-get_proxy_worker(struct uri *uri, unsigned char *proxy, int *connection_state)
+get_proxy_worker(struct uri *uri, unsigned char *proxy,
+                 enum connection_state *connection_state)
 {
 	unsigned char *protocol_proxy = NULL;
 
@@ -180,7 +183,7 @@ get_proxy_worker(struct uri *uri, unsigned char *proxy, int *connection_state)
 }
 
 struct uri *
-get_proxy_uri(struct uri *uri, int *connection_state)
+get_proxy_uri(struct uri *uri, enum connection_state *connection_state)
 {
 	if (uri->protocol == PROTOCOL_PROXY) {
 		return get_composed_uri(uri, URI_BASE);

From be07858b2b9938051b19493058492b8353c7c884 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sat, 28 Jan 2006 20:39:07 +0000
Subject: [PATCH 136/204] Refactor the document.write routines

Factor js_document_write_do out of js_document_write and
js_document_writeln and document_write_do out of document_write and
document_write_ln.
---
 src/ecmascript/see/document.c          | 40 +++++++++-----------------
 src/ecmascript/spidermonkey/document.c | 30 ++++++++-----------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/ecmascript/see/document.c b/src/ecmascript/see/document.c
index 70b54d90..51ee5b50 100644
--- a/src/ecmascript/see/document.c
+++ b/src/ecmascript/see/document.c
@@ -203,9 +203,9 @@ document_put(struct SEE_interpreter *interp, struct SEE_object *o,
 }
 
 static void
-js_document_write(struct SEE_interpreter *interp, struct SEE_object *self,
+js_document_write_do(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
-	     struct SEE_value *res)
+	     struct SEE_value *res, int newline)
 {
 	struct global_object *g = (struct global_object *)interp;
 	struct view_state *vs = g->win->vs;
@@ -217,6 +217,8 @@ js_document_write(struct SEE_interpreter *interp, struct SEE_object *self,
 		if (code) {
 			add_to_string(ret, code);
 			mem_free(code);
+			if (newline)
+				add_char_to_string(ret, '\n');
 		}
 	}
 #ifdef CONFIG_LEDS
@@ -233,36 +235,20 @@ js_document_write(struct SEE_interpreter *interp, struct SEE_object *self,
 	SEE_SET_BOOLEAN(res, 0);
 }
 
+static void
+js_document_write(struct SEE_interpreter *interp, struct SEE_object *self,
+	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
+	     struct SEE_value *res)
+{
+	js_document_write_do(interp, self, thisobj, argc, argv, res, 0);
+}
+
 static void
 js_document_writeln(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
 	     struct SEE_value *res)
 {
-	struct global_object *g = (struct global_object *)interp;
-	struct view_state *vs = g->win->vs;
-	struct string *ret = g->ret;
-
-	if (argc >= 1 && ret) {
-		unsigned char *code = SEE_value_to_unsigned_char(interp, argv[0]);
-
-		if (code) {
-			add_to_string(ret, code);
-			mem_free(code);
-			add_char_to_string(ret, '\n');
-		}
-	}
-#ifdef CONFIG_LEDS
-	/* XXX: I don't know about you, but I have *ENOUGH* of those 'Undefined
-	 * function' errors, I want to see just the useful ones. So just
-	 * lighting a led and going away, no muss, no fuss. --pasky */
-	/* TODO: Perhaps we can introduce ecmascript.error_report_unsupported
-	 * -> "Show information about the document using some valid,
-	 *  nevertheless unsupported methods/properties." --pasky too */
-
-	set_led_value(vs->doc_view->session->status.ecmascript_led, 'J');
-#endif
-	checktime(interp);
-	SEE_SET_BOOLEAN(res, 0);
+	js_document_write_do(interp, self, thisobj, argc, argv, res, 1);
 }
 
 static int
diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c
index 961fa8d2..4dac5d72 100644
--- a/src/ecmascript/spidermonkey/document.c
+++ b/src/ecmascript/spidermonkey/document.c
@@ -201,7 +201,8 @@ const JSFunctionSpec document_funcs[] = {
 };
 
 static JSBool
-document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+document_write_do(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
+                  jsval *rval, int newline)
 {
 	struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
 	struct string *ret = interpreter->ret;
@@ -210,6 +211,8 @@ document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
 		unsigned char *code = jsval_to_string(ctx, &argv[0]);
 
 		add_to_string(ret, code);
+		if (newline)
+			add_char_to_string(ret, '\n');
 	}
 	/* XXX: I don't know about you, but I have *ENOUGH* of those 'Undefined
 	 * function' errors, I want to see just the useful ones. So just
@@ -227,24 +230,15 @@ document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
 	return JS_TRUE;
 }
 
+static JSBool
+document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+
+	return document_write_do(ctx, obj, argc, argv, rval, 0);
+}
+
 static JSBool
 document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
-	struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
-	struct string *ret = interpreter->ret;
-
-	if (argc >= 1 && ret) {
-		unsigned char *code = jsval_to_string(ctx, &argv[0]);
-
-		add_to_string(ret, code);
-		add_char_to_string(ret, '\n');
-	}
-
-#ifdef CONFIG_LEDS
-	set_led_value(interpreter->vs->doc_view->session->status.ecmascript_led, 'J');
-#endif
-
-	boolean_to_jsval(ctx, rval, 0);
-
-	return JS_TRUE;
+	return document_write_do(ctx, obj, argc, argv, rval, 1);
 }

From c518a9f06ac0334f8a5bbfd555e0831a44c542ce Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 22:03:46 +0100
Subject: [PATCH 137/204] Compilation fix when --without-openssl was used

---
 configure.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.in b/configure.in
index e8f2b268..a8f7f51c 100644
--- a/configure.in
+++ b/configure.in
@@ -955,6 +955,7 @@ fi
 
 AC_MSG_RESULT($cf_result)
 
+CONFIG_GNUTLS_OPENSSL_COMPAT=no
 dnl ---- GNU TLS
 dnl We can't have AC_MSG_CHECKING here, because AC_PATH_PROG prints its own and
 dnl it looks ugly then.

From cb6a63f09e6e38c228fce25b8a40544110aeb283 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sat, 28 Jan 2006 22:06:10 +0100
Subject: [PATCH 138/204] Translation fixes

---
 po/pl.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index e3afbdbf..81cb8290 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2546,7 +2546,7 @@ msgstr "Numerowanie odno
 
 #: src/config/options.inc:306
 msgid "Display numbers next to the links."
-msgstr "Czy wy¶wietlaæ liczby z prawej strony odno¶ników."
+msgstr "Czy wy¶wietlaæ numery odno¶ników."
 
 #: src/config/options.inc:308
 msgid "Handling of target=_blank"
@@ -3274,7 +3274,7 @@ msgstr "Czy pami
 #
 #: src/config/options.inc:670
 msgid "HTML rendering"
-msgstr "Renderowanie HTML-a"
+msgstr "Formatowanie HTML-a"
 
 #: src/config/options.inc:672
 msgid "Options concerning the display of HTML pages."
@@ -3320,7 +3320,7 @@ msgstr "Pokazuj indeks g
 
 #: src/config/options.inc:690
 msgid "Rendering of html link element"
-msgstr "Renderowanie elementu odno¶nika html"
+msgstr "Wy¶wietlanie elementu odno¶nika html"
 
 #: src/config/options.inc:692
 msgid ""
@@ -3332,7 +3332,7 @@ msgid ""
 "4 is type in addition\n"
 "5 is everything"
 msgstr ""
-"W jaki sposób renderowaæ znaczniki <link> w nag³ówku HTML:\n"
+"W jaki sposób pokazywaæ znaczniki <link> w nag³ówku HTML:\n"
 "0 - w ogóle\n"
 "1 - tytu³\n"
 "2 - dodatkowo nazwa\n"
@@ -3365,7 +3365,7 @@ msgstr ""
 #
 #: src/config/options.inc:711
 msgid "Plain rendering"
-msgstr "Renderowanie zwyk³ego tekstu"
+msgstr "Formatowanie zwyk³ego tekstu"
 
 #: src/config/options.inc:713
 msgid "Options concerning the display of plain text pages."

From 58b8635cafa00103e27c620248212277d8cd7fa4 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 22:51:52 +0100
Subject: [PATCH 139/204] DOM: Add test to check that '\f' (form feed) counts
 as a newline

---
 src/dom/test/test-sgml-parser-lines | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/dom/test/test-sgml-parser-lines b/src/dom/test/test-sgml-parser-lines
index e021d59f..6c0c71e1 100755
--- a/src/dom/test/test-sgml-parser-lines
+++ b/src/dom/test/test-sgml-parser-lines
@@ -55,5 +55,10 @@ test_output_line_numbers \
 7
 8' \
 8
+ 
+test_output_line_numbers \
+'Check line numbers. (IIII)' \
+$'1\r\f 2\v\n 3\r\n 4\t\f 5' \
+5
 
 test_done

From 2918e3f59533abeac8c3eac373bda99a12764b3f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 28 Jan 2006 22:55:15 +0100
Subject: [PATCH 140/204] DOM: Add STATIC_DOM_STRING macro and make
 INIT_DOM_STRING cleaner

---
 src/dom/configuration.c    |  2 +-
 src/dom/css/scanner.c      |  2 +-
 src/dom/node.c             | 34 +++++++++++++++++-----------------
 src/dom/scanner.h          |  2 +-
 src/dom/select.c           |  2 +-
 src/dom/sgml/scanner.c     |  2 +-
 src/dom/sgml/sgml.h        |  4 ++--
 src/dom/string.h           | 11 ++++++++++-
 src/dom/test/dom-select.c  |  6 +++---
 src/dom/test/sgml-parser.c |  4 ++--
 10 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index b228f02e..08af021d 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -304,7 +304,7 @@ struct dom_config_info {
 };
 
 #define DOM_CONFIG(name, flag) \
-	{ INIT_DOM_STRING(name, -1), (flag) }
+	{ STATIC_DOM_STRING(name), (flag) }
 
 static struct dom_config_info dom_config_info[] = {
 	DOM_CONFIG("cdata-sections",		DOM_CONFIG_CDATA_SECTIONS),
diff --git a/src/dom/css/scanner.c b/src/dom/css/scanner.c
index 48054f59..a0e46e79 100644
--- a/src/dom/css/scanner.c
+++ b/src/dom/css/scanner.c
@@ -55,7 +55,7 @@ static const struct dom_scan_table_info css_scan_table_info[] = {
 };
 
 #define CSS_STRING_MAP(str, type, family) \
-	{ INIT_DOM_STRING(str, -1), CSS_TOKEN_##type, CSS_TOKEN_##family }
+	{ STATIC_DOM_STRING(str), CSS_TOKEN_##type, CSS_TOKEN_##family }
 
 static const struct dom_scanner_string_mapping css_string_mappings[] = {
 	CSS_STRING_MAP("Hz",		FREQUENCY,	DIMENSION),
diff --git a/src/dom/node.c b/src/dom/node.c
index d0ac956a..c21cbab9 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -451,11 +451,11 @@ done_dom_node(struct dom_node *node)
 struct dom_string *
 get_dom_node_name(struct dom_node *node)
 {
-	static struct dom_string cdata_section_str = INIT_DOM_STRING("#cdata-section", -1);
-	static struct dom_string comment_str = INIT_DOM_STRING("#comment", -1);
-	static struct dom_string document_str = INIT_DOM_STRING("#document", -1);
-	static struct dom_string document_fragment_str = INIT_DOM_STRING("#document-fragment", -1);
-	static struct dom_string text_str = INIT_DOM_STRING("#text", -1);
+	static struct dom_string cdata_section_str = STATIC_DOM_STRING("#cdata-section");
+	static struct dom_string comment_str = STATIC_DOM_STRING("#comment");
+	static struct dom_string document_str = STATIC_DOM_STRING("#document");
+	static struct dom_string document_fragment_str = STATIC_DOM_STRING("#document-fragment");
+	static struct dom_string text_str = STATIC_DOM_STRING("#text");
 
 	assert(node);
 
@@ -521,18 +521,18 @@ get_dom_node_type_name(enum dom_node_type type)
 {
 	static struct dom_string dom_node_type_names[DOM_NODES] = {
 		INIT_DOM_STRING(NULL, 0),
-		/* DOM_NODE_ELEMENT */			INIT_DOM_STRING("element", -1),
-		/* DOM_NODE_ATTRIBUTE */		INIT_DOM_STRING("attribute", -1),
-		/* DOM_NODE_TEXT */			INIT_DOM_STRING("text", -1),
-		/* DOM_NODE_CDATA_SECTION */		INIT_DOM_STRING("cdata-section", -1),
-		/* DOM_NODE_ENTITY_REFERENCE */		INIT_DOM_STRING("entity-reference", -1),
-		/* DOM_NODE_ENTITY */			INIT_DOM_STRING("entity", -1),
-		/* DOM_NODE_PROCESSING_INSTRUCTION */	INIT_DOM_STRING("proc-instruction", -1),
-		/* DOM_NODE_COMMENT */			INIT_DOM_STRING("comment", -1),
-		/* DOM_NODE_DOCUMENT */			INIT_DOM_STRING("document", -1),
-		/* DOM_NODE_DOCUMENT_TYPE */		INIT_DOM_STRING("document-type", -1),
-		/* DOM_NODE_DOCUMENT_FRAGMENT */	INIT_DOM_STRING("document-fragment", -1),
-		/* DOM_NODE_NOTATION */			INIT_DOM_STRING("notation", -1),
+		/* DOM_NODE_ELEMENT */			STATIC_DOM_STRING("element"),
+		/* DOM_NODE_ATTRIBUTE */		STATIC_DOM_STRING("attribute"),
+		/* DOM_NODE_TEXT */			STATIC_DOM_STRING("text"),
+		/* DOM_NODE_CDATA_SECTION */		STATIC_DOM_STRING("cdata-section"),
+		/* DOM_NODE_ENTITY_REFERENCE */		STATIC_DOM_STRING("entity-reference"),
+		/* DOM_NODE_ENTITY */			STATIC_DOM_STRING("entity"),
+		/* DOM_NODE_PROCESSING_INSTRUCTION */	STATIC_DOM_STRING("proc-instruction"),
+		/* DOM_NODE_COMMENT */			STATIC_DOM_STRING("comment"),
+		/* DOM_NODE_DOCUMENT */			STATIC_DOM_STRING("document"),
+		/* DOM_NODE_DOCUMENT_TYPE */		STATIC_DOM_STRING("document-type"),
+		/* DOM_NODE_DOCUMENT_FRAGMENT */	STATIC_DOM_STRING("document-fragment"),
+		/* DOM_NODE_NOTATION */			STATIC_DOM_STRING("notation"),
 	};
 
 	assert(type < DOM_NODES);
diff --git a/src/dom/scanner.h b/src/dom/scanner.h
index 54c3096d..2a7e61b9 100644
--- a/src/dom/scanner.h
+++ b/src/dom/scanner.h
@@ -67,7 +67,7 @@ struct dom_scanner_string_mapping {
 };
 
 #define DOM_STRING_MAP(str, type, family) \
-	{ INIT_DOM_STRING(str, -1), (type), (family) }
+	{ STATIC_DOM_STRING(str), (type), (family) }
 
 #define DOM_STRING_MAP_END \
 	{ INIT_DOM_STRING(NULL, 0), 0, 0 }
diff --git a/src/dom/select.c b/src/dom/select.c
index e1e4d548..af60c4d5 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -28,7 +28,7 @@ get_dom_select_pseudo(struct dom_scanner_token *token)
 	} pseudo_info[] = {
 
 #define INIT_DOM_SELECT_PSEUDO_STRING(str, type) \
-	{ INIT_DOM_STRING(str, -1), DOM_SELECT_PSEUDO_##type }
+	{ STATIC_DOM_STRING(str), DOM_SELECT_PSEUDO_##type }
 
 	INIT_DOM_SELECT_PSEUDO_STRING("first-line",	FIRST_LINE),
 	INIT_DOM_SELECT_PSEUDO_STRING("first-letter",	FIRST_LETTER),
diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index e2e7c5db..70a363dd 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -44,7 +44,7 @@ static struct dom_scan_table_info sgml_scan_table_info[] = {
 };
 
 #define SGML_STRING_MAP(str, type, family) \
-	{ INIT_DOM_STRING(str, -1), SGML_TOKEN_##type, SGML_TOKEN_##family }
+	{ STATIC_DOM_STRING(str), SGML_TOKEN_##type, SGML_TOKEN_##family }
 
 static struct dom_scanner_string_mapping sgml_string_mappings[] = {
 	SGML_STRING_MAP("--",		  NOTATION_COMMENT,	  NOTATION),
diff --git a/src/dom/sgml/sgml.h b/src/dom/sgml/sgml.h
index 34e941e6..ffac9415 100644
--- a/src/dom/sgml/sgml.h
+++ b/src/dom/sgml/sgml.h
@@ -55,10 +55,10 @@ struct sgml_node_info {
 	{ INIT_DOM_STRING(NULL, doctype##_##nodetype##S - 1), doctype##_##nodetype##_UNKNOWN }
 
 #define SGML_NODE_INFO(doctype, nodetype, name, data) \
-	{ INIT_DOM_STRING(#name, sizeof(#name) - 1), doctype##_##nodetype##_##name, data }
+	{ STATIC_DOM_STRING(#name), doctype##_##nodetype##_##name, data }
 
 #define SGML_NODE_INF2(doctype, nodetype, name, ident, data) \
-	{ INIT_DOM_STRING(ident, sizeof(ident) - 1), doctype##_##nodetype##_##name, data }
+	{ STATIC_DOM_STRING(ident), doctype##_##nodetype##_##name, data }
 
 #define SGML_NODE_INFO_TYPE(doctype, nodetype, name) doctype##_##nodetype##_##name
 
diff --git a/src/dom/string.h b/src/dom/string.h
index 15a15cfd..4e04e9d8 100644
--- a/src/dom/string.h
+++ b/src/dom/string.h
@@ -3,13 +3,22 @@
 
 #include "util/memory.h"
 
+/* For now DOM has it's own little string library. Mostly because there are
+ * some memory overhead associated with util/string's block-based allocation
+ * scheme which is optimized for building strings and quickly dispose of it.
+ * Also, at some point we need to switch to use mainly UTF-8 strings for DOM
+ * and it needs to be possible to adapt the string library to that. --jonas */
+
 struct dom_string {
 	size_t length;
 	unsigned char *string;
 };
 
 #define INIT_DOM_STRING(strvalue, strlength) \
-	{ (strlength) == -1 ? sizeof(strvalue) - 1 : (strlength), (strvalue) }
+	{ (strlength), (strvalue) }
+
+#define STATIC_DOM_STRING(strvalue) \
+	{ sizeof(strvalue) - 1, (strvalue) }
 
 static inline void
 set_dom_string(struct dom_string *string, unsigned char *value, size_t length)
diff --git a/src/dom/test/dom-select.c b/src/dom/test/dom-select.c
index 2121b43f..e4cc6f23 100644
--- a/src/dom/test/dom-select.c
+++ b/src/dom/test/dom-select.c
@@ -38,9 +38,9 @@ main(int argc, char *argv[])
 	struct sgml_parser *parser;
 	struct dom_select *select;
 	enum sgml_document_type doctype = SGML_DOCTYPE_HTML;
-	struct dom_string uri = INIT_DOM_STRING("dom://test", -1);
-	struct dom_string source = INIT_DOM_STRING("(no source)", -1);
-	struct dom_string selector = INIT_DOM_STRING("(no select)", -1);
+	struct dom_string uri = STATIC_DOM_STRING("dom://test");
+	struct dom_string source = STATIC_DOM_STRING("(no source)");
+	struct dom_string selector = STATIC_DOM_STRING("(no select)");
 	int i;
 
 	for (i = 1; i < argc; i++) {
diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 320758a6..9ac6817a 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -267,8 +267,8 @@ main(int argc, char *argv[])
 	int normalize = 0;
 	int complete = 1;
 	size_t read_stdin = 0;
-	struct dom_string uri = INIT_DOM_STRING("dom://test", -1);
-	struct dom_string source = INIT_DOM_STRING("(no source)", -1);
+	struct dom_string uri = STATIC_DOM_STRING("dom://test");
+	struct dom_string source = STATIC_DOM_STRING("(no source)");
 	int i;
 
 	for (i = 1; i < argc; i++) {

From 2e3e18595f6460b4cbe9b6774c2c3f8f37e66e1d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 09:04:52 +0100
Subject: [PATCH 141/204] Normalize all links added by the plain renderer

Fixes problems with host or protocol parts not being lowercased. This
triggers an assertion failure when trying to download such links. Reported
by lindi-.
---
 src/document/plain/renderer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/document/plain/renderer.c b/src/document/plain/renderer.c
index 7adf15fa..c17785eb 100644
--- a/src/document/plain/renderer.c
+++ b/src/document/plain/renderer.c
@@ -135,6 +135,10 @@ check_link_word(struct document *document, unsigned char *uri, int length,
 
 	if (!where) return NULL;
 
+	/* We need to reparse the URI and normalize it so that the protocol and
+	 * host part are converted to lowercase. */
+	normalize_uri(NULL, where);
+
 	new_link = add_document_link(document, where, length, x, y);
 
 	if (!new_link) mem_free(where);

From ca5a5f230ad816aba95440f3d12f8cc6f74c528f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 12:11:35 +0100
Subject: [PATCH 142/204] Make render_dom_node_source static

---
 src/document/dom/renderer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 8f5cd1a2..8d391e18 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -507,7 +507,7 @@ render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *no
 }
 #endif
 
-enum dom_stack_code
+static enum dom_stack_code
 render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;

From 9fe0608bd299eb54cb63f17b0e602e26520f594e Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 12:12:41 +0100
Subject: [PATCH 143/204] DOM: Fix checking of out-of-bound access to scanned
 strings

---
 src/dom/sgml/scanner.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 70a363dd..a544a43f 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -458,7 +458,8 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			real_length = 0;
 
 		} else if (string == scanner->end) {
-			/* It is incomplete. */
+			/* It is incomplete so prevent out of bound acess to
+			 * the scanned string. */
 
 		} else if (is_sgml_ident(*string)) {
 			token->string.string = string;
@@ -467,7 +468,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			real_length = string - token->string.string;
 
 			skip_sgml_space(scanner, &string);
-			if (*string == '>') {
+			if (string < scanner->end && *string == '>') {
 				type = SGML_TOKEN_ELEMENT;
 				string++;
 
@@ -570,7 +571,10 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			string++;
 			skip_sgml_space(scanner, &string);
 
-			if (is_sgml_ident(*string)) {
+			if (string == scanner->end) {
+				/* Prevent out of bound access. */
+
+			} else if (is_sgml_ident(*string)) {
 				token->string.string = string;
 				scan_sgml(scanner, string, SGML_CHAR_IDENT);
 				real_length = string - token->string.string;
@@ -634,7 +638,10 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 		 * For stricter parsing we should always require attribute
 		 * values to be quoted.
 		 */
-		if (*string == '>') {
+		if (string == scanner->end) {
+			/* Prevent out of bound access. */
+ 
+ 		} else if (*string == '>') {
 			string++;
 			real_length = 0;
 			type = SGML_TOKEN_ELEMENT_EMPTY_END;
@@ -671,7 +678,8 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			/* Force an incomplete token. */
 			string = scanner->end;
 
-		} else if (is_sgml_attribute(*string)) {
+		} else if (string < scanner->end
+			   && is_sgml_attribute(*string)) {
 			token->string.string++;
 			scan_sgml_attribute(scanner, string);
 			type = SGML_TOKEN_ATTRIBUTE;
@@ -683,7 +691,8 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
 			type = SGML_TOKEN_IDENT;
 		}
 
-		if (is_sgml_attribute(*string)) {
+		if (string < scanner->end
+		    && is_sgml_attribute(*string)) {
 			scan_sgml_attribute(scanner, string);
 			type = SGML_TOKEN_ATTRIBUTE;
 			if (string[-1] == '/' && string[0] == '>') {

From 8cc828bf7cab192be89850758c0e1e78e6196468 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sun, 29 Jan 2006 12:28:05 +0100
Subject: [PATCH 144/204] Compilation fix

---
 src/scripting/python/core.c  | 2 +-
 src/scripting/python/hooks.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripting/python/core.c b/src/scripting/python/core.c
index 5e08016e..fda82188 100644
--- a/src/scripting/python/core.c
+++ b/src/scripting/python/core.c
@@ -5,6 +5,7 @@
 #endif
 
 #include "scripting/python/core.h"
+#include <Python.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +18,6 @@
 #include "util/file.h"
 #include "util/string.h"
 
-#include <Python.h>
 
 PyObject *pDict, *pModule;
 
diff --git a/src/scripting/python/hooks.c b/src/scripting/python/hooks.c
index 6a92ffdf..8473ad7b 100644
--- a/src/scripting/python/hooks.c
+++ b/src/scripting/python/hooks.c
@@ -5,6 +5,7 @@
 #endif
 
 #include "scripting/python/core.h"
+#include <Python.h>
 
 #include "elinks.h"
 
@@ -16,7 +17,6 @@
 #include "session/session.h"
 #include "util/string.h"
 
-#include <Python.h>
 
 /* The events that will trigger the functions below and what they are expected
  * to do is explained in doc/events.txt */

From 0cb0d0aaae0035f68bff86950ca262010ba55919 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 12:59:48 +0100
Subject: [PATCH 145/204] Add Eric Wald to authors

---
 AUTHORS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index cf076cf8..d63f6127 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -161,6 +161,9 @@ Doug Kearns <djkea2@mugca.its.monash.edu.au>
 Edwin Groothuis <edwin@mavetju.org>
 	Dump-width option
 
+Eric Wald <eswald@gmail.com>
+	Vim ftplugin to set ELinks coding style
+
 Evan Hughes <hughes@lab43.org>
 	Bookmarks
 

From 46aae704eb81faa4757f7917d4058a63f29aea2e Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sun, 29 Jan 2006 13:22:05 +0100
Subject: [PATCH 146/204] Added slash to base href when directory didn't end
 with '/'

---
 src/protocol/fsp/fsp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 4696657c..d3613cd8 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -141,9 +141,10 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	fclose(stderr);
 	add_html_to_string(&buf, uristring, strlen(uristring));
 
-	printf("<html><head><title>%s</title><base href=\"%s\">"
-	       "</head><body><h2>FSP directory %s</h2><pre>",
-	       buf.source, uristring, buf.source);
+	printf("<html><head><title>%s</title><base href=\"%s", buf.source,
+		uristring);
+	if (buf.source[buf.length - 1] != '/') printf("/");
+	printf("\"></head><body><h2>FSP directory %s</h2><pre>", buf.source);
 
 	dir = fsp_opendir(ses, data);
 	if (!dir) goto end;

From a2366085546356481fc3f7cd0ea75f9d261d4fe3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 14:27:14 +0100
Subject: [PATCH 147/204] Do not set the content type for FSP files

Simplify commit 8d4f44f2f16d51e147df1dde7355d5da85a41115, in particular
detecting MIME types for files. It is more consistent to do it the way
it was already done by the session/download code.

Instead, write a NUL byte to stderr when getting FSP files and only set
cache->content_type when the header string is non-empty.

Additionally it also moves close(stderr) after the fsp_error() in the
file handling part of do_fsp() so the error message is shown with the
correct type.
---
 src/mime/mime.c        |  6 -----
 src/mime/mime.h        |  3 ---
 src/protocol/fsp/fsp.c | 50 ++++++++++++++----------------------------
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/mime/mime.c b/src/mime/mime.c
index bbeca78b..37372911 100644
--- a/src/mime/mime.c
+++ b/src/mime/mime.c
@@ -224,12 +224,6 @@ get_cache_header_content_type(struct cache_entry *cached)
 	return NULL;
 }
 
-unsigned char *
-get_default_content_type(void)
-{
-	return get_default_mime_type();
-}
-
 unsigned char *
 get_content_type(struct cache_entry *cached)
 {
diff --git a/src/mime/mime.h b/src/mime/mime.h
index 8584ee4f..779ed3b8 100644
--- a/src/mime/mime.h
+++ b/src/mime/mime.h
@@ -20,9 +20,6 @@ extern struct module mime_module;
  * scanning the uri for extensions. */
 unsigned char *get_content_type(struct cache_entry *cached);
 
-/* Default mime type */
-unsigned char *get_default_content_type(void);
-
 /* Guess content type by looking at configurations of the given @extension */
 unsigned char *get_extension_content_type(unsigned char *extension);
 
diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 4696657c..b8f0f389 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -27,7 +27,6 @@
 #include "intl/gettext/libintl.h"
 #include "main/module.h"
 #include "main/select.h"
-#include "mime/mime.h"
 #include "network/connection.h"
 #include "network/socket.h"
 #include "osdep/osdep.h"
@@ -180,31 +179,6 @@ end:
 	exit(0);
 }
 
-static unsigned char *
-get_content_type_uri(struct uri *uri)
-{
-	unsigned char *extension = get_extension_from_uri(uri);
-
-	if (extension) {
-		unsigned char *ctype;
-		/* XXX:	A little hack for making extension handling case
-		 * insensitive. We could probably do it better by making
-		 * guess_encoding() case independent the real problem however
-		 * is with default (via option system) and mimetypes resolving
-		 * doing that option and hash lookup will not be easy to
-		 * convert. --jonas */
-		convert_to_lowercase(extension, strlen(extension));
-
-		ctype = get_extension_content_type(extension);
-		if (ctype && *ctype) {
-			return ctype;
-		}
-	}
-
-	return get_default_content_type();
-
-}
-
 #define READ_SIZE	4096
 
 static void
@@ -229,13 +203,18 @@ do_fsp(struct connection *conn)
 		FSP_FILE *file = fsp_fopen(ses, data, "r");
 		int r;
 
-		fprintf(stderr, "%s", get_content_type_uri(uri));
-		fclose(stderr);
 		if (!file)
 			fsp_error("fsp_fopen error.");
 
+		/* Use the default way to find the MIME type, so write an
+		 * 'empty' name, since something needs to be written in order
+		 * to avoid socket errors. */
+		fprintf(stderr, "%c", '\0');
+		fclose(stderr);
+
 		while ((r = fsp_fread(buf, 1, READ_SIZE, file)) > 0)
 			fwrite(buf, 1, r, stdout);
+
 		fsp_fclose(file);
 		fsp_close_session(ses);
 		exit(0);
@@ -273,7 +252,6 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
 static void
 fsp_got_header(struct socket *socket, struct read_buffer *rb)
 {
-	int len = rb->length;
 	struct connection *conn = socket->conn;
 	struct read_buffer *buf;
 
@@ -285,10 +263,16 @@ fsp_got_header(struct socket *socket, struct read_buffer *rb)
 		return;
 	}
 	socket->state = SOCKET_END_ONCLOSE;
-	if (len <= 0) goto end;
-	rb->data[len] = '\0';
-	mem_free_set(&conn->cached->content_type, stracpy(rb->data));
-end:
+
+	if (rb->length > 0) {
+		unsigned char *ctype = memacpy(rb->data, rb->length);
+
+		if (ctype && *ctype)
+			mem_free_set(&conn->cached->content_type, ctype);
+		else
+			mem_free_if(ctype);
+	}
+
 	buf = alloc_read_buffer(conn->data_socket);
 	if (!buf) {
 		close(socket->fd);

From 87e27b9b3e47671484c7eb77d61b75fffc89624f Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sun, 29 Jan 2006 14:58:03 +0100
Subject: [PATCH 148/204] goto_url_hook takes 2 params not 1. Some dumbprefixes
 defined in hooks.py

---
 contrib/python/hooks.py      | 30 ++++++++++++++++++++++++++++--
 src/scripting/python/hooks.c |  6 ++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index 97f63178..fe75b5f6 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -1,5 +1,31 @@
-def goto_url_hook(url):
-	return None
+dumbprefixes = {
+	"7th" : "http://7thguard.net/",
+	"b" : "http://babelfish.altavista.com/babelfish/tr",
+	"bz" : "http://bugzilla.elinks.cz",
+	"bug" : "http://bugzilla.elinks.cz",
+	"d" : "http://www.dict.org",
+	"g" : "http://www.google.com/",
+	"gg" : "http://www.google.com/",
+	"go" : "http://www.google.com/",
+	"fm" : "http://www.freshmeat.net/",
+	"sf" : "http://www.sourceforge.net/",
+	"dbug" : "http://bugs.debian.org/",
+	"dpkg" : "http://packages.debian.org/",
+	"pycur" : "http://www.python.org/doc/current/",
+	"pydev" : "http://www.python.org/dev/doc/devel/",
+	"pyhelp" : "http://starship.python.net/crew/theller/pyhelp.cgi",
+	"pyvault" : "http://www.vex.net/parnassus/",
+	"e2" : "http://www.everything2.org/",
+	"sd" : "http://www.slashdot.org/"
+}
+
+def goto_url_hook(url, current_url):
+	global dumbprefixes
+
+	if dumbprefixes.has_key(url):
+		return dumbprefixes[url];
+	else:
+		return None
 
 def follow_url_hook(url):
 	return None
diff --git a/src/scripting/python/hooks.c b/src/scripting/python/hooks.c
index 8473ad7b..0c610338 100644
--- a/src/scripting/python/hooks.c
+++ b/src/scripting/python/hooks.c
@@ -21,7 +21,8 @@
 /* The events that will trigger the functions below and what they are expected
  * to do is explained in doc/events.txt */
 
-extern PyObject *pDict, *pModule;
+extern PyObject *pDict;
+extern PyObject *pModule;
 
 static void
 do_script_hook_goto_url(struct session *ses, unsigned char **url)
@@ -37,7 +38,8 @@ do_script_hook_goto_url(struct session *ses, unsigned char **url)
 		} else {
 			str = struri(cur_loc(ses)->vs.uri);
 		}
-		pValue = PyObject_CallFunction(pFunc, "s", str);
+
+		pValue = PyObject_CallFunction(pFunc, "ss", *url, str);
 		if (pValue && (pValue != Py_None)) {
 			const unsigned char *res = PyString_AsString(pValue);
 

From 5c607c1ce872de58a7e29d67eae1459d31f58ee7 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Sun, 29 Jan 2006 16:48:33 +0100
Subject: [PATCH 149/204] Check for python

---
 configure.in | 61 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/configure.in b/configure.in
index a8f7f51c..2033ef38 100644
--- a/configure.in
+++ b/configure.in
@@ -740,13 +740,17 @@ dnl Check for Python
 dnl ===================================================================
 enable_python="no";
 
-AC_ARG_WITH(python, [  --with-python           enable Python support],
+AC_ARG_WITH(python, [  --with-python=[prefix]       enable Python support],
             [
-if test "$withval" = yes; then
+if test "$withval" != no; then
 	# FIXME: If withval is a valid directory append it to PATH
 	# so that you can specify one of several Python installations.
-	withval="";
-	enable_python=yes;
+	if test "$withval" != yes; then
+		python_prefix="$withval"
+	else
+		python_prefix=""
+	fi
+	enable_python=yes
 	cat <<EOF
 ***********************************************************************
 The Python support is incomplete and not so well integrated to ELinks
@@ -758,35 +762,46 @@ EOF
 fi
 	    ])
 
-AC_MSG_CHECKING([for Python])
 
 cf_result=no
 
 EL_SAVE_FLAGS
 
 if test "$enable_python" = "yes"; then
-	PYTHON_LIBS="-lpython"
-	PYTHON_CFLAGS="-I`python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()' 2> /dev/null`"
-	LIBS="$PYTHON_LIBS $LIBS"
-	CFLAGS="$PYTHON_CFLAGS $CFLAGS"
-	CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-	AC_TRY_LINK([
-#include <Python.h>
-],
+	if test -n "$python_prefix" && test -d "$python_prefix/bin"; then
+		PYTHON_PATH="$python_prefix/bin:$PATH"
+	else
+		PYTHON_PATH="$PATH"
+	fi
+	AC_PATH_PROG(PYTHON, python, no, $PYTHON_PATH)
+	if test "$PYTHON" = "no" ; then
+		cf_result=no
+	else
+		PYTHON_CFLAGS="-I`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc()' 2> /dev/null`"
+		if test -n "$python_prefix" && test -d "$python_prefix/lib"; then
+			PYTHON_LIBS="-L$python_prefix/lib -lpython"
+		else
+			PYTHON_LIBS="-lpython"
+		fi
+		LIBS="$PYTHON_LIBS $LIBS"
+		CFLAGS="$PYTHON_CFLAGS $CFLAGS"
+		AC_TRY_LINK([#include <Python.h>],
 		    [Py_Initialize();],
 		    cf_result=yes, cf_result=no)
+
+		if test "$cf_result" != "yes"; then
+			EL_RESTORE_FLAGS
+		else
+			EL_CONFIG(CONFIG_SCRIPTING_PYTHON, [Python])
+
+			CFLAGS="$CFLAGS_X"
+			AC_SUBST(PYTHON_LIBS)
+			AC_SUBST(PYTHON_CFLAGS)
+		fi
+	fi
 fi
 
-if test "$cf_result" != "yes"; then
-	EL_RESTORE_FLAGS
-else
-	EL_CONFIG(CONFIG_SCRIPTING_PYTHON, [Python])
-
-	CFLAGS="$CFLAGS_X"
-	AC_SUBST(PYTHON_LIBS)
-	AC_SUBST(PYTHON_CFLAGS)
-fi
-
+AC_MSG_CHECKING([for Python])
 if test "$cf_result"; then AC_MSG_RESULT($cf_result); fi
 
 

From d07cf588bdfa9c829cd5fb185d66d8171dfc0b3e Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 29 Jan 2006 17:48:09 +0100
Subject: [PATCH 150/204] FSP: reduce code redundancy.

---
 src/protocol/fsp/fsp.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 2ced2e6e..d18f33b9 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -83,19 +83,11 @@ compare(FSP_RDENTRY *a, FSP_RDENTRY *b)
 
 
 static void
-sort_and_display_entries(FSP_DIR *dir)
+sort_and_display_entries(FSP_DIR *dir, unsigned char dircolor[])
 {
 	FSP_RDENTRY fentry, *fresult, *table = NULL;
 	int size = 0;
 	int i;
-	unsigned char dircolor[8];
-
-	if (get_opt_bool("document.browse.links.color_dirs")) {
-		color_to_string(get_opt_color("document.colors.dirs"),
-			(unsigned char *) &dircolor);
-	} else {
-		dircolor[0] = 0;
-	}
 
 	while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 		FSP_RDENTRY *new_table;
@@ -132,6 +124,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	FSP_DIR *dir;
 	unsigned char *uristring = get_uri_string(uri, URI_PUBLIC);
 	unsigned char *data = get_uri_string(uri, URI_DATA);
+	unsigned char dircolor[8] = "";
 
 	if (!uristring || !data || !init_string(&buf))
 		fsp_error("Out of memory");
@@ -148,19 +141,16 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	dir = fsp_opendir(ses, data);
 	if (!dir) goto end;
 
+	if (get_opt_bool("document.browse.links.color_dirs")) {
+		color_to_string(get_opt_color("document.colors.dirs"),
+				(unsigned char *) &dircolor);
+	}
+
 	if (get_opt_bool("protocol.fsp.sort")) {
-		sort_and_display_entries(dir);
+		sort_and_display_entries(dir, dircolor);
 	} else {
 		FSP_RDENTRY fentry, *fresult;
-		unsigned char dircolor[8];
-
-		if (get_opt_bool("document.browse.links.color_dirs")) {
-			color_to_string(get_opt_color("document.colors.dirs"),
-				(unsigned char *) &dircolor);
-		} else {
-			dircolor[0] = 0;
-		}
-
+	
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
 			printf("%10d\t<a href=\"%s%s\">", fentry.size,

From 0c4bc5a362ea4ba9d5e43e5a5a0d921de8f5f084 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 29 Jan 2006 17:53:26 +0100
Subject: [PATCH 151/204] FSP: reduce code redundancy, introducing
 display_entry().

---
 src/protocol/fsp/fsp.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index d18f33b9..b887ebbf 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -81,6 +81,18 @@ compare(FSP_RDENTRY *a, FSP_RDENTRY *b)
 	return strcmp(a->name, b->name);
 }
 
+static void
+display_entry(FSP_RDENTRY *fentry, unsigned char dircolor[])
+{
+	printf("%10d\t<a href=\"%s%s\">", fentry->size,
+	       fentry->name, fentry->type == FSP_RDTYPE_DIR ? "/" : "");
+	if (fentry->type == FSP_RDTYPE_DIR && *dircolor)
+		printf("<font color=\"%s\"><b>", dircolor);
+	printf("%s", fentry->name);
+	if (fentry->type == FSP_RDTYPE_DIR && *dircolor)
+		printf("</b></font>");
+	puts("</a>");
+}
 
 static void
 sort_and_display_entries(FSP_DIR *dir, unsigned char dircolor[])
@@ -106,14 +118,7 @@ sort_and_display_entries(FSP_DIR *dir, unsigned char dircolor[])
 	 (int (*)(const void *, const void *)) compare);
 
 	for (i = 0; i < size; i++) {
-		printf("%10d\t<a href=\"%s%s\">", table[i].size, table[i].name,
-			table[i].type == FSP_RDTYPE_DIR ? "/" : "");
-		if (table[i].type == FSP_RDTYPE_DIR && *dircolor)
-			printf("<font color=\"%s\"><b>", dircolor);
-		printf("%s", table[i].name);
-		if (table[i].type == FSP_RDTYPE_DIR && *dircolor)
-			printf("</b></font>");
-		puts("</a>");
+		display_entry(&table[i], dircolor);
 	}
 }
 
@@ -153,14 +158,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 	
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
-			printf("%10d\t<a href=\"%s%s\">", fentry.size,
-			 fentry.name, fentry.type == FSP_RDTYPE_DIR ? "/" : "");
-			if (fentry.type == FSP_RDTYPE_DIR && *dircolor)
-				printf("<font color=\"%s\"><b>", dircolor);
-			printf("%s", fentry.name);
-			if (fentry.type == FSP_RDTYPE_DIR && *dircolor)
-				printf("</b></font>");
-			puts("</a>");
+			display_entry(&fentry, dircolor);
 		}
 		fsp_closedir(dir);
 	}

From af2cc87054a14cbff59e183163418334a4915f66 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 29 Jan 2006 18:01:22 +0100
Subject: [PATCH 152/204] FSP: display_entry() cleanup, and mark directories by
 an ending / in lists.

---
 src/protocol/fsp/fsp.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index b887ebbf..d4ca3419 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -84,13 +84,17 @@ compare(FSP_RDENTRY *a, FSP_RDENTRY *b)
 static void
 display_entry(FSP_RDENTRY *fentry, unsigned char dircolor[])
 {
-	printf("%10d\t<a href=\"%s%s\">", fentry->size,
-	       fentry->name, fentry->type == FSP_RDTYPE_DIR ? "/" : "");
-	if (fentry->type == FSP_RDTYPE_DIR && *dircolor)
-		printf("<font color=\"%s\"><b>", dircolor);
-	printf("%s", fentry->name);
-	if (fentry->type == FSP_RDTYPE_DIR && *dircolor)
-		printf("</b></font>");
+	printf("%10d\t<a href=\"%s", fentry->size, fentry->name);
+	if (fentry->type == FSP_RDTYPE_DIR) {
+		printf("/\">");
+		if (*dircolor)
+			printf("<font color=\"%s\"><b>", dircolor);
+		printf("%s/", fentry->name);
+		if (*dircolor)
+			printf("</b></font>");
+	} else {
+		printf("/\">%s", fentry->name);
+	}
 	puts("</a>");
 }
 

From cf429c4eccf8e0dd4e8975cf16070b765d6c4b25 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 29 Jan 2006 18:01:48 +0100
Subject: [PATCH 153/204] FSP: trim trailing whitespaces.

---
 src/protocol/fsp/fsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index d4ca3419..508a4373 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -159,7 +159,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 		sort_and_display_entries(dir, dircolor);
 	} else {
 		FSP_RDENTRY fentry, *fresult;
-	
+
 		while (!fsp_readdir_native(dir, &fentry, &fresult)) {
 			if (!fresult) break;
 			display_entry(&fentry, dircolor);

From 7d1ff4fbf1344c75d0f252c0b180c5a190a6dce4 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 29 Jan 2006 18:35:59 +0100
Subject: [PATCH 154/204] Only add ending slash to directory URLs

Not even to directory names. We don't do that for file: or ftp: protocol.

Fixes: af2cc87054a14cbff59e183163418334a4915f66
---
 src/protocol/fsp/fsp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 508a4373..569cea1b 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -89,11 +89,11 @@ display_entry(FSP_RDENTRY *fentry, unsigned char dircolor[])
 		printf("/\">");
 		if (*dircolor)
 			printf("<font color=\"%s\"><b>", dircolor);
-		printf("%s/", fentry->name);
+		printf("%s", fentry->name);
 		if (*dircolor)
 			printf("</b></font>");
 	} else {
-		printf("/\">%s", fentry->name);
+		printf("\">%s", fentry->name);
 	}
 	puts("</a>");
 }

From 865af9ac4a1ae038d26edc1563e9781fc6c7a681 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 01:22:31 +0100
Subject: [PATCH 155/204] DIRLIST: Add helper to at start of (HTML) directory
 listing

---
 src/protocol/Makefile |  9 ++--
 src/protocol/common.c | 96 +++++++++++++++++++++++++++++++++++++++++++
 src/protocol/common.h |  8 ++++
 src/protocol/uri.h    |  3 ++
 4 files changed, 110 insertions(+), 6 deletions(-)

diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index c4bee068..7801c97e 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -1,8 +1,6 @@
 top_builddir=../..
 include $(top_builddir)/Makefile.config
 
-SUBDIRS = auth file http
-
 SUBDIRS-$(CONFIG_BITTORRENT)	+= bittorrent
 SUBDIRS-$(CONFIG_FINGER)	+= finger
 SUBDIRS-$(CONFIG_FSP)		+= fsp
@@ -12,11 +10,10 @@ SUBDIRS-$(CONFIG_NNTP)		+= nntp
 SUBDIRS-$(CONFIG_SMB)		+= smb
 SUBDIRS-$(CONFIG_URI_REWRITE)	+= rewrite
 
-OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o
+SUBDIRS = auth file http
 
 OBJS-$(CONFIG_DATA)		+= data.o
-OBJS-$(CONFIG_CGI)		+= common.o
-OBJS-$(CONFIG_FSP)		+= common.o
-OBJS-$(CONFIG_SMB)		+= common.o
+
+OBJS = about.o common.o date.o header.o protocol.o proxy.o uri.o user.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/protocol/common.c b/src/protocol/common.c
index 2195a9d1..e18930cf 100644
--- a/src/protocol/common.c
+++ b/src/protocol/common.c
@@ -17,7 +17,13 @@
 
 #include "elinks.h"
 
+#include "config/options.h"
 #include "protocol/common.h"
+#include "protocol/protocol.h"
+#include "protocol/uri.h"
+#include "util/conv.h"
+#include "util/memory.h"
+#include "util/string.h"
 
 
 /* Close all non-terminal file descriptors. */
@@ -35,3 +41,93 @@ close_all_non_term_fd(void)
 	for (n = 3; n < max; n++)
 		close(n);
 }
+
+enum connection_state
+init_directory_listing(struct string *page, struct uri *uri)
+{
+	struct string dirpath = NULL_STRING;
+	struct string location = NULL_STRING;
+	unsigned char *info;
+	int local = (uri->protocol == PROTOCOL_FILE);
+
+	if (!init_string(page)
+	    || !init_string(&dirpath)
+	    || !init_string(&location)
+	    || !add_uri_to_string(&dirpath, uri, URI_DATA)
+	    || !add_uri_to_string(&location, uri, URI_DIR_LOCATION))
+		goto out_of_memory;
+
+	if (dirpath.length > 0
+	    && !dir_sep(dirpath.source[dirpath.length - 1])
+	    && !add_char_to_string(&dirpath, '/'))
+		goto out_of_memory;
+
+	if (!local && !add_char_to_string(&location, '/'))
+		goto out_of_memory;
+
+	if (!add_to_string(page, "<html>\n<head><title>"))
+		goto out_of_memory;
+
+	if (!local && !add_string_to_string(page, &location))
+		goto out_of_memory;
+
+	if (!add_html_to_string(page, dirpath.source, dirpath.length)
+	    || !add_to_string(page, "</title>\n<base href=\"")
+	    || !add_string_to_string(page, &location))
+		goto out_of_memory;
+
+	encode_uri_string(page, dirpath.source, -1, 0);
+
+	if (!add_to_string(page, "\" />\n</head>\n<body>\n<h2>"))
+		goto out_of_memory;
+
+	switch (uri->protocol) {
+	case PROTOCOL_FILE:
+		info = "Local";
+		break;
+	case PROTOCOL_FTP:
+		info = "FTP";
+		break;
+	case PROTOCOL_FSP:
+		info = "FSP";
+		break;
+	default:
+		info = "?";
+	}
+
+	if (!add_to_string(page, info)
+	    || !add_to_string(page, " directory "))
+		goto out_of_memory;
+
+	if (!local && !add_string_to_string(page, &location))
+		goto out_of_memory;
+
+	/* Make the directory path with links to each subdir. */
+	{
+		unsigned char *slash = dirpath.source;
+		unsigned char *pslash = slash;
+
+		while ((slash = strchr(slash, '/'))) {
+			/* FIXME: htmlesc? At least we should escape quotes. --pasky */
+			if (!add_to_string(page, "<a href=\"")
+	    		    || !add_string_to_string(page, &location)
+			    || !add_bytes_to_string(page, dirpath.source, slash - dirpath.source)
+			    || !add_to_string(page, "/\">")
+			    || !add_html_to_string(page, pslash, slash - pslash)
+			    || !add_to_string(page, "</a>/"))
+				goto out_of_memory;
+
+			pslash = ++slash;
+		}
+	}
+
+	if (!add_to_string(page, "</h2>\n<pre>")) {
+out_of_memory:
+		done_string(page);
+	}
+
+	done_string(&dirpath);
+	done_string(&location);
+
+	return page->length > 0 ? S_OK : S_OUT_OF_MEM;
+}
diff --git a/src/protocol/common.h b/src/protocol/common.h
index 1f43b790..11654185 100644
--- a/src/protocol/common.h
+++ b/src/protocol/common.h
@@ -1,7 +1,15 @@
 #ifndef EL__PROTOCOL_COMMON_H
 #define EL__PROTOCOL_COMMON_H
 
+#include "network/state.h"
+
+struct string;
+struct uri;
+
 /* Close all non-terminal file descriptors. */
 void close_all_non_term_fd(void);
 
+enum connection_state
+init_directory_listing(struct string *page, struct uri *uri);
+
 #endif
diff --git a/src/protocol/uri.h b/src/protocol/uri.h
index dac654e5..cb6babb6 100644
--- a/src/protocol/uri.h
+++ b/src/protocol/uri.h
@@ -160,6 +160,9 @@ enum uri_component {
 	/* Used for HTTP CONNECT method info */
 	URI_HTTP_CONNECT	= URI_HOST | URI_PORT | URI_DEFAULT_PORT,
 
+	/* Used for adding directory listing HTML header, */
+	URI_DIR_LOCATION	= URI_PROTOCOL | URI_HOST | URI_PORT | URI_IDN,
+
 	/* Used for getting the host of a DNS query. As a hidden bonus we get
 	 * IPv6 hostnames without the brackets because we don't ask for
 	 * URI_PORT. */

From c96cb0bbae09ffcd005ce5f4804e32bc495eb78b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 01:25:18 +0100
Subject: [PATCH 156/204] DIRLIST: Use directory listing initializer in the
 file protocol module

---
 src/protocol/file/file.c | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/protocol/file/file.c b/src/protocol/file/file.c
index b085a943..84bc9506 100644
--- a/src/protocol/file/file.c
+++ b/src/protocol/file/file.c
@@ -25,6 +25,7 @@
 #include "intl/gettext/libintl.h"
 #include "main/module.h"
 #include "network/connection.h"
+#include "protocol/common.h"
 #include "protocol/file/cgi.h"
 #include "protocol/file/file.h"
 #include "protocol/uri.h"
@@ -186,12 +187,12 @@ add_dir_entries(struct directory_entry *entries, unsigned char *dirpath,
  * @dirpath. */
 /* Returns a connection state. S_OK if all is well. */
 static inline enum connection_state
-list_directory(unsigned char *dirpath, struct string *page)
+list_directory(struct connection *conn, unsigned char *dirpath,
+	       struct string *page)
 {
 	int show_hidden_files = get_opt_bool("protocol.file.show_hidden_files");
-	unsigned char *slash = dirpath;
-	unsigned char *pslash = ++slash;
 	struct directory_entry *entries;
+	enum connection_state state;
 
 	errno = 0;
 	entries = get_directory_entries(dirpath, show_hidden_files);
@@ -200,30 +201,17 @@ list_directory(unsigned char *dirpath, struct string *page)
 		return S_OUT_OF_MEM;
 	}
 
-	if (!init_string(page)) return S_OUT_OF_MEM;
+	state = init_directory_listing(page, conn->uri);
+	if (state != S_OK)
+		return S_OUT_OF_MEM;
 
-	add_to_string(page, "<html>\n<head><title>");
-	add_html_to_string(page, dirpath, strlen(dirpath));
-	add_to_string(page, "</title>\n<base href=\"");
-	encode_uri_string(page, dirpath, -1, 0);
-	add_to_string(page, "\" />\n</head>\n<body>\n<h2>Directory /");
+	add_dir_entries(entries, dirpath, page);
 
-	/* Make the directory path with links to each subdir. */
-	while ((slash = strchr(slash, '/'))) {
-		*slash = 0;
-		add_to_string(page, "<a href=\"");
-		/* FIXME: htmlesc? At least we should escape quotes. --pasky */
-		add_to_string(page, dirpath);
-		add_to_string(page, "/\">");
-		add_html_to_string(page, pslash, strlen(pslash));
-		add_to_string(page, "</a>/");
-		*slash = '/';
-		pslash = ++slash;
+	if (!add_to_string(page, "</pre>\n<hr>\n</body>\n</html>\n")) {
+		done_string(page);
+		return S_OUT_OF_MEM;
 	}
 
-	add_to_string(page, "</h2>\n<pre>");
-	add_dir_entries(entries, dirpath, page);
-	add_to_string(page, "</pre>\n<hr>\n</body>\n</html>\n");
 	return S_OK;
 }
 
@@ -277,7 +265,7 @@ file_protocol_handler(struct connection *connection)
 			redirect_location = "/";
 			state = S_OK;
 		} else {
-			state = list_directory(name.source, &page);
+			state = list_directory(connection, name.source, &page);
 			type = "text/html";
 		}
 

From b567f6a5db1be21b313d2a01e28a768b6cb5dae5 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 01:25:30 +0100
Subject: [PATCH 157/204] DIRLIST: Use directory listing initializer in the FTP
 protocol module

---
 src/protocol/ftp/ftp.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index 439279df..2f6b2cbe 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -42,6 +42,7 @@
 #include "osdep/osdep.h"
 #include "osdep/stat.h"
 #include "protocol/auth/auth.h"
+#include "protocol/common.h"
 #include "protocol/ftp/ftp.h"
 #include "protocol/ftp/parse.h"
 #include "protocol/uri.h"
@@ -1253,24 +1254,19 @@ out_of_mem:
 
 	if (ftp->dir && !conn->from) {
 		struct string string;
-		unsigned char *uristring;
+		enum connection_state state;
 
 		if (!conn->uri->data) {
 			abort_connection(conn, S_FTP_ERROR);
 			return;
 		}
 
-		uristring = get_uri_string(conn->uri, URI_PUBLIC);
-		if (!uristring) goto out_of_mem;
-
-		if (!init_string(&string)) {
-			mem_free(uristring);
-			goto out_of_mem;
+		state = init_directory_listing(&string, conn->uri);
+		if (state != S_OK) {
+			abort_connection(conn, state);
+			return;
 		}
 
-		add_html_to_string(&string, uristring, strlen(uristring));
-		mem_free(uristring);
-
 #define ADD_CONST(str) { \
 	add_fragment(conn->cached, conn->from, str, sizeof(str) - 1); \
 	conn->from += (sizeof(str) - 1); }
@@ -1279,11 +1275,7 @@ out_of_mem:
 	add_fragment(conn->cached, conn->from, string.source, string.length); \
 	conn->from += string.length; }
 
-		ADD_CONST("<html>\n<head><title>");
 		ADD_STRING();
-		ADD_CONST("</title></head>\n<body>\n<h2>FTP directory ");
-		ADD_STRING();
-		ADD_CONST("</h2>\n<pre>");
 
 		done_string(&string);
 

From d8ef7e1b683632b52e137a259205e7ca08dd1075 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 01:25:39 +0100
Subject: [PATCH 158/204] DIRLIST: Use directory listing initializer in the FSP
 protocol module

---
 src/protocol/fsp/fsp.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 569cea1b..3136bb04 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -131,21 +131,16 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
 {
 	struct string buf;
 	FSP_DIR *dir;
-	unsigned char *uristring = get_uri_string(uri, URI_PUBLIC);
 	unsigned char *data = get_uri_string(uri, URI_DATA);
 	unsigned char dircolor[8] = "";
 
-	if (!uristring || !data || !init_string(&buf))
+	if (!data || init_directory_listing(&buf, uri) != S_OK)
 		fsp_error("Out of memory");
 
 	fprintf(stderr, "text/html");
 	fclose(stderr);
-	add_html_to_string(&buf, uristring, strlen(uristring));
 
-	printf("<html><head><title>%s</title><base href=\"%s", buf.source,
-		uristring);
-	if (buf.source[buf.length - 1] != '/') printf("/");
-	printf("\"></head><body><h2>FSP directory %s</h2><pre>", buf.source);
+	puts(buf.source);
 
 	dir = fsp_opendir(ses, data);
 	if (!dir) goto end;

From 94f4b2fd1d450847207816b15bf3075ea778460a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 01:29:40 +0100
Subject: [PATCH 159/204] DIRLIST: Cleanup macros used in the FTP directory
 listing

---
 src/protocol/ftp/ftp.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index 2f6b2cbe..38a1aa5c 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -1267,15 +1267,8 @@ out_of_mem:
 			return;
 		}
 
-#define ADD_CONST(str) { \
-	add_fragment(conn->cached, conn->from, str, sizeof(str) - 1); \
-	conn->from += (sizeof(str) - 1); }
-
-#define ADD_STRING() { \
-	add_fragment(conn->cached, conn->from, string.source, string.length); \
-	conn->from += string.length; }
-
-		ADD_STRING();
+		add_fragment(conn->cached, conn->from, string.source, string.length);
+		conn->from += string.length;
 
 		done_string(&string);
 
@@ -1335,6 +1328,10 @@ out_of_mem:
 				(unsigned char *) dircolor) == -1)
 		goto out_of_mem;
 
+#define ADD_CONST(str) { \
+	add_fragment(conn->cached, conn->from, str, sizeof(str) - 1); \
+	conn->from += (sizeof(str) - 1); }
+
 	if (ftp->dir) ADD_CONST("</pre>\n<hr>\n</body>\n</html>");
 
 	close_socket(conn->data_socket);

From ba2b6e633ac68b4fb0191dfc91fbbd1230225ecf Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 02:41:09 +0100
Subject: [PATCH 160/204] DIRLIST:Use directory listing initializer in the
 Gopher protocol module

---
 src/protocol/common.c        | 14 ++++++++++++--
 src/protocol/gopher/gopher.c | 23 +++++++----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/protocol/common.c b/src/protocol/common.c
index e18930cf..3357aa4a 100644
--- a/src/protocol/common.c
+++ b/src/protocol/common.c
@@ -62,6 +62,12 @@ init_directory_listing(struct string *page, struct uri *uri)
 	    && !add_char_to_string(&dirpath, '/'))
 		goto out_of_memory;
 
+	if (uri->protocol == PROTOCOL_GOPHER) {
+		/* A little hack to get readable Gopher names. We should find a
+		 * way to do it more general. */
+		decode_uri_string(&dirpath);
+	}
+
 	if (!local && !add_char_to_string(&location, '/'))
 		goto out_of_memory;
 
@@ -81,15 +87,19 @@ init_directory_listing(struct string *page, struct uri *uri)
 	if (!add_to_string(page, "\" />\n</head>\n<body>\n<h2>"))
 		goto out_of_memory;
 
+	/* Use module names? */
 	switch (uri->protocol) {
 	case PROTOCOL_FILE:
 		info = "Local";
 		break;
+	case PROTOCOL_FSP:
+		info = "FSP";
+		break;
 	case PROTOCOL_FTP:
 		info = "FTP";
 		break;
-	case PROTOCOL_FSP:
-		info = "FSP";
+	case PROTOCOL_GOPHER:
+		info = "Gopher";
 		break;
 	default:
 		info = "?";
diff --git a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
index d2805a6d..c1d8781b 100644
--- a/src/protocol/gopher/gopher.c
+++ b/src/protocol/gopher/gopher.c
@@ -35,6 +35,7 @@
 #include "main/module.h"
 #include "network/connection.h"
 #include "network/socket.h"
+#include "protocol/common.h"
 #include "protocol/gopher/gopher.h"
 #include "protocol/protocol.h"
 #include "protocol/uri.h"
@@ -599,25 +600,15 @@ read_gopher_directory_data(struct connection *conn, struct read_buffer *rb)
 	struct string buffer;
 	unsigned char *end;
 
-	if (!init_string(&buffer))
-		return S_OUT_OF_MEM;
-
 	if (conn->from == 0) {
-		unsigned char *where = get_uri_string(conn->uri, URI_PUBLIC);
+		enum connection_state state;
 
-		if (where) decode_uri_for_display(where);
+		state = init_directory_listing(&buffer, conn->uri);
+		if (state != S_OK)
+			return state;
 
-		add_format_to_string(&buffer,
-			"<html>\n"
-			"<head>\n"
-			"<title>Gopher menu at %s</title>\n"
-			"</head>\n"
-			"<body>\n"
-			"<h1>Gopher menu at %s</h1>\n"
-			"<pre>",
-			empty_string_or_(where), empty_string_or_(where));
-
-		mem_free_if(where);
+	} else if (!init_string(&buffer)) {
+		return S_OUT_OF_MEM;
 	}
 
 	while ((end = get_gopher_line_end(rb->data, rb->length))) {

From f268d0c49517595155ae2c4058188c63c9a34654 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 05:55:35 +0100
Subject: [PATCH 161/204] DOM: Add missing config.h #include

---
 src/dom/configuration.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index 08af021d..657f916b 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -1,5 +1,9 @@
 /* DOM Configuration */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "elinks.h"
 
 #include "dom/configuration.h"

From ea675cbb6e84d66fc7337e8723d310dbdf5f4b2f Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:02:02 +0100
Subject: [PATCH 162/204] DOM: Fix get_dom_node_map_index() so it returns the
 correct ordered index

This was cause by the recent change to allocate string during incremental
parsing where the node string was set after insertion. Test for this in the
works.

Fixes: b6b6d3c67e16da25565b4a3a9a76abf2fbc1bb3c
---
 src/dom/node.c | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/dom/node.c b/src/dom/node.c
index c21cbab9..794e12e0 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -190,7 +190,8 @@ dom_node_list_bsearch(struct dom_node_search *search, struct dom_node_list *list
 	return NULL;
 }
 
-int get_dom_node_map_index(struct dom_node_list *list, struct dom_node *node)
+int
+get_dom_node_map_index(struct dom_node_list *list, struct dom_node *node)
 {
 	struct dom_node_search search = INIT_DOM_NODE_SEARCH(node, list);
 	struct dom_node *match = dom_node_list_bsearch(&search, list);
@@ -327,6 +328,23 @@ init_dom_node_(unsigned char *file, int line,
 	node->type   = type;
 	node->parent = parent;
 
+	/* Make it possible to add a node to a parent without allocating the
+	 * strings. */
+	if (allocated >= 0) {
+		node->allocated = !!allocated;
+	} else if (parent) {
+		node->allocated = parent->allocated;
+	}
+
+	if (node->allocated) {
+		if (!init_dom_string(&node->string, string->string, string->length)) {
+			done_dom_node(node);
+			return NULL;
+		}
+	} else {
+		copy_dom_string(&node->string, string);
+	}
+
 	if (parent) {
 		struct dom_node_list **list = get_dom_node_list(parent, node);
 		int sort = (type == DOM_NODE_ATTRIBUTE);
@@ -342,22 +360,6 @@ init_dom_node_(unsigned char *file, int line,
 			done_dom_node(node);
 			return NULL;
 		}
-
-		/* Make it possible to add a node to a parent without
-		 * allocating the strings. */
-		node->allocated = allocated < 0 ? parent->allocated : !!allocated;
-
-	} else if (allocated >= 0) {
-			node->allocated = !!allocated;
-	}
-
-	if (node->allocated) {
-		if (!init_dom_string(&node->string, string->string, string->length)) {
-			done_dom_node(node);
-			return NULL;
-		}
-	} else {
-		copy_dom_string(&node->string, string);
 	}
 
 	return node;

From bc50084475143a64f5b218501267ea95be89d08b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:03:36 +0100
Subject: [PATCH 163/204] DOM: Add get_dom_node_next()

---
 src/dom/node.c | 18 ++++++++++++++++++
 src/dom/node.h |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/src/dom/node.c b/src/dom/node.c
index 794e12e0..0ad0745d 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -268,6 +268,24 @@ get_dom_node_prev(struct dom_node *node)
 	return NULL;
 }
 
+struct dom_node *
+get_dom_node_next(struct dom_node *node)
+{
+	struct dom_node_list **list;
+	int index;
+
+	assert(node->parent);
+
+	list = get_dom_node_list(node->parent, node);
+	if (!list) return NULL;
+
+	index = get_dom_node_list_pos(*list, node);
+	if (index + 1 < (*list)->size)
+		return (*list)->entries[index + 1];
+
+	return NULL;
+}
+
 struct dom_node *
 get_dom_node_child(struct dom_node *parent, enum dom_node_type type,
 		   int16_t subtype)
diff --git a/src/dom/node.h b/src/dom/node.h
index 32948ea1..66c01895 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -242,6 +242,9 @@ int get_dom_node_map_index(struct dom_node_list *list, struct dom_node *node);
 /* Returns the previous sibling to the node. */
 struct dom_node *get_dom_node_prev(struct dom_node *node);
 
+/* Returns the next sibling to the node. */
+struct dom_node *get_dom_node_next(struct dom_node *node);
+
 /* Returns first text node of the element or NULL. */
 struct dom_node *
 get_dom_node_child(struct dom_node *node, enum dom_node_type child_type,

From a3dcc7d5e51a553d70155fbc8fbc0a2a1ca98545 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:05:32 +0100
Subject: [PATCH 164/204] DOM: Change the attribute node's quoted member to be
 unsigned char

It can hold NUL, ', or " depending on not quoted, single quoted or double
quoted.
---
 src/dom/node.h        | 6 +++---
 src/dom/sgml/parser.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dom/node.h b/src/dom/node.h
index 66c01895..2d1c8a77 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -111,6 +111,9 @@ struct dom_attribute_node {
 	 * to reduce string comparing and only do one fast find mapping. */
 	uint16_t type;
 
+	/* The attribute value is delimited by quotes. Can be NUL, ' or ". */
+	unsigned char quoted;
+
 	/* Was the attribute specified in the DTD as a default attribute or was
 	 * it added from the document source. */
 	unsigned int specified:1;
@@ -124,9 +127,6 @@ struct dom_attribute_node {
 
 	/* The attribute value references some other resource */
 	unsigned int reference:1;
-
-	/* The attribute value is delimited by quotes */
-	unsigned int quoted:1;
 };
 
 struct dom_text_node {
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 217b2115..9ead5c79 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -95,7 +95,7 @@ add_sgml_attribute(struct dom_stack *stack,
 	node->data.attribute.reference = !!(info->flags & SGML_ATTRIBUTE_REFERENCE);
 
 	if (valtoken && valtoken->type == SGML_TOKEN_STRING)
-		node->data.attribute.quoted = 1;
+		node->data.attribute.quoted = valtoken->string.string[-1];
 
 	if (!node || push_dom_node(stack, node) != DOM_STACK_CODE_OK)
 		return NULL;

From f8a86a26c40cfbe8078c13e0bc874d3ba09bd97a Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:07:16 +0100
Subject: [PATCH 165/204] DOM: Add simple stack context based utility for
 dumping DOM trees to SGML

---
 src/dom/sgml/Makefile |   2 +-
 src/dom/sgml/dump.c   | 170 ++++++++++++++++++++++++++++++++++++++++++
 src/dom/sgml/dump.h   |  12 +++
 3 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 src/dom/sgml/dump.c
 create mode 100644 src/dom/sgml/dump.h

diff --git a/src/dom/sgml/Makefile b/src/dom/sgml/Makefile
index 193145e9..581567ae 100644
--- a/src/dom/sgml/Makefile
+++ b/src/dom/sgml/Makefile
@@ -2,6 +2,6 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 
 SUBDIRS = docbook html rss xbel
-OBJS	= sgml.o parser.o scanner.o
+OBJS	= dump.o parser.o scanner.o sgml.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/dom/sgml/dump.c b/src/dom/sgml/dump.c
new file mode 100644
index 00000000..902a7e4f
--- /dev/null
+++ b/src/dom/sgml/dump.c
@@ -0,0 +1,170 @@
+/* SGML generics */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "elinks.h"
+
+#include "dom/node.h"
+#include "dom/sgml/dump.h"
+#include "dom/stack.h"
+#include "dom/string.h"
+
+
+static enum dom_stack_code
+sgml_file_dumper_element_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "<%.*s", string->length, string->string);
+	if (!node->data.element.map
+	    || node->data.element.map->size == 0)
+		fprintf(file, ">");
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_element_pop(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "</%.*s>", string->length, string->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_attribute_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *name = &node->string;
+	struct dom_string *value = &node->data.attribute.value;
+
+	if (node->parent->type == DOM_NODE_PROCESSING_INSTRUCTION)
+		return DOM_STACK_CODE_OK;
+
+	fprintf(file, " %.*s", name->length, name->string);
+
+	if (value->string) {
+		if (node->data.attribute.quoted)
+			fprintf(file, "=%c%.*s%c",
+				node->data.attribute.quoted,
+				value->length, value->string,
+				node->data.attribute.quoted);
+		else
+			/* FIXME: 'encode' if the value contains '"'s? */
+			fprintf(file, "=\"%.*s\"", value->length, value->string);
+	}
+
+	if (!get_dom_node_next(node))
+		fprintf(file, ">");
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_proc_instruction_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *target = &node->string;
+	struct dom_string *instruction = &node->data.proc_instruction.instruction;
+
+	fprintf(file, "<?%.*s %.*s?>",
+		target->length, target->string,
+		instruction->length, instruction->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_text_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "%.*s", string->length, string->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_cdata_section_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "<![CDATA[%.*s]]>", string->length, string->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_comment_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "<!--%.*s-->", string->length, string->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+static enum dom_stack_code
+sgml_file_dumper_entity_ref_push(struct dom_stack *stack, struct dom_node *node, void *data)
+{
+	FILE *file = stack->current->data;
+	struct dom_string *string = &node->string;
+
+	fprintf(file, "&%.*s;", string->length, string->string);
+
+	return DOM_STACK_CODE_OK;
+}
+
+struct dom_stack_context_info sgml_file_dumper = {
+	/* Object size: */			0,
+	/* Push: */
+	{
+		/*				*/ NULL,
+		/* DOM_NODE_ELEMENT		*/ sgml_file_dumper_element_push,
+		/* DOM_NODE_ATTRIBUTE		*/ sgml_file_dumper_attribute_push,
+		/* DOM_NODE_TEXT		*/ sgml_file_dumper_text_push,
+		/* DOM_NODE_CDATA_SECTION	*/ sgml_file_dumper_cdata_section_push,
+		/* DOM_NODE_ENTITY_REFERENCE	*/ sgml_file_dumper_entity_ref_push,
+		/* DOM_NODE_ENTITY		*/ NULL,
+		/* DOM_NODE_PROC_INSTRUCTION	*/ sgml_file_dumper_proc_instruction_push,
+		/* DOM_NODE_COMMENT		*/ sgml_file_dumper_comment_push,
+		/* DOM_NODE_DOCUMENT		*/ NULL,
+		/* DOM_NODE_DOCUMENT_TYPE	*/ NULL,
+		/* DOM_NODE_DOCUMENT_FRAGMENT	*/ NULL,
+		/* DOM_NODE_NOTATION		*/ NULL,
+	},
+	/* Pop: */
+	{
+		/*				*/ NULL,
+		/* DOM_NODE_ELEMENT		*/ sgml_file_dumper_element_pop,
+		/* DOM_NODE_ATTRIBUTE		*/ NULL,
+		/* DOM_NODE_TEXT		*/ NULL,
+		/* DOM_NODE_CDATA_SECTION	*/ NULL,
+		/* DOM_NODE_ENTITY_REFERENCE	*/ NULL,
+		/* DOM_NODE_ENTITY		*/ NULL,
+		/* DOM_NODE_PROC_INSTRUCTION	*/ NULL,
+		/* DOM_NODE_COMMENT		*/ NULL,
+		/* DOM_NODE_DOCUMENT		*/ NULL,
+		/* DOM_NODE_DOCUMENT_TYPE	*/ NULL,
+		/* DOM_NODE_DOCUMENT_FRAGMENT	*/ NULL,
+		/* DOM_NODE_NOTATION		*/ NULL,
+	}
+};
+
+struct dom_stack_context *
+add_sgml_file_dumper(struct dom_stack *stack, FILE *file)
+{
+	return add_dom_stack_context(stack, file, &sgml_file_dumper);
+}
diff --git a/src/dom/sgml/dump.h b/src/dom/sgml/dump.h
new file mode 100644
index 00000000..ac21a85a
--- /dev/null
+++ b/src/dom/sgml/dump.h
@@ -0,0 +1,12 @@
+#ifndef EL_DOM_SGML_DUMP_H
+#define EL_DOM_SGML_DUMP_H
+
+#include <stdio.h>
+
+struct dom_stack;
+struct dom_stack_context;
+
+struct dom_stack_context *
+add_sgml_file_dumper(struct dom_stack *stack, FILE *file);
+
+#endif

From 7be0093e362f5f8cc105204aa9f4040b14aa7289 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:25:22 +0100
Subject: [PATCH 166/204] DOM: Add test for dumping DOM trees to SGML

---
 src/dom/test/sgml-parser.c        |  15 ++-
 src/dom/test/test-sgml-dump-basic | 173 ++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100755 src/dom/test/test-sgml-dump-basic

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 9ac6817a..23b2ef68 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -13,6 +13,7 @@
 
 #include "dom/configuration.h"
 #include "dom/node.h"
+#include "dom/sgml/dump.h"
 #include "dom/sgml/parser.h"
 #include "dom/stack.h"
 
@@ -265,6 +266,7 @@ main(int argc, char *argv[])
 	enum sgml_parser_code code = 0;
 	enum dom_config_flag normalize_flags = 0;
 	int normalize = 0;
+	int dump = 0;
 	int complete = 1;
 	size_t read_stdin = 0;
 	struct dom_string uri = STATIC_DOM_STRING("dom://test");
@@ -338,6 +340,10 @@ main(int argc, char *argv[])
 			flags |= SGML_PARSER_INCREMENTAL;
 			complete = 0;
 
+		} else if (!strcmp(arg, "dump")) {
+			type = SGML_PARSER_TREE;
+			dump = 1;
+
 		} else if (!strcmp(arg, "error")) {
 			flags |= SGML_PARSER_DETECT_ERRORS;
 
@@ -355,7 +361,7 @@ main(int argc, char *argv[])
 	parser->error_func = sgml_error_function;
 	if (normalize)
 		add_dom_config_normalizer(&parser->stack, normalize_flags);
-	else
+	else if (!dump)
 		add_dom_stack_context(&parser->stack, NULL, &sgml_parser_test_context_info);
 
 	if (read_stdin > 0) {
@@ -402,7 +408,7 @@ main(int argc, char *argv[])
 			pop_dom_node(&parser->stack);
 		}
 
-		if (normalize) {
+		if (normalize || dump) {
 			struct dom_stack stack;
 
 			/* Note, that we cannot free nodes when walking the DOM
@@ -412,7 +418,10 @@ main(int argc, char *argv[])
 			/* XXX: This context needs to be added first because it
 			 * assumes the parser can be accessed via
 			 * stack->contexts[0].data. */
-			add_dom_stack_context(&stack, parser, &sgml_parser_test_context_info);
+			if (normalize)
+				add_dom_stack_context(&stack, parser, &sgml_parser_test_context_info);
+			else if (dump)
+				add_sgml_file_dumper(&stack, stdout);
 			walk_dom_nodes(&stack, parser->root);
 			done_dom_stack(&stack);
 			done_dom_node(parser->root);
diff --git a/src/dom/test/test-sgml-dump-basic b/src/dom/test/test-sgml-dump-basic
new file mode 100755
index 00000000..2e4ee6fe
--- /dev/null
+++ b/src/dom/test/test-sgml-dump-basic
@@ -0,0 +1,173 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Jonas Fonseca
+#
+
+test_description='Test dumping of SGML documents.
+
+Test that DOM documents are consistently dumped to SGML.
+Note, this also test whether attribute nodes are sorted
+correctly.
+'
+
+. "$TEST_LIB"
+
+test_sgml_dump_exact () {
+	desc="$1"; shift
+	src="$1"; shift
+
+	sgml-parser --dump --src "$src" > output
+	echo -n "$src" > expected
+
+	test_expect_success "$desc" 'cmp output expected' 
+}
+
+test_sgml_dump_equals () {
+	desc="$1"; shift
+	src="$1"; shift
+	out="$1"; shift
+
+	sgml-parser --dump --src "$src" > output
+	echo -n "$out" > expected
+
+	test_expect_success "$desc" 'cmp output expected' 
+}
+
+
+################################################################
+# Parse various SGML node types.
+
+test_sgml_dump_exact \
+'Parse a small document.' \
+'<html><body><p>Hello World!</p></body></html>'
+
+test_sgml_dump_exact \
+'Parse an enclosed comment.' \
+'<root><!-- Hello World! --></root>'
+
+test_sgml_dump_exact \
+'Parse comment combinations. (I)' \
+'<root><!-- <!-- -- > --><!--foo--><!----></root>'
+
+test_sgml_dump_exact \
+'Parse comment combinations. (II).' \
+'<!-- comment -->s<!-->-->t<!----->u'
+
+test_sgml_dump_exact \
+'Parse empty comment.' \
+'<!---->s'
+
+test_sgml_dump_exact \
+'Parse an enclosed CDATA section.' \
+'<root><![CDATA[...] ]>...]]></root>'
+
+test_sgml_dump_exact \
+'Parse non-enclosed CDATA section.' \
+'<![CDATA[...]]>'
+
+test_sgml_dump_exact \
+'Parse attributes.' \
+'<e a="1" b="2" c=""></e>'
+
+test_sgml_dump_exact \
+'Parse XML stylesheet processing instructions.' \
+'<?xml-stylesheet type="text/xsl" href="url"?>'
+
+test_sgml_dump_exact \
+'Parse entity references.' \
+'&amp;-&#42;'
+
+#############################################################################
+# Test tidy up dumping
+
+test_sgml_dump_equals \
+'Parse elements.' \
+'<root><child attr="value" /><child2></><child3 >a</></root>' \
+'<root><child attr="value"></child><child2></child2><child3>a</child3></root>'
+
+test_sgml_dump_equals \
+'Parse attributes with garbage.' \
+"<root a=b c='d' e'f' g= h i = j k =></root>" \
+"<root a=\"b\" c='d' g=\"h\" i=\"j\" k></root>"
+
+test_sgml_dump_equals \
+'Parse bad comment. (II)' \
+'<!--a--!>bad comment' \
+'<!--a-->bad comment'
+
+test_sgml_dump_equals \
+'Parse empty notation.' \
+'<!>s' \
+'s'
+
+test_sgml_dump_equals \
+'Parse a bad CDATA section.' \
+'<![CDATA[...' \
+'<![CDATA[...]]>'
+
+test_sgml_dump_equals \
+'Parse tag soup elements. (I)' \
+'<parent attr="value" <child:1></><child:2</>a</parent>' \
+'<parent attr="value"><child:1></child:1><child:2></child:2>a</parent>'
+
+test_sgml_dump_equals \
+'Parse tag soup elements. (II)' \
+'< a >< b < c / >< / >' \
+'<a><b><c></c></b></a>'
+
+test_sgml_dump_equals \
+'Parse attribute with non-quoted values.' \
+'<root color=#abc path=/to/%61-&\one";files/>...' \
+'<root color="#abc" path="/to/%61-&\one";files"></root>...'
+
+# Just how these should be gracefully handled is not clear to me.
+test_sgml_dump_equals \
+'Parse badly formatted entity references.' \
+'& m33p;-&.:-copy;-&;-&#;-&#xx;' \
+'& m33p;-&.:-copy;-&;-&#;-&#xx;'
+
+test_sgml_dump_equals \
+'Parse processing instructions.' \
+'<?xml encoding="UTF8"?>
+...
+<?ecmascript
+var val=2;
+?>' \
+'<?xml encoding="UTF8"?>
+...
+<?ecmascript var val=2;
+?>'
+
+test_sgml_dump_equals \
+'Parse XML processing instructions.' \
+'<?xml version="1.0" />?><?xml />-' \
+'<?xml version="1.0" />?><?xml />-?>'
+
+test_sgml_dump_equals \
+'Parse exotic processing instructions.' \
+'<?xml ?+>+?>-?>-<?js?>-<??>-' \
+'<?xml ?+>+?>-?>-<?js ?>-<? ?>-'
+
+test_sgml_dump_equals \
+'Parse incorrect processing instructions. (II)' \
+'<?js<?>-<?<??>-<?xml <=";&?>-<?' \
+'<?js <?>-<? <??>-<?xml <=";&?>-' \
+
+test_sgml_dump_equals \
+'Parse incorrect processing instructions (II).' \
+'<?><?' \
+'<? ><??>'
+
+test_sgml_dump_equals \
+'Skip spaces not inside text.' \
+'<
+root
+ns:attr                      
+=
+"value"
+><?	
+	target	
+ data?><	/	root	>' \
+'<root ns:attr="value"><?target data?></root>'
+
+test_done

From f42dd94fb560ed5db3e08bfc4be4b57a1f36abc9 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 30 Jan 2006 06:45:53 +0100
Subject: [PATCH 167/204] DOM: Fix test descriptions

---
 src/dom/test/test-sgml-dump-basic   | 4 ++--
 src/dom/test/test-sgml-parser-basic | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dom/test/test-sgml-dump-basic b/src/dom/test/test-sgml-dump-basic
index 2e4ee6fe..603a52e4 100755
--- a/src/dom/test/test-sgml-dump-basic
+++ b/src/dom/test/test-sgml-dump-basic
@@ -149,12 +149,12 @@ test_sgml_dump_equals \
 '<?xml ?+>+?>-?>-<?js ?>-<? ?>-'
 
 test_sgml_dump_equals \
-'Parse incorrect processing instructions. (II)' \
+'Parse incorrect processing instructions. (I)' \
 '<?js<?>-<?<??>-<?xml <=";&?>-<?' \
 '<?js <?>-<? <??>-<?xml <=";&?>-' \
 
 test_sgml_dump_equals \
-'Parse incorrect processing instructions (II).' \
+'Parse incorrect processing instructions. (II)' \
 '<?><?' \
 '<? ><??>'
 
diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic
index 989366be..fc8e45e6 100755
--- a/src/dom/test/test-sgml-parser-basic
+++ b/src/dom/test/test-sgml-parser-basic
@@ -225,7 +225,7 @@ proc-instruction:  ->
 #text: -'
 
 test_output_equals \
-'Parse incorrect processing instructions.' \
+'Parse incorrect processing instructions. (I)' \
 '<?js<?>-<?<??>-<?xml <=";&?>-<?' \
 '
 proc-instruction: js -> <

From 207922b37168374c1c88ce926cfe623f2e389139 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 08:33:59 +0100
Subject: [PATCH 168/204] Translation update

---
 po/pl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 81cb8290..e8490a4f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4388,7 +4388,7 @@ msgstr "Cykliczne zapisywanie"
 #. name:
 #: src/config/urlhist.c:61
 msgid "Goto URL History"
-msgstr "Historia globalna"
+msgstr "Historia \"Przejd¼ do URL-a\""
 
 #. name:
 #: src/cookies/cookies.c:80 src/cookies/cookies.c:827
@@ -5716,7 +5716,7 @@ msgstr "Czy na pewno chcesz skasowa
 
 #: src/globhist/dialogs.c:169
 msgid "Search history"
-msgstr "Przeszukaj historiê"
+msgstr "Historia szukania"
 
 #
 #: src/globhist/dialogs.c:226
@@ -8468,7 +8468,7 @@ msgstr "Szukaj wstecz"
 #. name:
 #: src/viewer/text/search.c:1654
 msgid "Search History"
-msgstr "Przeszukaj historiê"
+msgstr "Historia szukania"
 
 #: src/viewer/text/textarea.c:332
 msgid "You cannot launch an external editor in the anonymous mode."

From aed26bf002ea776806f84b4b9d03a8d4f0b83d27 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 08:56:40 +0100
Subject: [PATCH 169/204] Introduced CGI module

---
 src/protocol/file/cgi.c  | 24 ++++++++++++++++++++++++
 src/protocol/file/cgi.h  |  2 ++
 src/protocol/file/file.c | 14 --------------
 src/protocol/protocol.c  |  4 ++++
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/protocol/file/cgi.c b/src/protocol/file/cgi.c
index ddca7136..91ee73bf 100644
--- a/src/protocol/file/cgi.c
+++ b/src/protocol/file/cgi.c
@@ -35,6 +35,30 @@
 #include "util/env.h"
 #include "util/string.h"
 
+static struct option_info cgi_options[] = {
+	INIT_OPT_TREE("protocol.file", N_("Local CGI"),
+		"cgi", 0,
+		N_("Local CGI specific options.")),
+
+	INIT_OPT_STRING("protocol.file.cgi", N_("Path"),
+		"path", 0, "",
+		N_("Colon separated list of directories, where CGI scripts are stored.")),
+
+	INIT_OPT_BOOL("protocol.file.cgi", N_("Allow local CGI"),
+		"policy", 0, 0,
+		N_("Whether to execute local CGI scripts.")),
+	NULL_OPTION_INFO,
+};
+
+struct module cgi_protocol_module = struct_module(
+	/* name: */		N_("CGI"),
+	/* options: */		cgi_options,
+	/* hooks: */		NULL,
+	/* submodules: */	NULL,
+	/* data: */		NULL,
+	/* init: */		NULL,
+	/* done: */		NULL
+);
 
 static void
 close_pipe_and_read(struct socket *data_socket)
diff --git a/src/protocol/file/cgi.h b/src/protocol/file/cgi.h
index bf844fa8..72cd6a02 100644
--- a/src/protocol/file/cgi.h
+++ b/src/protocol/file/cgi.h
@@ -3,7 +3,9 @@
 #define EL__PROTOCOL_FILE_CGI_H
 
 struct connection;
+struct module;
 
+extern struct module cgi_protocol_module;
 int execute_cgi(struct connection *);
 
 #endif
diff --git a/src/protocol/file/file.c b/src/protocol/file/file.c
index b085a943..fe37eb18 100644
--- a/src/protocol/file/file.c
+++ b/src/protocol/file/file.c
@@ -39,20 +39,6 @@ static struct option_info file_options[] = {
 		"file", 0,
 		N_("Options specific to local browsing.")),
 
-#ifdef CONFIG_CGI
-	INIT_OPT_TREE("protocol.file", N_("Local CGI"),
-		"cgi", 0,
-		N_("Local CGI specific options.")),
-
-	INIT_OPT_STRING("protocol.file.cgi", N_("Path"),
-		"path", 0, "",
-		N_("Colon separated list of directories, where CGI scripts are stored.")),
-
-	INIT_OPT_BOOL("protocol.file.cgi", N_("Allow local CGI"),
-		"policy", 0, 0,
-		N_("Whether to execute local CGI scripts.")),
-#endif /* CONFIG_CGI */
-
 	INIT_OPT_BOOL("protocol.file", N_("Allow reading special files"),
 		"allow_special_files", 0, 0,
 		N_("Whether to allow reading from non-regular files.\n"
diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c
index 9ab10da8..75de4646 100644
--- a/src/protocol/protocol.c
+++ b/src/protocol/protocol.c
@@ -29,6 +29,7 @@
 #include "protocol/bittorrent/bittorrent.h"
 #include "protocol/bittorrent/connection.h"
 #include "protocol/data.h"
+#include "protocol/file/cgi.h"
 #include "protocol/file/file.h"
 #include "protocol/finger/finger.h"
 #include "protocol/fsp/fsp.h"
@@ -275,6 +276,9 @@ static struct module *protocol_submodules[] = {
 	&bittorrent_protocol_module,
 #endif
 	&file_protocol_module,
+#ifdef CONFIG_CGI
+	&cgi_protocol_module,
+#endif
 #ifdef CONFIG_FINGER
 	&finger_protocol_module,
 #endif

From ef11f9750ea46fb56c01bc262e0445b2b8043fdb Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 09:09:26 +0100
Subject: [PATCH 170/204] Translation update

---
 po/pl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index e8490a4f..b6e9a276 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5716,7 +5716,7 @@ msgstr "Czy na pewno chcesz skasowa
 
 #: src/globhist/dialogs.c:169
 msgid "Search history"
-msgstr "Historia szukania"
+msgstr "Szukanie w historii"
 
 #
 #: src/globhist/dialogs.c:226
@@ -8468,7 +8468,7 @@ msgstr "Szukaj wstecz"
 #. name:
 #: src/viewer/text/search.c:1654
 msgid "Search History"
-msgstr "Historia szukania"
+msgstr "Szukanie w historii"
 
 #: src/viewer/text/textarea.c:332
 msgid "You cannot launch an external editor in the anonymous mode."

From 44710bb1e9800d2edd5fb936856d610156ba7847 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 10:47:24 +0100
Subject: [PATCH 171/204] The same trick as in SEE: Remember last 8 locations
 and do not open them again

---
 src/ecmascript/spidermonkey/window.c | 33 ++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index 4a6b1790..767f910e 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -310,10 +310,38 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
 	if (argc < 1) return JS_TRUE;
 
+	url = jsval_to_string(ctx, &argv[0]);
+	if (argc > 1) {
+		JSString *url_string = JS_ValueToString(ctx, argv[0]);
+		JSString *target_string = JS_ValueToString(ctx, argv[1]);
+		int i;
+#define NUMBER_OF_URLS_TO_REMEMBER 8
+		static struct {
+			JSContext *ctx;
+			JSString *url;
+			JSString *frame;
+		} strings[NUMBER_OF_URLS_TO_REMEMBER];
+		static int indeks;
+
+		for (i = 0; i < NUMBER_OF_URLS_TO_REMEMBER; i++) {
+			if (!(strings[i].ctx && strings[i].url && strings[i].frame))
+				continue;
+			if (ctx == strings[i].ctx
+				&& !JS_CompareStrings(url_string, strings[i].url)
+				&& !JS_CompareStrings(target_string, strings[i].frame))
+				return JS_TRUE;
+		}
+		strings[indeks].ctx = ctx;
+		strings[indeks].url = JS_InternString(ctx, url);
+		strings[indeks].frame = JS_InternString(ctx, target);
+		indeks++;
+		if (indeks >= NUMBER_OF_URLS_TO_REMEMBER) indeks = 0;
+#undef NUMBER_OF_URLS_TO_REMEMBER
+	}
+
 	/* Ratelimit window opening. Recursive window.open() is very nice.
 	 * We permit at most 20 tabs in 2 seconds. The ratelimiter is very
 	 * rough but shall suffice against the usual cases. */
-
 	if (!ratelimit_start || time(NULL) - ratelimit_start > 2) {
 		ratelimit_start = time(NULL);
 		ratelimit_count = 0;
@@ -323,8 +351,6 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 			return JS_TRUE;
 	}
 
-	url = jsval_to_string(ctx, &argv[0]);
-
 	/* TODO: Support for window naming and perhaps some window features? */
 
 	url = join_urls(doc_view->document->uri,
@@ -334,7 +360,6 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	mem_free(url);
 	if (!uri) return JS_TRUE;
 
-	if (argc > 1) target = jsval_to_string(ctx, &argv[1]);
 
 	if (*target && strcasecmp(target, "_blank")) {
 		struct delayed_open *deo = mem_calloc(1, sizeof(*deo));

From b4d9b7f5a60a64a26fcfffcb66a376cae5b31bc1 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 11:15:04 +0100
Subject: [PATCH 172/204] Make SpiderMonkey consistent with SEE. Do not cache
 ecmascript_objs

---
 src/ecmascript/spidermonkey/form.c | 44 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index f089c64f..85889579 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -385,17 +385,19 @@ input_select(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 static JSObject *
 get_input_object(JSContext *ctx, JSObject *jsform, struct form_state *fs)
 {
-	if (!fs->ecmascript_obj) {
-		/* jsform ('form') is input's parent */
-		/* FIXME: That is NOT correct since the real containing element
-		 * should be its parent, but gimme DOM first. --pasky */
-		JSObject *jsinput = JS_NewObject(ctx, (JSClass *) &input_class, NULL, jsform);
+#if 0
+	if (fs->ecmascript_obj)
+		return fs->ecmascript_obj;
+#endif
+	/* jsform ('form') is input's parent */
+	/* FIXME: That is NOT correct since the real containing element
+	 * should be its parent, but gimme DOM first. --pasky */
+	JSObject *jsinput = JS_NewObject(ctx, (JSClass *) &input_class, NULL, jsform);
 
-		JS_DefineProperties(ctx, jsinput, (JSPropertySpec *) input_props);
-		JS_DefineFunctions(ctx, jsinput, (JSFunctionSpec *) input_funcs);
-		JS_SetPrivate(ctx, jsinput, fs);
-		fs->ecmascript_obj = jsinput;
-	}
+	JS_DefineProperties(ctx, jsinput, (JSPropertySpec *) input_props);
+	JS_DefineFunctions(ctx, jsinput, (JSFunctionSpec *) input_funcs);
+	JS_SetPrivate(ctx, jsinput, fs);
+	fs->ecmascript_obj = jsinput;
 	return fs->ecmascript_obj;
 }
 
@@ -815,17 +817,19 @@ form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 JSObject *
 get_form_object(JSContext *ctx, JSObject *jsdoc, struct form_view *fv)
 {
-	if (!fv->ecmascript_obj) {
-		/* jsdoc ('document') is fv's parent */
-		/* FIXME: That is NOT correct since the real containing element
-		 * should be its parent, but gimme DOM first. --pasky */
-		JSObject *jsform = JS_NewObject(ctx, (JSClass *) &form_class, NULL, jsdoc);
+#if 0
+	if (fv->ecmascript_obj)
+		return fv->ecmascript_obj;
+#endif
+	/* jsdoc ('document') is fv's parent */
+	/* FIXME: That is NOT correct since the real containing element
+	 * should be its parent, but gimme DOM first. --pasky */
+	JSObject *jsform = JS_NewObject(ctx, (JSClass *) &form_class, NULL, jsdoc);
 
-		JS_DefineProperties(ctx, jsform, (JSPropertySpec *) form_props);
-		JS_DefineFunctions(ctx, jsform, (JSFunctionSpec *) form_funcs);
-		JS_SetPrivate(ctx, jsform, fv);
-		fv->ecmascript_obj = jsform;
-	}
+	JS_DefineProperties(ctx, jsform, (JSPropertySpec *) form_props);
+	JS_DefineFunctions(ctx, jsform, (JSFunctionSpec *) form_funcs);
+	JS_SetPrivate(ctx, jsform, fv);
+	fv->ecmascript_obj = jsform;
 	return fv->ecmascript_obj;
 }
 

From 1dae2926fd7fecaa8cf7be21b148c5ab5c214392 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 11:52:58 +0100
Subject: [PATCH 173/204] Neither SEE nor SpiderMonkey tolerate return outside
 functions

---
 src/viewer/text/link.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 87276bce..90bef114 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -865,22 +865,18 @@ try_submit_given_form(struct session *ses, struct document_view *doc_view,
 		if (init_string(&code)) {
 			struct view_state *vs = doc_view->vs;
 			struct ecmascript_interpreter *interpreter;
-			int res = 1;
+			unsigned char *ret = form->onsubmit;
+			int res;
 
 			if (vs->ecmascript_fragile)
 				ecmascript_reset_state(vs);
 			interpreter = vs->ecmascript;
 			assert(interpreter);
-#ifdef CONFIG_ECMASCRIPT_SEE
-			{
-				unsigned char *ret = form->onsubmit;
-
-				/* SEE doesn't like return outside functions */
-				while ((ret = strstr(ret, "return "))) {
-					while (*ret != ' ') *ret++ = ' ';
-				}
+			/* SEE and SpiderMonkey do not like return outside
+			 * functions. */
+			while ((ret = strstr(ret, "return "))) {
+				while (*ret != ' ') *ret++ = ' ';
 			}
-#endif
 			add_to_string(&code, form->onsubmit);
 			res = ecmascript_eval_boolback(interpreter, &code);
 			done_string(&code);

From fa93d05b7ea0de5720b006d43e4330d884069606 Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 12:18:43 +0100
Subject: [PATCH 174/204] current_link_evhook: return effaced

---
 src/viewer/text/link.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 90bef114..019743f6 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -63,12 +63,18 @@ current_link_evhook(struct document_view *doc_view, enum script_event_hook_type
 	if (!doc_view->vs->ecmascript) return -1;
 
 	foreach (evhook, *link->event_hooks) {
-		struct string src = INIT_STRING(evhook->src, strlen(evhook->src));
+		unsigned char *ret;
 
 		if (evhook->type != type) continue;
-		/* TODO: Some even handlers return a bool. */
-		if (!ecmascript_eval_boolback(doc_view->vs->ecmascript, &src))
-			return 0;
+		ret = evhook->src;
+		while ((ret = strstr(ret, "return ")))
+			while (*ret != ' ') *ret++ = ' ';
+		{
+			struct string src = INIT_STRING(evhook->src, strlen(evhook->src));
+			/* TODO: Some even handlers return a bool. */
+			if (!ecmascript_eval_boolback(doc_view->vs->ecmascript, &src))
+				return 0;
+		}
 	}
 
 	return 1;
@@ -874,9 +880,9 @@ try_submit_given_form(struct session *ses, struct document_view *doc_view,
 			assert(interpreter);
 			/* SEE and SpiderMonkey do not like return outside
 			 * functions. */
-			while ((ret = strstr(ret, "return "))) {
+			while ((ret = strstr(ret, "return ")))
 				while (*ret != ' ') *ret++ = ' ';
-			}
+
 			add_to_string(&code, form->onsubmit);
 			res = ecmascript_eval_boolback(interpreter, &code);
 			done_string(&code);

From b99f15fa338141f36c44b4a1279426088cb4234b Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 12:39:40 +0100
Subject: [PATCH 175/204] Info about Python scripting

---
 contrib/python/README.Python | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 contrib/python/README.Python

diff --git a/contrib/python/README.Python b/contrib/python/README.Python
new file mode 100644
index 00000000..9fde5abf
--- /dev/null
+++ b/contrib/python/README.Python
@@ -0,0 +1,13 @@
+If you want to use Python scripting with ELinks add
+--with-python to the configure invocation copy hooks.py to ~/.elinks
+When your Python installation is your own build, you could give prefix
+to the configure, eg.
+--with-python=/usr/local when Python binary is placed in /usr/local/bin, etc.
+
+When 'configure' cannot find -lpython make symbolic link to the appropriate
+library, eg.
+# cd /usr/local/lib
+# ln -s libpython2.4.so.1.0 libpython.so
+
+For the present hooks.py is not very usable. You are welcome to make it better.
+Good Luck!

From 8d91c501a6f02679723a00dc1e8ad6ddd883a64c Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Mon, 30 Jan 2006 15:42:58 +0000
Subject: [PATCH 176/204] SMJS: mangle_deb_bugnumbers: fix horrible error

Use cached.type instead of cached.content_type so that the script
works again.
---
 contrib/smjs/hooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/smjs/hooks.js b/contrib/smjs/hooks.js
index 0278e46f..2f28e683 100644
--- a/contrib/smjs/hooks.js
+++ b/contrib/smjs/hooks.js
@@ -56,7 +56,7 @@ function mangle_deb_bugnumbers(cached, vs) {
 	var closes_re = /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/gi;
 
 	var new_content = cached.content.replace(closes_re, rewrite_closes_fn);
-	if (cached.content_type == 'text/plain') {
+	if (cached.type == 'text/plain') {
 		cached.content = '<pre>' + new_content + '</pre>';
 		vs.plain = "0";
 	} else {

From 4aaafc4716c1bd93abe339ec4c14b973b5fd796d Mon Sep 17 00:00:00 2001
From:  <witekfl@laptop.(none)>
Date: Mon, 30 Jan 2006 22:09:13 +0100
Subject: [PATCH 177/204] Inroduced garbage collector. Disabled by default

---
 Makefile.config.in  |  1 +
 configure.in        | 20 ++++++++++++++++++++
 src/main/main.c     | 12 ++++++++++++
 src/util/memdebug.c | 31 +++++++++++++++++++++++++++++--
 src/util/memory.c   | 20 ++++++++++++++++----
 src/util/memory.h   | 12 ++++++++++++
 6 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index af505807..f5145e9c 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -114,6 +114,7 @@ CONFIG_FINGER = @CONFIG_FINGER@
 CONFIG_FORMHIST = @CONFIG_FORMHIST@
 CONFIG_FSP = @CONFIG_FSP@
 CONFIG_FTP = @CONFIG_FTP@
+CONFIG_GC = @CONFIG_GC@
 CONFIG_GLOBHIST = @CONFIG_GLOBHIST@
 CONFIG_GNUTLS = @CONFIG_GNUTLS@
 CONFIG_GNUTLS_OPENSSL_COMPAT = @CONFIG_GNUTLS_OPENSSL_COMPAT@
diff --git a/configure.in b/configure.in
index 2033ef38..19c73f1c 100644
--- a/configure.in
+++ b/configure.in
@@ -1253,6 +1253,26 @@ EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs],
 EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
 
+EL_ARG_ENABLE(CONFIG_GC, gc, [Garbage collector],
+	      [  --enable-gc             enable Boehm's garbage collector])
+
+EL_SAVE_FLAGS
+if test "x${enable_gc}" = xyes; then
+	CFLAGS="$CFLAGS -I/usr/include/gc"
+# -lgc might already be added by SEE 	
+	AC_TRY_LINK([#include <gc.h>
+	], [void *p = GC_MALLOC(1);], CONFIG_GC=yes, CONFIG_GC=no)
+	if test "$CONFIG_GC" != yes; then
+		LIBS="$LIBS -lgc"
+		AC_TRY_LINK([#include <gc.h>
+		], [void *p = GC_MALLOC(1);], CONFIG_GC=yes, CONFIG_GC=no)
+	fi
+	if test "$CONFIG_GC" != yes; then
+		EL_RESTORE_FLAGS
+	fi
+fi
+AC_SUBST(CONFIG_GC)
+
 AC_ARG_ENABLE(weehoofooboomookerchoo,
               [
     Also check out the features.conf file for more information about features!
diff --git a/src/main/main.c b/src/main/main.c
index 5b2bec8e..e85c72cc 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -336,9 +336,21 @@ check_if_root(void)
 #define check_if_root()
 #endif
 
+#ifdef CONFIG_GC
+static void
+gc_warning(char *msg, GC_word arg)
+{
+}
+#endif
+
+
 int
 main(int argc, char *argv[])
 {
+#ifdef CONFIG_GC
+	GC_INIT();
+	GC_set_warn_proc(gc_warning);
+#endif
 	check_if_root();
 
 	program.terminate = 0;
diff --git a/src/util/memdebug.c b/src/util/memdebug.c
index 44fa9c02..26c65380 100644
--- a/src/util/memdebug.c
+++ b/src/util/memdebug.c
@@ -319,7 +319,11 @@ debug_mem_alloc(unsigned char *file, int line, size_t size)
 
 	true_size = SIZE_BASE2AH(size);
 	do {
+#ifdef CONFIG_GC
+		ah = GC_MALLOC(true_size);
+#else
 		ah = malloc(true_size);
+#endif
 		if (ah) break;
 	} while (patience(file, line, "malloc"));
 	if (!ah) return NULL;
@@ -368,7 +372,11 @@ debug_mem_calloc(unsigned char *file, int line, size_t eltcount, size_t eltsize)
 
 	true_size = SIZE_BASE2AH(size);
 	do {
-		ah = calloc(1, SIZE_BASE2AH(size));
+#ifdef CONFIG_GC
+		ah = GC_MALLOC(true_size);
+#else
+		ah = calloc(1, true_size);
+#endif
 		if (ah) break;
 	} while (patience(file, line, "calloc"));
 	if (!ah) return NULL;
@@ -450,7 +458,11 @@ debug_mem_free(unsigned char *file, int line, void *ptr)
 
 	if (ah->comment) {
 		mem_stats.true_amount -= strlen(ah->comment) + 1;
+#ifdef CONFIG_GC
+		ah->comment = NULL;
+#else
 		free(ah->comment);
+#endif
 	}
 
 	del_from_list(ah);
@@ -465,7 +477,11 @@ debug_mem_free(unsigned char *file, int line, void *ptr)
 	ah->magic = AH_FREE_MAGIC;
 #endif
 
+#ifdef CONFIG_GC
+	ah = NULL;
+#else
 	free(ah);
+#endif
 }
 
 void *
@@ -502,7 +518,11 @@ debug_mem_realloc(unsigned char *file, int line, void *ptr, size_t size)
 
 	true_size = SIZE_BASE2AH(size);
 	do {
+#ifdef CONFIG_GC
+		ah2 = GC_REALLOC(ah, true_size);
+#else
 		ah2 = realloc(ah, true_size);
+#endif
 		if (ah2) {
 			ah = ah2;
 			break;
@@ -546,10 +566,17 @@ set_mem_comment(void *ptr, unsigned char *str, int len)
 
 	if (ah->comment) {
 		mem_stats.true_amount -= strlen(ah->comment) + 1;
+#ifdef CONFIG_GC
+		ah->comment = NULL;
+#else
 		free(ah->comment);
+#endif
 	}
-
+#ifdef CONFIG_GC
+	ah->comment = GC_MALLOC(len + 1);
+#else
 	ah->comment = malloc(len + 1);
+#endif
 	if (ah->comment) {
 		memcpy(ah->comment, str, len);
 		ah->comment[len] = 0;
diff --git a/src/util/memory.c b/src/util/memory.c
index c0a2421a..81dfbc82 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -55,8 +55,11 @@ mem_alloc(size_t size)
 {
 	if (size)
 		do {
+#ifdef CONFIG_GC
+			void *p = GC_MALLOC(size);
+#else
 			void *p = malloc(size);
-
+#endif
 			if (p) return p;
 		} while (patience("malloc"));
 
@@ -68,8 +71,11 @@ mem_calloc(size_t count, size_t eltsize)
 {
 	if (eltsize && count)
 		do {
+#ifdef CONFIG_GC
+			void *p = GC_MALLOC(count * eltsize);
+#else
 			void *p = calloc(count, eltsize);
-
+#endif
 			if (p) return p;
 		} while (patience("calloc"));
 
@@ -83,8 +89,11 @@ mem_free(void *p)
 		INTERNAL("mem_free(NULL)");
 		return;
 	}
-
+#ifdef CONFIG_GC
+	p = NULL;
+#else
 	free(p);
+#endif
 }
 
 void *
@@ -94,8 +103,11 @@ mem_realloc(void *p, size_t size)
 
 	if (size)
 		do {
+#ifdef CONFIG_GC
+			void *p2 = GC_REALLOC(p, size);
+#else
 			void *p2 = realloc(p, size);
-
+#endif
 			if (p2) return p2;
 		} while (patience("realloc"));
 	else
diff --git a/src/util/memory.h b/src/util/memory.h
index cb5927d4..2864408b 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -20,6 +20,10 @@
 #include <sys/types.h>
 #include <stddef.h>
 
+#ifdef CONFIG_GC
+#include <gc.h>
+#endif
+
 #ifdef HAVE_MMAP
 void *mem_mmap_alloc(size_t size);
 void mem_mmap_free(void *p, size_t size);
@@ -62,12 +66,20 @@ void *mem_realloc(void *, size_t);
  * For these we need some replacement functions.
  * This should not be an issue on most modern systems.
  */
+#ifdef CONFIG_GC
+# define mem_alloc(size) GC_MALLOC(size)
+# define mem_calloc(count, size) GC_MALLOC((count) * (size))
+# define mem_free(p) (p) = NULL
+# define mem_realloc(p, size) GC_REALLOC(p, size)
+
+#else
 
 # define mem_alloc(size) malloc(size)
 # define mem_calloc(count, size) calloc(count, size)
 # define mem_free(p) free(p)
 # define mem_realloc(p, size) realloc(p, size)
 
+#endif
 
 /* fmem_* functions should be use for allocation and freeing of memory
  * inside a function.

From 1a394f7f28e5a9e8f92f33ec1bcb23329c4b5a9f Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Mon, 30 Jan 2006 23:29:11 +0100
Subject: [PATCH 178/204] French translation was updated.

---
 po/fr.po | 219 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 112 insertions(+), 107 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 5a237a2b..104fa3bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 00:01+0100\n"
-"PO-Revision-Date: 2006-01-17 00:02+0100\n"
+"POT-Creation-Date: 2006-01-30 23:26+0100\n"
+"PO-Revision-Date: 2006-01-30 23:28+0100\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Pressez espace pour d
 #: src/bfu/msgbox.c:189 src/config/dialogs.c:57 src/config/dialogs.c:391
 #: src/cookies/dialogs.c:354 src/dialogs/edit.c:97 src/dialogs/info.c:133
 #: src/dialogs/options.c:210 src/dialogs/options.c:290 src/mime/dialogs.c:129
-#: src/protocol/auth/dialogs.c:110 src/protocol/protocol.c:233
+#: src/protocol/auth/dialogs.c:110 src/protocol/protocol.c:234
 #: src/scripting/lua/core.c:377 src/scripting/lua/core.c:457
 #: src/session/session.c:792 src/viewer/text/search.c:1593
 msgid "~OK"
@@ -187,7 +187,7 @@ msgid "Digital clock in the status bar."
 msgstr "Horloge digitale dans la barre de status."
 
 #: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1118
-#: src/config/options.inc:1125 src/ecmascript/ecmascript.c:45
+#: src/config/options.inc:1125 src/ecmascript/ecmascript.c:41
 #: src/globhist/globhist.c:63 src/mime/backend/mailcap.c:93
 #: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80
 msgid "Enable"
@@ -1796,7 +1796,7 @@ msgid "Description"
 msgstr "Description"
 
 #: src/config/dialogs.c:320 src/protocol/bittorrent/dialogs.c:594
-#: src/protocol/protocol.c:227 src/session/session.c:282
+#: src/protocol/protocol.c:228 src/session/session.c:282
 #: src/session/session.c:954 src/viewer/text/textarea.c:331
 #: src/viewer/text/textarea.c:338
 msgid "Error"
@@ -3747,7 +3747,7 @@ msgstr "Texte"
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:978 src/viewer/text/form.c:1460
+#: src/config/options.inc:978 src/viewer/text/form.c:1462
 msgid "Checkbox"
 msgstr "Case à cocher"
 
@@ -3795,7 +3795,7 @@ msgstr "Raccourci du bouton"
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1006 src/viewer/text/form.c:1464
+#: src/config/options.inc:1006 src/viewer/text/form.c:1466
 msgid "Text field"
 msgstr "Champ texte"
 
@@ -4400,7 +4400,7 @@ msgid "Domain"
 msgstr "Domaine"
 
 #: src/cookies/dialogs.c:37 src/mime/backend/mailcap.c:97
-#: src/mime/backend/mimetypes.c:56 src/protocol/file/file.c:47
+#: src/mime/backend/mimetypes.c:56 src/protocol/file/cgi.c:43
 msgid "Path"
 msgstr "Chemin"
 
@@ -5358,31 +5358,31 @@ msgstr ""
 "Laisser à \"\" pour utiliser le style initial du document."
 
 #. name:
-#: src/ecmascript/ecmascript.c:41 src/ecmascript/ecmascript.c:153
+#: src/ecmascript/ecmascript.c:37 src/ecmascript/ecmascript.c:247
 msgid "ECMAScript"
 msgstr "ECMAScript"
 
-#: src/ecmascript/ecmascript.c:43
+#: src/ecmascript/ecmascript.c:39
 msgid "ECMAScript options."
 msgstr "Options d'ECMAScript."
 
-#: src/ecmascript/ecmascript.c:47
+#: src/ecmascript/ecmascript.c:43
 msgid "Whether to run those scripts inside of documents."
 msgstr "Exécuter ou non ces scripts présents dans les documents."
 
-#: src/ecmascript/ecmascript.c:49
+#: src/ecmascript/ecmascript.c:45
 msgid "Script error reporting"
 msgstr "Rapport d'erreur de script"
 
-#: src/ecmascript/ecmascript.c:51
+#: src/ecmascript/ecmascript.c:47
 msgid "Open a message box when a script reports an error."
 msgstr "Ouvrir une boîte de message quand un script produit une erreur."
 
-#: src/ecmascript/ecmascript.c:53
+#: src/ecmascript/ecmascript.c:49
 msgid "Ignore <noscript> content"
 msgstr "Ignorer le contenu de <noscript>"
 
-#: src/ecmascript/ecmascript.c:55
+#: src/ecmascript/ecmascript.c:51
 msgid ""
 "Whether to ignore content enclosed by the <noscript> tag\n"
 "when ECMAScript is enabled."
@@ -5390,29 +5390,29 @@ msgstr ""
 "Ignorer ou non le contenu du tag <noscript> quand ECMAScript\n"
 "est actif."
 
-#: src/ecmascript/ecmascript.c:58
+#: src/ecmascript/ecmascript.c:54
 msgid "Maximum execution time"
 msgstr "Temps maximal d'exécution"
 
-#: src/ecmascript/ecmascript.c:60
+#: src/ecmascript/ecmascript.c:56
 msgid "Maximum execution time in seconds for a script."
 msgstr "Temps maximal pour l'exécution d'un script, en secondes."
 
-#: src/ecmascript/ecmascript.c:62
+#: src/ecmascript/ecmascript.c:58
 msgid "Pop-up window blocking"
 msgstr "Blocage des fenêtres Javascript (popups)"
 
-#: src/ecmascript/ecmascript.c:64
+#: src/ecmascript/ecmascript.c:60
 msgid "Whether to disallow scripts to open new windows or tabs."
 msgstr ""
 "Interdire ou non l'ouverture de fenêtres ou d'onglets\n"
 "par les scripts."
 
-#: src/ecmascript/ecmascript.c:132
+#: src/ecmascript/ecmascript.c:226
 msgid "JavaScript Emergency"
 msgstr "Alerte JavaScript"
 
-#: src/ecmascript/ecmascript.c:134
+#: src/ecmascript/ecmascript.c:228
 #, c-format
 msgid ""
 "A script embedded in the current document was running\n"
@@ -5425,16 +5425,16 @@ msgstr ""
 "qu'il y a un bogue dans ce script et que cela aurait pû\n"
 "bloquer ELinks, l'exécution du script a donc été interrompue."
 
-#: src/ecmascript/see/window.c:215 src/ecmascript/spidermonkey/window.c:286
+#: src/ecmascript/see/window.c:216 src/ecmascript/spidermonkey/window.c:286
 msgid "JavaScript Alert"
 msgstr "Alerte JavaScript"
 
-#: src/ecmascript/spidermonkey.c:162
+#: src/ecmascript/spidermonkey.c:88
 #, c-format
 msgid "A script embedded in the current document raised the following%s%s%s%s"
 msgstr "Un script contenu dans le document courant a provoqué%s%s%s%s"
 
-#: src/ecmascript/spidermonkey.c:178
+#: src/ecmascript/spidermonkey.c:104
 msgid "JavaScript Error"
 msgstr "Erreur Javascript"
 
@@ -7140,40 +7140,45 @@ msgstr "A~fficher"
 msgid "Show ~header"
 msgstr "~Montrer les en-têtes"
 
-#: src/protocol/file/file.c:38
-msgid "Local files"
-msgstr "Fichiers locaux"
-
-#: src/protocol/file/file.c:40
-msgid "Options specific to local browsing."
-msgstr "Options pour la navigation locale."
-
-#: src/protocol/file/file.c:43
+#: src/protocol/file/cgi.c:39
 msgid "Local CGI"
 msgstr "Scripts CGI locaux"
 
-#: src/protocol/file/file.c:45
+#: src/protocol/file/cgi.c:41
 msgid "Local CGI specific options."
 msgstr "Options des scripts CGI locaux."
 
-#: src/protocol/file/file.c:49
+#: src/protocol/file/cgi.c:45
 msgid "Colon separated list of directories, where CGI scripts are stored."
 msgstr ""
 "Liste des répertoires où sont les scripts CGI (séparée par des virgules)."
 
-#: src/protocol/file/file.c:51
+#: src/protocol/file/cgi.c:47
 msgid "Allow local CGI"
 msgstr "Autoriser les scripts CGI locaux"
 
-#: src/protocol/file/file.c:53
+#: src/protocol/file/cgi.c:49
 msgid "Whether to execute local CGI scripts."
 msgstr "Exécuter ou non les scripts CGI locaux."
 
-#: src/protocol/file/file.c:56
+#. name:
+#: src/protocol/file/cgi.c:54
+msgid "CGI"
+msgstr "CGI"
+
+#: src/protocol/file/file.c:39
+msgid "Local files"
+msgstr "Fichiers locaux"
+
+#: src/protocol/file/file.c:41
+msgid "Options specific to local browsing."
+msgstr "Options pour la navigation locale."
+
+#: src/protocol/file/file.c:43
 msgid "Allow reading special files"
 msgstr "Autoriser la lecture des fichiers spéciaux"
 
-#: src/protocol/file/file.c:58
+#: src/protocol/file/file.c:45
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7183,11 +7188,11 @@ msgstr ""
 "Notez que cela peut être dangereux; lire /dev/urandom\n"
 "ou /dev/zero peut ruiner votre journée !"
 
-#: src/protocol/file/file.c:62
+#: src/protocol/file/file.c:49
 msgid "Show hidden files in directory listing"
 msgstr "Montrer les fichiers cachés"
 
-#: src/protocol/file/file.c:64
+#: src/protocol/file/file.c:51
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directories listing."
@@ -7196,11 +7201,11 @@ msgstr ""
 "seront cachés lors de la visualisation du contenu d'un répertoire\n"
 "local."
 
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:54
 msgid "Try encoding extensions"
 msgstr "Deviner l'extension des fichiers encodés"
 
-#: src/protocol/file/file.c:69
+#: src/protocol/file/file.c:56
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7211,7 +7216,7 @@ msgstr ""
 "'un_nom.gz'); cela dépend des encodages supportés."
 
 #. name:
-#: src/protocol/file/file.c:77
+#: src/protocol/file/file.c:64
 msgid "File"
 msgstr "File"
 
@@ -7221,46 +7226,46 @@ msgid "Finger"
 msgstr "Finger"
 
 #. name:
-#: src/protocol/fsp/fsp.c:43 src/protocol/fsp/fsp.c:55
+#: src/protocol/fsp/fsp.c:44 src/protocol/fsp/fsp.c:56
 msgid "FSP"
 msgstr "FSP"
 
-#: src/protocol/fsp/fsp.c:45
+#: src/protocol/fsp/fsp.c:46
 msgid "FSP specific options."
 msgstr "Options du protocole FSP."
 
-#: src/protocol/fsp/fsp.c:47
+#: src/protocol/fsp/fsp.c:48
 msgid "Sort entries"
 msgstr "Trier les entrées"
 
-#: src/protocol/fsp/fsp.c:49
+#: src/protocol/fsp/fsp.c:50
 msgid "Whether to sort entries in directory listings."
 msgstr "Trier ou non les entrées des répertoires."
 
 #. name:
-#: src/protocol/ftp/ftp.c:55 src/protocol/ftp/ftp.c:85
+#: src/protocol/ftp/ftp.c:56 src/protocol/ftp/ftp.c:86
 msgid "FTP"
 msgstr "FTP"
 
-#: src/protocol/ftp/ftp.c:57
+#: src/protocol/ftp/ftp.c:58
 msgid "FTP specific options."
 msgstr "Options du protocole FTP."
 
-#: src/protocol/ftp/ftp.c:59 src/protocol/http/http.c:124
+#: src/protocol/ftp/ftp.c:60 src/protocol/http/http.c:124
 #: src/protocol/http/http.c:206
 msgid "Proxy configuration"
 msgstr "Configuration proxy"
 
-#: src/protocol/ftp/ftp.c:61
+#: src/protocol/ftp/ftp.c:62
 msgid "FTP proxy configuration."
 msgstr "Configuration proxy FTP."
 
-#: src/protocol/ftp/ftp.c:63 src/protocol/http/http.c:128
+#: src/protocol/ftp/ftp.c:64 src/protocol/http/http.c:128
 #: src/protocol/http/http.c:210
 msgid "Host and port-number"
 msgstr "Hôte et numéro de port"
 
-#: src/protocol/ftp/ftp.c:65
+#: src/protocol/ftp/ftp.c:66
 msgid ""
 "Host and port-number (host:port) of the FTP proxy, or blank.\n"
 "If it's blank, FTP_PROXY environment variable is checked as well."
@@ -7268,36 +7273,36 @@ msgstr ""
 "Hôte et numéro de port (hôte:port) du proxy FTP, ou rien.\n"
 "Si rien, la variable d'environnement FTP_PROXY sera utilisée."
 
-#: src/protocol/ftp/ftp.c:68
+#: src/protocol/ftp/ftp.c:69
 msgid "Anonymous password"
 msgstr "Mot de passe anonyme"
 
-#: src/protocol/ftp/ftp.c:70
+#: src/protocol/ftp/ftp.c:71
 msgid "FTP anonymous password to be sent."
 msgstr "Mot de passe pour l'accès FTP anonyme."
 
-#: src/protocol/ftp/ftp.c:72
+#: src/protocol/ftp/ftp.c:73
 msgid "Use passive mode (IPv4)"
 msgstr "Utiliser le mode passif (IPv4)"
 
-#: src/protocol/ftp/ftp.c:74
+#: src/protocol/ftp/ftp.c:75
 msgid "Use PASV instead of PORT (passive vs active mode, IPv4 only)."
 msgstr ""
 "Utiliser PASV au lieu de PORT (mode passif contre mode actif, IPv4\n"
 "seulement)."
 
-#: src/protocol/ftp/ftp.c:76
+#: src/protocol/ftp/ftp.c:77
 msgid "Use passive mode (IPv6)"
 msgstr "Utiliser le mode passif (IPv6)"
 
-#: src/protocol/ftp/ftp.c:78
+#: src/protocol/ftp/ftp.c:79
 msgid "Use EPSV instead of EPRT (passive vs active mode, IPv6 only)."
 msgstr ""
 "Utiliser EPSV au lieu de EPRT (mode passif contre mode actif, IPv6\n"
 "seulement)."
 
 #. name:
-#: src/protocol/gopher/gopher.c:46
+#: src/protocol/gopher/gopher.c:47
 msgid "Gopher"
 msgstr "Gopher"
 
@@ -7590,25 +7595,25 @@ msgstr ""
 "Toutes les entrées possibles peuvent être lues dans le dialogue\n"
 "Info. En-têtes."
 
-#: src/protocol/protocol.c:229
+#: src/protocol/protocol.c:230
 #, c-format
 msgid "This version of ELinks does not contain %s protocol support"
 msgstr ""
 "Cette version de ELinks ne contient pas le support pour le protocole %s"
 
-#: src/protocol/protocol.c:260
+#: src/protocol/protocol.c:261
 msgid "Protocols"
 msgstr "Protocoles"
 
-#: src/protocol/protocol.c:262
+#: src/protocol/protocol.c:263
 msgid "Protocol specific options."
 msgstr "Options des protocoles."
 
-#: src/protocol/protocol.c:264
+#: src/protocol/protocol.c:265
 msgid "No-proxy domains"
 msgstr "Domaines ignorés en ce qui concerne les proxys"
 
-#: src/protocol/protocol.c:266
+#: src/protocol/protocol.c:267
 msgid ""
 "Comma separated list of domains for which the proxy (HTTP/FTP)\n"
 "should be disabled. Optionally, a port can be specified for some\n"
@@ -7621,7 +7626,7 @@ msgstr ""
 "NO_PROXY sera utilisé."
 
 #. name:
-#: src/protocol/protocol.c:305
+#: src/protocol/protocol.c:309
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -8109,167 +8114,167 @@ msgstr "Erreur lors de l'envoi du formulaire"
 msgid "Could not load file %s: %s"
 msgstr "Impossible de charger le fichier %s: %s"
 
-#: src/viewer/text/form.c:1445
+#: src/viewer/text/form.c:1447
 msgid "Reset form"
 msgstr "Réinitialiser le formulaire"
 
-#: src/viewer/text/form.c:1447
+#: src/viewer/text/form.c:1449
 msgid "Harmless button"
 msgstr "Bouton sans impact"
 
-#: src/viewer/text/form.c:1455
+#: src/viewer/text/form.c:1457
 msgid "Submit form to"
 msgstr "Envoi du formulaire à"
 
-#: src/viewer/text/form.c:1456
+#: src/viewer/text/form.c:1458
 msgid "Post form to"
 msgstr "Transfert du formulaire à"
 
-#: src/viewer/text/form.c:1458
+#: src/viewer/text/form.c:1460
 msgid "Radio button"
 msgstr "Bouton radio"
 
-#: src/viewer/text/form.c:1462
+#: src/viewer/text/form.c:1464
 msgid "Select field"
 msgstr "Liste"
 
-#: src/viewer/text/form.c:1466
+#: src/viewer/text/form.c:1468
 msgid "Text area"
 msgstr "Champ texte multiligne"
 
-#: src/viewer/text/form.c:1468
+#: src/viewer/text/form.c:1470
 msgid "File upload"
 msgstr "Envoi de fichier"
 
-#: src/viewer/text/form.c:1470
+#: src/viewer/text/form.c:1472
 msgid "Password field"
 msgstr "Champ mot de passe"
 
-#: src/viewer/text/form.c:1508
+#: src/viewer/text/form.c:1510
 msgid "name"
 msgstr "Nom"
 
-#: src/viewer/text/form.c:1520
+#: src/viewer/text/form.c:1522
 msgid "value"
 msgstr "Valeur"
 
-#: src/viewer/text/form.c:1533
+#: src/viewer/text/form.c:1535
 msgid "read only"
 msgstr "lecture seule"
 
-#: src/viewer/text/form.c:1544
+#: src/viewer/text/form.c:1546
 #, c-format
 msgid "press %s to navigate"
 msgstr "pressez %s pour naviguer"
 
-#: src/viewer/text/form.c:1546
+#: src/viewer/text/form.c:1548
 #, c-format
 msgid "press %s to edit"
 msgstr "pressez %s pour éditer"
 
-#: src/viewer/text/form.c:1582
+#: src/viewer/text/form.c:1584
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "pressez %s pour soumettre à %s"
 
-#: src/viewer/text/form.c:1584
+#: src/viewer/text/form.c:1586
 #, c-format
 msgid "press %s to post to %s"
 msgstr "pressez %s pour poster à %s"
 
-#: src/viewer/text/form.c:1686
+#: src/viewer/text/form.c:1688
 msgid "Useless button"
 msgstr "Bouton inutile"
 
-#: src/viewer/text/form.c:1688
+#: src/viewer/text/form.c:1690
 msgid "Submit button"
 msgstr "Bouton Soumettre"
 
-#: src/viewer/text/link.c:1166
+#: src/viewer/text/link.c:1209
 msgid "Display ~usemap"
 msgstr "Afficher ~usemap"
 
-#: src/viewer/text/link.c:1169
+#: src/viewer/text/link.c:1212
 msgid "~Follow link"
 msgstr "~Suivre le lien"
 
-#: src/viewer/text/link.c:1171
+#: src/viewer/text/link.c:1214
 msgid "Follow link and r~eload"
 msgstr "Suivre le lien et ~recharger"
 
-#: src/viewer/text/link.c:1175
+#: src/viewer/text/link.c:1218
 msgid "Open in new ~window"
 msgstr "Ouvrir dans une nouvelle ~fenêtre"
 
-#: src/viewer/text/link.c:1177
+#: src/viewer/text/link.c:1220
 msgid "Open in new ~tab"
 msgstr "Ouvrir dans un nouvel ongle~t"
 
-#: src/viewer/text/link.c:1179
+#: src/viewer/text/link.c:1222
 msgid "Open in new tab in ~background"
 msgstr "Ouvrir dans un nouvel onglet en arrière-~plan"
 
-#: src/viewer/text/link.c:1184
+#: src/viewer/text/link.c:1227
 msgid "~Download link"
 msgstr "~Enregistrer le lien"
 
-#: src/viewer/text/link.c:1187
+#: src/viewer/text/link.c:1230
 msgid "~Add link to bookmarks"
 msgstr "~Ajouter ce lien aux signets"
 
-#: src/viewer/text/link.c:1199 src/viewer/text/link.c:1235
+#: src/viewer/text/link.c:1242 src/viewer/text/link.c:1278
 msgid "~Reset form"
 msgstr "Remettre à ~zéro le formulaire"
 
-#: src/viewer/text/link.c:1212
+#: src/viewer/text/link.c:1255
 msgid "Open in ~external editor"
 msgstr "Ouvrir dans un ~éditeur externe"
 
-#: src/viewer/text/link.c:1218
+#: src/viewer/text/link.c:1261
 msgid "~Submit form"
 msgstr "~Envoyer le formulaire"
 
-#: src/viewer/text/link.c:1219
+#: src/viewer/text/link.c:1262
 msgid "Submit form and rel~oad"
 msgstr "Envoyer le formulaire et ~recharger"
 
-#: src/viewer/text/link.c:1223
+#: src/viewer/text/link.c:1266
 msgid "Submit form and open in new ~window"
 msgstr "Envoyer le formulaire et ouvrir dans une nouvelle ~fenêtre"
 
-#: src/viewer/text/link.c:1225
+#: src/viewer/text/link.c:1268
 msgid "Submit form and open in new ~tab"
 msgstr "Envoyer le formulaire et ouvrir un ~onglet"
 
-#: src/viewer/text/link.c:1228
+#: src/viewer/text/link.c:1271
 msgid "Submit form and open in new tab in ~background"
 msgstr "Envoyer le formulaire et ouvrir un onglet en ~arrière-plan"
 
-#: src/viewer/text/link.c:1233
+#: src/viewer/text/link.c:1276
 msgid "Submit form and ~download"
 msgstr "Envoyer le formulaire et ~télécharger"
 
-#: src/viewer/text/link.c:1238
+#: src/viewer/text/link.c:1281
 msgid "Form f~ields"
 msgstr "Champs de formula~ire"
 
-#: src/viewer/text/link.c:1243
+#: src/viewer/text/link.c:1286
 msgid "V~iew image"
 msgstr "~Voir l'image"
 
-#: src/viewer/text/link.c:1245
+#: src/viewer/text/link.c:1288
 msgid "Download ima~ge"
 msgstr "Enregistrer l'~image"
 
-#: src/viewer/text/link.c:1253
+#: src/viewer/text/link.c:1296
 msgid "No link selected"
 msgstr "Aucun lien sélectionné"
 
-#: src/viewer/text/link.c:1301
+#: src/viewer/text/link.c:1344
 msgid "Image"
 msgstr "Image"
 
-#: src/viewer/text/link.c:1306
+#: src/viewer/text/link.c:1349
 msgid "Usemap"
 msgstr "Usemap"
 

From 3f878c6ce783f07e5acb4d3adc75edff6fa79c1c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 03:52:48 +0100
Subject: [PATCH 179/204] BOOKMARKS: Fix XBEL calling add_bookmark() with NULL
 title

It didn't check that both title and title->text was non NULL. In either
case it now passes "No title" string to add_bookmark().

Reported by Neuromancer.

Tested with both:

	<bookmark href="empty://title"><title></title><bookmark>
	<bookmark href="no://title"></bookmark>
---
 src/bookmarks/backend/xbel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bookmarks/backend/xbel.c b/src/bookmarks/backend/xbel.c
index 114ddc1a..69eed05b 100644
--- a/src/bookmarks/backend/xbel.c
+++ b/src/bookmarks/backend/xbel.c
@@ -386,7 +386,7 @@ xbeltree_to_bookmarks_list(struct tree_node *node,
 
 			tmp = add_bookmark(current_parent, 0,
 					   /* The <title> element is optional */
-					   title ? title->text
+					   title && title->text ? title->text
 						 : (unsigned char *) gettext("No title"),
 					   /* XXX: The href attribute isn't optional but
 					    * we don't validate the source XML yet, so
@@ -407,7 +407,7 @@ xbeltree_to_bookmarks_list(struct tree_node *node,
 			title = get_child(node, "title");
 
 			tmp = add_bookmark(current_parent, 0,
-					   title ? title->text
+					   title && title->text ? title->text
 						 : (unsigned char *) gettext("No title"),
 					   NULL);
 

From 7eaa1bb2f974acc2d9d5aeca3d9343e391bfec4b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 04:28:25 +0100
Subject: [PATCH 180/204] CONFIG: Fix GC checking on Debian-based systems

This changes GC checking to use the EL_CHECK_OPTIONAL_LIBRARY macro to
reduce redundancy. This means that there is --with-gc instead of
--enable-gc so you can pass it a path, which is needed on Debian systems
where <gc.h> resides in /usr/include/gc/gc.h.

The macro is adapted accordingly to serve the above purpose. That is,
"$withval/include" and "$withval/lib" is only appended to CFLAGS and LIBS
if they exist (else "$withval" is appended to CFLAGS).
---
 configure.in | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/configure.in b/configure.in
index 19c73f1c..66493fbd 100644
--- a/configure.in
+++ b/configure.in
@@ -395,9 +395,22 @@ AC_DEFUN([EL_CHECK_OPTIONAL_LIBRARY],
 		AC_MSG_RESULT(yes)
 		EL_SAVE_FLAGS
 		if test -n "$withval" && test -d "$withval"; then
-			CFLAGS="$CFLAGS -I$withval/include";
-			CPPFLAGS="$CPPFLAGS -I$withval/include";
-			LDFLAGS="$LDFLAGS -L$withval/lib";
+			# Be a little more careful when setting
+			# include and lib directories. This way
+			# $withval will work when includes are
+			# there but the library is in the common
+			# /usr/lib ... Does the right thing when
+			# looking for gc on Debian.
+			if test -d "$withval/include"; then
+				CFLAGS="$CFLAGS -I$withval/include"
+				CPPFLAGS="$CPPFLAGS -I$withval/include"
+			else
+				CFLAGS="$CFLAGS -I$withval"
+				CPPFLAGS="$CPPFLAGS -I$withval"
+			fi
+			if test -d "$withval/lib"; then
+				LDFLAGS="$LDFLAGS -L$withval/lib"
+			fi
 		fi
 
 		AC_CHECK_HEADERS([$3], [$1=yes], [$1=no; break;])
@@ -446,6 +459,9 @@ EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen,
 EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version,
 	[  --without-idn           disable international domain names support])
 
+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GC, gc, gc.h, gc, GC_init,
+	[  --with-gc            enable Boehm's garbage collector])
+
 dnl ===================================================================
 dnl Bookmark and XBEL support
 dnl ===================================================================
@@ -1253,26 +1269,6 @@ EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs],
 EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
 
-EL_ARG_ENABLE(CONFIG_GC, gc, [Garbage collector],
-	      [  --enable-gc             enable Boehm's garbage collector])
-
-EL_SAVE_FLAGS
-if test "x${enable_gc}" = xyes; then
-	CFLAGS="$CFLAGS -I/usr/include/gc"
-# -lgc might already be added by SEE 	
-	AC_TRY_LINK([#include <gc.h>
-	], [void *p = GC_MALLOC(1);], CONFIG_GC=yes, CONFIG_GC=no)
-	if test "$CONFIG_GC" != yes; then
-		LIBS="$LIBS -lgc"
-		AC_TRY_LINK([#include <gc.h>
-		], [void *p = GC_MALLOC(1);], CONFIG_GC=yes, CONFIG_GC=no)
-	fi
-	if test "$CONFIG_GC" != yes; then
-		EL_RESTORE_FLAGS
-	fi
-fi
-AC_SUBST(CONFIG_GC)
-
 AC_ARG_ENABLE(weehoofooboomookerchoo,
               [
     Also check out the features.conf file for more information about features!

From 3c0c9121989541eb84be88cc7085bf2f2498d13e Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Tue, 31 Jan 2006 13:03:17 +0100
Subject: [PATCH 181/204] SpiderMonkey: target was not set

---
 src/ecmascript/spidermonkey/window.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index 767f910e..cbc92d44 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -323,6 +323,7 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		} strings[NUMBER_OF_URLS_TO_REMEMBER];
 		static int indeks;
 
+		target = jsval_to_string(ctx, &argv[1]);
 		for (i = 0; i < NUMBER_OF_URLS_TO_REMEMBER; i++) {
 			if (!(strings[i].ctx && strings[i].url && strings[i].frame))
 				continue;

From 3fc0eb38840f2d43c7000c1d82d7ddab48aff4a4 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 15:17:11 +0100
Subject: [PATCH 182/204] DOC: Sync with current option tree, propagate zas'
 fix for hooks file list

---
 doc/man/man1/elinks.1.in   |  4 ++--
 doc/man/man5/elinks.conf.5 | 26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/doc/man/man1/elinks.1.in b/doc/man/man1/elinks.1.in
index 7a23b8a2..00521452 100644
--- a/doc/man/man1/elinks.1.in
+++ b/doc/man/man1/elinks.1.in
@@ -17,7 +17,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKS" 1 "The Elinks text-browser" "2006-01-14" "The Elinks text-browser"
+.TH "ELINKS" 1 "The Elinks text-browser" "2006-01-31" "The Elinks text-browser"
 .SH NAME
 elinks \- lynx-like alternative character mode WWW browser
 .SH "SYNOPSIS"
@@ -279,7 +279,7 @@ History file containing most recently visited URLs\&.
 GoTo URL dialog history file\&.
 
 .TP
-~/\&.elinks/hooks\&.{js,lua,pl,py,pl,scm}
+~/\&.elinks/hooks\&.{js,lua,pl,py,rb,scm}
 Browser scripting hooks\&.
 
 .TP
diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5
index fcd422df..c392ae14 100644
--- a/doc/man/man5/elinks.conf.5
+++ b/doc/man/man5/elinks.conf.5
@@ -17,7 +17,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKS.CONF" 5 "ELinks configuration file" "2006-01-14" "ELinks configuration file"
+.TH "ELINKS.CONF" 5 "ELinks configuration file" "2006-01-31" "ELinks configuration file"
 .SH NAME
 elinks.conf \- ELinks configuration file
 .SH "SYNOPSIS"
@@ -1156,6 +1156,18 @@ Allow blacklisting of buggy peers\&.
 protocol\&.file
 Options specific to local browsing\&.
 
+.TP
+protocol\&.file\&.allow_special_files [0|1] (default: 0)
+Whether to allow reading from non\-regular files\&. Note this can be dangerous; reading /dev/urandom or /dev/zero can ruin your day!
+
+.TP
+protocol\&.file\&.show_hidden_files [0|1] (default: 1)
+When set to false, files with name starting with a dot will be hidden in local directories listing\&.
+
+.TP
+protocol\&.file\&.try_encoding_extensions [0|1] (default: 1)
+When set, if we can't open a file named 'filename', we'll try to open 'filename' with some encoding extension appended (ie\&. 'filename\&.gz'); it depends on the supported encodings\&.
+
 .TP
 protocol\&.file\&.cgi
 Local CGI specific options\&.
@@ -1169,16 +1181,12 @@ protocol\&.file\&.cgi\&.policy [0|1] (default: 0)
 Whether to execute local CGI scripts\&.
 
 .TP
-protocol\&.file\&.allow_special_files [0|1] (default: 0)
-Whether to allow reading from non\-regular files\&. Note this can be dangerous; reading /dev/urandom or /dev/zero can ruin your day!
+protocol\&.fsp
+FSP specific options\&.
 
 .TP
-protocol\&.file\&.show_hidden_files [0|1] (default: 1)
-When set to false, files with name starting with a dot will be hidden in local directories listing\&.
-
-.TP
-protocol\&.file\&.try_encoding_extensions [0|1] (default: 1)
-When set, if we can't open a file named 'filename', we'll try to open 'filename' with some encoding extension appended (ie\&. 'filename\&.gz'); it depends on the supported encodings\&.
+protocol\&.fsp\&.sort [0|1] (default: 1)
+Whether to sort entries in directory listings\&.
 
 .TP
 protocol\&.ftp

From 367afb2cebb8b6cde10e28e25bcd2784c5c39038 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 19:25:37 +0100
Subject: [PATCH 183/204] BUILD: Fix test building to support more than one
 test program pr directory

---
 Makefile.lib | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile.lib b/Makefile.lib
index b0953760..af488125 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -176,16 +176,14 @@ TESTDEPS += $(TESTDEPS-yes)
 TEST_LIB=$(top_srcdir)/test/libtest.sh
 export TEST_LIB
 
-# This does the work for the next rule. It is a very general rule
-# but as long as we don't put test programs in src/ it should work.
+# This is a very general rule but as long as we don't put test programs in src/
+# it should work.
 %: %.o $(TESTDEPS)
 	$(call cmd,link)
 
-$(TEST_PROGS): $(addsuffix .o,$(TEST_PROGS)) $(TESTDEPS)
-
 TESTS = $(wildcard $(srcdir)test-*)
 
-$(TESTS): $(TEST_PROGS)
+$(TESTS): $(addsuffix .o,$(TEST_PROGS)) $(TEST_PROGS)
 	@echo "*** $(notdir $@) ***"; \
 	$(call shellquote,$(SHELL)) $@ $(TEST_OPTS)
 

From 73c06aaa107ad81ed60d53661e8893d5545589ad Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 19:29:48 +0100
Subject: [PATCH 184/204] DOM: Add test for parsing randomized HTML

It uses mangleme by Michal Zalewski <lcamtuf@coredump.cx> to generate HTML
which is then fed into the sgml-parser program. By default 100 random HTML
documents are tested. But the test script takes the number of documents
to test against as an argument. Useful for torture testing the SGML parser.
---
 src/dom/test/Makefile                |   1 +
 src/dom/test/html-mangle.c           | 221 +++++++++++++++++++++++++++
 src/dom/test/test-sgml-parser-random |  34 +++++
 3 files changed, 256 insertions(+)
 create mode 100644 src/dom/test/html-mangle.c
 create mode 100755 src/dom/test/test-sgml-parser-random

diff --git a/src/dom/test/Makefile b/src/dom/test/Makefile
index bbdf0dc4..27ae7afe 100644
--- a/src/dom/test/Makefile
+++ b/src/dom/test/Makefile
@@ -4,6 +4,7 @@ include $(top_builddir)/Makefile.config
 # Disabled since it requires DOM_STACK_TRACE to be defined
 #	dom-select
 TEST_PROGS = \
+ html-mangle \
  sgml-parser
 
 TESTDEPS = \
diff --git a/src/dom/test/html-mangle.c b/src/dom/test/html-mangle.c
new file mode 100644
index 00000000..abed647d
--- /dev/null
+++ b/src/dom/test/html-mangle.c
@@ -0,0 +1,221 @@
+/* HTML manglizer
+ * --------------
+ * Copyright (C) 2004 by Michal Zalewski <lcamtuf@coredump.cx>
+ *
+ * Based on mangleme-1.2, downloaded on the date below.
+ *
+ * Date: Tue, 31 Jan 2006 10:14:38 +0100 (CET)
+ * From: Michal Zalewski <lcamtuf@dione.ids.pl>
+ * To: Jonas Fonseca <fonseca@diku.dk>
+ * Subject: Re: [mangleme] Question about license and reusability
+ * In-Reply-To: <20060131022616.GB30744@diku.dk>
+ * Message-ID: <Pine.LNX.4.58.0601311013400.24339@dione>
+ *
+ * On Tue, 31 Jan 2006, Jonas Fonseca wrote:
+ * > I would like to reuse your HTML manglizer for stress testing a program I
+ * > am working on (licensed under GPL) but mangleme.tgz (version 1.2)
+ * > doesn't carry any license info as far as I can see. The freshmeat
+ * > project page mentions LGPL, is that authoritative?
+ *
+ * The program is so trivial I have no issues with other people using it
+ * under any licence they choose, to be honest. Consider it to be freeware,
+ * or LGPL if you insist on having some restrictions ;-)
+ *
+ * In other words, go ahead.
+ *
+ * Cheers,
+ * /mz
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#define R(x) (rand() % (x))
+
+#define MAXTCOUNT 100
+#define MAXPCOUNT 20
+#define MAXSTR2   80
+#define MAXTAGS 80
+#define MAXPARS 20
+
+/* Tag and parameter list: guesstimating / reference compilation. */
+static char* tags[MAXTAGS][MAXPARS] = {
+	{ "A", "NAME", "HREF", "REF", "REV", "TITLE", "TARGET", "SHAPE", "onLoad", "STYLE", 0 },
+	{ "APPLET", "CODEBASE", "CODE", "NAME", "ALIGN", "ALT", "HEIGHT", "WIDTH", "HSPACE", "VSPACE", "DOWNLOAD", "HEIGHT", "NAME", "TITLE", "onLoad", "STYLE", 0 }, 
+	{ "AREA", "SHAPE", "ALT", "CO-ORDS", "HREF", "onLoad", "STYLE", 0 }, 
+	{ "B", "onLoad", "STYLE", 0 }, 
+	{ "BANNER", "onLoad", "STYLE", 0 }, 
+	{ "BASE", "HREF", "TARGET", "onLoad", "STYLE", 0 }, 
+	{ "BASEFONT", "SIZE", "onLoad", "STYLE", 0 }, 
+	{ "BGSOUND", "SRC", "LOOP", "onLoad", "STYLE", 0 }, 
+	{ "BQ", "CLEAR", "NOWRAP", "onLoad", "STYLE", 0 }, 
+	{ "BODY", "BACKGROUND", "BGCOLOR", "TEXT", "LINK", "ALINK", "VLINK", "LEFTMARGIN", "TOPMARGIN", "BGPROPERTIES", "onLoad", "STYLE", 0 }, 
+	{ "CAPTION", "ALIGN", "VALIGN", "onLoad", "STYLE", 0 }, 
+	{ "CENTER", "onLoad", "STYLE", 0 }, 
+	{ "COL", "ALIGN", "SPAN", "onLoad", "STYLE", 0 }, 
+	{ "COLGROUP", "ALIGN", "VALIGN", "HALIGN", "WIDTH", "SPAN", "onLoad", "STYLE", 0 }, 
+	{ "DIV", "ALIGN", "CLASS", "LANG", "onLoad", "STYLE", 0 }, 
+	{ "EMBED", "SRC", "HEIGHT", "WIDTH", "UNITS", "NAME", "PALETTE", "onLoad", "STYLE", 0 }, 
+	{ "FIG", "SRC", "ALIGN", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 }, 
+	{ "FN", "ID", "onLoad", "STYLE", 0 }, 
+	{ "FONT", "SIZE", "COLOR", "FACE", "onLoad", "STYLE", 0 }, 
+	{ "FORM", "ACTION", "METHOD", "ENCTYPE", "TARGET", "SCRIPT", "onLoad", "STYLE", 0 }, 
+	{ "FRAME", "SRC", "NAME", "MARGINWIDTH", "MARGINHEIGHT", "SCROLLING", "FRAMESPACING", "onLoad", "STYLE", 0 }, 
+	{ "FRAMESET", "ROWS", "COLS", "onLoad", "STYLE", 0 }, 
+	{ "H1", "SRC", "DINGBAT", "onLoad", "STYLE", 0 }, 
+	{ "HEAD", "onLoad", "STYLE", 0 }, 
+	{ "HR", "SRC", "SIZE", "WIDTH", "ALIGN", "COLOR", "onLoad", "STYLE", 0 }, 
+	{ "HTML", "onLoad", "STYLE", 0 }, 
+	{ "IFRAME", "ALIGN", "FRAMEBORDER", "HEIGHT", "MARGINHEIGHT", "MARGINWIDTH", "NAME", "SCROLLING", "SRC", "ADDRESS", "WIDTH", "onLoad", "STYLE", 0 }, 
+	{ "IMG", "ALIGN", "ALT", "SRC", "BORDER", "DYNSRC", "HEIGHT", "HSPACE", "ISMAP", "LOOP", "LOWSRC", "START", "UNITS", "USEMAP", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 }, 
+	{ "INPUT", "TYPE", "NAME", "VALUE", "onLoad", "STYLE", 0 }, 
+	{ "ISINDEX", "HREF", "PROMPT", "onLoad", "STYLE", 0 }, 
+	{ "LI", "SRC", "DINGBAT", "SKIP", "TYPE", "VALUE", "onLoad", "STYLE", 0 }, 
+	{ "LINK", "REL", "REV", "HREF", "TITLE", "onLoad", "STYLE", 0 }, 
+	{ "MAP", "NAME", "onLoad", "STYLE", 0 }, 
+	{ "MARQUEE", "ALIGN", "BEHAVIOR", "BGCOLOR", "DIRECTION", "HEIGHT", "HSPACE", "LOOP", "SCROLLAMOUNT", "SCROLLDELAY", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 }, 
+	{ "MENU", "onLoad", "STYLE", 0 }, 
+	{ "META", "HTTP-EQUIV", "CONTENT", "NAME", "onLoad", "STYLE", 0 }, 
+	{ "MULTICOL", "COLS", "GUTTER", "WIDTH", "onLoad", "STYLE", 0 }, 
+	{ "NOFRAMES", "onLoad", "STYLE", 0 }, 
+	{ "NOTE", "CLASS", "SRC", "onLoad", "STYLE", 0 }, 
+	{ "OVERLAY", "SRC", "X", "Y", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 }, 
+	{ "PARAM", "NAME", "VALUE", "onLoad", "STYLE", 0 }, 
+	{ "RANGE", "FROM", "UNTIL", "onLoad", "STYLE", 0 }, 
+	{ "SCRIPT", "LANGUAGE", "onLoad", "STYLE", 0 }, 
+	{ "SELECT", "NAME", "SIZE", "MULTIPLE", "WIDTH", "HEIGHT", "UNITS", "onLoad", "STYLE", 0 },
+	{ "OPTION", "VALUE", "SHAPE", "onLoad", "STYLE", 0 }, 
+	{ "SPACER", "TYPE", "SIZE", "WIDTH", "HEIGHT", "ALIGN", "onLoad", "STYLE", 0 }, 
+	{ "SPOT", "ID", "onLoad", "STYLE", 0 }, 
+	{ "TAB", "INDENT", "TO", "ALIGN", "DP", "onLoad", "STYLE", 0 }, 
+	{ "TABLE", "ALIGN", "WIDTH", "BORDER", "CELLPADDING", "CELLSPACING", "BGCOLOR", "VALIGN", "COLSPEC", "UNITS", "DP", "onLoad", "STYLE", 0 }, 
+	{ "TBODY", "CLASS", "ID", "onLoad", "STYLE", 0 },
+	{ "TD", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 }, 
+	{ "TEXTAREA", "NAME", "COLS", "ROWS", "onLoad", "STYLE", 0 }, 
+	{ "TEXTFLOW", "CLASS", "ID", "onLoad", "STYLE", 0 },
+	{ "TFOOT", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 }, 
+	{ "TH", "ALIGN", "CLASS", "ID", "onLoad", "STYLE", 0 },
+	{ "TITLE", "onLoad", "STYLE", 0 }, 
+	{ "TR", "ALIGN", "VALIGN", "BGCOLOR", "CLASS", "onLoad", "STYLE", 0 }, 
+	{ "UL", "SRC", "DINGBAT", "WRAP", "TYPE", "PLAIN", "onLoad", "STYLE", 0 }, 
+	{ 0 }
+};
+
+void make_up_value(void)
+{
+	char c=R(2);
+
+	if (c) putchar('"');
+
+	switch (R(31)) {
+	case 0: printf("javascript:"); make_up_value(); break;
+#if 0
+	case 1: printf("jar:"); make_up_value(); break;
+#endif
+	case 2: printf("mk:"); make_up_value(); break;
+	case 3: printf("file:"); make_up_value(); break;
+	case 4: printf("http:"); make_up_value(); break;
+	case 5: printf("about:"); make_up_value(); break;
+	case 6: printf("_blank"); break;
+	case 7: printf("_self"); break;
+	case 8: printf("top"); break;
+	case 9: printf("left"); break;
+	case 10: putchar('&'); make_up_value(); putchar(';'); break;
+	case 11: make_up_value(); make_up_value(); break;
+	case 12:
+	case 13:
+	case 14:
+	case 15:
+	case 16:
+	case 17:
+	case 18:
+	case 19:
+	case 20:
+	{
+		int c = R(10) ? R(10) : (1 + R(MAXSTR2) * R(MAXSTR2));
+		char *x = malloc(c);
+
+		memset(x,R(256),c);
+		fwrite(x,c,1,stdout);
+		free(x);
+		break;
+	}
+	case 21: printf("%s","%n%n%n%n%n%n"); break;
+	case 22: putchar('#'); break;
+	case 23: putchar('*'); break;
+	default:
+		 if (R(2)) putchar('-'); printf("%d",rand());
+		 break;
+	}
+
+	if (c) putchar('"');
+}
+
+void random_tag(void)
+{
+	int tn, tc;
+
+	do
+		tn = R(MAXTAGS);
+	while (!tags[tn][0]);
+
+	tc = R(MAXPCOUNT) + 1;
+
+	putchar('<');
+
+	switch (R(10)) {
+	case 0: putchar(R(256)); break;
+	case 1: putchar('/');
+	}
+
+	printf("%s", tags[tn][0]);
+
+	while (tc--) {
+		int pn;
+
+		switch (R(32)) {
+		case 0: putchar(R(256)); 
+		case 1: break;
+		default: putchar(' ');
+		}
+
+		do
+			pn = R(MAXPARS-1) + 1;
+		while (!tags[tn][pn]);
+
+		printf("%s", tags[tn][pn]);
+
+		switch (R(32)) {
+		case 0: putchar(R(256)); 
+		case 1: break;
+		default: putchar('=');
+		}
+
+		make_up_value();
+	}
+
+	putchar('>');
+
+}
+
+int main(int argc, char **argv)
+{
+	int tc, seed;
+
+	printf("<HTML>\n");
+	printf("<HEAD>\n");
+
+	seed = (time(0) ^ (getpid() << 16));
+#if 0
+	fprintf(stderr,"[%u] Mangle attempt 0x%08x (%s) -- %s\n", (int)time(0), seed, getenv("HTTP_USER_AGENT"), getenv("REMOTE_ADDR"));
+#endif
+	srand(seed);
+
+	tc = R(MAXTCOUNT) + 1;
+	while (tc--) random_tag();
+	fflush(0);
+	return 0;
+}
diff --git a/src/dom/test/test-sgml-parser-random b/src/dom/test/test-sgml-parser-random
new file mode 100755
index 00000000..9d33e441
--- /dev/null
+++ b/src/dom/test/test-sgml-parser-random
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Jonas Fonseca
+#
+
+test_description='Test parsing of random SGML garbage documents.
+
+This test checks if the SGML parser will not barf on randomly generated
+HTML documents.
+'
+
+. "$TEST_LIB"
+
+# Make it possible to torture test by passing number of times to
+# test.
+test -n "$1" && runs="$1" || runs=100
+run=1
+
+while test "$run" -le "$runs"; do
+	desc="Parsing randomised HTML"
+
+	html-mangle > "$run.html"
+	test_run_ 'sgml-parser --stdin "$run" < "$run.html"'
+	if [ "$?" != 0 -o "$eval_ret" != 0 ]
+	then
+		test_failure_ "$desc" "output saved in $run.html"
+	else
+		test_ok_ "$desc"
+		rm "$run.html"
+	fi
+	run=$((run + 1))
+done
+
+test_done

From 92a9cafb6e826958c023a9380ebc4d7b179f21e6 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 22:01:35 +0100
Subject: [PATCH 185/204] DOM: Replace various DOM status/error/exception codes
 with dom_code enum

Replaces sgml_parser_code, dom_stack_code, and dom_exception_code and
generally tries to simplify things and remove redundant codes.
---
 src/document/dom/renderer.c |  42 ++++++-------
 src/dom/configuration.c     |  36 +++++------
 src/dom/dom.h               |  56 ++++++++++++------
 src/dom/select.c            | 115 ++++++++++++++++++------------------
 src/dom/sgml/dump.c         |  34 +++++------
 src/dom/sgml/parser.c       |  90 ++++++++++++++--------------
 src/dom/sgml/parser.h       |  25 ++------
 src/dom/stack.c             |  32 +++++-----
 src/dom/stack.h             |  16 +----
 9 files changed, 222 insertions(+), 224 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 8d391e18..0dfb3890 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -507,7 +507,7 @@ render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *no
 }
 #endif
 
-static enum dom_stack_code
+static enum dom_code
 render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -524,11 +524,11 @@ render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *dat
 #endif
 		render_dom_node_text(renderer, &renderer->styles[node->type], node);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 /* This callback is also used for rendering processing instruction nodes.  */
-static enum dom_stack_code
+static enum dom_code
 render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -537,10 +537,10 @@ render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *
 
 	render_dom_node_text(renderer, &renderer->styles[node->type], node);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -553,7 +553,7 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
 	assert(node && renderer && renderer->document);
 
 	if (!string || !length)
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	if (check_dom_node_source(renderer, string, length)) {
 		render_dom_flush(renderer, string);
@@ -563,7 +563,7 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
 
 	render_dom_text(renderer, &renderer->styles[node->type], string, length);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 static void
@@ -587,7 +587,7 @@ set_base_uri(struct dom_renderer *renderer, unsigned char *value, size_t valuele
 	renderer->base_uri = uri;
 }
 
-enum dom_stack_code
+enum dom_code
 render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -659,10 +659,10 @@ render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void
 		}
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -680,10 +680,10 @@ render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *da
 
 	render_dom_node_text(renderer, &renderer->styles[node->type], node);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -695,7 +695,7 @@ render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *da
 		render_dom_flush(renderer, renderer->end);
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 static struct dom_stack_context_info dom_source_renderer_context_info = {
@@ -740,7 +740,7 @@ static struct dom_stack_context_info dom_source_renderer_context_info = {
 #define RSS_CONFIG_FLAGS \
 	(DOM_CONFIG_NORMALIZE_WHITESPACE | DOM_CONFIG_NORMALIZE_CHARACTERS)
 
-enum dom_stack_code
+enum dom_code
 dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -783,10 +783,10 @@ dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 		renderer->node = node;
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
@@ -826,7 +826,7 @@ dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 		break;
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 
@@ -897,13 +897,13 @@ render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
 	}
 }
 
-enum dom_stack_code
+enum dom_code
 dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *data)
 {
 	struct dom_renderer *renderer = stack->current->data;
 
 	if (!renderer->channel)
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	render_rss_item(renderer, renderer->channel);
 
@@ -924,7 +924,7 @@ dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *data)
 
 	done_dom_node(root);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 
@@ -978,7 +978,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	unsigned char *string = struri(cached->uri);
 	size_t length = strlen(string);
 	struct dom_string uri = INIT_DOM_STRING(string, length);
-	enum sgml_parser_code code;
+	enum dom_code code;
 
 	convert_table = get_convert_table(head, document->options.cp,
 					  document->options.assume_cp,
diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index 657f916b..fa933610 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -12,7 +12,7 @@
 #include "dom/string.h"
 
 
-static enum dom_stack_code
+static enum dom_code
 normalize_text_node_whitespace(struct dom_node *node)
 {
 	unsigned char buf[256];
@@ -44,7 +44,7 @@ normalize_text_node_whitespace(struct dom_node *node)
 
 		if (!add_to_dom_string(&string, buf, j)) {
 			done_dom_string(&string);
-			return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+			return DOM_CODE_ALLOC_ERR;
 		}
 	}
 
@@ -54,11 +54,11 @@ normalize_text_node_whitespace(struct dom_node *node)
 	set_dom_string(&node->string, string.string, string.length);
 	node->allocated = 1;
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 
 }
 
-static enum dom_stack_code
+static enum dom_code
 append_node_text(struct dom_config *config, struct dom_node *node)
 {
 	struct dom_node *prev = get_dom_node_prev(node);
@@ -72,7 +72,7 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 	if (!prev || prev->type != DOM_NODE_TEXT) {
 		/* Preserve text nodes with no one to append to. */
 		if (node->type == DOM_NODE_TEXT)
-			return DOM_STACK_CODE_OK;
+			return DOM_CODE_OK;
 
 		prev = NULL;
 		set_dom_string(&dest, NULL, 0);
@@ -83,7 +83,7 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 		} else {
 			set_dom_string(&dest, NULL, 0);
 			if (!add_to_dom_string(&dest, prev->string.string, prev->string.length))
-				return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 			set_dom_string(&prev->string, dest.string, dest.length);
 			prev->allocated = 1;
 		}
@@ -119,7 +119,7 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 			prev->string.length = length;
 		else
 			done_dom_string(&dest);
-		return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+		return DOM_CODE_ALLOC_ERR;
 	}
 
 	if (prev) {
@@ -132,7 +132,7 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 			normalize_text_node_whitespace(prev);
 		}
 
-		return DOM_STACK_CODE_FREE_NODE;
+		return DOM_CODE_FREE_NODE;
 
 	} else {
 		int was_cdata_section = node->type == DOM_NODE_CDATA_SECTION;
@@ -149,15 +149,15 @@ append_node_text(struct dom_config *config, struct dom_node *node)
 			normalize_text_node_whitespace(node);
 		}
 
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 	}
 }
 
-static enum dom_stack_code
+static enum dom_code
 dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_config *config = stack->current->data;
-	enum dom_stack_code code = DOM_STACK_CODE_OK;
+	enum dom_code code = DOM_CODE_OK;
 
 	switch (node->type) {
 	case DOM_NODE_ELEMENT:
@@ -165,7 +165,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		    && !node->data.element.type) {
 			/* Drop elements that are not known from the built-in
 			 * node info. */
-			code = DOM_STACK_CODE_FREE_NODE;
+			code = DOM_CODE_FREE_NODE;
 		}
 		break;
 
@@ -174,7 +174,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		    && !node->data.attribute.type) {
 			/* Drop elements that are not known from the built-in
 			 * node info. */
-			code = DOM_STACK_CODE_FREE_NODE;
+			code = DOM_CODE_FREE_NODE;
 		}
 		break;
 
@@ -183,7 +183,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		    && !node->data.proc_instruction.type) {
 			/* Drop elements that are not known from the built-in
 			 * node info. */
-			code = DOM_STACK_CODE_FREE_NODE;
+			code = DOM_CODE_FREE_NODE;
 		}
 		break;
 
@@ -192,7 +192,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		    && node->data.text.only_space) {
 			/* Discard all Text nodes that contain
 			 * whitespaces in element content]. */
-			code = DOM_STACK_CODE_FREE_NODE;
+			code = DOM_CODE_FREE_NODE;
 		} else {
 			code = append_node_text(config, node);
 		}
@@ -201,7 +201,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 	case DOM_NODE_COMMENT:
 		if (!(config->flags & DOM_CONFIG_COMMENTS)) {
 			/* Discard all comments. */
-			code = DOM_STACK_CODE_FREE_NODE;
+			code = DOM_CODE_FREE_NODE;
 		}
 		break;
 
@@ -234,7 +234,7 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 	return code;
 }
 
-enum dom_stack_code
+enum dom_code
 dom_normalize_text(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_config *config = stack->current->data;
@@ -244,7 +244,7 @@ dom_normalize_text(struct dom_stack *stack, struct dom_node *node, void *data)
 		return normalize_text_node_whitespace(node);
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 
diff --git a/src/dom/dom.h b/src/dom/dom.h
index 5eadc5a8..211d0119 100644
--- a/src/dom/dom.h
+++ b/src/dom/dom.h
@@ -1,25 +1,45 @@
 #ifndef EL_DOM_DOM_H
 #define EL_DOM_DOM_H
 
-enum dom_exception_code {
-	DOM_ERR_NONE				=  0,
-	DOM_ERR_INDEX_SIZE			=  1,
-	DOM_ERR_STRING_SIZE			=  2,
-	DOM_ERR_HIERARCHY_REQUEST		=  3,
-	DOM_ERR_WRONG_DOCUMENT			=  4,
-	DOM_ERR_INVALID_CHARACTER		=  5,
-	DOM_ERR_NO_DATA_ALLOWED			=  6,
-	DOM_ERR_NO_MODIFICATION_ALLOWED		=  7,
-	DOM_ERR_NOT_FOUND			=  8,
-	DOM_ERR_NOT_SUPPORTED			=  9,
-	DOM_ERR_INUSE_ATTRIBUTE			= 10,
+/** DOM status/error/exception codes
+ *
+ * These enum values are used for return codes throughout the DOM engine.
+ */
+enum dom_code {
+	/** ELinks specific codes: */
+	DOM_CODE_OK = 0,		/*: The sane default. */
+	DOM_CODE_ERR = -1000,		/*: Anything by DOM_CODE_OK. */
 
-	/* Introduced in DOM Level 2: */
-	DOM_ERR_INVALID_STATE			= 11,
-	DOM_ERR_SYNTAX				= 12,
-	DOM_ERR_INVALID_MODIFICATION		= 13,
-	DOM_ERR_NAMESPACE			= 14,
-	DOM_ERR_INVALID_ACCESS			= 15,
+	DOM_CODE_INCOMPLETE,		/*: The parsing could not be completed */
+	DOM_CODE_FREE_NODE,		/*: Discard the node */
+
+	/** Error codes: */
+	DOM_CODE_ALLOC_ERR,		/*: Failed to allocate memory */
+	DOM_CODE_MAX_DEPTH_ERR,		/*: Stack max depth reached */
+	DOM_CODE_VALUE_ERR,		/*: Bad/unexpected value */
+
+	/** DOM Level 1 codes: */
+	DOM_CODE_INDEX_SIZE_ERR			=  1,
+	DOM_CODE_STRING_SIZE_ERR		=  2,
+	DOM_CODE_HIERARCHY_REQUEST_ERR		=  3,
+	DOM_CODE_WRONG_DOCUMENT_ERR		=  4,
+	DOM_CODE_INVALID_CHARACTER_ERR		=  5,
+	DOM_CODE_NO_DATA_ALLOWED_ERR		=  6,
+	DOM_CODE_NO_MODIFICATION_ALLOWED_ERR	=  7,
+	DOM_CODE_NOT_FOUND_ERR			=  8,
+	DOM_CODE_NOT_SUPPORTED_ERR		=  9,
+	DOM_CODE_INUSE_ATTRIBUTE_ERR		= 10,
+
+	/** Introduced in DOM Level 2: */
+	DOM_CODE_INVALID_STATE_ERR		= 11,
+	DOM_CODE_SYNTAX_ERR			= 12,
+	DOM_CODE_INVALID_MODIFICATION_ERR	= 13,
+	DOM_CODE_NAMESPACE_ERR			= 14,
+	DOM_CODE_INVALID_ACCESS_ERR		= 15,
+
+	/** Introduced in DOM Level 3: */
+	DOM_CODE_VALIDATION_ERR			= 16,
+	DOM_CODE_TYPE_MISMATCH_ERR		= 17,
 };
 
 #endif
diff --git a/src/dom/select.c b/src/dom/select.c
index af60c4d5..839dc576 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -80,7 +80,7 @@ get_dom_select_pseudo(struct dom_scanner_token *token)
 }
 
 /* Parses attribute selector. For example '[foo="bar"]' or '[foo|="boo"]'. */
-static enum dom_exception_code
+static enum dom_code
 parse_dom_select_attribute(struct dom_select_node *sel, struct dom_scanner *scanner)
 {
 	struct dom_scanner_token *token = get_dom_scanner_token(scanner);
@@ -88,25 +88,25 @@ parse_dom_select_attribute(struct dom_select_node *sel, struct dom_scanner *scan
 	/* Get '['. */
 
 	if (token->type != '[')
-		return DOM_ERR_INVALID_STATE;
+		return DOM_CODE_SYNTAX_ERR;
 
 	/* Get the attribute name. */
 
 	token = get_next_dom_scanner_token(scanner);
 	if (!token || token->type != CSS_TOKEN_IDENT)
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 
 	copy_dom_string(&sel->node.string, &token->string);
 
 	/* Get the optional '=' combo or ending ']'. */
 
 	token = get_next_dom_scanner_token(scanner);
-	if (!token) return DOM_ERR_SYNTAX;
+	if (!token) return DOM_CODE_SYNTAX_ERR;
 
 	switch (token->type) {
 	case ']':
 		sel->match.attribute |= DOM_SELECT_ATTRIBUTE_ANY;
-		return DOM_ERR_NONE;
+		return DOM_CODE_OK;
 
 	case CSS_TOKEN_SELECT_SPACE_LIST:
 		sel->match.attribute |= DOM_SELECT_ATTRIBUTE_SPACE_LIST;
@@ -129,13 +129,13 @@ parse_dom_select_attribute(struct dom_select_node *sel, struct dom_scanner *scan
 		break;
 
 	default:
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 	}
 
 	/* Get the required value. */
 
 	token = get_next_dom_scanner_token(scanner);
-	if (!token) return DOM_ERR_SYNTAX;
+	if (!token) return DOM_CODE_SYNTAX_ERR;
 
 	switch (token->type) {
 	case CSS_TOKEN_IDENT:
@@ -144,16 +144,16 @@ parse_dom_select_attribute(struct dom_select_node *sel, struct dom_scanner *scan
 		break;
 
 	default:
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 	}
 
 	/* Get the ending ']'. */
 
 	token = get_next_dom_scanner_token(scanner);
 	if (token && token->type == ']')
-		return DOM_ERR_NONE;
+		return DOM_CODE_OK;
 
-	return DOM_ERR_SYNTAX;
+	return DOM_CODE_SYNTAX_ERR;
 }
 
 /* Parse:
@@ -190,7 +190,7 @@ get_scanner_token_number(struct dom_scanner_token *token)
 }
 
 /* Parses the '(...)' part of ':nth-of-type(...)' and ':nth-child(...)'. */
-static enum dom_exception_code
+static enum dom_code
 parse_dom_select_nth_arg(struct dom_select_nth_match *nth, struct dom_scanner *scanner)
 {
 	struct dom_scanner_token *token = get_next_dom_scanner_token(scanner);
@@ -198,11 +198,11 @@ parse_dom_select_nth_arg(struct dom_select_nth_match *nth, struct dom_scanner *s
 	int number = -1;
 
 	if (!token || token->type != '(')
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 
 	token = get_next_dom_scanner_token(scanner);
 	if (!token)
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 
 	switch (token->type) {
 	case CSS_TOKEN_IDENT:
@@ -220,59 +220,59 @@ parse_dom_select_nth_arg(struct dom_select_nth_match *nth, struct dom_scanner *s
 		}
 
 		if (skip_css_tokens(scanner, ')'))
-			return DOM_ERR_NONE;
+			return DOM_CODE_OK;
 
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 
 	case '-':
 		sign = -1;
 
 		token = get_next_dom_scanner_token(scanner);
-		if (!token) return DOM_ERR_SYNTAX;
+		if (!token) return DOM_CODE_SYNTAX_ERR;
 
 		if (token->type != CSS_TOKEN_IDENT)
 			break;
 
 		if (token->type != CSS_TOKEN_NUMBER)
-			return DOM_ERR_SYNTAX;
+			return DOM_CODE_SYNTAX_ERR;
 		/* Fall-through */
 
 	case CSS_TOKEN_NUMBER:
 		number = get_scanner_token_number(token);
 		if (number < 0)
-			return DOM_ERR_INVALID_STATE;
+			return DOM_CODE_VALUE_ERR;
 
 		token = get_next_dom_scanner_token(scanner);
-		if (!token) return DOM_ERR_SYNTAX;
+		if (!token) return DOM_CODE_SYNTAX_ERR;
 		break;
 
 	default:
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 	}
 
 	/* The rest can contain n+ part */
 	switch (token->type) {
 	case CSS_TOKEN_IDENT:
 		if (!dom_scanner_token_contains(token, "n"))
-			return DOM_ERR_SYNTAX;
+			return DOM_CODE_SYNTAX_ERR;
 
 		nth->step = sign * number;
 
 		token = get_next_dom_scanner_token(scanner);
-		if (!token) return DOM_ERR_SYNTAX;
+		if (!token) return DOM_CODE_SYNTAX_ERR;
 
 		if (token->type != '+')
 			break;
 
 		token = get_next_dom_scanner_token(scanner);
-		if (!token) return DOM_ERR_SYNTAX;
+		if (!token) return DOM_CODE_SYNTAX_ERR;
 
 		if (token->type != CSS_TOKEN_NUMBER)
 			break;
 
 		number = get_scanner_token_number(token);
 		if (number < 0)
-			return DOM_ERR_INVALID_STATE;
+			return DOM_CODE_VALUE_ERR;
 
 		nth->index = sign * number;
 		break;
@@ -283,19 +283,19 @@ parse_dom_select_nth_arg(struct dom_select_nth_match *nth, struct dom_scanner *s
 	}
 
 	if (skip_css_tokens(scanner, ')'))
-		return DOM_ERR_NONE;
+		return DOM_CODE_OK;
 
-	return DOM_ERR_SYNTAX;
+	return DOM_CODE_SYNTAX_ERR;
 }
 
 /* Parse a pseudo-class or -element with the syntax: ':<ident>'. */
-static enum dom_exception_code
+static enum dom_code
 parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 			struct dom_scanner *scanner)
 {
 	struct dom_scanner_token *token = get_dom_scanner_token(scanner);
 	enum dom_select_pseudo pseudo;
-	enum dom_exception_code code;
+	enum dom_code code;
 
 	/* Skip double :'s in front of some pseudo's (::first-line, etc.) */
 	do {
@@ -303,12 +303,12 @@ parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 	} while (token && token->type == ':');
 
 	if (!token || token->type != CSS_TOKEN_IDENT)
-		return DOM_ERR_SYNTAX;
+		return DOM_CODE_SYNTAX_ERR;
 
 	pseudo = get_dom_select_pseudo(token);
 	switch (pseudo) {
 	case DOM_SELECT_PSEUDO_UNKNOWN:
-		return DOM_ERR_NOT_FOUND;
+		return DOM_CODE_ERR;
 
 	case DOM_SELECT_PSEUDO_CONTAINS:
 		/* FIXME: E:contains("text") */
@@ -317,7 +317,7 @@ parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 	case DOM_SELECT_PSEUDO_NTH_CHILD:
 	case DOM_SELECT_PSEUDO_NTH_LAST_CHILD:
 		code = parse_dom_select_nth_arg(&sel->nth_child, scanner);
-		if (code != DOM_ERR_NONE)
+		if (code != DOM_CODE_OK)
 			return code;
 
 		sel->match.element |= DOM_SELECT_ELEMENT_NTH_CHILD;
@@ -341,7 +341,7 @@ parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 	case DOM_SELECT_PSEUDO_NTH_TYPE:
 	case DOM_SELECT_PSEUDO_NTH_LAST_TYPE:
 		code = parse_dom_select_nth_arg(&sel->nth_type, scanner);
-		if (code != DOM_ERR_NONE)
+		if (code != DOM_CODE_OK)
 			return code;
 
 		sel->match.element |= DOM_SELECT_ELEMENT_NTH_TYPE;
@@ -375,7 +375,7 @@ parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 		select->pseudo |= pseudo;
 	}
 
-	return DOM_ERR_NONE;
+	return DOM_CODE_OK;
 }
 
 /* The element relation flags are mutual exclusive. This macro can be used
@@ -384,7 +384,7 @@ parse_dom_select_pseudo(struct dom_select *select, struct dom_select_node *sel,
 	((sel)->match.element & DOM_SELECT_RELATION_FLAGS)
 
 /* Parse a CSS3 selector and add selector nodes to the @select struct. */
-static enum dom_exception_code
+static enum dom_code
 parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 		 struct dom_string *string)
 {
@@ -397,7 +397,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 
 	while (dom_scanner_has_tokens(&scanner)) {
 		struct dom_scanner_token *token = get_dom_scanner_token(&scanner);
-		enum dom_exception_code code;
+		enum dom_code code;
 		struct dom_select_node *select_node;
 
 		assert(token);
@@ -430,14 +430,14 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 		case '[':
 			sel.node.type = DOM_NODE_ATTRIBUTE;
 			code = parse_dom_select_attribute(&sel, &scanner);
-			if (code != DOM_ERR_NONE)
+			if (code != DOM_CODE_OK)
 				return code;
 			break;
 
 		case '.':
 			token = get_next_dom_scanner_token(&scanner);
 			if (!token || token->type != CSS_TOKEN_IDENT)
-				return DOM_ERR_SYNTAX;
+				return DOM_CODE_SYNTAX_ERR;
 
 			sel.node.type = DOM_NODE_ATTRIBUTE;
 			sel.match.attribute |= DOM_SELECT_ATTRIBUTE_SPACE_LIST;
@@ -447,30 +447,30 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 
 		case ':':
 			code = parse_dom_select_pseudo(select, &sel, &scanner);
-			if (code != DOM_ERR_NONE)
+			if (code != DOM_CODE_OK)
 				return code;
 			break;
 
 		case '>':
 			if (get_element_relation(&sel) != DOM_SELECT_RELATION_DESCENDANT)
-				return DOM_ERR_SYNTAX;
+				return DOM_CODE_SYNTAX_ERR;
 			sel.match.element |= DOM_SELECT_RELATION_DIRECT_CHILD;
 			break;
 
 		case '+':
 			if (get_element_relation(&sel) != DOM_SELECT_RELATION_DESCENDANT)
-				return DOM_ERR_SYNTAX;
+				return DOM_CODE_SYNTAX_ERR;
 			sel.match.element |= DOM_SELECT_RELATION_DIRECT_ADJACENT;
 			break;
 
 		case '~':
 			if (get_element_relation(&sel) != DOM_SELECT_RELATION_DESCENDANT)
-				return DOM_ERR_SYNTAX;
+				return DOM_CODE_SYNTAX_ERR;
 			sel.match.element |= DOM_SELECT_RELATION_INDIRECT_ADJACENT;
 			break;
 
 		default:
-			return DOM_ERR_SYNTAX;
+			return DOM_CODE_SYNTAX_ERR;
 		}
 
 		skip_dom_scanner_token(&scanner);
@@ -496,7 +496,7 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 
 			if (!add_to_dom_node_list(list, node, index)) {
 				done_dom_node(node);
-				return DOM_ERR_INVALID_STATE;
+				return DOM_CODE_ALLOC_ERR;
 			}
 
 			node->parent = parent;
@@ -506,8 +506,9 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 			select->selector = select_node;
 		}
 
-		if (push_dom_node(stack, &select_node->node) != DOM_STACK_CODE_OK)
-			return DOM_ERR_INVALID_STATE;
+		code = push_dom_node(stack, &select_node->node);
+		if (code != DOM_CODE_OK)
+			return code;
 
 		if (select_node->node.type != DOM_NODE_ELEMENT)
 			pop_dom_node(stack);
@@ -516,9 +517,9 @@ parse_dom_select(struct dom_select *select, struct dom_stack *stack,
 	}
 
 	if (select->selector)
-		return DOM_ERR_NONE;
+		return DOM_CODE_OK;
 
-	return DOM_ERR_INVALID_STATE;
+	return DOM_CODE_ERR;
 }
 
 /* Basically this is just a wrapper for parse_dom_select() to ease error
@@ -528,7 +529,7 @@ init_dom_select(enum dom_select_syntax syntax, struct dom_string *string)
 {
 	struct dom_select *select = mem_calloc(1, sizeof(select));
 	struct dom_stack stack;
-	enum dom_exception_code code;
+	enum dom_code code;
 
 	init_dom_stack(&stack, DOM_STACK_FLAG_NONE);
 	add_dom_stack_tracer(&stack, "init-select: ");
@@ -536,7 +537,7 @@ init_dom_select(enum dom_select_syntax syntax, struct dom_string *string)
 	code = parse_dom_select(select, &stack, string);
 	done_dom_stack(&stack);
 
-	if (code == DOM_ERR_NONE)
+	if (code == DOM_CODE_OK)
 		return select;
 
 	done_dom_select(select);
@@ -897,7 +898,7 @@ match_element_selector(struct dom_select_node *selector, struct dom_node *node,
 #define get_dom_select_data(stack) ((stack)->current->data)
 
 /* Matches an element node being visited against the current selector stack. */
-enum dom_stack_code
+enum dom_code
 dom_select_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -922,12 +923,12 @@ dom_select_push_element(struct dom_stack *stack, struct dom_node *node, void *da
 			push_dom_node(&select_data->stack, &selector->node);
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 /* Ensures that nodes, no longer 'reachable' on the stack do not have any
  * states associated with them on the select data stack. */
-enum dom_stack_code
+enum dom_code
 dom_select_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -947,13 +948,13 @@ dom_select_pop_element(struct dom_stack *stack, struct dom_node *node, void *dat
 		}
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 /* For now this is only for matching the ':contains(<string>)' pseudo-class.
  * Any node which can contain text and thus characters from the given <string>
  * are handled in this common callback. */
-enum dom_stack_code
+enum dom_code
 dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_select_data *select_data = get_dom_select_data(stack);
@@ -965,7 +966,7 @@ dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 	WDBG("Text node: %d chars", node->string.length);
 
 	if (!text_sel)
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	text = &text_sel->node.string;
 
@@ -978,7 +979,7 @@ dom_select_push_text(struct dom_stack *stack, struct dom_node *node, void *data)
 		ERROR("Unhandled type");
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 /* Context info for interacting with the DOM tree or stream stack. */
@@ -1076,7 +1077,7 @@ select_dom_nodes(struct dom_select *select, struct dom_node *root)
 			      &dom_select_data_context_info);
 	add_dom_stack_tracer(&select_data.stack, "select-match: ");
 
-	if (push_dom_node(&select_data.stack, &select->selector->node) == DOM_STACK_CODE_OK) {
+	if (push_dom_node(&select_data.stack, &select->selector->node) == DOM_CODE_OK) {
 		get_dom_stack_top(&select_data.stack)->immutable = 1;
 		walk_dom_nodes(&stack, root);
 	}
diff --git a/src/dom/sgml/dump.c b/src/dom/sgml/dump.c
index 902a7e4f..3bac87e8 100644
--- a/src/dom/sgml/dump.c
+++ b/src/dom/sgml/dump.c
@@ -15,7 +15,7 @@
 #include "dom/string.h"
 
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_element_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -26,10 +26,10 @@ sgml_file_dumper_element_push(struct dom_stack *stack, struct dom_node *node, vo
 	    || node->data.element.map->size == 0)
 		fprintf(file, ">");
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_element_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -37,10 +37,10 @@ sgml_file_dumper_element_pop(struct dom_stack *stack, struct dom_node *node, voi
 
 	fprintf(file, "</%.*s>", string->length, string->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_attribute_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -48,7 +48,7 @@ sgml_file_dumper_attribute_push(struct dom_stack *stack, struct dom_node *node,
 	struct dom_string *value = &node->data.attribute.value;
 
 	if (node->parent->type == DOM_NODE_PROCESSING_INSTRUCTION)
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	fprintf(file, " %.*s", name->length, name->string);
 
@@ -66,10 +66,10 @@ sgml_file_dumper_attribute_push(struct dom_stack *stack, struct dom_node *node,
 	if (!get_dom_node_next(node))
 		fprintf(file, ">");
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_proc_instruction_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -80,10 +80,10 @@ sgml_file_dumper_proc_instruction_push(struct dom_stack *stack, struct dom_node
 		target->length, target->string,
 		instruction->length, instruction->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_text_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -91,10 +91,10 @@ sgml_file_dumper_text_push(struct dom_stack *stack, struct dom_node *node, void
 
 	fprintf(file, "%.*s", string->length, string->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_cdata_section_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -102,10 +102,10 @@ sgml_file_dumper_cdata_section_push(struct dom_stack *stack, struct dom_node *no
 
 	fprintf(file, "<![CDATA[%.*s]]>", string->length, string->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_comment_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -113,10 +113,10 @@ sgml_file_dumper_comment_push(struct dom_stack *stack, struct dom_node *node, vo
 
 	fprintf(file, "<!--%.*s-->", string->length, string->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_file_dumper_entity_ref_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	FILE *file = stack->current->data;
@@ -124,7 +124,7 @@ sgml_file_dumper_entity_ref_push(struct dom_stack *stack, struct dom_node *node,
 
 	fprintf(file, "&%.*s;", string->length, string->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 struct dom_stack_context_info sgml_file_dumper = {
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 9ead5c79..c34bf93b 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -41,7 +41,7 @@ add_sgml_document(struct sgml_parser *parser)
 	struct dom_node *node;
 
 	node = init_dom_node(DOM_NODE_DOCUMENT, &parser->uri, allocated);
-	if (node && push_dom_node(&parser->stack, node) == DOM_STACK_CODE_OK)
+	if (node && push_dom_node(&parser->stack, node) == DOM_CODE_OK)
 		return node;
 
 	return NULL;
@@ -63,7 +63,7 @@ add_sgml_element(struct dom_stack *stack, struct dom_scanner_token *token)
 	node_info = get_sgml_node_info(parser->info->elements, node);
 	node->data.element.type = node_info->type;
 
-	if (push_dom_node(stack, node) != DOM_STACK_CODE_OK)
+	if (push_dom_node(stack, node) != DOM_CODE_OK)
 		return NULL;
 
 	state = get_dom_stack_top(stack);
@@ -97,7 +97,7 @@ add_sgml_attribute(struct dom_stack *stack,
 	if (valtoken && valtoken->type == SGML_TOKEN_STRING)
 		node->data.attribute.quoted = valtoken->string.string[-1];
 
-	if (!node || push_dom_node(stack, node) != DOM_STACK_CODE_OK)
+	if (!node || push_dom_node(stack, node) != DOM_CODE_OK)
 		return NULL;
 
 	pop_dom_node(stack);
@@ -130,7 +130,7 @@ add_sgml_proc_instruction(struct dom_stack *stack, struct dom_scanner_token *tar
 		node->data.proc_instruction.type = DOM_PROC_INSTRUCTION;
 	}
 
-	if (push_dom_node(stack, node) == DOM_STACK_CODE_OK)
+	if (push_dom_node(stack, node) == DOM_CODE_OK)
 		return node;
 
 	return NULL;
@@ -147,7 +147,7 @@ add_sgml_node(struct dom_stack *stack, enum dom_node_type type, struct dom_scann
 	if (token->type == SGML_TOKEN_SPACE)
 		node->data.text.only_space = 1;
 
-	if (push_dom_node(stack, node) == DOM_STACK_CODE_OK)
+	if (push_dom_node(stack, node) == DOM_CODE_OK)
 		pop_dom_node(stack);
 
 	return node;
@@ -156,7 +156,7 @@ add_sgml_node(struct dom_stack *stack, enum dom_node_type type, struct dom_scann
 
 /* SGML parser main handling: */
 
-static enum sgml_parser_code
+static enum dom_code
 call_sgml_error_function(struct dom_stack *stack, struct dom_scanner_token *token)
 {
 	struct sgml_parser *parser = get_sgml_parser(stack);
@@ -173,7 +173,7 @@ call_sgml_error_function(struct dom_stack *stack, struct dom_scanner_token *toke
  *
  * NOTE: You can only do this for tokens that are not stripped of markup such
  * as identifiers. */
-static enum sgml_parser_code
+static enum dom_code
 check_sgml_incomplete(struct dom_scanner *scanner,
 		      struct dom_scanner_token *start,
 		      struct dom_scanner_token *token)
@@ -198,7 +198,7 @@ check_sgml_incomplete(struct dom_scanner *scanner,
 	return 0;
 }
 
-static inline enum sgml_parser_code
+static inline enum dom_code
 parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 {
 	struct dom_scanner_token name;
@@ -216,7 +216,7 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 		case SGML_TOKEN_ELEMENT_BEGIN:
 		case SGML_TOKEN_ELEMENT_END:
 		case SGML_TOKEN_ELEMENT_EMPTY_END:
-			return SGML_PARSER_CODE_OK;
+			return DOM_CODE_OK;
 
 		case SGML_TOKEN_IDENT:
 			copy_struct(&name, token);
@@ -229,7 +229,7 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 				 * ignore it. */
 				token = get_next_dom_scanner_token(scanner);
 				if (check_sgml_incomplete(scanner, &name, token))
-					return SGML_PARSER_CODE_INCOMPLETE;
+					return DOM_CODE_INCOMPLETE;
 
 				if (token
 				    && token->type != SGML_TOKEN_IDENT
@@ -238,14 +238,14 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 					token = NULL;
 
 			} else if (check_sgml_incomplete(scanner, &name, token)) {
-				return SGML_PARSER_CODE_INCOMPLETE;
+				return DOM_CODE_INCOMPLETE;
 
 			} else {
 				token = NULL;
 			}
 
 			if (!add_sgml_attribute(stack, &name, token))
-				return SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 
 			/* Skip the value token */
 			if (token)
@@ -253,14 +253,14 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 			break;
 
 		case SGML_TOKEN_INCOMPLETE:
-			return SGML_PARSER_CODE_INCOMPLETE;
+			return DOM_CODE_INCOMPLETE;
 
 		case SGML_TOKEN_ERROR:
 		{
-			enum sgml_parser_code code;
+			enum dom_code code;
 
 			code = call_sgml_error_function(stack, token);
-			if (code != SGML_PARSER_CODE_OK)
+			if (code != DOM_CODE_OK)
 				return code;
 
 			skip_dom_scanner_token(scanner);
@@ -271,10 +271,10 @@ parse_sgml_attributes(struct dom_stack *stack, struct dom_scanner *scanner)
 		}
 	}
 
-	return SGML_PARSER_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum sgml_parser_code
+static enum dom_code
 parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 {
 	struct dom_scanner_token target;
@@ -286,15 +286,15 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 		case SGML_TOKEN_ELEMENT:
 		case SGML_TOKEN_ELEMENT_BEGIN:
 			if (!add_sgml_element(stack, token))
-				return SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 
 			if (token->type == SGML_TOKEN_ELEMENT_BEGIN) {
-				enum sgml_parser_code code;
+				enum dom_code code;
 
 				skip_dom_scanner_token(scanner);
 
 				code = parse_sgml_attributes(stack, scanner);
-				if (code != SGML_PARSER_CODE_OK)
+				if (code != DOM_CODE_OK)
 					return code;
 
 			} else {
@@ -332,7 +332,7 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 
 		case SGML_TOKEN_NOTATION_COMMENT:
 			if (!add_sgml_node(stack, DOM_NODE_COMMENT, token))
-				return SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 			skip_dom_scanner_token(scanner);
 			break;
 
@@ -346,7 +346,7 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 
 		case SGML_TOKEN_CDATA_SECTION:
 			if (!add_sgml_node(stack, DOM_NODE_CDATA_SECTION, token))
-				return SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 			skip_dom_scanner_token(scanner);
 			break;
 
@@ -358,7 +358,7 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			/* Skip the target token */
 			token = get_next_dom_scanner_token(scanner);
 			if (!token || token->type == SGML_TOKEN_INCOMPLETE)
-				return SGML_PARSER_CODE_INCOMPLETE;
+				return DOM_CODE_INCOMPLETE;
 
 			if (token->type == SGML_TOKEN_ERROR)
 				break;
@@ -367,7 +367,7 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			/* Fall-through */
 
 			if (!add_sgml_proc_instruction(stack, &target, token))
-				return SGML_PARSER_CODE_MEM_ALLOC;
+				return DOM_CODE_ALLOC_ERR;
 			if ((target.type == SGML_TOKEN_PROCESS_XML
 			     || target.type == SGML_TOKEN_PROCESS_XML_STYLESHEET)
 			    && token->string.length > 0) {
@@ -399,14 +399,14 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 			break;
 
 		case SGML_TOKEN_INCOMPLETE:
-			return SGML_PARSER_CODE_INCOMPLETE;
+			return DOM_CODE_INCOMPLETE;
 
 		case SGML_TOKEN_ERROR:
 		{
-			enum sgml_parser_code code;
+			enum dom_code code;
 
 			code = call_sgml_error_function(stack, token);
-			if (code != SGML_PARSER_CODE_OK)
+			if (code != DOM_CODE_OK)
 				return code;
 
 			skip_dom_scanner_token(scanner);
@@ -420,10 +420,10 @@ parse_sgml_plain(struct dom_stack *stack, struct dom_scanner *scanner)
 		}
 	}
 
-	return SGML_PARSER_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum sgml_parser_code
+enum dom_code
 parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 	   int complete)
 {
@@ -436,13 +436,13 @@ parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize,
 	if (!parser->root) {
 		parser->root = add_sgml_document(parser);
 		if (!parser->root)
-			return SGML_PARSER_CODE_MEM_ALLOC;
+			return DOM_CODE_ALLOC_ERR;
 		get_dom_stack_top(&parser->stack)->immutable = 1;
 	}
 
 	node = init_dom_node(DOM_NODE_TEXT, &source, 0);
-	if (!node || push_dom_node(&parser->parsing, node) != DOM_STACK_CODE_OK)
-		return SGML_PARSER_CODE_MEM_ALLOC;
+	if (!node || push_dom_node(&parser->parsing, node) != DOM_CODE_OK)
+		return DOM_CODE_ALLOC_ERR;
 
 	return parser->code;
 }
@@ -464,7 +464,7 @@ struct sgml_parsing_state {
 	unsigned int resume:1;
 };
 
-enum dom_stack_code
+enum dom_code
 sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = get_sgml_parser(stack);
@@ -490,8 +490,8 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 						       string->string,
 						       string->length)) {
 
-					parser->code = SGML_PARSER_CODE_MEM_ALLOC;
-					return DOM_STACK_CODE_OK;
+					parser->code = DOM_CODE_ALLOC_ERR;
+					return DOM_CODE_OK;
 				}
 
 				string = &parent->incomplete;
@@ -512,7 +512,7 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 
 	if (scanner_state == SGML_STATE_ELEMENT) {
 		parser->code = parse_sgml_attributes(&parser->stack, &parsing->scanner);
-		if (parser->code == SGML_PARSER_CODE_OK)
+		if (parser->code == DOM_CODE_OK)
 			parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
 	} else {
 		parser->code = parse_sgml_plain(&parser->stack, &parsing->scanner);
@@ -520,19 +520,19 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 
 	if (complete) {
 		pop_dom_node(&parser->parsing);
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 	}
 
-	if (parser->code != SGML_PARSER_CODE_INCOMPLETE) {
+	if (parser->code != DOM_CODE_INCOMPLETE) {
 		/* No need to preserve the default scanner state. */
 		if (parsing->scanner.state == SGML_STATE_TEXT) {
 			pop_dom_node(&parser->parsing);
-			return DOM_STACK_CODE_OK;
+			return DOM_CODE_OK;
 		}
 
 		done_dom_string(&parsing->incomplete);
 		parsing->resume = 1;
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 	}
 
 	token = get_dom_scanner_token(&parsing->scanner);
@@ -543,18 +543,18 @@ sgml_parsing_push(struct dom_stack *stack, struct dom_node *node, void *data)
 	set_dom_string(&incomplete, NULL, 0);
 
 	if (!init_dom_string(&incomplete, string->string, string->length)) {
-		parser->code = SGML_PARSER_CODE_MEM_ALLOC;
-		return DOM_STACK_CODE_OK;
+		parser->code = DOM_CODE_ALLOC_ERR;
+		return DOM_CODE_OK;
 	}
 
 	done_dom_string(&parsing->incomplete);
 	set_dom_string(&parsing->incomplete, incomplete.string, incomplete.length);
 	parsing->resume = 1;
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = get_sgml_parser(stack);
@@ -575,7 +575,7 @@ sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
 
 	done_dom_string(&parsing->incomplete);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 static struct dom_stack_context_info sgml_parsing_context_info = {
diff --git a/src/dom/sgml/parser.h b/src/dom/sgml/parser.h
index 956ff9b3..43eab16b 100644
--- a/src/dom/sgml/parser.h
+++ b/src/dom/sgml/parser.h
@@ -2,6 +2,7 @@
 #ifndef EL_DOM_SGML_PARSER_H
 #define EL_DOM_SGML_PARSER_H
 
+#include "dom/dom.h"
 #include "dom/node.h"
 #include "dom/stack.h"
 #include "dom/sgml/sgml.h"
@@ -62,27 +63,13 @@ struct sgml_parser_state {
 	struct dom_scanner_token end_token;
 };
 
-/** (Error) codes for the SGML parser
- *
- * These enum values are used for return codes.
- */
-enum sgml_parser_code {
-	SGML_PARSER_CODE_OK,		/*: The parsing was successful */
-	SGML_PARSER_CODE_INCOMPLETE,	/*: The parsing could not be completed */
-	SGML_PARSER_CODE_MEM_ALLOC,	/*: Failed to allocate memory */
-	/**
-	 * FIXME: For when we will add support for requiring stricter parsing
-	 * or even a validator. */
-	SGML_PARSER_CODE_ERROR,
-};
-
 /** SGML error callback
  *
  * Called by the SGML parser when a parsing error has occurred.
  *
- * If the return code is not ref:[SGML_PARSER_CODE_OK] the parsing will be
+ * If the return code is not ref:[DOM_CODE_OK] the parsing will be
  * ended and that code will be returned. */
-typedef enum sgml_parser_code
+typedef enum dom_code
 (*sgml_error_T)(struct sgml_parser *, struct dom_string *, unsigned int);
 
 
@@ -101,7 +88,7 @@ struct sgml_parser {
 	struct dom_string uri;		/*: The URI of the DOM document */
 	struct dom_node *root;		/*: The document root node */
 
-	enum sgml_parser_code code;	/*: The latest (error) code */
+	enum dom_code code;		/*: The latest (error) code */
 	sgml_error_T error_func;	/*: Called for detected errors */
 
 	struct dom_stack stack;		/*: A stack for tracking parsed nodes */
@@ -142,10 +129,10 @@ void done_sgml_parser(struct sgml_parser *parser);
  * bufsize::	The size of the buffer given in the buf parameter.
  * complete::	Whether this is the last chunk to parse.
  *
- * The returned code is ref:[SGML_PARSER_CODE_OK] if the buffer was
+ * The returned code is ref:[DOM_CODE_OK] if the buffer was
  * successfully parserd, else a code hinting at the error.
  */
-enum sgml_parser_code
+enum dom_code
 parse_sgml(struct sgml_parser *parser, unsigned char *buf, size_t bufsize, int complete);
 
 /** Get the line position in the source
diff --git a/src/dom/stack.c b/src/dom/stack.c
index 328a7ef4..5546757d 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -151,7 +151,7 @@ call_dom_stack_callbacks(struct dom_stack *stack, struct dom_stack_state *state,
 
 			stack->current = context;
 			switch (callback(stack, state->node, data)) {
-			case DOM_STACK_CODE_FREE_NODE:
+			case DOM_CODE_FREE_NODE:
 				free_node = 1;
 				break;
 			default:
@@ -164,7 +164,7 @@ call_dom_stack_callbacks(struct dom_stack *stack, struct dom_stack_state *state,
 	return free_node;
 }
 
-enum dom_stack_code
+enum dom_code
 push_dom_node(struct dom_stack *stack, struct dom_node *node)
 {
 	struct dom_stack_state *state;
@@ -174,13 +174,13 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 	assert(0 < node->type && node->type < DOM_NODES);
 
 	if (stack->depth > DOM_STACK_MAX_DEPTH) {
-		return DOM_STACK_CODE_ERROR_MAX_DEPTH;
+		return DOM_CODE_MAX_DEPTH_ERR;
 	}
 
 	state = realloc_dom_stack_states(&stack->states, stack->depth);
 	if (!state) {
 		done_dom_node(node);
-		return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+		return DOM_CODE_ALLOC_ERR;
 	}
 
 	state += stack->depth;
@@ -191,7 +191,7 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 		if (context->info->object_size
 		    && !realloc_dom_stack_state_objects(context, stack->depth)) {
 			done_dom_node(node);
-			return DOM_STACK_CODE_ERROR_MEM_ALLOC;
+			return DOM_CODE_ALLOC_ERR;
 		}
 	}
 
@@ -203,7 +203,7 @@ push_dom_node(struct dom_stack *stack, struct dom_node *node)
 	stack->depth++;
 	call_dom_stack_callbacks(stack, state, DOM_STACK_PUSH);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 void
@@ -358,7 +358,7 @@ walk_dom_nodes(struct dom_stack *stack, struct dom_node *root)
 	if (!context)
 		return;
 
-	if (push_dom_node(stack, root) != DOM_STACK_CODE_OK)
+	if (push_dom_node(stack, root) != DOM_CODE_OK)
 		return;
 
 	while (!dom_stack_is_empty(stack)) {
@@ -420,7 +420,7 @@ walk_dom_nodes(struct dom_stack *stack, struct dom_node *root)
 		if (is_dom_node_list_member(list, wstate->index)) {
 			struct dom_node *child = list->entries[wstate->index++];
 
-			if (push_dom_node(stack, child) == DOM_STACK_CODE_OK)
+			if (push_dom_node(stack, child) == DOM_CODE_OK)
 				continue;
 		}
 
@@ -498,7 +498,7 @@ static unsigned char indent_string[] =
 #define get_indent_offset(stack) \
 	((stack)->depth < sizeof(indent_string)/2 ? (stack)->depth * 2 : sizeof(indent_string))
 
-enum dom_stack_code
+enum dom_code
 dom_stack_trace_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *value = &node->string;
@@ -510,10 +510,10 @@ dom_stack_trace_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 		name->length, name->string,
 		value->length, value->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 dom_stack_trace_id_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string value;
@@ -534,10 +534,10 @@ dom_stack_trace_id_leaf(struct dom_stack *stack, struct dom_node *node, void *da
 
 	done_dom_string(&value);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 dom_stack_trace_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -556,10 +556,10 @@ dom_stack_trace_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 
 	done_dom_string(&value);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-enum dom_stack_code
+enum dom_code
 dom_stack_trace_branch(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -575,7 +575,7 @@ dom_stack_trace_branch(struct dom_stack *stack, struct dom_node *node, void *dat
 		get_indent_offset(stack), indent_string,
 		id->length, id->string, name->length, name->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 struct dom_stack_context_info dom_stack_trace_context_info = {
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 996b2a00..3ab10388 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -1,6 +1,7 @@
 #ifndef EL_DOM_STACK_H
 #define EL_DOM_STACK_H
 
+#include "dom/dom.h"
 #include "dom/node.h"
 #include "util/error.h"
 #include "util/hash.h"
@@ -9,21 +10,10 @@ struct dom_stack;
 
 /* API Doc :: dom-stack */
 
-/** DOM stack code
- *
- * Codes used by the DOM stack to indicate states.
- */
-enum dom_stack_code {
-	DOM_STACK_CODE_OK,		/*: All is well */
-	DOM_STACK_CODE_FREE_NODE,	/*: Free the (popped) node */
-	DOM_STACK_CODE_ERROR_MEM_ALLOC,	/*: Memory allocation failure */
-	DOM_STACK_CODE_ERROR_MAX_DEPTH,	/*: Stack max depth reached */
-};
-
 /** DOM stack callback
  *
  * Used by contexts, for 'hooking' into the node traversing. */
-typedef enum dom_stack_code
+typedef enum dom_code
 	(*dom_stack_callback_T)(struct dom_stack *, struct dom_node *, void *);
 
 #define DOM_STACK_MAX_DEPTH	4096
@@ -242,7 +232,7 @@ void done_dom_stack_context(struct dom_stack *stack, struct dom_stack_context *c
  *
  * If an error occurs the node is released with ref:[done_dom_node] and NULL is
  * returned. Else the pushed node is returned. */
-enum dom_stack_code push_dom_node(struct dom_stack *stack, struct dom_node *node);
+enum dom_code push_dom_node(struct dom_stack *stack, struct dom_node *node);
 
 /** Pop the top stack state
  *

From 4de26051b97245e0543fab82f59314dc6c155836 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 22:23:22 +0100
Subject: [PATCH 186/204] Ignore test files

---
 src/dom/test/.gitignore     | 3 +++
 src/mime/backend/.gitignore | 2 ++
 src/protocol/ftp/.gitignore | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 src/dom/test/.gitignore
 create mode 100644 src/mime/backend/.gitignore
 create mode 100644 src/protocol/ftp/.gitignore

diff --git a/src/dom/test/.gitignore b/src/dom/test/.gitignore
new file mode 100644
index 00000000..1a42ef7f
--- /dev/null
+++ b/src/dom/test/.gitignore
@@ -0,0 +1,3 @@
+html-mangle
+sgml-parser
+trash
diff --git a/src/mime/backend/.gitignore b/src/mime/backend/.gitignore
new file mode 100644
index 00000000..8ebfa082
--- /dev/null
+++ b/src/mime/backend/.gitignore
@@ -0,0 +1,2 @@
+mailcap-cache
+trash
diff --git a/src/protocol/ftp/.gitignore b/src/protocol/ftp/.gitignore
new file mode 100644
index 00000000..01f9a0f4
--- /dev/null
+++ b/src/protocol/ftp/.gitignore
@@ -0,0 +1,2 @@
+ftp-parser
+trash

From a983603863b25637a4c54cfc9c11bc3c108e2299 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 31 Jan 2006 22:38:06 +0100
Subject: [PATCH 187/204] DOM: Rename src/dom/dom.h src/dom/code.h

Additionally, add API doc mark.
---
 src/dom/{dom.h => code.h} | 6 ++++--
 src/dom/select.c          | 2 +-
 src/dom/sgml/parser.h     | 2 +-
 src/dom/stack.h           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename src/dom/{dom.h => code.h} (94%)

diff --git a/src/dom/dom.h b/src/dom/code.h
similarity index 94%
rename from src/dom/dom.h
rename to src/dom/code.h
index 211d0119..92de7fc8 100644
--- a/src/dom/dom.h
+++ b/src/dom/code.h
@@ -1,5 +1,7 @@
-#ifndef EL_DOM_DOM_H
-#define EL_DOM_DOM_H
+#ifndef EL_DOM_CODE_H
+#define EL_DOM_CODE_H
+
+/* API Doc :: dom-code */
 
 /** DOM status/error/exception codes
  *
diff --git a/src/dom/select.c b/src/dom/select.c
index 839dc576..472bd07f 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -7,7 +7,7 @@
 #include "elinks.h"
 
 #include "dom/css/scanner.h"
-#include "dom/dom.h"
+#include "dom/code.h"
 #include "dom/node.h"
 #include "dom/scanner.h"
 #include "dom/select.h"
diff --git a/src/dom/sgml/parser.h b/src/dom/sgml/parser.h
index 43eab16b..c83f857d 100644
--- a/src/dom/sgml/parser.h
+++ b/src/dom/sgml/parser.h
@@ -2,7 +2,7 @@
 #ifndef EL_DOM_SGML_PARSER_H
 #define EL_DOM_SGML_PARSER_H
 
-#include "dom/dom.h"
+#include "dom/code.h"
 #include "dom/node.h"
 #include "dom/stack.h"
 #include "dom/sgml/sgml.h"
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 3ab10388..0feeff73 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -1,7 +1,7 @@
 #ifndef EL_DOM_STACK_H
 #define EL_DOM_STACK_H
 
-#include "dom/dom.h"
+#include "dom/code.h"
 #include "dom/node.h"
 #include "util/error.h"
 #include "util/hash.h"

From d267fcc7472130e845d3fd4345d5b3dc8d56ebad Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Wed, 1 Feb 2006 09:31:26 +0100
Subject: [PATCH 188/204] SpiderMonkey: Handling both 'document.location.href
 =' and 'document.location ='

---
 src/ecmascript/spidermonkey/document.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c
index 4dac5d72..896daacf 100644
--- a/src/ecmascript/spidermonkey/document.c
+++ b/src/ecmascript/spidermonkey/document.c
@@ -57,11 +57,11 @@ const JSClass document_class = {
 	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
 };
 
-enum document_prop { JSP_DOC_REF, JSP_DOC_TITLE, JSP_DOC_URL };
+enum document_prop { JSP_DOC_LOC, JSP_DOC_REF, JSP_DOC_TITLE, JSP_DOC_URL };
 /* "cookie" is special; it isn't a regular property but we channel it to the
  * cookie-module. XXX: Would it work if "cookie" was defined in this array? */
 const JSPropertySpec document_props[] = {
-	{ "location",	JSP_DOC_URL,	JSPROP_ENUMERATE },
+	{ "location",	JSP_DOC_LOC,	JSPROP_ENUMERATE },
 	{ "referrer",	JSP_DOC_REF,	JSPROP_ENUMERATE | JSPROP_READONLY },
 	{ "title",	JSP_DOC_TITLE,	JSPROP_ENUMERATE }, /* TODO: Charset? */
 	{ "url",	JSP_DOC_URL,	JSPROP_ENUMERATE },
@@ -114,6 +114,9 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	undef_to_jsval(ctx, vp);
 
 	switch (JSVAL_TO_INT(id)) {
+	case JSP_DOC_LOC:
+		JS_GetProperty(ctx, parent, "location", vp);
+		break;
 	case JSP_DOC_REF:
 		switch (get_opt_int("protocol.http.referer.policy")) {
 		case REFERER_NONE:
@@ -179,6 +182,7 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 		mem_free_set(&document->title, stracpy(jsval_to_string(ctx, vp)));
 		print_screen_status(doc_view->session);
 		break;
+	case JSP_DOC_LOC:
 	case JSP_DOC_URL:
 		/* According to the specs this should be readonly but some
 		 * broken sites still assign to it (i.e.

From 51e5a51936cdcc761f57b13d8f294ee30c7e48eb Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 1 Feb 2006 10:36:42 +0100
Subject: [PATCH 189/204] BUILD: Only compile Boehm's GC in if explicitly
 requested

Reported by zas.
---
 configure.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 66493fbd..7deaa6e2 100644
--- a/configure.in
+++ b/configure.in
@@ -459,8 +459,10 @@ EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen,
 EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version,
 	[  --without-idn           disable international domain names support])
 
-EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GC, gc, gc.h, gc, GC_init,
-	[  --with-gc            enable Boehm's garbage collector])
+if test "x{with_gc}" != xno; then
+	EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GC, gc, gc.h, gc, GC_init,
+		[  --with-gc            enable Boehm's garbage collector])
+fi
 
 dnl ===================================================================
 dnl Bookmark and XBEL support

From c7843058fc94e663d1dff54a0c73fffaac9d02ae Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 1 Feb 2006 10:38:21 +0100
Subject: [PATCH 190/204] DOM: Convert to use enum dom_code

Doh, ended pushing out half finished commits. :(
---
 src/dom/test/sgml-parser.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 23b2ef68..6229575f 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -99,7 +99,7 @@ print_indent(struct dom_stack *stack)
 	printf("%.*s", get_indent_offset(stack), indent_string);
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_parser_test_tree(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *value = &node->string;
@@ -107,17 +107,17 @@ sgml_parser_test_tree(struct dom_stack *stack, struct dom_node *node, void *data
 
 	/* Always print the URI for identification. */
 	if (update_number_of_lines(stack))
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	print_indent(stack);
 	printf("%.*s: %.*s\n",
 		name->length, name->string,
 		value->length, value->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -126,7 +126,7 @@ sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *d
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	name	= get_dom_node_name(node);
 	id	= get_dom_node_type_name(node->type);
@@ -138,10 +138,10 @@ sgml_parser_test_id_leaf(struct dom_stack *stack, struct dom_node *node, void *d
 	print_dom_node_value(node);
 	printf("\n");
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -149,7 +149,7 @@ sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	name	= get_dom_node_name(node);
 
@@ -159,10 +159,10 @@ sgml_parser_test_leaf(struct dom_stack *stack, struct dom_node *node, void *data
 	print_dom_node_value(node);
 	printf("\n");
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct dom_string *name;
@@ -171,7 +171,7 @@ sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *da
 	assert(node);
 
 	if (update_number_of_lines(stack))
-		return DOM_STACK_CODE_OK;
+		return DOM_CODE_OK;
 
 	name	= get_dom_node_name(node);
 	id	= get_dom_node_type_name(node->type);
@@ -180,10 +180,10 @@ sgml_parser_test_branch(struct dom_stack *stack, struct dom_node *node, void *da
 	printf("%.*s: %.*s\n",
 		id->length, id->string, name->length, name->string);
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
-static enum dom_stack_code
+static enum dom_code
 sgml_parser_test_end(struct dom_stack *stack, struct dom_node *node, void *data)
 {
 	struct sgml_parser *parser = stack->contexts[0]->data;
@@ -193,7 +193,7 @@ sgml_parser_test_end(struct dom_stack *stack, struct dom_node *node, void *data)
 		printf("%d\n", number_of_lines);
 	}
 
-	return DOM_STACK_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 struct dom_stack_context_info sgml_parser_test_context_info = {
@@ -232,14 +232,14 @@ struct dom_stack_context_info sgml_parser_test_context_info = {
 	}
 };
 
-static enum sgml_parser_code
+static enum dom_code
 sgml_error_function(struct sgml_parser *parser, struct dom_string *string,
 		    unsigned int line_number)
 {
 	printf("error on line %d: %.*s\n",
 	       line_number, string->length, string->string);
 
-	return SGML_PARSER_CODE_OK;
+	return DOM_CODE_OK;
 }
 
 void die(const char *msg, ...)
@@ -263,7 +263,7 @@ main(int argc, char *argv[])
 	enum sgml_document_type doctype = SGML_DOCTYPE_HTML;
 	enum sgml_parser_flag flags = 0;
 	enum sgml_parser_type type = SGML_PARSER_STREAM;
-	enum sgml_parser_code code = 0;
+	enum dom_code code = 0;
 	enum dom_config_flag normalize_flags = 0;
 	int normalize = 0;
 	int dump = 0;
@@ -383,10 +383,10 @@ main(int argc, char *argv[])
 
 			code = parse_sgml(parser, buffer, size, complete);
 			switch (code) {
-			case SGML_PARSER_CODE_OK:
+			case DOM_CODE_OK:
 				break;
 
-			case SGML_PARSER_CODE_INCOMPLETE:
+			case DOM_CODE_INCOMPLETE:
 				if (!complete) break;
 				/* Error */
 			default:

From 6cd5e387e5e8065066ae4bfdb2313e786bceaa25 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 1 Feb 2006 10:51:24 +0100
Subject: [PATCH 191/204] DOM: Change sgml-parser program to have sane exit
 code for incomplete input

---
 src/dom/test/sgml-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index 6229575f..df8eb110 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -433,5 +433,5 @@ main(int argc, char *argv[])
 	check_memory_leaks();
 #endif
 
-	return code;
+	return code != DOM_CODE_OK ? 1 : 0;
 }

From b99f5c4b9f57b18c964abf7dfe172cf640a8e5a1 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 1 Feb 2006 11:34:07 +0100
Subject: [PATCH 192/204] Include <sys/types.h> and fix compilation on an old
 PPC/Debian system

It should be included via elinks.h but apparently some other system header
can prevent this somehow on some systems.

Reported-by: Phillip Pi <ant@zimage.com>
---
 src/util/time.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/time.h b/src/util/time.h
index 40a0680e..e80417ca 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -1,6 +1,9 @@
 #ifndef EL__UTIL_TIME_H
 #define EL__UTIL_TIME_H
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

From 5388ccc5ef5f80ce1b5735b0159147ee64779530 Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@pldmachine.(none)>
Date: Thu, 2 Feb 2006 16:04:11 +0100
Subject: [PATCH 193/204] hooks.py: annulled black background on cygwin.com

---
 contrib/python/hooks.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index fe75b5f6..4aa69090 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -1,3 +1,5 @@
+import re
+
 dumbprefixes = {
 	"7th" : "http://7thguard.net/",
 	"b" : "http://babelfish.altavista.com/babelfish/tr",
@@ -31,6 +33,9 @@ def follow_url_hook(url):
 	return None
 
 def pre_format_html_hook(url, html):
+	if re.search("cygwin\.com", url):
+		html2 = re.sub("<body bgcolor=\"#000000\" color=\"#000000\"", "<body bgcolor=\"#ffffff\" color=\"#000000\"", html)
+		return html2
 	return None
 
 def proxy_for_hook(url):

From 5bf39bd3044ea0fe1e9c617d5b72cbdb377613a9 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 2 Feb 2006 16:29:20 +0100
Subject: [PATCH 194/204] FSP: Check and exit the file 'writer' process if
 writes to stdout fails

This ensures that the 'writer' process will remove itself when the
main ELinks process for some reason decides to shutdown the connection.
Before the 'writer' process would complete it's task taking up unnecessary
system resources.

This is mostly an issue when fetching big files. Therefore only file
fetching is fixed. FIXME added about also checking return codes for write
associated with directory listing.

Reported-by: zas
---
 src/protocol/fsp/fsp.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c
index 3136bb04..6e785ae6 100644
--- a/src/protocol/fsp/fsp.c
+++ b/src/protocol/fsp/fsp.c
@@ -63,6 +63,11 @@ struct module fsp_protocol_module = struct_module(
 );
 
 
+/* FSP synchronous connection management: */
+
+/* FIXME: Although it is probably not so much an issue, check if writes to
+ * stdout fails for directory listing like we do for file fetching. */
+
 static void
 fsp_error(unsigned char *error)
 {
@@ -201,7 +206,8 @@ do_fsp(struct connection *conn)
 		fclose(stderr);
 
 		while ((r = fsp_fread(buf, 1, READ_SIZE, file)) > 0)
-			fwrite(buf, 1, r, stdout);
+			if (safe_write(STDOUT_FILENO, buf, r) <= 0)
+				break;
 
 		fsp_fclose(file);
 		fsp_close_session(ses);
@@ -209,6 +215,11 @@ do_fsp(struct connection *conn)
 	}
 }
 
+#undef READ_SIZE
+
+
+/* FSP asynchronous connection management: */
+
 static void
 fsp_got_data(struct socket *socket, struct read_buffer *rb)
 {
@@ -271,8 +282,6 @@ fsp_got_header(struct socket *socket, struct read_buffer *rb)
 	read_from_socket(conn->data_socket, buf, S_CONN, fsp_got_data);
 }
 
-#undef READ_SIZE
-
 
 void
 fsp_protocol_handler(struct connection *conn)

From 4a276375297f91f37d501f38287a6772ee3afef3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:27 +0100
Subject: [PATCH 195/204] DOM: Cleanup the unused parts of the node interface

Take a quick stroll through the unchartered corners of the DOM node data
structures:

 - Remove ununsed struct dom_node_id_item.
 - Make the document node reference a future struct dom_document.
 - Describe ideas for node data, e.g. the entity reference node should use
 it for storing the unicode_val_T.
---
 src/dom/node.c |  7 -------
 src/dom/node.h | 35 ++++++++++++-----------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/dom/node.c b/src/dom/node.c
index 0ad0745d..e0f336ce 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -399,12 +399,6 @@ done_dom_node_data(struct dom_node *node)
 		break;
 
 	case DOM_NODE_DOCUMENT:
-		if (data->document.element_ids)
-			free_hash(data->document.element_ids);
-
-		if (data->document.meta_nodes)
-			done_dom_node_list(data->document.meta_nodes);
-
 		if (data->document.children)
 			done_dom_node_list(data->document.children);
 		break;
@@ -444,7 +438,6 @@ done_dom_node(struct dom_node *node)
 
 		switch (parent->type) {
 		case DOM_NODE_DOCUMENT:
-			del_from_dom_node_list(data->document.meta_nodes, node);
 			del_from_dom_node_list(data->document.children, node);
 			break;
 
diff --git a/src/dom/node.h b/src/dom/node.h
index 2d1c8a77..466bdcbe 100644
--- a/src/dom/node.h
+++ b/src/dom/node.h
@@ -3,9 +3,9 @@
 #define EL_DOM_NODE_H
 
 #include "dom/string.h"
-#include "util/hash.h"
 
 struct dom_node_list;
+struct dom_document;
 
 enum dom_node_type {
 	DOM_NODE_UNKNOWN		=  0, /* for internal purpose only */
@@ -27,27 +27,15 @@ enum dom_node_type {
 };
 
 /* Following is the node specific datastructures. They may contain no more
- * than 3 pointers or something equivalent. */
-
-struct dom_node_id_item {
-	/* The attibute node containing the id value */
-	struct dom_node *id_attribute;
-
-	/* The node with the @id attribute */
-	struct dom_node *node;
-};
+ * than 4 pointers or something equivalent. */
 
+/* The document URI is stored in the string / length members. */
 struct dom_document_node {
-	/* The document URI is stored in the string / length members. */
-	/* An id to node hash for fast lookup. */
-	struct hash *element_ids; /* -> {struct dom_node_id_item} */
-
-	/* Any meta data the root node carries such as document type nodes,
-	 * entity and notation map nodes and maybe some internal CSS stylesheet
-	 * node. */
-	struct dom_node_list *meta_nodes;
+	/* The document. */
+	struct dom_document *document;
 
 	/* The child nodes. May be NULL. Ordered like they where inserted. */
+	/* FIXME: Should be just one element (root) node reference. */
 	struct dom_node_list *children;
 };
 
@@ -176,12 +164,13 @@ union dom_node_data {
 	struct dom_id			 entity;
 	struct dom_proc_instruction_node proc_instruction;
 
-	/* Node types without a union member yet
+	/* Node types without a union member yet (mostly because it hasn't
+	 * been necessary):
 	 *
-	 * DOM_NODE_CDATA_SECTION,
-	 * DOM_NODE_COMMENT,
-	 * DOM_NODE_DOCUMENT_FRAGMENT,
-	 * DOM_NODE_ENTITY_REFERENCE,
+	 * DOM_NODE_CDATA_SECTION:	Use dom_text_node?
+	 * DOM_NODE_DOCUMENT_FRAGMENT:	struct dom_node_list children;
+	 * DOM_NODE_ENTITY_REFERENCE:	unicode_val_T
+	 * DOM_NODE_COMMENT
 	 */
 };
 

From 3324496b57751f2fa1d5a1c75ea9ad747bcfebb8 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:28 +0100
Subject: [PATCH 196/204] NET: Replace change_connection with cancel_download
 and move_download

This simplifies unqueuing of downloads and makes it more obvious that
the 'change' being performed is to migrate or replace an old download
handle with a new one.
---
 src/network/connection.c         | 16 +++++++++++++++-
 src/network/connection.h         |  6 ++++--
 src/protocol/bittorrent/common.c |  4 ++--
 src/session/download.c           | 16 ++++++++--------
 src/session/session.c            |  6 +++---
 src/session/task.c               |  4 ++--
 src/viewer/dump/dump.c           |  2 +-
 7 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index b28a9630..5622c584 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -978,7 +978,7 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 
 
 /* FIXME: one object in more connections */
-void
+static void
 change_connection(struct download *old, struct download *new,
 		  enum connection_priority newpri, int interrupt)
 {
@@ -1029,6 +1029,20 @@ change_connection(struct download *old, struct download *new,
 	register_check_queue();
 }
 
+void
+cancel_download(struct download *download, int interrupt)
+{
+	change_connection(download, NULL, PRI_CANCEL, interrupt);
+}
+
+void
+move_download(struct download *old, struct download *new,
+	       enum connection_priority newpri)
+{
+	change_connection(old, new, newpri, 0);
+}
+
+
 /* This will remove 'pos' bytes from the start of the cache for the specified
  * connection, if the cached object is already too big. */
 void
diff --git a/src/network/connection.h b/src/network/connection.h
index 0069f0ba..aaa702c5 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -89,8 +89,10 @@ void add_keepalive_connection(struct connection *conn, long timeout_in_seconds,
 void abort_connection(struct connection *, enum connection_state);
 void retry_connection(struct connection *, enum connection_state);
 
-void change_connection(struct download *old, struct download *new,
-		       enum connection_priority newpri, int interrupt);
+void cancel_download(struct download *download, int interrupt);
+void move_download(struct download *old, struct download *new,
+		     enum connection_priority newpri);
+
 void detach_connection(struct download *, off_t);
 void abort_all_connections(void);
 void abort_background_connections(void);
diff --git a/src/protocol/bittorrent/common.c b/src/protocol/bittorrent/common.c
index 23469366..63ade24d 100644
--- a/src/protocol/bittorrent/common.c
+++ b/src/protocol/bittorrent/common.c
@@ -352,7 +352,7 @@ bittorrent_fetch_callback(struct download *download, void *data)
 
 	if (cached->redirect && fetcher->redirects++ < MAX_REDIRECTS) {
 		if (is_in_progress_state(download->state))
-			change_connection(download, NULL, PRI_CANCEL, 0);
+			cancel_download(download, 0);
 
 		download->state = S_WAIT_REDIR;
 
@@ -428,7 +428,7 @@ end_bittorrent_fetch(void *fetcher_data)
 
 	/* Stop any running connections. */
 	if (is_in_progress_state(fetcher->download.state))
-		change_connection(&fetcher->download, NULL, PRI_CANCEL, 0);
+		cancel_download(&fetcher->download, 0);
 
 	mem_free(fetcher);
 }
diff --git a/src/session/download.c b/src/session/download.c
index b0c0ef74..3b0fa81b 100644
--- a/src/session/download.c
+++ b/src/session/download.c
@@ -141,8 +141,7 @@ abort_download(struct file_download *file_download)
 	if (file_download->dlg_data)
 		cancel_dialog(file_download->dlg_data, NULL);
 	if (is_in_progress_state(file_download->download.state))
-		change_connection(&file_download->download, NULL, PRI_CANCEL,
-				  file_download->stop);
+		cancel_download(&file_download->download, file_download->stop);
 	if (file_download->uri) done_uri(file_download->uri);
 
 	if (file_download->handle != -1) {
@@ -391,7 +390,7 @@ download_data(struct download *download, struct file_download *file_download)
 
 	if (cached->redirect && file_download->redirect_cnt++ < MAX_REDIRECTS) {
 		if (is_in_progress_state(download->state))
-			change_connection(&file_download->download, NULL, PRI_CANCEL, 0);
+			cancel_download(&file_download->download, 0);
 
 		assertm(compare_uri(cached->uri, file_download->uri, 0),
 			"Redirecting using bad base URI");
@@ -822,7 +821,7 @@ continue_download_do(struct terminal *term, int fd, void *data, int resume)
 	 * handler can become initialized. */
 	display_download(term, file_download, type_query->ses);
 
-	change_connection(&type_query->download, &file_download->download, PRI_DOWNLOAD, 0);
+	move_download(&type_query->download, &file_download->download, PRI_DOWNLOAD);
 	done_type_query(type_query);
 
 	mem_free(codw_hop);
@@ -888,7 +887,7 @@ init_type_query(struct session *ses, struct download *download,
 	type_query->cached = cached;
 	object_lock(type_query->cached);
 
-	change_connection(download, &type_query->download, PRI_MAIN, 0);
+	move_download(download, &type_query->download, PRI_MAIN);
 	download->state = S_OK;
 
 	add_to_list(ses->type_queries, type_query);
@@ -901,7 +900,7 @@ done_type_query(struct type_query *type_query)
 {
 	/* Unregister any active download */
 	if (is_in_progress_state(type_query->download.state))
-		change_connection(&type_query->download, NULL, PRI_CANCEL, 0);
+		cancel_download(&type_query->download, 0);
 
 	object_unlock(type_query->cached);
 	done_uri(type_query->uri);
@@ -916,8 +915,9 @@ void
 tp_cancel(void *data)
 {
 	struct type_query *type_query = data;
+
 	/* XXX: Should we really abort? (1 vs 0 as the last param) --pasky */
-	change_connection(&type_query->download, NULL, PRI_CANCEL, 1);
+	cancel_download(&type_query->download, 1);
 	done_type_query(type_query);
 }
 
@@ -968,7 +968,7 @@ tp_display(struct type_query *type_query)
 		new->data = ses;
 
 		if (is_in_progress_state(old->state))
-			change_connection(old, new, PRI_MAIN, 0);
+			move_download(old, new, PRI_MAIN);
 		else
 			new->state = old->state;
 	}
diff --git a/src/session/session.c b/src/session/session.c
index bd7a6ed9..9e18a02e 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -297,7 +297,7 @@ abort_files_load(struct session *ses, int interrupt)
 				continue;
 
 			more = 1;
-			change_connection(&ftl->download, NULL, PRI_CANCEL, interrupt);
+			cancel_download(&ftl->download, interrupt);
 		}
 
 		if (!more) break;
@@ -663,7 +663,7 @@ request_additional_file(struct session *ses, unsigned char *name, struct uri *ur
 		if (compare_uri(ftl->uri, uri, URI_BASE)) {
 			if (ftl->pri > pri) {
 				ftl->pri = pri;
-				change_connection(&ftl->download, &ftl->download, pri, 0);
+				move_download(&ftl->download, &ftl->download, pri);
 			}
 			return NULL;
 		}
@@ -1116,7 +1116,7 @@ abort_loading(struct session *ses, int interrupt)
 		struct location *loc = cur_loc(ses);
 
 		if (is_in_progress_state(loc->download.state))
-			change_connection(&loc->download, NULL, PRI_CANCEL, interrupt);
+			cancel_download(&loc->download, interrupt);
 		abort_files_load(ses, interrupt);
 	}
 	abort_preloading(ses, interrupt);
diff --git a/src/session/task.c b/src/session/task.c
index 001dcd42..621ef7e0 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -55,7 +55,7 @@ abort_preloading(struct session *ses, int interrupt)
 {
 	if (!ses->task.type) return;
 
-	change_connection(&ses->loading, NULL, PRI_CANCEL, interrupt);
+	cancel_download(&ses->loading, interrupt);
 	free_task(ses);
 }
 
@@ -506,7 +506,7 @@ do_move(struct session *ses, struct download **download_p)
 	if (is_in_progress_state((*download_p)->state)) {
 		if (have_location(ses))
 			*download_p = &cur_loc(ses)->download;
-		change_connection(&ses->loading, *download_p, PRI_MAIN, 0);
+		move_download(&ses->loading, *download_p, PRI_MAIN);
 	} else if (have_location(ses)) {
 		cur_loc(ses)->download.state = ses->loading.state;
 	}
diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index 9b38ab2d..48208eb6 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -207,7 +207,7 @@ dump_loading_callback(struct download *download, void *p)
 		struct uri *uri = cached->redirect;
 
 		if (is_in_progress_state(download->state))
-			change_connection(download, NULL, PRI_CANCEL, 0);
+			cancel_download(download, 0);
 
 		load_uri(uri, cached->uri, download, PRI_MAIN, 0, -1);
 		return;

From 500de86927b743c8fd8093cc23566fce3382f514 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:29 +0100
Subject: [PATCH 197/204] NET: Setup the new download in the start of
 move_download

---
 src/network/connection.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 5622c584..13fd13cb 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -989,9 +989,6 @@ change_connection(struct download *old, struct download *new,
 
 	if (is_in_result_state(old->state)) {
 		if (new) {
-			new->cached = old->cached;
-			new->state = old->state;
-			new->prev_error = old->prev_error;
 			if (new->callback)
 				new->callback(new, new->data);
 		}
@@ -1011,13 +1008,7 @@ change_connection(struct download *old, struct download *new,
 	old->state = S_INTERRUPTED;
 
 	if (new) {
-		new->progress = conn->progress;
 		add_to_list(conn->downloads, new);
-		new->state = conn->state;
-		new->prev_error = conn->prev_error;
-		new->pri = newpri;
-		new->conn = conn;
-		new->cached = conn->cached;
 
 	} else if (conn->detached || interrupt) {
 		abort_connection(conn, S_INTERRUPTED);
@@ -1039,6 +1030,15 @@ void
 move_download(struct download *old, struct download *new,
 	       enum connection_priority newpri)
 {
+	struct connection *conn = old->conn;
+
+	new->conn	= conn;
+	new->cached	= conn->cached;
+	new->prev_error	= conn->prev_error;
+	new->progress	= conn->progress;
+	new->state	= conn->state;
+	new->pri	= newpri;
+
 	change_connection(old, new, newpri, 0);
 }
 

From 8b938cb7a60f88d82fdf120274bf059482645439 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:29 +0100
Subject: [PATCH 198/204] NET: Move shortcut from change_connection to the two
 front-ends

---
 src/network/connection.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 13fd13cb..eeb7f520 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -987,14 +987,6 @@ change_connection(struct download *old, struct download *new,
 	assert(old);
 	if_assert_failed return;
 
-	if (is_in_result_state(old->state)) {
-		if (new) {
-			if (new->callback)
-				new->callback(new, new->data);
-		}
-		return;
-	}
-
 	check_queue_bugs();
 
 	conn = old->conn;
@@ -1023,6 +1015,9 @@ change_connection(struct download *old, struct download *new,
 void
 cancel_download(struct download *download, int interrupt)
 {
+	if (is_in_result_state(download->state))
+		return;
+
 	change_connection(download, NULL, PRI_CANCEL, interrupt);
 }
 
@@ -1039,6 +1034,12 @@ move_download(struct download *old, struct download *new,
 	new->state	= conn->state;
 	new->pri	= newpri;
 
+	if (is_in_result_state(old->state)) {
+		if (new->callback)
+			new->callback(new, new->data);
+		return;
+	}
+
 	change_connection(old, new, newpri, 0);
 }
 

From c2d546491017ee226b7273ce1013dd0f9071d264 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:29 +0100
Subject: [PATCH 199/204] NET: Minor tidyup

---
 src/network/connection.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index eeb7f520..e79529b7 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -1002,8 +1002,9 @@ change_connection(struct download *old, struct download *new,
 	if (new) {
 		add_to_list(conn->downloads, new);
 
-	} else if (conn->detached || interrupt) {
-		abort_connection(conn, S_INTERRUPTED);
+	} else {
+		if (conn->detached || interrupt)
+			abort_connection(conn, S_INTERRUPTED);
 	}
 
 	sort_queue();

From 33625ae9e28a49539fc04bc0dd4e5e6b2dfb5ab6 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:29 +0100
Subject: [PATCH 200/204] NET: Move attaching of new download to move_download

This includes setting the new priority and adding the download to the list
of connection downloads. If the connection has no downloads set the
PRI_CANCEL priority; get_priority() requires that.
---
 src/network/connection.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index e79529b7..0a90d729 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -995,14 +995,13 @@ change_connection(struct download *old, struct download *new,
 	assertm(conn->pri[old->pri] >= 0, "priority counter underflow");
 	if_assert_failed conn->pri[old->pri] = 0;
 
-	conn->pri[newpri]++;
 	del_from_list(old);
 	old->state = S_INTERRUPTED;
 
-	if (new) {
-		add_to_list(conn->downloads, new);
+	if (list_empty(conn->downloads)) {
+		/* Necessary because of assertion in get_priority(). */
+		conn->pri[PRI_CANCEL]++;
 
-	} else {
 		if (conn->detached || interrupt)
 			abort_connection(conn, S_INTERRUPTED);
 	}
@@ -1041,6 +1040,9 @@ move_download(struct download *old, struct download *new,
 		return;
 	}
 
+	conn->pri[new->pri]++;
+	add_to_list(conn->downloads, new);
+
 	change_connection(old, new, newpri, 0);
 }
 

From 637f1e82e6eedb44b6300e80e0fe04bf4021df60 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:30 +0100
Subject: [PATCH 201/204] NET: Merge change_connection into cancel_download

---
 src/network/connection.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 0a90d729..63105f3b 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -978,15 +978,17 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 
 
 /* FIXME: one object in more connections */
-static void
-change_connection(struct download *old, struct download *new,
-		  enum connection_priority newpri, int interrupt)
+void
+cancel_download(struct download *old, int interrupt)
 {
 	struct connection *conn;
 
 	assert(old);
 	if_assert_failed return;
 
+	if (is_in_result_state(old->state))
+		return;
+
 	check_queue_bugs();
 
 	conn = old->conn;
@@ -1012,15 +1014,6 @@ change_connection(struct download *old, struct download *new,
 	register_check_queue();
 }
 
-void
-cancel_download(struct download *download, int interrupt)
-{
-	if (is_in_result_state(download->state))
-		return;
-
-	change_connection(download, NULL, PRI_CANCEL, interrupt);
-}
-
 void
 move_download(struct download *old, struct download *new,
 	       enum connection_priority newpri)
@@ -1043,7 +1036,7 @@ move_download(struct download *old, struct download *new,
 	conn->pri[new->pri]++;
 	add_to_list(conn->downloads, new);
 
-	change_connection(old, new, newpri, 0);
+	cancel_download(old, 0);
 }
 
 

From c51300066f6c55c09480abdf49849511b32c169b Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 3 Feb 2006 10:44:30 +0100
Subject: [PATCH 202/204] NET: Rename old to download in cancel_download

---
 src/network/connection.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 63105f3b..91c2a677 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -979,26 +979,26 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 
 /* FIXME: one object in more connections */
 void
-cancel_download(struct download *old, int interrupt)
+cancel_download(struct download *download, int interrupt)
 {
 	struct connection *conn;
 
-	assert(old);
+	assert(download);
 	if_assert_failed return;
 
-	if (is_in_result_state(old->state))
+	if (is_in_result_state(download->state))
 		return;
 
 	check_queue_bugs();
 
-	conn = old->conn;
+	conn = download->conn;
 
-	conn->pri[old->pri]--;
-	assertm(conn->pri[old->pri] >= 0, "priority counter underflow");
-	if_assert_failed conn->pri[old->pri] = 0;
+	conn->pri[download->pri]--;
+	assertm(conn->pri[download->pri] >= 0, "priority counter underflow");
+	if_assert_failed conn->pri[download->pri] = 0;
 
-	del_from_list(old);
-	old->state = S_INTERRUPTED;
+	del_from_list(download);
+	download->state = S_INTERRUPTED;
 
 	if (list_empty(conn->downloads)) {
 		/* Necessary because of assertion in get_priority(). */

From b8ee886a602dbd7c4b208dc33e872d93c5accf84 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Fri, 3 Feb 2006 20:12:24 +0000
Subject: [PATCH 203/204] sort_links: fix memory leak

Free document->lines1 and document->lines2 if they are already set. This
fixes a memory leak from commit 52d3a6411dfbbde866ed3c973740a598ec07f125.
---
 src/document/renderer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/document/renderer.c b/src/document/renderer.c
index e6ddec68..0a164b44 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -512,7 +512,9 @@ sort_links(struct document *document)
 
 	if (!document->height) return;
 
+	mem_free_if(document->lines1);
 	document->lines1 = mem_calloc(document->height, sizeof(*document->lines1));
+	mem_free_if(document->lines2);
 	if (!document->lines1) return;
 	document->lines2 = mem_calloc(document->height, sizeof(*document->lines2));
 	if (!document->lines2) {

From 347970988d244afa226ceee6807bca9fbf3caeb3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 4 Feb 2006 23:20:40 +0100
Subject: [PATCH 204/204] NET: Fix regression from the latest change_connection
 changes

This makes move_download not assume that there is a connection attached
when it is called. This is the case pretty often for file:// downloads when
dialogs are involved (query file) and the reason why it explicitly checks
if the connection state is 'in result state'. Anyway, fill the new download
struct with variabled from the old one instead of taking variables from the
connection struct.

This patch also adds some assertions and a few comments.
---
 src/network/connection.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/network/connection.c b/src/network/connection.c
index 91c2a677..f2c59a08 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -986,20 +986,23 @@ cancel_download(struct download *download, int interrupt)
 	assert(download);
 	if_assert_failed return;
 
+	/* Did the connection already end? */
 	if (is_in_result_state(download->state))
 		return;
 
+	assertm(download->conn, "last state is %d", download->state);
+
 	check_queue_bugs();
 
+	download->state = S_INTERRUPTED;
+	del_from_list(download);
+
 	conn = download->conn;
 
 	conn->pri[download->pri]--;
 	assertm(conn->pri[download->pri] >= 0, "priority counter underflow");
 	if_assert_failed conn->pri[download->pri] = 0;
 
-	del_from_list(download);
-	download->state = S_INTERRUPTED;
-
 	if (list_empty(conn->downloads)) {
 		/* Necessary because of assertion in get_priority(). */
 		conn->pri[PRI_CANCEL]++;
@@ -1016,15 +1019,21 @@ cancel_download(struct download *download, int interrupt)
 
 void
 move_download(struct download *old, struct download *new,
-	       enum connection_priority newpri)
+	      enum connection_priority newpri)
 {
 	struct connection *conn = old->conn;
 
-	new->conn	= conn;
-	new->cached	= conn->cached;
-	new->prev_error	= conn->prev_error;
-	new->progress	= conn->progress;
-	new->state	= conn->state;
+	assert(old);
+
+	/* The download doesn't necessarily have a connection attached, for
+	 * example the file protocol loads it's object immediately. This is
+	 * catched by the result state check below. */
+
+	new->conn	= old->conn;
+	new->cached	= old->cached;
+	new->prev_error	= old->prev_error;
+	new->progress	= old->progress;
+	new->state	= old->state;
 	new->pri	= newpri;
 
 	if (is_in_result_state(old->state)) {
@@ -1033,6 +1042,8 @@ move_download(struct download *old, struct download *new,
 		return;
 	}
 
+	assertm(old->conn, "last state is %d", old->state);
+
 	conn->pri[new->pri]++;
 	add_to_list(conn->downloads, new);