Default fish_pager_color_description to '555 yellow'

Fixes https://github.com/fish-shell/fish-shell/issues/280

.gitattributes

@@ -0,0 +1,4 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+/build_tools export-ignore
+

.gitignore

@@ -0,0 +1,34 @@
+*.o
+*~
+
+Doxyfile.help
+Makefile
+autom4te.cache/
+builtin_scripts.cpp
+builtin_scripts.h
+command_list.txt
+config.h
+config.h.in
+config.log
+config.status
+configure
+doc.h
+doc_src/commands.hdr
+doc_src/index.hdr
+po/*.gmo
+fish
+fish.spec
+fish_indent
+fish_pager
+fish_tests
+fishd
+mimedb
+seq
+set_color
+share/config.fish
+share/man/
+toc.txt
+user_doc/
+xsel-1.2.0/
+tests/*tmp.*
+tests/foo.txt

CHANGELOG

@@ -0,0 +1,3 @@
+24-01-2012 Jan Kanis
+	* Added a changelog file
+	* removed unescaping if the 'commandline' builtin is called without the -o (tokenise) flag

Doxyfile.user

@@ -10,8 +10,8 @@ ABBREVIATE_BRIEF       = YES
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
@@ -19,7 +19,7 @@ DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 8
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 SUBGROUPING            = YES
@@ -44,7 +44,7 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = YES
@@ -53,19 +53,19 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-INPUT                  = 
+WARN_LOGFILE           =
+INPUT                  =
 FILE_PATTERNS          =  doc.h
 RECURSIVE              = NO
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
@@ -75,17 +75,17 @@ REFERENCES_RELATION    = YES
 VERBATIM_HEADERS       = YES
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = user_doc.head.html
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
+HTML_FOOTER            =
+HTML_STYLESHEET        =
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
@@ -99,8 +99,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
 PDF_HYPERLINKS         = YES
 USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = NO
@@ -109,33 +109,33 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
-TAGFILES               = 
-GENERATE_TAGFILE       = 
+TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
@@ -151,8 +151,8 @@ INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = YES
 GRAPHICAL_HIERARCHY    = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
+DOT_PATH               =
+DOTFILE_DIRS           =
 MAX_DOT_GRAPH_WIDTH    = 750
 MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 0

INSTALL

@@ -49,10 +49,15 @@ Then, use following commands to compile fish:
 Finally, if you wish to use fish as your default shell, use the
 following command:
 
- % chsh -s /usr/local/bin/fish			 
+ % chsh -s /usr/local/bin/fish
 
 chsh will prompt you for your password, and change your default shell.
 
+To switch your default shell back, you can run:
+
+ % chsh -s /bin/bash
+
+Substitute /bin/bash with /bin/tcsh or /bin/zsh as appropriate.
 
 Local install procedure
 =======================

Makefile.in

@@ -31,12 +31,14 @@
 # hallucinations.
 #
 
+# Used by docdir
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
 #
 # Programs
 #
 
-CC := @CC@
+CXX := @CXX@
 INSTALL:=@INSTALL@
 
 
@@ -46,23 +48,22 @@ INSTALL:=@INSTALL@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
 docdir = @docdir@
 localedir = @localedir@
-prefix = @prefix@
-optbindirs = @optbindirs@ 
+optbindirs = @optbindirs@
 
 #
 # Various flags
 #
 
-MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" 
-CFLAGS = @CFLAGS@ $(MACROS) 
-CPPFLAGS = @CPPFLAGS@ 
-LDFLAGS = @LIBS@ @LDFLAGS@ 
+MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
+CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
+LDFLAGS = @LIBS@ @LDFLAGS@
 LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
 LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
 LDFLAGS_FISH_PAGER = ${LDFLAGS} @LIBS_FISH_PAGER@
@@ -78,11 +79,11 @@ HAVE_GETTEXT=@HAVE_GETTEXT@
 
 
 #
-#Additional .c files used by common.o. These also have a corresponding
+#Additional .cpp files used by common.o. These also have a corresponding
 #.h file.
 #
 
-COMMON_FILES := util.c halloc.c halloc_util.c fallback.c
+COMMON_FILES := util.cpp fallback.cpp
 
 
 #
@@ -93,8 +94,9 @@ FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o		\
 	highlight.o history.o kill.o parser.o proc.o reader.o sanity.o		\
 	tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o	\
 	env_universal.o env_universal_common.o input_common.o event.o		\
-	signal.o io.o parse_util.o common.o screen.o path.o					\
-	parser_keywords.o
+	signal.o io.o parse_util.o common.o screen.o path.o autoload.o		\
+	parser_keywords.o iothread.o builtin_scripts.o color.o postfork.o	\
+	builtin_test.o
 
 FISH_INDENT_OBJS := fish_indent.o print_help.o common.o	\
 parser_keywords.o wutil.o tokenizer.o
@@ -103,8 +105,8 @@ parser_keywords.o wutil.o tokenizer.o
 # Additional files used by builtin.o
 #
 
-BUILTIN_FILES := builtin_set.c builtin_commandline.c	\
-	builtin_ulimit.c builtin_complete.c builtin_jobs.c
+BUILTIN_FILES := builtin_set.cpp builtin_commandline.cpp	\
+	builtin_ulimit.cpp builtin_complete.cpp builtin_jobs.cpp
 
 
 #
@@ -113,7 +115,7 @@ BUILTIN_FILES := builtin_set.c builtin_commandline.c	\
 
 FISH_PAGER_OBJS := fish_pager.o output.o wutil.o 		\
 	input_common.o env_universal.o env_universal_common.o common.o	\
-	print_help.o
+	print_help.o iothread.o color.o
 
 
 #
@@ -158,7 +160,25 @@ HDR_FILES_SRC := doc_src/index.hdr.in doc_src/commands.hdr.in doc_src/design.hdr
 HDR_FILES := $(subst .hdr.in,.hdr,$(HDR_FILES_SRC))
 
 #
-# Files containing documentation for external commands. 
+# Internalized scripts
+#
+
+GENERATED_INTERN_SCRIPT_FILES := builtin_scripts.h builtin_scripts.cpp
+
+# Use a pattern rule so that Make knows to only issue one invocation
+# per http://www.gnu.org/software/make/manual/make.html#Pattern-Intro
+
+# Internalized scripts are currently disabled.
+# For now, we just generate empty arrays.
+# To generate them again, you would run this:
+# ./internalize_scripts.py share/functions/*.fish share/completions/*.fish
+
+builtin%scripts.h builtin%scripts.cpp: internalize_scripts.py
+	./internalize_scripts.py
+
+
+#
+# Files containing documentation for external commands.
 #
 
 HELP_SRC := $(wildcard doc_src/*.txt)
@@ -188,12 +208,12 @@ DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC)
 
 MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help.in		\
     Makefile.in configure configure.ac config.h.in install-sh			\
-    set_color.c key_reader.c $(MIME_OBJS:.o=.h)					\
-    $(MIME_OBJS:.o=.c) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES)				\
-    $(COMMON_FILES) $(COMMON_FILES:.c=.h) $(FISH_OBJS:.o=.c)			\
+    set_color.cpp key_reader.cpp $(MIME_OBJS:.o=.h)					\
+    $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES)				\
+    $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp)			\
     fish.spec.in INSTALL README user_doc.head.html xsel-0.9.6.tar		\
-    ChangeLog config.sub config.guess fish_tests.c fish.c fish_pager.c	\
-    fishd.c seq.in make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.c)
+    ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp	\
+    fishd.cpp seq.in make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp)
 
 #
 # The sorting is not meaningful in itself, but it has the side effect
@@ -204,20 +224,6 @@ MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help.in		\
 MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
 
 
-#
-# Files in ./etc/
-#
-
-ETC_DIR_FILES :=etc/config.fish.in	
-
-
-#
-# Files in ./share/
-#
-
-SHARE_DIR_FILES :=share/config.fish.in
-
-
 #
 # Files in ./tests/
 #
@@ -245,7 +251,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
 #
 
 SIMPLE_PROGRAMS := fish set_color mimedb fish_pager fishd fish_indent
-PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL@ @SEQ_FALLBACK@ 
+PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL_BIN@ @SEQ_FALLBACK@
 
 
 #
@@ -264,12 +270,19 @@ TRANSLATIONS_SRC := $(wildcard po/*.po)
 TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
 
 
+#
+# Extra util
+#
+
+XSEL := @XSEL@
+XSEL_BIN := @XSEL_BIN@
+
 #
 # Make everything needed for installing fish
 #
 
-all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish $(TRANSLATIONS)
-	@echo fish has now been built. 
+all: $(PROGRAMS) user_doc share/man $(TRANSLATIONS)
+	@echo fish has now been built.
 	@echo Use \'$(MAKE) install\' to install fish.
 .PHONY: all
 
@@ -291,41 +304,40 @@ Makefile: Makefile.in configure
 # and should only be used when debuging fish.
 #
 
-debug:
-	$(MAKE) fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g"
-.PHONY: debug
-
+prof: EXTRA_CXXFLAGS += -pg
+prof: LDFLAGS += -pg
+prof: all
+.PHONY: prof
 
 #
 # User documentation, describing the features of the fish shell.
 #
 
-# Depend on the sources (*.hdr.in) and manually make the 
+# Depend on the sources (*.hdr.in) and manually make the
 # intermediate *.hdr and doc.h files if needed
+# Allow doxygen to fail, e.g. if it does not exist
 
-user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC)
-	$(MAKE) doc.h $(HDR_FILES)
-	doxygen Doxyfile.user
-	touch user_doc
+user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) doc.h $(HDR_FILES)
+	- doxygen Doxyfile.user && touch user_doc
 
 
 #
 # Source code documentation. Also includes user documentation.
 #
 
-doc: *.h *.c doc.h Doxyfile 
-	doxygen; 
+doc: *.h *.cpp doc.h Doxyfile
+	doxygen;
 
 
 #
 # PDF version of the source code documentation.
 #
 
-doc/refman.pdf: doc 
-	cd doc/latex; 
-	make; 
-	mv refman.pdf ..; 
-	cd ../..; 
+doc/refman.pdf: doc
+	cd doc/latex;
+	make;
+	mv refman.pdf ..;
+	cd ../..;
 	rm -r doc/latex;
 
 
@@ -342,11 +354,8 @@ test: $(PROGRAMS) fish_tests
 # Build the xsel program, which is maintained in its own tarball
 #
 
-xsel-0.9.6:
-	tar -xf xsel-0.9.6.tar
-
-xsel-0.9.6/xsel: xsel-0.9.6
-	cd xsel-0.9.6; ./configure && make || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it."
+$(XSEL_BIN):
+	$(MAKE) -C $(XSEL) || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it."
 
 
 #
@@ -362,7 +371,7 @@ doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in
 		echo >>command_list.tmp; \
 		echo >>command_list.tmp; \
 		echo "Back to <a href='index.html#toc-commands'>index</a>". >>command_list.tmp; \
-	done 
+	done
 	mv command_list.tmp command_list.txt
 	cat $@.in | awk '{if ($$0 ~ /@command_list@/){ system("cat command_list.txt");} else{ print $$0;}}' >$@
 
@@ -400,19 +409,19 @@ doc.h: $(HDR_FILES)
 #
 
 %.doxygen:%.txt
-	echo  "/** \page " `basename $*` >$@; 
-	cat $*.txt >>$@; 
+	echo  "/** \page " `basename $*` >$@;
+	cat $*.txt >>$@;
 	echo "*/" >>$@
 
-%: %.in 
+%: %.in
 	sed <$@.in >$@ \
 		-e "s,@sysconfdir\@,$(sysconfdir),g" \
 		-e "s,@datadir\@,$(datadir),g" \
 		-e "s,@docdir\@,$(docdir),g" \
 		-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
 		-e "s,@prefix\@,$(prefix),g" \
-		-e "s,@optbindirs\@,$(optbindirs),g" 
-#-e "s,@\@,$()," 
+		-e "s,@optbindirs\@,$(optbindirs),g"
+#-e "s,@\@,$(),"
 
 
 #
@@ -443,10 +452,10 @@ doc.h: $(HDR_FILES)
 # Create a template translation object
 #
 
-messages.pot: *.c *.h etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq
+messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish seq
 	if test $(HAVE_GETTEXT) = 1;then \
-		xgettext -k_ -kN_ *.c *.h -o messages.pot; \
-		if xgettext -j -k_ -kN_ -k--description -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
+		xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \
+		if xgettext -j -k_ -kN_ -k--description -LShell share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
 			echo "Your xgettext version is too old to build the messages.pot file"\
 			rm messages.pot\
 			false;\
@@ -477,8 +486,8 @@ common.o: $(COMMON_FILES)
 # (__fish_print_help)
 #       ||
 #       \/
-#   formated text 
-#   with escape 
+#   formated text
+#   with escape
 #    sequences
 #
 #
@@ -496,13 +505,15 @@ share/man: $(HELP_SRC)
 		cat $$i >>$$FILE; \
 		echo "*/" >>$$FILE; \
 	done
-	doxygen Doxyfile.help
-	for i in $(HELP_SRC); do \
-		CMD_NAME=`basename $$i .txt`; \
-		sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" <help_doc/man/man1/$$CMD_NAME.1 >share/man/$$CMD_NAME.1; \
-	done 
+	if command -v doxygen; then \
+		doxygen Doxyfile.help ; \
+		for i in $(HELP_SRC); do \
+			CMD_NAME=`basename $$i .txt`; \
+			sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" <help_doc/man/man1/$$CMD_NAME.1 >share/man/$$CMD_NAME.1; \
+		done \
+	fi
 	rm doc_src/*.doxygen   # Clean up intermediate files in doc_src/
-	rm -r help_doc         # Clean up intermediate help_doc tree
+	rm -rf help_doc         # Clean up intermediate help_doc tree
 
 #
 # The build rules for installing/uninstalling fish
@@ -562,29 +573,54 @@ install: all install-sh check-uninstall install-force
 #
 # Force installation, even in presense of incompatible previous
 # version. This may fail.
+# These 'true' lines are to prevent installs from failing for (e.g.) missing man pages.
 #
 
 install-force: all install-translations
-	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
+		true ;\
 	done;
 	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
-	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man/man1
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
 	$(INSTALL) -m 644 etc/config.fish                  $(DESTDIR)$(sysconfdir)/fish/
 	$(INSTALL) -m 644 share/config.fish                $(DESTDIR)$(datadir)/fish/
 	for i in $(COMPLETIONS_DIR_FILES); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
+		true; \
 	done;
 	for i in $(FUNCTIONS_DIR_FILES); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \
+		true; \
 	done;
 	for i in share/man/*.1; do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/; \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/man1/; \
+		true; \
 	done;
+	for i in share/tools/*.py; do\
+		$(INSTALL) -m 755 $$i $(DESTDIR)$(datadir)/fish/tools/; \
+		true; \
+	done;
+	for i in share/tools/web_config/*; do\
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/; \
+		true; \
+	done;
+	for i in share/tools/web_config/sample_prompts/*.fish; do\
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts/; \
+		true; \
+	done;
+	for i in share/tools/web_config/*.py; do\
+		$(INSTALL) -m 755 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/; \
+		true; \
+	done;
+
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
 	for i in user_doc/html/* ChangeLog; do \
 		if test -f $$i; then \
@@ -594,14 +630,19 @@ install-force: all install-translations
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	for i in $(MANUALS); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
+		true; \
 	done;
-	@echo fish is now installed on your system. 
+	@echo fish is now installed on your system.
 	@echo To run fish, type \'fish\' in your terminal.
 	@echo
 	@echo To use fish as your login shell:
 	@echo \* add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
 	@echo \* use the command \'chsh -s $(DESTDIR)$(bindir)/fish\'.
 	@echo
+	@echo To set your colors, run \'fish_config\'
+	@echo To scan your man pages for completions, run \'fish_update_completions\'
+	@echo To autocomplete command suggestions press Ctrl + F or right arrow key.
+	@echo
 	@echo Have fun!
 .PHONY: install-force
 
@@ -615,16 +656,15 @@ uninstall: uninstall-translations
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
 	-rm -f $(DESTDIR)$(bindir)/xsel
-	-rm -f $(DESTDIR)$(sysconfdir)/fish/config.fish
-	-rmdir $(DESTDIR)$(sysconfdir)/fish
+	-rm -rf $(DESTDIR)$(sysconfdir)/fish
 	-if test -d $(DESTDIR)$(datadir)/fish; then \
 		rm -r $(DESTDIR)$(datadir)/fish; \
 	fi
 	-if test -d $(DESTDIR)$(docdir); then \
-		rm -r $(DESTDIR)$(docdir);\
+		rm -rf $(DESTDIR)$(docdir);\
 	fi
 	-for i in $(MANUALS); do \
-		rm -f $(DESTDIR)$(mandir)/man1/`basename $$i`*; \
+		rm -rf $(DESTDIR)$(mandir)/man1/`basename $$i`*; \
 	done;
 .PHONY: uninstall
 
@@ -652,7 +692,7 @@ uninstall-legacy: uninstall
 	-rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions
 	-rmdir $(DESTDIR)$(sysconfdir)/fish.d
 	-rm $(DESTDIR)$(sysconfdir)/fish
-	@echo The previous fish installation has been removed. 
+	@echo The previous fish installation has been removed.
 .PHONY: uninstall-legacy
 
 install-translations: $(TRANSLATIONS)
@@ -665,7 +705,7 @@ install-translations: $(TRANSLATIONS)
 	fi;
 .PHONY: install-translations
 
-uninstall-translations: 
+uninstall-translations:
 	if test $(HAVE_GETTEXT) = 1; then \
 		for i in $(TRANSLATIONS_SRC); do \
 			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
@@ -682,8 +722,8 @@ uninstall-translations:
 # Build the fish program.
 #
 
-fish: $(FISH_OBJS) fish.o 
-	$(CC) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
+fish: $(FISH_OBJS) fish.o
+	$(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
 
 
 #
@@ -691,15 +731,15 @@ fish: $(FISH_OBJS) fish.o
 #
 
 fish_pager: $(FISH_PAGER_OBJS)
-	$(CC) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
+	$(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
 
 
 #
 # Build the fishd program.
 #
 
-fishd: $(FISHD_OBJS) 
-	$(CC) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
+fishd: $(FISHD_OBJS)
+	$(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
 
 
 #
@@ -707,7 +747,7 @@ fishd: $(FISHD_OBJS)
 #
 
 fish_tests: $(FISH_TESTS_OBJS)
-	$(CC) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
+	$(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
 
 
 #
@@ -717,23 +757,23 @@ fish_tests: $(FISH_TESTS_OBJS)
 #
 
 mimedb: $(MIME_OBJS)
-	$(CC) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
+	$(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
 
 
 #
 # Build the set_color program
 #
 
-set_color: set_color.o print_help.o common.o
-	$(CC) set_color.o print_help.o common.o wutil.o $(LDFLAGS_SET_COLOR) -o $@
+set_color: set_color.o print_help.o common.o color.o wutil.o
+	$(CXX) set_color.o print_help.o common.o wutil.o color.o $(LDFLAGS_SET_COLOR) -o $@
 
 
 #
 # Test program for the tokenizer library
 #
 
-tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o
-	$(CC) $(CFLAGS) tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
+tokenizer_test: tokenizer.cpp tokenizer.h wutil.o common.o
+	$(CXX) $(CXXFLAGS) tokenizer.cpp wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
 
 
 #
@@ -741,67 +781,30 @@ tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o
 #
 
 fish_indent: $(FISH_INDENT_OBJS)
-	$(CC) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
+	$(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
 
 
 #
 # Neat little program to show output from terminal
 #
 
-key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o
-	$(CC) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o $(LDFLAGS) -o $@
+key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o
+	$(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
 
 
 #
 # Update dependencies
 #
 depend:
-	makedepend -fMakefile.in -Y *.c 
+	makedepend -fMakefile.in -Y *.cpp
 	./config.status
 .PHONY: depend
 
-#
-# Copy all the source files into a new directory and use tar to create
-# an archive from it. Simplest way I could think of to make an archive
-# witout backups, autogenerated files, etc.
-#
-# Uses install instead of mkdir so build won't fail if the directory 
-# exists
-#
-
-fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(ETC_DIR_FILES) $(TEST_DIR_FILES) $(SHARE_DIR_FILES) $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog user_doc share/man
-	rm -rf fish-@PACKAGE_VERSION@
-	$(INSTALL) -d fish-@PACKAGE_VERSION@
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/user_doc
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/etc
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/completions
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/functions
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/man
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/tests
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/po
-	cp -f $(DOC_SRC_DIR_FILES) fish-@PACKAGE_VERSION@/doc_src
-	cp -f $(MAIN_DIR_FILES) fish-@PACKAGE_VERSION@/
-	cp -f $(ETC_DIR_FILES) fish-@PACKAGE_VERSION@/etc/
-	cp -f $(SHARE_DIR_FILES) fish-@PACKAGE_VERSION@/share/
-	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/completions/
-	cp -f $(FUNCTIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/functions/
-	cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/
-	cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/
-	cp -f share/man/*.1 fish-@PACKAGE_VERSION@/share/man/
-	cp -rf user_doc fish-@PACKAGE_VERSION@/
-	tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
-	rm -rf fish-@PACKAGE_VERSION@
-
 
 #
-# Just an alias for fish-@PACKAGE_VERSION@.tar
+# Dependencies that makedepend misses
 #
-
-tar: fish-@PACKAGE_VERSION@.tar
-.PHONY: tar
-
+autoload.cpp function.cpp: $(GENERATED_INTERN_SCRIPT_FILES)
 
 #
 # Make compressed tar archives
@@ -817,7 +820,7 @@ dist: fish-@PACKAGE_VERSION@.tar.bz2
 .PHONY: dist
 
 #
-# Build the RPM spec file. 
+# Build the RPM spec file.
 #
 
 fish.spec: fish.spec.in
@@ -854,9 +857,9 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec
 #
 
 distclean: clean
-	rm -f fish.spec Doxyfile.help 
-	rm -f etc/config.fish seq share/config.fish
+	rm -f fish.spec Doxyfile.help
 	rm -f config.status config.log config.h Makefile
+	rm -rf $(XSEL)
 .PHONY: distclean
 
 
@@ -865,139 +868,155 @@ distclean: clean
 # are created by the configure script.
 #
 
+# Don't delete the docs unless we have Doxygen installed
+# We provide pre-built docs in the tarball, and if they get
+# deleted we won't be able to regenerate them
+
 clean:
-	rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.c doc_src/*.o doc_src/commands.hdr
+	rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
+	rm -f $(GENERATED_INTERN_SCRIPT_FILES)
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
-	rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader 
-	rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr
-	rm -f fish-@PACKAGE_VERSION@.tar 
-	rm -f fish-@PACKAGE_VERSION@.tar.gz 
+	rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader
+	rm -f command_list.txt toc.txt
+	rm -f doc_src/index.hdr doc_src/commands.hdr
+	rm -f fish-@PACKAGE_VERSION@.tar
+	rm -f fish-@PACKAGE_VERSION@.tar.gz
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2
-	rm -rf doc; 
+	if command -v doxygen; then \
+		rm -rf doc user_doc share/man; \
+	fi
 	rm -rf fish-@PACKAGE_VERSION@
-	rm -rf xsel-0.9.6/
 	rm -f $(TRANSLATIONS)
+	test ! -d "$(XSEL)" || make -C $(XSEL) clean
 .PHONY: clean
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-builtin.o: config.h fallback.h util.h wutil.h builtin.h io.h function.h
-builtin.o: complete.h proc.h parser.h event.h reader.h env.h common.h
-builtin.o: wgetopt.h sanity.h tokenizer.h wildcard.h input_common.h input.h
-builtin.o: intern.h signal.h exec.h highlight.h halloc.h halloc_util.h
-builtin.o: parse_util.h parser_keywords.h expand.h path.h builtin_set.c
-builtin.o: builtin_commandline.c builtin_complete.c builtin_ulimit.c
-builtin.o: builtin_jobs.c
+autoload.o: config.h autoload.h common.h util.h lru.h wutil.h signal.h env.h
+autoload.o: builtin_scripts.h exec.h proc.h io.h
+builtin.o: config.h signal.h fallback.h util.h wutil.h builtin.h io.h
+builtin.o: common.h function.h event.h complete.h proc.h parser.h reader.h
+builtin.o: env.h wgetopt.h sanity.h tokenizer.h wildcard.h input_common.h
+builtin.o: input.h intern.h exec.h highlight.h screen.h color.h parse_util.h
+builtin.o: autoload.h lru.h parser_keywords.h expand.h path.h builtin_set.cpp
+builtin.o: builtin_commandline.cpp builtin_complete.cpp builtin_ulimit.cpp
+builtin.o: builtin_jobs.cpp
 builtin_commandline.o: config.h signal.h fallback.h util.h wutil.h builtin.h
 builtin_commandline.o: io.h common.h wgetopt.h reader.h proc.h parser.h
-builtin_commandline.o: event.h tokenizer.h input_common.h input.h
-builtin_commandline.o: parse_util.h
+builtin_commandline.o: event.h function.h tokenizer.h input_common.h input.h
+builtin_commandline.o: parse_util.h autoload.h lru.h
 builtin_complete.o: config.h signal.h fallback.h util.h wutil.h builtin.h
 builtin_complete.o: io.h common.h complete.h wgetopt.h parser.h proc.h
-builtin_complete.o: event.h reader.h
-builtin_jobs.o: config.h fallback.h util.h wutil.h builtin.h io.h proc.h
-builtin_jobs.o: parser.h event.h common.h wgetopt.h
+builtin_complete.o: event.h function.h reader.h
+builtin_jobs.o: config.h fallback.h signal.h util.h wutil.h builtin.h io.h
+builtin_jobs.o: common.h proc.h parser.h event.h function.h wgetopt.h
+builtin_scripts.o: builtin_scripts.h
 builtin_set.o: config.h signal.h fallback.h util.h wutil.h builtin.h io.h
-builtin_set.o: env.h expand.h common.h wgetopt.h proc.h parser.h event.h
-builtin_ulimit.o: config.h fallback.h util.h builtin.h io.h common.h
+builtin_set.o: common.h env.h expand.h wgetopt.h proc.h parser.h event.h
+builtin_set.o: function.h
+builtin_ulimit.o: config.h fallback.h signal.h util.h builtin.h io.h common.h
 builtin_ulimit.o: wgetopt.h
-common.o: config.h fallback.h util.h wutil.h common.h expand.h proc.h io.h
-common.o: wildcard.h parser.h event.h util.c halloc.c halloc.h halloc_util.c
-common.o: fallback.c
-complete.o: config.h signal.h fallback.h util.h tokenizer.h wildcard.h proc.h
-complete.o: io.h parser.h event.h function.h complete.h builtin.h env.h
-complete.o: exec.h expand.h common.h reader.h history.h intern.h parse_util.h
-complete.o: parser_keywords.h halloc.h halloc_util.h wutil.h path.h
+color.o: color.h config.h common.h util.h
+common.o: config.h fallback.h signal.h util.h wutil.h common.h expand.h
+common.o: proc.h io.h wildcard.h parser.h event.h function.h complete.h
+common.o: util.cpp fallback.cpp
+complete.o: config.h signal.h fallback.h util.h tokenizer.h wildcard.h
+complete.o: common.h proc.h io.h parser.h event.h function.h complete.h
+complete.o: builtin.h env.h exec.h expand.h reader.h history.h intern.h
+complete.o: parse_util.h autoload.h lru.h parser_keywords.h wutil.h path.h
+complete.o: builtin_scripts.h
 env.o: config.h signal.h fallback.h util.h wutil.h proc.h io.h common.h env.h
-env.o: sanity.h expand.h history.h reader.h parser.h event.h env_universal.h
-env.o: env_universal_common.h input_common.h path.h halloc.h halloc_util.h
+env.o: sanity.h expand.h history.h reader.h parser.h event.h function.h
+env.o: env_universal.h env_universal_common.h input_common.h path.h
 env.o: complete.h
 env_universal.o: config.h signal.h fallback.h util.h common.h wutil.h
 env_universal.o: env_universal_common.h env_universal.h
 env_universal_common.o: config.h signal.h fallback.h util.h common.h wutil.h
 env_universal_common.o: env_universal_common.h
-event.o: config.h signal.h fallback.h util.h wutil.h function.h proc.h io.h
-event.o: parser.h event.h common.h halloc_util.h
+event.o: config.h signal.h fallback.h util.h wutil.h function.h common.h
+event.o: event.h proc.h io.h parser.h
 exec.o: config.h signal.h fallback.h util.h common.h wutil.h proc.h io.h
-exec.o: exec.h parser.h event.h builtin.h function.h env.h wildcard.h
-exec.o: sanity.h expand.h halloc.h halloc_util.h parse_util.h
+exec.o: exec.h parser.h event.h function.h builtin.h env.h wildcard.h
+exec.o: sanity.h expand.h parse_util.h autoload.h lru.h
 expand.o: config.h signal.h fallback.h util.h common.h wutil.h env.h proc.h
-expand.o: io.h parser.h event.h expand.h wildcard.h exec.h tokenizer.h
-expand.o: complete.h parse_util.h halloc.h halloc_util.h
-fallback.o: config.h fallback.h util.h
+expand.o: io.h parser.h event.h function.h expand.h wildcard.h exec.h
+expand.o: tokenizer.h complete.h parse_util.h autoload.h lru.h
+fallback.o: config.h fallback.h signal.h util.h
 fish.o: config.h signal.h fallback.h util.h common.h reader.h io.h builtin.h
-fish.o: function.h complete.h wutil.h env.h sanity.h proc.h parser.h event.h
-fish.o: expand.h intern.h exec.h output.h halloc.h halloc_util.h history.h
-fish.o: path.h
-fish_indent.o: config.h fallback.h util.h common.h wutil.h halloc.h
-fish_indent.o: halloc_util.h tokenizer.h print_help.h parser_keywords.h
+fish.o: function.h event.h complete.h wutil.h env.h sanity.h proc.h parser.h
+fish.o: expand.h intern.h exec.h output.h screen.h color.h history.h path.h
+fish_indent.o: config.h fallback.h signal.h util.h common.h wutil.h
+fish_indent.o: tokenizer.h print_help.h parser_keywords.h
 fish_pager.o: config.h signal.h fallback.h util.h wutil.h common.h complete.h
-fish_pager.o: output.h input_common.h env_universal.h env_universal_common.h
-fish_pager.o: halloc.h halloc_util.h print_help.h
+fish_pager.o: output.h screen.h color.h input_common.h env_universal.h
+fish_pager.o: env_universal_common.h print_help.h
 fish_tests.o: config.h signal.h fallback.h util.h common.h proc.h io.h
-fish_tests.o: reader.h builtin.h function.h complete.h wutil.h env.h expand.h
-fish_tests.o: parser.h event.h tokenizer.h output.h exec.h path.h halloc.h
-fish_tests.o: halloc_util.h
+fish_tests.o: reader.h builtin.h function.h event.h autoload.h lru.h
+fish_tests.o: complete.h wutil.h env.h expand.h parser.h tokenizer.h output.h
+fish_tests.o: screen.h color.h exec.h path.h history.h
 fishd.o: config.h signal.h fallback.h util.h common.h wutil.h
-fishd.o: env_universal_common.h halloc.h halloc_util.h path.h print_help.h
-function.o: config.h signal.h wutil.h fallback.h util.h function.h proc.h
-function.o: io.h parser.h event.h common.h intern.h reader.h parse_util.h
-function.o: parser_keywords.h env.h expand.h halloc.h halloc_util.h
-halloc.o: config.h fallback.h util.h common.h halloc.h
-halloc_util.o: config.h fallback.h util.h common.h halloc.h
-highlight.o: config.h signal.h fallback.h util.h wutil.h highlight.h
-highlight.o: tokenizer.h proc.h io.h parser.h event.h parse_util.h
-highlight.o: parser_keywords.h builtin.h function.h env.h expand.h sanity.h
-highlight.o: common.h complete.h output.h halloc.h halloc_util.h wildcard.h
-highlight.o: path.h
-history.o: config.h fallback.h util.h wutil.h history.h common.h halloc.h
-history.o: halloc_util.h intern.h path.h signal.h
-input.o: config.h signal.h fallback.h util.h wutil.h reader.h io.h proc.h
-input.o: common.h sanity.h input_common.h input.h parser.h event.h env.h
-input.o: expand.h output.h intern.h halloc.h halloc_util.h
-input_common.o: config.h fallback.h util.h common.h wutil.h input_common.h
-input_common.o: env_universal.h env_universal_common.h
-intern.o: config.h fallback.h util.h wutil.h common.h intern.h
-io.o: config.h fallback.h util.h wutil.h exec.h proc.h io.h common.h halloc.h
-key_reader.o: config.h fallback.h input_common.h
+fishd.o: env_universal_common.h path.h print_help.h
+function.o: config.h signal.h wutil.h fallback.h util.h function.h common.h
+function.o: event.h proc.h io.h parser.h intern.h reader.h parse_util.h
+function.o: autoload.h lru.h parser_keywords.h env.h expand.h
+function.o: builtin_scripts.h
+highlight.o: config.h signal.h fallback.h util.h wutil.h highlight.h env.h
+highlight.o: common.h screen.h color.h tokenizer.h proc.h io.h parser.h
+highlight.o: event.h function.h parse_util.h autoload.h lru.h
+highlight.o: parser_keywords.h builtin.h expand.h sanity.h complete.h
+highlight.o: output.h wildcard.h path.h
+history.o: config.h fallback.h signal.h util.h sanity.h wutil.h history.h
+history.o: common.h intern.h path.h autoload.h lru.h
+input.o: config.h signal.h fallback.h util.h wutil.h reader.h io.h common.h
+input.o: proc.h sanity.h input_common.h input.h parser.h event.h function.h
+input.o: env.h expand.h output.h screen.h color.h intern.h
+input_common.o: config.h fallback.h signal.h util.h common.h wutil.h
+input_common.o: input_common.h env_universal.h env_universal_common.h
+input_common.o: iothread.h
+intern.o: config.h fallback.h signal.h util.h wutil.h common.h intern.h
+io.o: config.h fallback.h signal.h util.h wutil.h exec.h proc.h io.h common.h
+iothread.o: iothread.h signal.h
+key_reader.o: config.h fallback.h signal.h input_common.h
 kill.o: config.h signal.h fallback.h util.h wutil.h kill.h proc.h io.h
-kill.o: sanity.h common.h env.h exec.h halloc.h path.h
-mimedb.o: config.h xdgmime.h fallback.h util.h print_help.h
+kill.o: common.h sanity.h env.h exec.h path.h
+mimedb.o: config.h xdgmime.h fallback.h signal.h util.h print_help.h
 output.o: config.h signal.h fallback.h util.h wutil.h expand.h common.h
-output.o: output.h halloc_util.h highlight.h
-parse_util.o: config.h fallback.h util.h wutil.h common.h tokenizer.h
-parse_util.o: parse_util.h expand.h intern.h exec.h proc.h io.h env.h
-parse_util.o: signal.h wildcard.h halloc_util.h
+output.o: output.h screen.h color.h highlight.h env.h
+parse_util.o: config.h fallback.h signal.h util.h wutil.h common.h
+parse_util.o: tokenizer.h parse_util.h autoload.h lru.h expand.h intern.h
+parse_util.o: exec.h proc.h io.h env.h wildcard.h
 parser.o: config.h signal.h fallback.h util.h common.h wutil.h proc.h io.h
-parser.o: parser.h event.h parser_keywords.h tokenizer.h exec.h wildcard.h
-parser.o: function.h builtin.h env.h expand.h reader.h sanity.h
+parser.o: parser.h event.h function.h parser_keywords.h tokenizer.h exec.h
+parser.o: wildcard.h builtin.h env.h expand.h reader.h sanity.h
 parser.o: env_universal.h env_universal_common.h intern.h parse_util.h
-parser.o: halloc.h halloc_util.h path.h
-parser_keywords.o: config.h fallback.h common.h util.h parser_keywords.h
-path.o: config.h fallback.h util.h common.h env.h wutil.h halloc.h
-path.o: halloc_util.h path.h expand.h
+parser.o: autoload.h lru.h path.h complete.h
+parser_keywords.o: config.h fallback.h signal.h common.h util.h
+parser_keywords.o: parser_keywords.h
+path.o: config.h fallback.h signal.h util.h common.h env.h wutil.h path.h
+path.o: expand.h
 print_help.o: print_help.h
 proc.o: config.h signal.h fallback.h util.h wutil.h proc.h io.h common.h
-proc.o: reader.h sanity.h env.h parser.h event.h halloc.h halloc_util.h
-proc.o: output.h
-reader.o: config.h signal.h fallback.h util.h wutil.h highlight.h reader.h
-reader.o: io.h proc.h parser.h event.h complete.h history.h common.h sanity.h
-reader.o: env.h exec.h expand.h tokenizer.h kill.h input_common.h input.h
-reader.o: function.h output.h screen.h halloc.h halloc_util.h parse_util.h
+proc.o: reader.h sanity.h env.h parser.h event.h function.h output.h screen.h
+proc.o: color.h
+reader.o: config.h signal.h fallback.h util.h wutil.h highlight.h env.h
+reader.o: common.h screen.h color.h reader.h io.h proc.h parser.h event.h
+reader.o: function.h complete.h history.h sanity.h exec.h expand.h
+reader.o: tokenizer.h kill.h input_common.h input.h output.h iothread.h
+reader.o: intern.h parse_util.h autoload.h lru.h
 sanity.o: config.h signal.h fallback.h util.h common.h sanity.h proc.h io.h
 sanity.o: history.h reader.h kill.h wutil.h
-screen.o: config.h fallback.h common.h util.h wutil.h output.h highlight.h
-screen.o: screen.h env.h
-set_color.o: config.h fallback.h print_help.h
+screen.o: config.h fallback.h signal.h common.h util.h wutil.h output.h
+screen.o: screen.h color.h highlight.h env.h
+set_color.o: config.h fallback.h signal.h print_help.h
 signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
 signal.o: reader.h io.h proc.h
-tokenizer.o: config.h fallback.h util.h wutil.h tokenizer.h common.h
-util.o: config.h fallback.h util.h common.h wutil.h
-wgetopt.o: config.h wgetopt.h wutil.h fallback.h
-wildcard.o: config.h fallback.h util.h wutil.h complete.h common.h wildcard.h
-wildcard.o: reader.h io.h expand.h exec.h proc.h halloc_util.h
-wutil.o: config.h fallback.h util.h common.h wutil.h halloc.h halloc_util.h
+tokenizer.o: config.h fallback.h signal.h util.h wutil.h tokenizer.h common.h
+util.o: config.h fallback.h signal.h util.h common.h wutil.h
+wgetopt.o: config.h wgetopt.h wutil.h fallback.h signal.h
+wildcard.o: config.h fallback.h signal.h util.h wutil.h complete.h common.h
+wildcard.o: wildcard.h reader.h io.h expand.h exec.h proc.h
+wutil.o: config.h fallback.h signal.h util.h common.h wutil.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
 xdgmime.o: xdgmimeparent.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h

README

@@ -1,15 +0,0 @@
-How to find documentation for fish
-==================================
-
-The fish documentation is distributed in an intermediate format. To
-view it, you have to type:
-
-  % make user_doc
-
-Which will create the directory user_doc, containing html
-documentation for fish. If you build and install fish, the
-documentation will be available through the 'help' builtin.
-
-After installation, you can start fish by typing fish in the
-terminal. After fish has started, try using the help command for more
-information.

README.md

@@ -0,0 +1,39 @@
+[fish](http://ridiculousfish.com/shell/) - the friendly interactive shell
+================================================
+
+fish is a smart and user-friendly command line shell for OS X, Linux, and the rest of the family. fish includes features like syntax highlighting, autosuggest-as-you-type, and fancy tab completions that just work, with no configuration required.
+
+For more on fish's design philosophy, see the [design document](http://ridiculousfish.com/shell/user_doc/html/design.html).
+
+## Quick Start
+
+fish generally works like other shells, like bash or zsh. A few important differences are documented at <http://ridiculousfish.com/shell/faq.html>
+
+Detailed user documentation is available by running `help` within fish, and also at <http://ridiculousfish.com/shell/user_doc/html/>
+
+## Building
+
+fish can be built using autotools or Xcode.
+
+### Autotools Build
+
+    autoconf
+    ./configure [--without-xsel]
+    make [gmake on BSD]
+    sudo make install
+
+### Xcode Development Build
+
+* Build the `base` target in Xcode
+* Run the fish executable, for example, in `DerivedData/FishsFish/Build/Products/Debug/base/bin/fish`
+
+### Xcode Build and Install
+
+    mkdir /tmp/fish_build
+    xcodebuild install -target install_tree DSTROOT=/tmp/fish_build
+    sudo ditto /tmp/fish_build/ /
+
+## Contact Us
+
+Questions, comments, rants and raves can be posted to the official fish mailing list at <https://lists.sourceforge.net/lists/listinfo/fish-users>
+Found a bug? Have an awesome idea? Please open an issue on this github page.

autoload.cpp

@@ -0,0 +1,344 @@
+/** \file autoload.cpp
+	
+The classes responsible for autoloading functions and completions.
+*/
+
+#include "config.h"
+#include "autoload.h"
+#include "wutil.h"
+#include "common.h"
+#include "signal.h"
+#include "env.h"
+#include "builtin_scripts.h"
+#include "exec.h"
+#include <assert.h>
+#include <algorithm>
+
+/* The time before we'll recheck an autoloaded file */
+static const int kAutoloadStalenessInterval = 15;
+
+file_access_attempt_t access_file(const wcstring &path, int mode) {
+    //printf("Touch %ls\n", path.c_str());
+    file_access_attempt_t result = {0};
+    struct stat statbuf;
+    if (wstat(path, &statbuf)) {
+        result.error = errno;
+    } else {
+        result.mod_time = statbuf.st_mtime;
+        if (waccess(path, mode)) {
+            result.error = errno;
+        } else {
+            result.accessible = true;
+        }
+    }
+    
+    // Note that we record the last checked time after the call, on the assumption that in a slow filesystem, the lag comes before the kernel check, not after.
+    result.stale = false;
+    result.last_checked = time(NULL);
+    return result;
+}
+
+autoload_t::autoload_t(const wcstring &env_var_name_var, const builtin_script_t * const scripts, size_t script_count) :
+                       lock(),
+                       env_var_name(env_var_name_var),
+                       builtin_scripts(scripts),
+                       builtin_script_count(script_count),
+                       last_path(),
+                       is_loading_set()
+{
+    pthread_mutex_init(&lock, NULL);
+}
+
+autoload_t::~autoload_t() {
+    pthread_mutex_destroy(&lock);
+}
+
+void autoload_t::node_was_evicted(autoload_function_t *node) {
+    // This should only ever happen on the main thread
+    ASSERT_IS_MAIN_THREAD();
+    
+    // Tell ourselves that the command was removed if it was loaded
+    if (! node->is_loaded)
+        this->command_removed(node->key);
+    delete node;
+}
+
+int autoload_t::unload( const wcstring &cmd )
+{
+    return this->evict_node(cmd);
+}
+
+int autoload_t::load( const wcstring &cmd, bool reload )
+{
+	int res;
+	CHECK_BLOCK( 0 );
+    ASSERT_IS_MAIN_THREAD();
+    
+	env_var_t path_var = env_get_string( env_var_name );
+    
+    /*
+      Do we know where to look?
+    */
+    if( path_var.empty() )
+        return 0;
+    
+    /* Check if the lookup path has changed. If so, drop all loaded files. path_var may only be inspected on the main thread. */
+    if( path_var != this->last_path )
+    {
+        this->last_path = path_var;
+        scoped_lock locker(lock);
+        this->evict_all_nodes();
+    }
+    
+    /** Warn and fail on infinite recursion. It's OK to do this because this function is only called on the main thread. */
+    if (this->is_loading(cmd))
+    {
+        debug( 0, 
+               _( L"Could not autoload item '%ls', it is already being autoloaded. " 
+                  L"This is a circular dependency in the autoloading scripts, please remove it."), 
+               cmd.c_str() );
+        return 1;
+    }
+    
+    /* Mark that we're loading this */
+    is_loading_set.insert(cmd);
+
+    /* Get the list of paths from which we will try to load */
+    std::vector<wcstring> path_list;
+	tokenize_variable_array( path_var, path_list );
+
+	/* Try loading it */
+	res = this->locate_file_and_maybe_load_it( cmd, true, reload, path_list );
+    
+    /* Clean up */
+    bool erased = !! is_loading_set.erase(cmd);
+    assert(erased);
+		
+	return res;
+}
+
+bool autoload_t::can_load( const wcstring &cmd, const env_vars_snapshot_t &vars )
+{
+    const env_var_t path_var = vars.get(env_var_name);
+    if (path_var.missing_or_empty())
+        return false;
+
+    std::vector<wcstring> path_list;
+	tokenize_variable_array( path_var, path_list );
+    return this->locate_file_and_maybe_load_it( cmd, false, false, path_list );
+}
+
+static bool script_name_precedes_script_name(const builtin_script_t &script1, const builtin_script_t &script2)
+{
+    return wcscmp(script1.name, script2.name) < 0;
+}
+
+void autoload_t::unload_all(void) {
+    scoped_lock locker(lock);
+    this->evict_all_nodes();
+}
+
+/** Check whether the given command is loaded. */
+bool autoload_t::has_tried_loading( const wcstring &cmd )
+{
+    scoped_lock locker(lock);   
+    autoload_function_t * func = this->get_node(cmd);
+    return func != NULL;
+}
+
+static bool is_stale(const autoload_function_t *func) {
+    /** Return whether this function is stale. Internalized functions can never be stale. */
+    return ! func->is_internalized && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval;
+}
+
+autoload_function_t *autoload_t::get_autoloaded_function_with_creation(const wcstring &cmd, bool allow_eviction)
+{
+    ASSERT_IS_LOCKED(lock);
+    autoload_function_t *func = this->get_node(cmd);
+    if (! func) {
+        func = new autoload_function_t(cmd);
+        if (allow_eviction) {
+            this->add_node(func);
+        } else {
+            this->add_node_without_eviction(func);
+        }
+    }
+    return func;
+}
+
+/**
+   This internal helper function does all the real work. By using two
+   functions, the internal function can return on various places in
+   the code, and the caller can take care of various cleanup work.
+   
+     cmd: the command name ('grep')
+     really_load: whether to actually parse it as a function, or just check it it exists
+     reload: whether to reload it if it's already loaded
+     path_list: the set of paths to check
+     
+     Result: if really_load is true, returns whether the function was loaded. Otherwise returns whether the function existed.
+*/
+bool autoload_t::locate_file_and_maybe_load_it( const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list )
+{
+    /* Note that we are NOT locked in this function! */
+	size_t i;
+	bool reloaded = 0;
+
+    /* Try using a cached function. If we really want the function to be loaded, require that it be really loaded. If we're not reloading, allow stale functions. */
+    {
+        bool allow_stale_functions = ! reload;
+        
+        /* Take a lock */
+        scoped_lock locker(lock);
+        
+        /* Get the function */
+        autoload_function_t * func = this->get_node(cmd);
+        
+        /* Determine if we can use this cached function */
+        bool use_cached;
+        if (! func) {
+            /* Can't use a function that doesn't exist */
+            use_cached = false;
+        } else if (really_load && ! func->is_placeholder && ! func->is_loaded) {
+            /* Can't use an unloaded function */
+            use_cached = false;
+        } else if ( ! allow_stale_functions && is_stale(func)) {
+            /* Can't use a stale function */
+            use_cached = false;
+        } else {
+            /* I guess we can use it */
+            use_cached = true;
+        }
+        
+        /* If we can use this function, return whether we were able to access it */
+        if (use_cached) {
+            return func->is_internalized || func->access.accessible;
+        }
+    }    
+    /* The source of the script will end up here */
+    wcstring script_source;
+    bool has_script_source = false;
+    
+    /* Whether we found an accessible file */
+    bool found_file = false;
+    
+    /* Look for built-in scripts via a binary search */
+    const builtin_script_t *matching_builtin_script = NULL;
+    if (builtin_script_count > 0)
+    {
+        const builtin_script_t test_script = {cmd.c_str(), NULL};
+        const builtin_script_t *array_end = builtin_scripts + builtin_script_count;
+        const builtin_script_t *found = std::lower_bound(builtin_scripts, array_end, test_script, script_name_precedes_script_name);
+        if (found != array_end && ! wcscmp(found->name, test_script.name))
+        {
+            /* We found it */
+            matching_builtin_script = found;
+        }
+    }
+    if (matching_builtin_script) {
+        has_script_source = true;
+        script_source = str2wcstring(matching_builtin_script->def);
+        
+        /* Make a node representing this function */
+        scoped_lock locker(lock);
+        autoload_function_t *func = this->get_autoloaded_function_with_creation(cmd, really_load);
+        
+        /* This function is internalized */
+        func->is_internalized = true;
+        
+        /* It's a fiction to say the script is loaded at this point, but we're definitely going to load it down below. */
+        if (really_load) func->is_loaded = true;
+    }
+    
+    if (! has_script_source)
+    {
+        /* Iterate over path searching for suitable completion files */
+        for( i=0; i<path_list.size(); i++ )
+        {
+            wcstring next = path_list.at(i);
+            wcstring path = next + L"/" + cmd + L".fish";
+
+            const file_access_attempt_t access = access_file(path, R_OK);
+            if (access.accessible) {
+                /* Found it! */
+                found_file = true;
+                
+                /* Now we're actually going to take the lock. */
+                scoped_lock locker(lock);
+                autoload_function_t *func = this->get_node(cmd);
+                
+                /* Generate the source if we need to load it */
+                bool need_to_load_function = really_load && (func == NULL || func->access.mod_time != access.mod_time || ! func->is_loaded);
+                if (need_to_load_function) {
+                
+                    /* Generate the script source */
+                    wcstring esc = escape_string(path, 1);
+                    script_source = L". " + esc;
+                    has_script_source = true;
+                    
+                    /* Remove any loaded command because we are going to reload it. Note that this will deadlock if command_removed calls back into us. */
+                    if (func && func->is_loaded) {
+                        command_removed(cmd);
+                        func->is_placeholder = false;
+                    }
+                    
+                    /* Mark that we're reloading it */
+                    reloaded = true;
+                }
+                
+                /* Create the function if we haven't yet. This does not load it. Do not trigger eviction unless we are actually loading, because we don't want to evict off of the main thread. */
+                if (! func) {
+                    func = get_autoloaded_function_with_creation(cmd, really_load);
+                }
+                
+                /* It's a fiction to say the script is loaded at this point, but we're definitely going to load it down below. */
+                if (need_to_load_function) func->is_loaded = true;
+                                                                
+                /* Unconditionally record our access time */
+                func->access = access;
+
+                break;
+            }
+        }
+
+        /*
+          If no file or builtin script was found we insert a placeholder function.
+          Later we only research if the current time is at least five seconds later.
+          This way, the files won't be searched over and over again.
+        */
+        if( ! found_file && ! has_script_source )
+        {
+            scoped_lock locker(lock);
+            /* Generate a placeholder */
+            autoload_function_t *func = this->get_node(cmd);
+            if (! func) {
+                func = new autoload_function_t(cmd);
+                func->is_placeholder = true;
+                if (really_load) {
+                    this->add_node(func);
+                } else {
+                    this->add_node_without_eviction(func);
+                }
+            }
+            func->access.last_checked = time(NULL);
+        }
+    }
+    
+    /* If we have a script, either built-in or a file source, then run it */
+    if (really_load && has_script_source)
+    {
+        if( exec_subshell( script_source) == -1 )
+        {
+            /*
+              Do nothing on failiure
+            */
+        }
+
+    }
+
+    if (really_load) {
+        return reloaded;
+    } else {
+        return found_file || has_script_source;
+    }
+}

autoload.h

@@ -0,0 +1,129 @@
+/** \file autoload.h
+
+    The classes responsible for autoloading functions and completions.
+*/
+
+#ifndef FISH_AUTOLOAD_H
+#define FISH_AUTOLOAD_H
+
+#include <wchar.h>
+#include <map>
+#include <set>
+#include <list>
+#include "common.h"
+#include "lru.h"
+
+/** A struct responsible for recording an attempt to access a file. */
+struct file_access_attempt_t {
+    time_t mod_time; /** The modification time of the file */
+    time_t last_checked; /** When we last checked the file */
+    bool accessible; /** Whether we believe we could access this file */
+    bool stale; /** Whether the access attempt is stale */
+    int error; /** If we could not access the file, the error code */
+};
+
+file_access_attempt_t access_file(const wcstring &path, int mode);
+
+struct autoload_function_t : public lru_node_t
+{   
+    autoload_function_t(const wcstring &key) : lru_node_t(key), access(), is_loaded(false), is_placeholder(false), is_internalized(false) { }
+    file_access_attempt_t access; /** The last access attempt */
+    bool is_loaded; /** Whether we have actually loaded this function */
+    bool is_placeholder; /** Whether we are a placeholder that stands in for "no such function". If this is true, then is_loaded must be false. */
+    bool is_internalized; /** Whether this function came from a builtin "internalized" script */
+};
+
+
+struct builtin_script_t;
+class env_vars_snapshot_t;
+
+/**
+  A class that represents a path from which we can autoload, and the autoloaded contents.
+ */
+class autoload_t : private lru_cache_t<autoload_function_t> {
+private:
+
+    /** Lock for thread safety */
+    pthread_mutex_t lock;
+
+    /** The environment variable name */
+    const wcstring env_var_name;
+    
+    /** Builtin script array */
+    const struct builtin_script_t *const builtin_scripts;
+    
+    /** Builtin script count */
+    const size_t builtin_script_count;
+
+    /** The path from which we most recently autoloaded */
+    wcstring last_path;
+
+	/**
+	   A table containing all the files that are currently being
+	   loaded. This is here to help prevent recursion.
+	*/
+    std::set<wcstring> is_loading_set;
+
+    bool is_loading(const wcstring &name) const {
+        return is_loading_set.find(name) != is_loading_set.end();
+    }
+    
+    void remove_all_functions(void) {
+        this->evict_all_nodes();
+    }
+    
+    bool locate_file_and_maybe_load_it( const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list );
+    
+    virtual void node_was_evicted(autoload_function_t *node);
+
+    autoload_function_t *get_autoloaded_function_with_creation(const wcstring &cmd, bool allow_eviction);
+    
+    protected:    
+    /** Overridable callback for when a command is removed */
+    virtual void command_removed(const wcstring &cmd) { }
+    
+    public:
+    
+    /** Create an autoload_t for the given environment variable name */
+    autoload_t(const wcstring &env_var_name_var, const builtin_script_t *scripts, size_t script_count );
+    
+    /** Destructor */
+    virtual ~autoload_t();
+    
+    /**
+       Autoload the specified file, if it exists in the specified path. Do
+       not load it multiple times unless it's timestamp changes or
+       parse_util_unload is called.
+
+       Autoloading one file may unload another. 
+
+       \param cmd the filename to search for. The suffix '.fish' is always added to this name
+       \param on_unload a callback function to run if a suitable file is found, which has not already been run. unload will also be called for old files which are unloaded.
+       \param reload wheter to recheck file timestamps on already loaded files
+    */
+    int load( const wcstring &cmd, bool reload );
+    
+    /** Check whether we have tried loading the given command. Does not do any I/O. */
+    bool has_tried_loading( const wcstring &cmd );
+
+    /**
+       Tell the autoloader that the specified file, in the specified path,
+       is no longer loaded.
+
+       \param cmd the filename to search for. The suffix '.fish' is always added to this name
+       \param on_unload a callback function which will be called before (re)loading a file, may be used to unload the previous file.
+       \return non-zero if the file was removed, zero if the file had not yet been loaded
+    */
+    int unload( const wcstring &cmd );
+    
+    /**
+       Unloads all files.
+    */
+    void unload_all( );
+    
+    /** Check whether the given command could be loaded, but do not load it. */
+    bool can_load( const wcstring &cmd, const env_vars_snapshot_t &vars );
+
+};
+
+#endif

build_tools/description-pak

@@ -0,0 +1,3 @@
+This is the_ridiculous'fish s delightful fork of, fish friendly interactive shell. For more information, visit http://ridiculousfish.com/shell/ .
+
+This installer will install fish, but will not modify your /etc/shells file or your default shell. I trust you know how to do that yourself if you care to!

build_tools/fish_shell.pmdoc/01fish-contents.xml

@@ -0,0 +1 @@
+<pkg-contents spec="1.12"/>

build_tools/fish_shell.pmdoc/01fish.xml

@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="6A7E1ED5-E40E-4ACE-959B-B9D77555AD39"><config><identifier>com.ridiculousfish.fish-shell.fishShell.fish_pkg.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom>/private/tmp/fish_pkg</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo</mod></config></pkgref>

build_tools/fish_shell.pmdoc/index.xml

@@ -0,0 +1,40 @@
+<pkmkdoc spec="1.12"><properties><title>fish shell</title><organization>com.ridiculousfish.fish-shell</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="fish_pkg" id="fish shell" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.ridiculousfish.fish-shell.fishShell.fish_pkg.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="bottomleft"><locale lang="en"><resource mod="true" type="background">/Users/peter/Desktop/Untitled.pdf</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs30 \cf0 This installs ridiculous_fish's fork of fish, a command line shell for Mac OS X, Linux, and the rest of the family. For more information on fish, visit {\field{\*\fldinst{HYPERLINK "http://ridiculousfish.com/shell/"}}{\fldrslt http://ridiculousfish.com/shell/}}\
+\
+The path to fish will be added to /etc/shells, but your default shell will not be modified. \
+\
+This release is beta r2.\
+}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs26 \cf0 Run 
+\f1 fish
+\f0  at the command line to start it up!  Some useful commands:\
+\
+Interactively set your colors from a web page:\
+\
+	
+\f1 fish_config
+\f0 \
+\
+Update man-page completions:\
+\
+	
+\f1 fish_update_completions
+\f0 \
+\
+Make fish your default shell:\
+\
+	
+\f1 chsh -s /usr/local/bin/fish\
+
+\f0 \
+\
+Enjoy!\
+}]]></resource></locale></resources><flags/><item type="file">01fish.xml</item><mod>properties.title</mod><mod>description</mod></pkmkdoc>

build_tools/make_deb.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Terminate on error
+set -e
+
+sudo rm -Rf /tmp/fishfish
+mkdir /tmp/fishfish
+git archive --format=tar fish_fish | tar -x -C /tmp/fishfish
+mkdir /tmp/fishfish/doc-pak
+cp README INSTALL CHANGELOG release_notes.html /tmp/fishfish/doc-pak/
+cp build_tools/description-pak /tmp/fishfish/
+cd /tmp/fishfish
+autoconf
+./configure
+make -j 3
+sudo checkinstall --default --pakdir ~/fish_built/ --pkgversion 0.9 make install
+mv ~/fish_built/fishfish_0.9-1_i386.deb ~/fish_built/fishfish_0.9_i386.deb
+

build_tools/make_pkg.sh

@@ -0,0 +1,31 @@
+#!/bin/sh -x
+
+make distclean
+rm -rf /tmp/fish_pkg
+mkdir -p /tmp/fish_pkg/
+
+# Make sure what we build can run on SnowLeopard
+export OSX_SDK="/Developer/SDKs/MacOSX10.6.sdk"
+export MACOSX_DEPLOYMENT_TARGET="10.6"
+export CC="clang -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
+export CCX="clang++ -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
+export CFLAGS="$CFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
+export CXXFLAGS="$CXXFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
+export LDFLAGS="$LDFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
+autoconf
+./configure --without-xsel
+
+# Actually build it now
+if make -j 4 DESTDIR=/tmp/fish_pkg install
+then
+	echo "Root written to /tmp/fish_pkg/"
+	if /Developer/usr/bin/packagemaker --doc ./build_tools/fish_shell.pmdoc --out ~/fish_built/fishfish.pkg
+	then
+		echo "Package written to ~/fish_built/fishfish.pkg"
+	else
+		echo "Package could not be written"
+	fi
+	
+else
+	echo "Root could not be written"
+fi

build_tools/make_tarball.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Script to generate a tarball
+# We use git to output a tree. But we also want to build the user documentation
+# and put that in the tarball, so that nobody needs to have doxygen installed
+# to build it.
+
+# Exit on error
+set -e
+
+# We wil generate a tarball with a prefix "fish"
+# git can do that automatically for us via git-archive
+# but to get the documentation in, we need to make a symlink called "fish"
+# and tar from that, so that the documentation gets the right prefix
+
+# Get the current directory, which we'll use for symlinks
+wd="$PWD"
+
+# The name of the prefix, which is the directory that you get when you untar
+prefix="fish"
+
+# The path where we will output the tar file
+path=~/fish_built/fish-2.0.tar
+
+# Clean up stuff we've written before
+rm -f "$path" "$path".gz
+
+# git starts the archive
+git archive --format=tar --prefix="$prefix"/ master > "$path"
+
+# tarball out the documentation
+make user_doc
+make share/man
+cd /tmp
+rm -f "$prefix"
+ln -s "$wd" "$prefix"
+tar --append --file="$path" "$prefix"/user_doc/html
+tar --append --file="$path" "$prefix"/share/man
+rm -f "$prefix"
+
+# gzip it
+gzip "$path"
+
+# Output what we did, and the sha1 hash
+echo "Tarball written to $path".gz
+openssl sha1 "$path".gz

build_tools/osx_package_scripts/add-shell

@@ -0,0 +1,53 @@
+#!/bin/sh -e
+
+# Modified from Debian's add-shell to work on OS X
+
+if test $# -eq 0
+then
+	echo usage: $0 shellname [shellname ...]
+	exit 1
+fi
+
+scriptname=`basename "$0"`
+if [[ $UID -ne 0 ]]; then
+     echo "${scriptname} must be run as root"
+     exit 1
+fi
+
+file=/etc/shells
+# I want this to be GUARANTEED to be on the same filesystem as $file
+tmpfile=${file}.tmp
+
+set -o noclobber
+
+trap "rm -f $tmpfile" EXIT
+
+if ! cat $file > $tmpfile
+then
+        cat 1>&2 <<EOF
+Either another instance of $0 is running, or it was previously interrupted.
+Please examine ${tmpfile} to see if it should be moved onto ${file}.
+EOF
+        exit 1
+fi
+
+# Append a newline if it doesn't exist
+if [ "$(tail -c1 "$tmpfile"; echo x)" != $'\nx' ]; then
+    echo "" >> "$tmpfile"
+fi
+
+for i
+do
+        if ! grep -q "^${i}$" "$tmpfile"
+        then
+                echo $i >> "$tmpfile"
+        fi
+done
+
+chmod 0644 $tmpfile
+chown root:wheel $tmpfile
+
+mv $tmpfile $file
+
+trap "" EXIT
+exit 0

build_tools/osx_package_scripts/postinstall

@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+./add-shell /usr/local/bin/fish > /tmp/fish_postinstall_output.log

builtin.h

@@ -9,6 +9,9 @@
 
 #include "util.h"
 #include "io.h"
+#include "common.h"
+
+class parser_t;
 
 enum
 {
@@ -70,6 +73,10 @@ enum
 
 #define BUILTIN_FOR_ERR_NAME _( L"%ls: '%ls' is not a valid variable name\n" )
 
+/** Error messages for 'else if' */
+#define BUILTIN_ELSEIF_ERR_COUNT _( L"%ls: can only take 'if' and then another command as an argument\n")
+#define BUILTIN_ELSEIF_ERR_ARGUMENT _( L"%ls: any second argument must be 'if'\n")
+
 /**
    Error message when too many arguments are supplied to a builtin
 */
@@ -86,15 +93,13 @@ enum
 #define BUILTIN_END_BLOCK_UNKNOWN _( L"%ls: Unknown block type '%ls'\n" )
 
 #define BUILTIN_ERR_NOT_NUMBER _( L"%ls: Argument '%ls' is not a number\n" )
-/**
-   Stringbuffer used to represent standard output
-*/
-extern string_buffer_t *sb_out;
 
-/**
-   Stringbuffer used to represent standard error
-*/
-extern string_buffer_t *sb_err;
+/** Get the string used to represent stdout and stderr */
+const wcstring &get_stdout_buffer();
+const wcstring &get_stderr_buffer();
+
+/** Output an error */
+void builtin_show_error(const wcstring &err);
 
 /**
    Kludge. Tells builtins if output is to screen
@@ -120,40 +125,43 @@ void builtin_destroy();
 /**
   Is there a builtin command with the given name?
 */
-int builtin_exists( wchar_t *cmd );
+int builtin_exists( const wcstring &cmd );
 
 /**
   Execute a builtin command 
 
+  \param parser The parser being used
   \param argv Array containing the command and parameters 
   of the builtin.  The list is terminated by a
   null pointer. This syntax resembles the syntax 
   for exec.
+  \param io the io redirections to perform on this builtin.
 
   \return the exit status of the builtin command
 */
-int builtin_run( wchar_t **argv, io_data_t *io );
+int builtin_run( parser_t &parser, const wchar_t * const *argv, const io_chain_t &io );
+
+/** Returns a list of all builtin names */
+wcstring_list_t builtin_get_names(void);
+
+/** Insert all builtin names into list. */
+void builtin_get_names(std::vector<completion_t> &list);
 
 /**
-  Insert all builtin names into l. These are not copies of the strings and should not be freed after use.
+   Pushes a new set of input/output to the stack. The new stdin is supplied, a new set of output strings is created.
 */
-void builtin_get_names( array_list_t *list );
+void builtin_push_io( parser_t &parser, int stdin_fd );
 
 /**
-   Pushes a new set of input/output to the stack. The new stdin is supplied, a new set of output string_buffer_ts is created.
+   Pops a set of input/output from the stack. The output strings are destroued, but the input file is not closed.
 */
-void builtin_push_io( int stdin_fd );
-
-/**
-   Pops a set of input/output from the stack. The output string_buffer_ts are destroued, but the input file is not closed.
-*/
-void builtin_pop_io();
+void builtin_pop_io(parser_t &parser);
 
 
 /**
-   Return a one-line description of the specified builtin
+   Return a one-line description of the specified builtin.
 */
-const wchar_t *builtin_get_desc( const wchar_t *b );
+wcstring builtin_get_desc( const wcstring &b );
 
 
 /**
@@ -166,10 +174,9 @@ const wchar_t *builtin_complete_get_temporary_buffer();
 
 /**
    Run the __fish_print_help function to obtain the help information
-   for the specified command. The resulting string will be valid until
-   the next time this function is called, and must never be free'd manually.
+   for the specified command.
 */
 
-wchar_t *builtin_help_get( const wchar_t *cmd );
+wcstring builtin_help_get( parser_t &parser, const wchar_t *cmd );
 
 #endif

builtin_commandline.cpp

@@ -52,13 +52,21 @@ enum
 }
 	;
 
-static wchar_t *current_buffer=0;
-static int current_cursor_pos = -1;
+/**
+   Pointer to what the commandline builtin considers to be the current
+   contents of the command line buffer.
+ */
+static const wchar_t *current_buffer=0;
+/**
+   What the commandline builtin considers to be the current cursor
+   position.
+ */
+static size_t current_cursor_pos = (size_t)(-1);
 
 /**
    Returns the current commandline buffer.
 */
-static wchar_t *get_buffer()
+static const wchar_t *get_buffer()
 {
 	return current_buffer;
 }
@@ -66,7 +74,7 @@ static wchar_t *get_buffer()
 /**
    Returns the position of the cursor
 */
-static int get_cursor_pos()
+static size_t get_cursor_pos()
 {
 	return current_cursor_pos;
 }
@@ -82,46 +90,44 @@ static int get_cursor_pos()
 */
 static void replace_part( const wchar_t *begin,
 						  const wchar_t *end,
-						  wchar_t *insert,
+						  const wchar_t *insert,
 						  int append_mode )
 {
 	const wchar_t *buff = get_buffer();
-	string_buffer_t out;
-	int out_pos=get_cursor_pos();
-					
-	sb_init( &out );
+	size_t out_pos = get_cursor_pos();
+    
+    wcstring out;
 
-	sb_append_substring( &out, buff, begin-buff );
+    out.append(buff, begin - buff);
 					
 	switch( append_mode)
 	{
 		case REPLACE_MODE:
 		{
 							
-			sb_append( &out, insert );
+			out.append(insert);
 			out_pos = wcslen( insert ) + (begin-buff);							
 			break;
 							
 		}
 		case APPEND_MODE:
 		{
-			sb_append_substring( &out, begin, end-begin );
-			sb_append( &out, insert );
+			out.append( begin, end-begin );
+			out.append( insert );
 			break;
 		}
 		case INSERT_MODE:
 		{
-			int cursor = get_cursor_pos() -(begin-buff);
-			sb_append_substring( &out, begin, cursor );
-			sb_append( &out, insert );
-			sb_append_substring( &out, begin+cursor, end-begin-cursor );
+			long cursor = get_cursor_pos() -(begin-buff);
+			out.append( begin, cursor );
+			out.append( insert );
+			out.append( begin+cursor, end-begin-cursor );
 			out_pos +=  wcslen( insert );							
 			break;
 		}
 	}
-	sb_append( &out, end );
-	reader_set_buffer( (wchar_t *)out.buff, out_pos );
-	sb_destroy( &out );
+	out.append( end );
+	reader_set_buffer( out, out_pos );
 }
 	
 /**
@@ -138,9 +144,9 @@ static void write_part( const wchar_t *begin,
 						int tokenize )
 {	
 	tokenizer tok;
-	string_buffer_t out;
+	wcstring out;
 	wchar_t *buff;
-	int pos;
+	size_t pos;
 
 	pos = get_cursor_pos()-(begin-get_buffer());
 
@@ -148,7 +154,7 @@ static void write_part( const wchar_t *begin,
 	{
 		buff = wcsndup( begin, end-begin );
 //		fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end );
-		sb_init( &out );
+		out.clear();
 					
 		for( tok_init( &tok, buff, TOK_ACCEPT_UNFINISHED );
 			 tok_has_next( &tok );
@@ -162,41 +168,30 @@ static void write_part( const wchar_t *begin,
 			{
 				case TOK_STRING:
 				{
-					wchar_t *tmp = unescape( tok_last( &tok ), UNESCAPE_INCOMPLETE );
-					sb_append( &out, tmp, L"\n", (void *)0 );
-					free( tmp );
+                    out.append(escape_string(tok_last( &tok ), UNESCAPE_INCOMPLETE));
+                    out.push_back(L'\n');
 					break;
 				}
 				
 			}						
 		}
 
-		sb_append( sb_out,
-				   (wchar_t *)out.buff );
+        stdout_buffer.append(out);
 					
 		free( buff );
 		tok_destroy( &tok );
-		sb_destroy( &out );
 	}
 	else
 	{
-		wchar_t *buff, *esc;
-		
 		if( cut_at_cursor )
 		{
 			end = begin+pos;			
 		}
 
-		buff = wcsndup( begin, end-begin );
-		esc = unescape( buff, UNESCAPE_INCOMPLETE );
-
 //		debug( 0, L"woot2 %ls -> %ls", buff, esc );
 
-		sb_append( sb_out, esc );
-		sb_append( sb_out, L"\n" );
-		
-		free( esc );
-		free( buff );
+        stdout_buffer.append(begin, end - begin);
+        stdout_buffer.append(L"\n");
 		
 	}
 }
@@ -206,7 +201,7 @@ static void write_part( const wchar_t *begin,
    The commandline builtin. It is used for specifying a new value for
    the commandline.
 */
-static int builtin_commandline( wchar_t **argv )
+static int builtin_commandline( parser_t &parser, wchar_t **argv )
 {
 
 	int buffer_part=0;
@@ -222,7 +217,7 @@ static int builtin_commandline( wchar_t **argv )
 	int cursor_mode = 0;
 	int line_mode = 0;
 	int search_mode = 0;
-	wchar_t *begin, *end;
+	const wchar_t *begin, *end;
 
 	current_buffer = (wchar_t *)builtin_complete_get_temporary_buffer();
 	if( current_buffer )
@@ -247,11 +242,9 @@ static int builtin_commandline( wchar_t **argv )
 			return 1;
 		}
 		
-		sb_append( sb_err,
-			    argv[0],
-			    L": Can not set commandline in non-interactive mode\n",
-			    (void *)0 );
-		builtin_print_help( argv[0], sb_err );
+        stderr_buffer.append(argv[0]);
+        stderr_buffer.append(L": Can not set commandline in non-interactive mode\n");
+		builtin_print_help( parser, argv[0], stderr_buffer );
 		return 1;
 	}
 
@@ -259,7 +252,7 @@ static int builtin_commandline( wchar_t **argv )
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
@@ -343,11 +336,11 @@ static int builtin_commandline( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-                sb_printf( sb_err,
+                append_format( stderr_buffer,
                            BUILTIN_ERR_UNKNOWN,
                            argv[0],
                            long_options[opt_index].name );
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 
 				return 1;
 				
@@ -410,11 +403,11 @@ static int builtin_commandline( wchar_t **argv )
 				break;
 				
 			case 'h':
-				builtin_print_help( argv[0], sb_out );
+				builtin_print_help( parser, argv[0], stdout_buffer );
 				return 0;
 
 			case L'?':
-				builtin_unknown_option( argv[0], argv[woptind-1] );
+				builtin_unknown_option( parser, argv[0], argv[woptind-1] );
 				return 1;	
 		}
 	}		
@@ -428,22 +421,22 @@ static int builtin_commandline( wchar_t **argv )
 		*/
 		if( buffer_part || cut_at_cursor || append_mode || tokenize || cursor_mode || line_mode || search_mode )
 		{
-			sb_printf(sb_err,
+			append_format(stderr_buffer,
 					  BUILTIN_ERR_COMBO,
 					  argv[0] );
 			
-			builtin_print_help( argv[0], sb_err );
+			builtin_print_help( parser, argv[0], stderr_buffer );
 			return 1;
 		}
 		
 
 		if( argc == woptind )
 		{
-			sb_printf( sb_err,
+			append_format(stderr_buffer,
 					   BUILTIN_ERR_MISSING,
 					   argv[0] );
 			
-			builtin_print_help( argv[0], sb_err );
+			builtin_print_help( parser, argv[0], stderr_buffer );
 			return 1;
  		}
 		for( i=woptind; i<argc; i++ )
@@ -460,11 +453,11 @@ static int builtin_commandline( wchar_t **argv )
 			}
 			else
 			{
-				sb_printf( sb_err,
+				append_format(stderr_buffer,
 					   _(L"%ls: Unknown input function '%ls'\n"),
 					   argv[0],
 					   argv[i] );
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 				return 1;
 			}
 		}
@@ -478,45 +471,45 @@ static int builtin_commandline( wchar_t **argv )
 	if( (search_mode || line_mode || cursor_mode) && (argc-woptind > 1) )
 	{
 		
-		sb_append( sb_err,
+		append_format(stderr_buffer,
 					argv[0],
 					L": Too many arguments\n",
-					(void *)0 );
-		builtin_print_help( argv[0], sb_err );
+					NULL );
+		builtin_print_help( parser, argv[0], stderr_buffer );
 		return 1;
 	}
 
 	if( (buffer_part || tokenize || cut_at_cursor) && (cursor_mode || line_mode || search_mode) )
 	{		
-		sb_printf( sb_err,
+		append_format(stderr_buffer,
 				   BUILTIN_ERR_COMBO,
 				   argv[0] );
 
-		builtin_print_help( argv[0], sb_err );
+		builtin_print_help( parser, argv[0], stderr_buffer );
 		return 1;
 	}		
 	
 
 	if( (tokenize || cut_at_cursor) && (argc-woptind) )
 	{
-		sb_printf( sb_err,
+		append_format(stderr_buffer,
 				   BUILTIN_ERR_COMBO2,
 				   argv[0],
 				   L"--cut-at-cursor and --tokenize can not be used when setting the commandline" );
 		
 
-		builtin_print_help( argv[0], sb_err );
+		builtin_print_help( parser, argv[0], stderr_buffer );
 		return 1;
 	}
 
 	if( append_mode && !(argc-woptind) )
 	{
-		sb_printf( sb_err,
+		append_format(stderr_buffer,
                     BUILTIN_ERR_COMBO2,
                     argv[0],
 				   L"insertion mode switches can not be used when not in insertion mode" );
 
-        builtin_print_help( argv[0], sb_err );		
+        builtin_print_help( parser, argv[0], stderr_buffer );		
         return 1;
 	}
 
@@ -538,27 +531,27 @@ static int builtin_commandline( wchar_t **argv )
 		if( argc-woptind )
 		{
 			wchar_t *endptr;
-			int new_pos;
+			long new_pos;
 			errno = 0;
 			
 			new_pos = wcstol( argv[woptind], &endptr, 10 );
 			if( *endptr || errno )
 			{
-				sb_printf( sb_err,
+				append_format(stderr_buffer,
 					   BUILTIN_ERR_NOT_NUMBER,
 					   argv[0],
 					   argv[woptind] );
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 			}
 			
 			current_buffer = reader_get_buffer();
-			new_pos = maxi( 0, mini( new_pos, wcslen( current_buffer ) ) );
-			reader_set_buffer( current_buffer, new_pos );
+			new_pos = maxi( 0L, mini( new_pos, (long)wcslen( current_buffer ) ) );
+			reader_set_buffer( current_buffer, (size_t)new_pos );
 			return 0;
 		}
 		else
 		{
-			sb_printf( sb_out, L"%d\n", reader_get_cursor_pos() );
+			append_format(stdout_buffer, L"%lu\n", (unsigned long)reader_get_cursor_pos() );
 			return 0;
 		}
 		
@@ -566,9 +559,9 @@ static int builtin_commandline( wchar_t **argv )
 	
 	if( line_mode )
 	{
-		int pos = reader_get_cursor_pos();
-		wchar_t *buff = reader_get_buffer();
-		sb_printf( sb_out, L"%d\n", parse_util_lineno( buff, pos ) );
+		size_t pos = reader_get_cursor_pos();
+		const wchar_t *buff = reader_get_buffer();
+		append_format(stdout_buffer, L"%lu\n", (unsigned long)parse_util_lineno( buff, pos ) );
 		return 0;
 			
 	}
@@ -634,21 +627,16 @@ static int builtin_commandline( wchar_t **argv )
 
 		default:
 		{
-			string_buffer_t sb;
+			wcstring sb = argv[woptind];
 			int i;
 			
-			sb_init( &sb );
-			
-			sb_append( &sb, argv[woptind] );
-			
 			for( i=woptind+1; i<argc; i++ )
 			{
-				sb_append( &sb, L"\n" );
-				sb_append( &sb, argv[i] );
+                sb.push_back(L'\n');
+                sb.append(argv[i]);
 			}
 			
-			replace_part( begin, end, (wchar_t *)sb.buff, append_mode );
-			sb_destroy( &sb );
+			replace_part( begin, end, sb.c_str(), append_mode );
 			
 			break;
 		}		

builtin_complete.cpp

@@ -26,9 +26,9 @@ Functions used for implementing the complete builtin.
 
 
 /**
-   Internal storage for the builtin_get_temporary_buffer() function.
+   Internal storage for the builtin_complete_get_temporary_buffer() function.
 */
-const static wchar_t *temporary_buffer;
+static const wchar_t *temporary_buffer;
 
 /*
   builtin_complete_* are a set of rather silly looping functions that
@@ -45,15 +45,15 @@ const static wchar_t *temporary_buffer;
 static void	builtin_complete_add2( const wchar_t *cmd,
 								   int cmd_type,
 								   const wchar_t *short_opt,
-								   array_list_t *gnu_opt,
-								   array_list_t *old_opt, 
+								   const wcstring_list_t &gnu_opt,
+								   const wcstring_list_t &old_opt, 
 								   int result_mode, 
 								   const wchar_t *condition,
 								   const wchar_t *comp,
 								   const wchar_t *desc,
 								   int flags )
 {
-	int i;
+	size_t i;
 	const wchar_t *s;
 	
 	for( s=short_opt; *s; s++ )
@@ -70,12 +70,12 @@ static void	builtin_complete_add2( const wchar_t *cmd,
 					  flags );
 	}
 	
-	for( i=0; i<al_get_count( gnu_opt ); i++ )
+	for( i=0; i<gnu_opt.size(); i++ )
 	{
 		complete_add( cmd, 
 					  cmd_type,
 					  0,
-					  (wchar_t *)al_get(gnu_opt, i ),
+					  gnu_opt.at(i).c_str(),
 					  0,
 					  result_mode,
 					  condition,
@@ -84,12 +84,12 @@ static void	builtin_complete_add2( const wchar_t *cmd,
 					  flags );
 	}
 	
-	for( i=0; i<al_get_count( old_opt ); i++ )
+	for( i=0; i<old_opt.size(); i++ )
 	{
 		complete_add( cmd, 
 					  cmd_type,
 					  0,
-					  (wchar_t *)al_get(old_opt, i ),
+					  old_opt.at(i).c_str(),
 					  1,
 					  result_mode,
 					  condition,
@@ -98,7 +98,7 @@ static void	builtin_complete_add2( const wchar_t *cmd,
 					  flags );
 	}	
 
-	if( al_get_count( old_opt )+al_get_count( gnu_opt )+wcslen(short_opt) == 0 )
+	if( old_opt.size() == 0 && gnu_opt.size() == 0 && wcslen(short_opt) == 0 )
 	{
 		complete_add( cmd, 
 					  cmd_type,
@@ -116,11 +116,11 @@ static void	builtin_complete_add2( const wchar_t *cmd,
 /**
    Silly function
 */
-static void	builtin_complete_add( array_list_t *cmd, 
-								  array_list_t *path,
+static void	builtin_complete_add( const wcstring_list_t &cmd, 
+								  const wcstring_list_t &path,
 								  const wchar_t *short_opt,
-								  array_list_t *gnu_opt,
-								  array_list_t *old_opt, 
+								  wcstring_list_t &gnu_opt,
+								  wcstring_list_t &old_opt, 
 								  int result_mode, 
 								  int authoritative,
 								  const wchar_t *condition,
@@ -128,11 +128,9 @@ static void	builtin_complete_add( array_list_t *cmd,
 								  const wchar_t *desc,
 								  int flags )
 {
-	int i;
-	
-	for( i=0; i<al_get_count( cmd ); i++ )
+	for( size_t i=0; i<cmd.size(); i++ )
 	{
-		builtin_complete_add2( al_get( cmd, i ),
+		builtin_complete_add2( cmd.at(i).c_str(),
 							   COMMAND,
 							   short_opt, 
 							   gnu_opt,
@@ -145,16 +143,16 @@ static void	builtin_complete_add( array_list_t *cmd,
 
 		if( authoritative != -1 )
 		{
-			complete_set_authoritative( al_get( cmd, i ),
+			complete_set_authoritative( cmd.at(i).c_str(),
 									  COMMAND,
 									  authoritative );
 		}
 		
 	}
 	
-	for( i=0; i<al_get_count( path ); i++ )
+	for( size_t i=0; i<path.size(); i++ )
 	{
-		builtin_complete_add2( al_get( path, i ),
+		builtin_complete_add2( path.at(i).c_str(),
 							   PATH,
 							   short_opt, 
 							   gnu_opt,
@@ -167,7 +165,7 @@ static void	builtin_complete_add( array_list_t *cmd,
 
 		if( authoritative != -1 )
 		{
-			complete_set_authoritative( al_get( path, i ),
+			complete_set_authoritative( path.at(i).c_str(),
 									  PATH,
 									  authoritative );
 		}
@@ -178,37 +176,35 @@ static void	builtin_complete_add( array_list_t *cmd,
 /**
    Silly function
 */
-static void builtin_complete_remove3( wchar_t *cmd,
+static void builtin_complete_remove3( const wchar_t *cmd,
 									  int cmd_type,
 									  wchar_t short_opt,
-									  array_list_t *long_opt )		
+									  const wcstring_list_t &long_opt )
 {
-	int i;
-	
-	for( i=0; i<al_get_count( long_opt ); i++ )
+	for( size_t i=0; i<long_opt.size(); i++ )
 	{
 		complete_remove( cmd,
 						 cmd_type,
 						 short_opt,
-						 (wchar_t *)al_get( long_opt, i ) );
+						 long_opt.at(i).c_str());
 	}	
 }
 
 /**
    Silly function
 */
-static void	builtin_complete_remove2( wchar_t *cmd,
+static void	builtin_complete_remove2( const wchar_t *cmd,
 									  int cmd_type,
 									  const wchar_t *short_opt,
-									  array_list_t *gnu_opt,
-									  array_list_t *old_opt )
+									  const wcstring_list_t &gnu_opt,
+									  const wcstring_list_t &old_opt )
 {
 	const wchar_t *s = (wchar_t *)short_opt;
 	if( *s )
 	{
 		for( ; *s; s++ )
 		{
-			if( al_get_count( old_opt) + al_get_count( gnu_opt ) == 0 )
+			if( old_opt.size() == 0 && gnu_opt.size() == 0 )
 			{
 				complete_remove(cmd,
 								cmd_type,
@@ -248,27 +244,24 @@ static void	builtin_complete_remove2( wchar_t *cmd,
 /**
    Silly function
 */
-static void	builtin_complete_remove( array_list_t *cmd, 
-									 array_list_t *path,
+static void	builtin_complete_remove( const wcstring_list_t &cmd, 
+									 const wcstring_list_t &path,
 									 const wchar_t *short_opt,
-									 array_list_t *gnu_opt,
-									 array_list_t *old_opt )
-{
-	
-	int i;
-	
-	for( i=0; i<al_get_count( cmd ); i++ )
+									 const wcstring_list_t &gnu_opt,
+									 const wcstring_list_t &old_opt )
+{	
+	for( size_t i=0; i<cmd.size(); i++ )
 	{
-		builtin_complete_remove2( (wchar_t *)al_get( cmd, i ),
+		builtin_complete_remove2( cmd.at(i).c_str(),
 								  COMMAND,
 								  short_opt, 
 								  gnu_opt,
 								  old_opt );
 	}
 	
-	for( i=0; i<al_get_count( path ); i++ )
+	for( size_t i=0; i<path.size(); i++ )
 	{
-		builtin_complete_remove2( (wchar_t *)al_get( path, i ),
+		builtin_complete_remove2( path.at(i).c_str(),
 								  PATH,
 								  short_opt, 
 								  gnu_opt,
@@ -280,6 +273,7 @@ static void	builtin_complete_remove( array_list_t *cmd,
 
 const wchar_t *builtin_complete_get_temporary_buffer()
 {
+    ASSERT_IS_MAIN_THREAD();
 	return temporary_buffer;
 }
 
@@ -288,44 +282,35 @@ const wchar_t *builtin_complete_get_temporary_buffer()
    tab-completions. Calls the functions in complete.c for any heavy
    lifting. Defined in builtin_complete.c
 */
-static int builtin_complete( wchar_t **argv )
+static int builtin_complete( parser_t &parser, wchar_t **argv )
 {
-	int res=0;
+    ASSERT_IS_MAIN_THREAD();
+	bool res=false;
 	int argc=0;
 	int result_mode=SHARED;
 	int remove = 0;
 	int authoritative = -1;
 	int flags = COMPLETE_AUTO_SPACE;
 	
-	string_buffer_t short_opt;
-	array_list_t gnu_opt, old_opt;
-	wchar_t *comp=L"", *desc=L"", *condition=L"";
+	wcstring short_opt;
+	wcstring_list_t gnu_opt, old_opt;
+	const wchar_t *comp=L"", *desc=L"", *condition=L"";
 
-	wchar_t *do_complete = 0;
+    bool do_complete = false;
+    wcstring do_complete_param;
 	
-	array_list_t cmd;
-	array_list_t path;
+	wcstring_list_t cmd;
+	wcstring_list_t path;
 
 	static int recursion_level=0;
 	
-	if( !is_interactive_session )
-	{
-		debug( 1, _(L"%ls: Command only available in interactive sessions"), argv[0] );
-	}
-	
-	al_init( &cmd );
-	al_init( &path );
-	sb_init( &short_opt );
-	al_init( &gnu_opt );
-	al_init( &old_opt );
-	
 	argc = builtin_count_args( argv );	
 	
 	woptind=0;
 	
-	while( res == 0 )
+	while( ! res )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
@@ -413,14 +398,14 @@ static int builtin_complete( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-                sb_printf( sb_err,
+                append_format(stderr_buffer,
                            BUILTIN_ERR_UNKNOWN,
                            argv[0],
                            long_options[opt_index].name );
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 
 				
-				res = 1;
+				res = true;
 				break;
 				
 			case 'x':					
@@ -438,15 +423,18 @@ static int builtin_complete( wchar_t **argv )
 			case 'p':	
 			case 'c':
 			{
-				wchar_t *a = unescape( woptarg, 1);
-				if( a )
+                wcstring tmp = woptarg;
+                if (unescape_string(tmp, 1))
 				{
-					al_push( (opt=='p'?&path:&cmd), a );
+                    if (opt=='p')
+                        path.push_back(tmp);
+                    else
+                        cmd.push_back(tmp);
 				}
 				else
 				{
-					sb_printf( sb_err, L"%ls: Invalid token '%ls'\n", argv[0], woptarg );
-					res = 1;					
+					append_format(stderr_buffer, L"%ls: Invalid token '%ls'\n", argv[0], woptarg );
+					res = true;					
 				}				
 				break;
 			}
@@ -464,15 +452,15 @@ static int builtin_complete( wchar_t **argv )
 				break;
 				
 			case 's':
-				sb_append( &short_opt, woptarg );
+                short_opt.append(woptarg);
 				break;
 					
 			case 'l':
-				al_push( &gnu_opt, woptarg );
+                gnu_opt.push_back(woptarg);
 				break;
 				
 			case 'o':
-				al_push( &old_opt, woptarg );
+                old_opt.push_back(woptarg);
 				break;
 
 			case 'a':
@@ -488,16 +476,17 @@ static int builtin_complete( wchar_t **argv )
 				break;
 				
 			case 'C':
-				do_complete = woptarg?woptarg:reader_get_buffer();
+                do_complete = true;
+				do_complete_param = woptarg ? woptarg : reader_get_buffer();
 				break;
 				
 			case 'h':
-				builtin_print_help( argv[0], sb_out );
+				builtin_print_help( parser, argv[0], stdout_buffer );
 				return 0;
 				
 			case '?':
-				builtin_unknown_option( argv[0], argv[woptind-1] );
-				res = 1;
+				builtin_unknown_option( parser, argv[0], argv[woptind-1] );
+				res = true;
 				break;
 				
 		}
@@ -508,16 +497,16 @@ static int builtin_complete( wchar_t **argv )
 	{
 		if( condition && wcslen( condition ) )
 		{
-			if( parser_test( condition, 0, 0, 0 ) )
+			if( parser.test( condition, 0, 0, 0 ) )
 			{
-				sb_printf( sb_err,
+				append_format(stderr_buffer,
 						   L"%ls: Condition '%ls' contained a syntax error\n", 
 						   argv[0],
 						   condition );
 				
-				parser_test( condition, 0, sb_err, argv[0] );
+				parser.test( condition, 0, &stderr_buffer, argv[0] );
 				
-				res = 1;
+				res = true;
 			}
 		}
 	}
@@ -526,16 +515,16 @@ static int builtin_complete( wchar_t **argv )
 	{
 		if( comp && wcslen( comp ) )
 		{
-			if( parser_test_args( comp, 0, 0 ) )
+			if( parser.test_args( comp, 0, 0 ) )
 			{
-				sb_printf( sb_err,
+				append_format(stderr_buffer,
 						   L"%ls: Completion '%ls' contained a syntax error\n", 
 						   argv[0],
 						   comp );
 				
-				parser_test_args( comp, sb_err, argv[0] );
+				parser.test_args( comp, &stderr_buffer, argv[0] );
 				
-				res = 1;
+				res = true;
 			}
 		}
 	}
@@ -544,31 +533,27 @@ static int builtin_complete( wchar_t **argv )
 	{
 		if( do_complete )
 		{
-			array_list_t *comp;
-			int i;
+			const wchar_t *token;
 
-			const wchar_t *prev_temporary_buffer = temporary_buffer;
-
-			wchar_t *token;
-
-			parse_util_token_extent( do_complete, wcslen( do_complete ), &token, 0, 0, 0 );
+			parse_util_token_extent( do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0, 0 );
 						
-			temporary_buffer = do_complete;		
+			const wchar_t *prev_temporary_buffer = temporary_buffer;
+			temporary_buffer = do_complete_param.c_str();
 
 			if( recursion_level < 1 )
 			{
 				recursion_level++;
+                
+                std::vector<completion_t> comp;
+				complete( do_complete_param, comp, COMPLETE_DEFAULT );
 			
-				comp = al_halloc( 0 );
-			
-				complete( do_complete, comp );
-			
-				for( i=0; i<al_get_count( comp ); i++ )
+				for( size_t i=0; i< comp.size() ; i++ )
 				{
-					completion_t *next = (completion_t *)al_get( comp, i );
-					wchar_t *prepend;
+					const completion_t &next =  comp.at( i );
+
+					const wchar_t *prepend;
 					
-					if( next->flags & COMPLETE_NO_CASE )
+					if( next.flags & COMPLETE_NO_CASE )
 					{
 						prepend = L"";
 					}
@@ -578,17 +563,16 @@ static int builtin_complete( wchar_t **argv )
 					}
 						
 
-					if( next->description )
+					if( !(next.description).empty() )
 					{
-						sb_printf( sb_out, L"%ls%ls\t%ls\n", prepend, next->completion, next->description );
+						append_format(stdout_buffer, L"%ls%ls\t%ls\n", prepend, next.completion.c_str(), next.description.c_str() );
 					}
 					else
 					{
-						sb_printf( sb_out, L"%ls%ls\n", prepend, next->completion );
+						append_format(stdout_buffer, L"%ls%ls\n", prepend, next.completion.c_str() );
 					}
 				}
 			
-				halloc_free( comp );
 				recursion_level--;
 			}
 		
@@ -597,36 +581,36 @@ static int builtin_complete( wchar_t **argv )
 		}
 		else if( woptind != argc )
 		{
-			sb_printf( sb_err, 
+			append_format(stderr_buffer, 
 					   _( L"%ls: Too many arguments\n" ),
 					   argv[0] );
-			builtin_print_help( argv[0], sb_err );
+			builtin_print_help( parser, argv[0], stderr_buffer );
 
-			res = 1;
+			res = true;
 		}
-		else if( (al_get_count( &cmd) == 0 ) && (al_get_count( &path) == 0 ) )
+		else if( cmd.empty() && path.empty() )
 		{
 			/* No arguments specified, meaning we print the definitions of
 			 * all specified completions to stdout.*/
-			complete_print( sb_out );		
+			complete_print( stdout_buffer );		
 		}
 		else
 		{
 			if( remove )
 			{
-				builtin_complete_remove( &cmd,
-										 &path,
-										 (wchar_t *)short_opt.buff,
-										 &gnu_opt,
-										 &old_opt );									 
+				builtin_complete_remove( cmd,
+										 path,
+										 short_opt.c_str(),
+										 gnu_opt,
+										 old_opt );									 
 			}
 			else
 			{
-				builtin_complete_add( &cmd, 
-									  &path,
-									  (wchar_t *)short_opt.buff,
-									  &gnu_opt,
-									  &old_opt, 
+				builtin_complete_add( cmd, 
+									  path,
+									  short_opt.c_str(),
+									  gnu_opt,
+									  old_opt, 
 									  result_mode, 
 									  authoritative,
 									  condition,
@@ -638,14 +622,5 @@ static int builtin_complete( wchar_t **argv )
 		}	
 	}
 	
-	al_foreach( &cmd, &free );
-	al_foreach( &path, &free );
-
-	al_destroy( &cmd );
-	al_destroy( &path );
-	sb_destroy( &short_opt );
-	al_destroy( &gnu_opt );
-	al_destroy( &old_opt );
-
-	return res;
+	return res ? 1 : 0;
 }

builtin_jobs.cpp

@@ -43,7 +43,7 @@ enum
 /**
    Calculates the cpu usage (in percent) of the specified job.
 */
-static int cpu_use( job_t *j )
+static int cpu_use( const job_t *j )
 {
 	double u=0;
 	process_t *p;
@@ -71,7 +71,7 @@ static int cpu_use( job_t *j )
 /**
    Print information about the specified job
 */
-static void builtin_jobs_print( job_t *j, int mode, int header )
+static void builtin_jobs_print( const job_t *j, int mode, int header )
 {
 	process_t *p;
 	switch( mode )
@@ -84,24 +84,22 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, _( L"Job\tGroup\t" ));
+				stdout_buffer.append( _( L"Job\tGroup\t" ));
 #ifdef HAVE__PROC_SELF_STAT
-				sb_append( sb_out, _( L"CPU\t" ) );
+				stdout_buffer.append( _( L"CPU\t" ) );
 #endif
-				sb_append( sb_out, _( L"State\tCommand\n" ) );
+				stdout_buffer.append( _( L"State\tCommand\n" ) );
 			}
 
-			sb_printf( sb_out, L"%d\t%d\t", j->job_id, j->pgid );
+			append_format(stdout_buffer, L"%d\t%d\t", j->job_id, j->pgid );
 
 #ifdef HAVE__PROC_SELF_STAT
-			sb_printf( sb_out, L"%d%%\t", cpu_use(j) );
+			append_format(stdout_buffer, L"%d%%\t", cpu_use(j) );
 #endif
-			sb_append( sb_out,
-						job_is_stopped(j)?_(L"stopped"):_(L"running"),
-						L"\t",
-						j->command,
-						L"\n",
-						(void *)0 );
+			stdout_buffer.append(job_is_stopped(j)?_(L"stopped"):_(L"running"));
+            stdout_buffer.append(L"\t");
+            stdout_buffer.append(j->command_wcstr());
+            stdout_buffer.append(L"\n");
 			break;
 		}
 
@@ -112,9 +110,9 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, _( L"Group\n" ));
+				stdout_buffer.append( _( L"Group\n" ));
 			}
-			sb_printf( sb_out, L"%d\n", j->pgid );
+			append_format(stdout_buffer, L"%d\n", j->pgid );
 			break;
 		}
 
@@ -125,12 +123,12 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, _( L"Procces\n" ));
+				stdout_buffer.append( _( L"Procces\n" ));
 			}
 
 			for( p=j->first_process; p; p=p->next )
 			{
-				sb_printf( sb_out, L"%d\n", p->pid );
+				append_format(stdout_buffer, L"%d\n", p->pid );
 			}
 			break;
 		}
@@ -142,12 +140,12 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, _( L"Command\n" ));
+				stdout_buffer.append( _( L"Command\n" ));
 			}
 
 			for( p=j->first_process; p; p=p->next )
 			{
-				sb_printf( sb_out, L"%ls\n", p->argv[0] );
+				append_format(stdout_buffer, L"%ls\n", p->argv0() );
 			}
 			break;
 		}
@@ -160,20 +158,20 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 /**
    The jobs builtin. Used fopr printing running jobs. Defined in builtin_jobs.c.
 */
-static int builtin_jobs( wchar_t **argv )
+static int builtin_jobs( parser_t &parser, wchar_t **argv )
 {
 	int argc=0;
 	int found=0;
 	int mode=JOBS_DEFAULT;
 	int print_last = 0;
-	job_t *j;
+	const job_t *j;
 
 	argc = builtin_count_args( argv );
 	woptind=0;
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
@@ -217,12 +215,12 @@ static int builtin_jobs( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-                sb_printf( sb_err,
+                append_format(stderr_buffer,
                            BUILTIN_ERR_UNKNOWN,
                            argv[0],
                            long_options[opt_index].name );
 
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 
 
 				return 1;
@@ -247,11 +245,11 @@ static int builtin_jobs( wchar_t **argv )
 			}
 
 			case 'h':
-				builtin_print_help( argv[0], sb_out );
+				builtin_print_help( parser, argv[0], stdout_buffer );
 				return 0;				
 
 			case '?':
-				builtin_unknown_option( argv[0], argv[woptind-1] );
+				builtin_unknown_option( parser, argv[0], argv[woptind-1] );
 				return 1;
 
 		}
@@ -271,8 +269,11 @@ static int builtin_jobs( wchar_t **argv )
 		/*
 		  Ignore unconstructed jobs, i.e. ourself.
 		*/
-		for( j=first_job; j; j=j->next )
+        job_iterator_t jobs;
+        const job_t *j;
+        while ((j = jobs.next()))
 		{
+            
 			if( (j->flags & JOB_CONSTRUCTED) && !job_is_completed(j) )
 			{
 				builtin_jobs_print( j, mode, !found );
@@ -291,13 +292,13 @@ static int builtin_jobs( wchar_t **argv )
 
 			for( i=woptind; i<argc; i++ )
 			{
-				long pid;
+				int pid;
 				wchar_t *end;
 				errno=0;
-				pid=wcstol( argv[i], &end, 10 );
+				pid=fish_wcstoi( argv[i], &end, 10 );
 				if( errno || *end )
 				{
-					sb_printf( sb_err,
+					append_format(stderr_buffer,
 							   _( L"%ls: '%ls' is not a job\n" ),
 							   argv[0],
 							   argv[i] );
@@ -312,7 +313,7 @@ static int builtin_jobs( wchar_t **argv )
 				}
 				else
 				{
-					sb_printf( sb_err,
+					append_format(stderr_buffer,
 							   _( L"%ls: No suitable job: %d\n" ),
 							   argv[0],
 							   pid );
@@ -322,8 +323,10 @@ static int builtin_jobs( wchar_t **argv )
 		}
 		else
 		{
-			for( j= first_job; j; j=j->next )
-			{
+            job_iterator_t jobs;
+            const job_t *j;
+            while ((j = jobs.next()))
+            {
 				/*
 				  Ignore unconstructed jobs, i.e. ourself.
 				*/
@@ -338,7 +341,7 @@ static int builtin_jobs( wchar_t **argv )
 
 	if( !found )
 	{
-		sb_printf( sb_out,
+		append_format(stdout_buffer,
 				   _( L"%ls: There are no jobs\n" ),
 				   argv[0] );
 	}

builtin_set.c

@@ -1,879 +0,0 @@
-/** \file builtin_set.c Functions defining the set builtin
-
-Functions used for implementing the set builtin. 
-
-*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <signal.h>
-
-#include "fallback.h"
-#include "util.h"
-
-#include "wutil.h"
-#include "builtin.h"
-#include "env.h"
-#include "expand.h"
-#include "common.h"
-#include "wgetopt.h"
-#include "proc.h"
-#include "parser.h"
-
-
-/**
-   Error message for invalid path operations
-*/
-#define BUILTIN_SET_PATH_ERROR L"%ls: Could not add component %ls to %ls.\n"
-
-/**
-   Hint for invalid path operation with a colon
-*/
-#define BUILTIN_SET_PATH_HINT L"%ls: Did you mean 'set %ls $%ls %ls'?\n"
-
-/**
-   Error for mismatch between index count and elements
-*/
-#define BUILTIN_SET_ARG_COUNT L"%ls: The number of variable indexes does not match the number of values\n"
-
-/**
-   Test if the specified variable should be subject to path validation
-*/
-static int is_path_variable( const wchar_t *env )
-{
-	return contains( env,
-						 L"PATH",
-						 L"CDPATH" );
-}
-
-/**
-   Call env_set. If this is a path variable, e.g. PATH, validate the
-   elements. On error, print a description of the problem to stderr.
-*/
-static int my_env_set( const wchar_t *key, array_list_t *val, int scope )
-{
-	string_buffer_t sb;
-	int i;
-	int retcode = 0;
-	wchar_t *val_str=0;
-		
-	if( is_path_variable( key ) )
-	{
-		int error = 0;
-		
-		for( i=0; i<al_get_count( val ); i++ )
-		{
-			int show_perror = 0;
-			int show_hint = 0;
-			
-			struct stat buff;
-			wchar_t *dir = (wchar_t *)al_get( val, i );
-			
-			if( wstat( dir, &buff ) )
-			{
-				error = 1;
-				show_perror = 1;
-			}
-
-			if( !( S_ISDIR(buff.st_mode) ) )
-			{
-				error = 1;
-				
-			}
-			
-			if( error )
-			{
-				wchar_t *colon;
-				
-				sb_printf( sb_err, 
-						   _(BUILTIN_SET_PATH_ERROR),
-						   L"set", 
-						   dir, 
-						   key );
-				
-				colon = wcschr( dir, L':' );
-				
-				if( colon && *(colon+1) ) 
-				{
-					show_hint = 1;
-				}
-				
-			}
-			
-			if( show_perror )
-			{
-				builtin_wperror( L"set" );
-			}
-			
-			if( show_hint )
-			{
-				sb_printf( sb_err, 
-						   _(BUILTIN_SET_PATH_HINT),
-						   L"set",
-						   key,
-						   key,
-						   wcschr( dir, L':' )+1);
-			}
-			
-			if( error )
-			{
-				break;
-			}
-			
-		}
-
-		if( error )
-		{
-			return 1;
-		}
-		
-	}
-
-	sb_init( &sb );
-
-	if( al_get_count( val ) )
-	{
-		for( i=0; i<al_get_count( val ); i++ )
-		{
-			wchar_t *next =(wchar_t *)al_get( val, i );
-			sb_append( &sb, next?next:L"" );
-			if( i<al_get_count( val )-1 )
-			{
-				sb_append( &sb, ARRAY_SEP_STR );
-			}
-		}
-		val_str = (wchar_t *)sb.buff;
-		
-	}
-	
-	switch( env_set( key, val_str, scope | ENV_USER ) )
-	{
-		case ENV_PERM:
-		{
-			sb_printf( sb_err, _(L"%ls: Tried to change the read-only variable '%ls'\n"), L"set", key );
-			retcode=1;
-			break;
-		}
-		
-		case ENV_INVALID:
-		{
-			sb_printf( sb_err, _(L"%ls: Unknown error"), L"set" );
-			retcode=1;
-			break;
-		}
-	}
-
-	sb_destroy( &sb );
-
-	return retcode;
-}
-
-/** 
-	Extract indexes from a destination argument of the form name[index1 index2...]
-
-	\param indexes the list to insert the new indexes into
-	\param src the source string to parse
-	\param name the name of the element. Return null if the name in \c src does not match this name
-	\param var_count the number of elements in the array to parse. 
-
-	\return the total number of indexes parsed, or -1 on error
-*/
-static int parse_index( array_list_t *indexes,
-						const wchar_t *src,
-						const wchar_t *name,
-						int var_count )
-{
-	int len;
-	
-	int count = 0;
-	const wchar_t *src_orig = src;
-	
-	if (src == 0)
-	{
-		return 0;
-	}
-	
-	while (*src != L'\0' && (iswalnum(*src) || *src == L'_'))
-	{
-		src++;
-	}
-	
-	if (*src != L'[')
-	{
-		sb_printf( sb_err, _(BUILTIN_SET_ARG_COUNT), L"set" );					
-		return 0;
-	}
-	
-	len = src-src_orig;
-	
-	if( (wcsncmp( src_orig, name, len )!=0) || (wcslen(name) != (len)) )
-	{
-		sb_printf( sb_err, 
-				   _(L"%ls: Multiple variable names specified in single call (%ls and %.*ls)\n"),
-				   L"set", 
-				   name,
-				   len,
-				   src_orig);
-		return 0;
-	}
-
-	src++;	
-
-	while (iswspace(*src)) 
-	{
-		src++;
-	}
-	
-	while (*src != L']') 
-	{
-		wchar_t *end;
-		
-		long l_ind;
-
-		errno = 0;
-		
-		l_ind = wcstol(src, &end, 10);
-		
-		if( end==src || errno ) 
-		{
-			sb_printf(sb_err, _(L"%ls: Invalid index starting at '%ls'\n"), L"set", src);
-			return 0;
-		}
-
-		if( l_ind < 0 )
-		{
-			l_ind = var_count+l_ind+1;
-		}
-		
-		al_push_long(indexes, l_ind);
-		src = end;
-		count++;
-		while (iswspace(*src)) src++;
-	}
-
-	return count;
-}
-
-
-/**
-   Update a list \c list by writing copies (using wcsdup) of the
-   values specified by \c values to the indexes specified by \c
-   indexes. The previous entries at the specidied position will be
-   free'd.
-
-   \return 0 if the operation was successfull, non-zero otherwise
-*/
-static int update_values( array_list_t *list, 
-						  array_list_t *indexes,
-						  array_list_t *values ) 
-{
-	int i;
-
-	/* Replace values where needed */
-	for( i = 0; i < al_get_count(indexes); i++ ) 
-	{
-		/*
-		  The '- 1' below is because the indices in fish are
-		  one-based, but the array_list_t uses zero-based indices
-		*/
-		long ind = al_get_long(indexes, i) - 1;
-		void *new = (void *) al_get(values, i);
-		if( ind < 0 )
-		{
-			return 1;
-		}
-		
-		free((void *) al_get(list, ind));
-		al_set(list, ind, new != 0 ? wcsdup(new) : wcsdup(L""));
-	}
-  
-	return 0;
-}
-
-
-/**
-   Return 1 if an array list of longs contains the specified
-   value, 0 otherwise
-*/
-static int al_contains_long( array_list_t *list,
-							long val)
-{
-	int i;
-
-	for (i = 0; i < al_get_count(list); i++) 
-	{
-		long current = al_get_long(list, i);
-		if( current != 0 && current == val ) 
-		{
-			return 1;
-		}
-	}
-	
-	return 0;
-}
-
-
-/**
-   Erase from a list values at specified indexes 
-*/
-static void erase_values(array_list_t *list, array_list_t *indexes) 
-{
-	long i;
-	array_list_t result;
-
-	al_init(&result);
-
-	for (i = 0; i < al_get_count(list); i++) 
-	{
-		if (!al_contains_long(indexes, i + 1)) 
-		{
-			al_push(&result, al_get(list, i));
-		}
-		else 
-		{
-			free( (void *)al_get(list, i));
-		}
-	}
-	
-	al_truncate(list,0);	
-	al_push_all( list, &result );
-	al_destroy(&result);
-}
-
-
-/**
-   Print the names of all environment variables in the scope, with or without values,
-   with or without escaping
-*/
-static void print_variables(int include_values, int esc, int scope) 
-{
-	array_list_t names;
-	int i;
-	
-	al_init( &names );
-	env_get_names( &names, scope );
-	
-	sort_list( &names );
-	
-	for( i = 0; i < al_get_count(&names); i++ )
-	{
-		wchar_t *key = (wchar_t *)al_get( &names, i );
-		wchar_t *e_key = esc ? escape(key, 0) : wcsdup(key);
-
-		sb_append(sb_out, e_key);
-		
-		if( include_values ) 
-		{
-			wchar_t *value = env_get(key);
-			wchar_t *e_value;
-			if( value )
-			{
-				int shorten = 0;
-				
-				if( wcslen( value ) > 64 )
-				{
-					shorten = 1;
-					value = wcsndup( value, 60 );
-					if( !value )
-					{
-						DIE_MEM();
-					}
-				}
-				
-				e_value = esc ? expand_escape_variable(value) : wcsdup(value);
-				
-				sb_append(sb_out, L" ", e_value, (void *)0);
-				free(e_value);
-				
-				if( shorten )
-				{
-					sb_append(sb_out, L"\u2026");
-					free( value );
-				}
-
-			}
-		}
-		
-		sb_append(sb_out, L"\n");
-		free(e_key);
-	}
-  	al_destroy(&names);
-}
-
-
-
-/**
-   The set builtin. Creates, updates and erases environment variables
-   and environemnt variable arrays.
-*/
-static int builtin_set( wchar_t **argv ) 
-{
-	
-	/**
-	   Variables used for parsing the argument list
-	*/
-	const static struct woption
-		long_options[] = 
-		{
-			{ 
-				L"export", no_argument, 0, 'x' 
-			}
-			,
-			{ 
-				L"global", no_argument, 0, 'g' 
-			}
-			,
-			{ 
-				L"local", no_argument, 0, 'l'  
-			}
-			,
-			{ 
-				L"erase", no_argument, 0, 'e'  
-			}
-			,
-			{ 
-				L"names", no_argument, 0, 'n' 
-			} 
-			,
-			{ 
-				L"unexport", no_argument, 0, 'u' 
-			} 
-			,
-			{ 
-				L"universal", no_argument, 0, 'U' 
-			} 
-			,
-			{ 
-				L"query", no_argument, 0, 'q' 
-			} 
-			,
-			{ 
-				L"help", no_argument, 0, 'h' 
-			} 
-			,
-			{ 
-				0, 0, 0, 0 
-			}
-		}
-	;
-	
-	const wchar_t *short_options = L"+xglenuUqh";
-
-	int argc = builtin_count_args(argv);
-
-	/*
-	  Flags to set the work mode
-	*/
-	int local = 0, global = 0, export = 0;
-	int erase = 0, list = 0, unexport=0;
-	int universal = 0, query=0;
-	
-
-	/*
-	  Variables used for performing the actual work
-	*/
-	wchar_t *dest = 0;
-	int retcode=0;
-	int scope;
-	int slice=0;
-	int i;
-	
-	wchar_t *bad_char;
-	
-	
-	/* Parse options to obtain the requested operation and the modifiers */
-	woptind = 0;
-	while (1) 
-	{
-		int c = wgetopt_long(argc, argv, short_options, long_options, 0);
-
-		if (c == -1) 
-		{
-			break;
-		}
-    
-		switch(c) 
-		{
-			case 0:
-				break;
-
-			case 'e':
-				erase = 1;
-				break;
-
-			case 'n':
-				list = 1;
-				break;
-
-			case 'x':
-				export = 1;
-				break;
-
-			case 'l':
-				local = 1;
-				break;
-
-			case 'g':
-				global = 1;
-				break;
-
-			case 'u':
-				unexport = 1;
-				break;
-
-			case 'U':
-				universal = 1;
-				break;
-
-			case 'q':
-				query = 1;
-				break;
-
-			case 'h':
-				builtin_print_help( argv[0], sb_out );
-				return 0;
-
-			case '?':
-				builtin_unknown_option( argv[0], argv[woptind-1] );
-				return 1;
-
-			default:
-				break;
-		}
-	}
-
-	/*
-	  Ok, all arguments have been parsed, let's validate them
-	*/
-
-	/*
-	  If we are checking the existance of a variable (-q) we can not
-	  also specify scope
-	*/
-
-	if( query && (erase || list || global || local || universal || export || unexport ) )
-	{
-		sb_printf(sb_err,
-				  BUILTIN_ERR_COMBO,
-				  argv[0] );
-		
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-	
-
-	/* We can't both list and erase varaibles */
-	if( erase && list ) 
-	{
-		sb_printf(sb_err,
-				  BUILTIN_ERR_COMBO,
-				  argv[0] );		
-
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	/*
-	  Variables can only have one scope
-	*/
-	if( local + global + universal > 1 ) 
-	{
-		sb_printf( sb_err,
-				   BUILTIN_ERR_GLOCAL,
-				   argv[0] );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	/*
-	  Variables can only have one export status
-	*/
-	if( export && unexport ) 
-	{
-		sb_printf( sb_err,
-				   BUILTIN_ERR_EXPUNEXP,
-				   argv[0] );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	/*
-	  Calculate the scope value for variable assignement
-	*/
-	scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (export ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; 
-
-	if( query )
-	{
-		/*
-		  Query mode. Return the number of variables that do not exist
-		  out of the specified variables.
-		*/
-		int i;
-		for( i=woptind; i<argc; i++ )
-		{
-			wchar_t *arg = argv[i];
-			int slice=0;
-
-			if( !(dest = wcsdup(arg)))
-			{
-				DIE_MEM();		
-			}
-
-			if( wcschr( dest, L'[' ) )
-			{
-				slice = 1;
-				*wcschr( dest, L'[' )=0;
-			}
-			
-			if( slice )
-			{
-				array_list_t indexes;
-				array_list_t result;
-				int j;
-				
-				al_init( &result );
-				al_init( &indexes );
-
-				tokenize_variable_array( env_get( dest ), &result );
-								
-				if( !parse_index( &indexes, arg, dest, al_get_count( &result ) ) )
-				{
-					builtin_print_help( argv[0], sb_err );
-					retcode = 1;
-					break;
-				}
-				for( j=0; j<al_get_count( &indexes ); j++ )
-				{
-					long idx = al_get_long( &indexes, j );
-					if( idx < 1 || idx > al_get_count( &result ) )
-					{
-						retcode++;
-					}
-				}
-			}
-			else
-			{
-				if( !env_exist( arg, scope ) )
-				{
-					retcode++;
-				}
-			}
-			
-			free( dest );
-			
-		}
-		return retcode;
-	}
-	
-	if( list ) 
-	{
-		/* Maybe we should issue an error if there are any other arguments? */
-		print_variables(0, 0, scope);
-		return 0;
-	} 
-	
-	if( woptind == argc )
-	{
-		/*
-		  Print values of variables
-		*/
-
-		if( erase ) 
-		{
-			sb_printf( sb_err,
-					   _(L"%ls: Erase needs a variable name\n%ls\n"), 
-					   argv[0] );
-			
-			builtin_print_help( argv[0], sb_err );
-			retcode = 1;
-		}
-		else
-		{
-			print_variables( 1, 1, scope );
-		}
-		
-		return retcode;
-	}
-
-	if( !(dest = wcsdup(argv[woptind])))
-	{
-		DIE_MEM();		
-	}
-
-	if( wcschr( dest, L'[' ) )
-	{
-		slice = 1;
-		*wcschr( dest, L'[' )=0;
-	}
-	
-	if( !wcslen( dest ) )
-	{
-		free( dest );
-		sb_printf( sb_err, BUILTIN_ERR_VARNAME_ZERO, argv[0] );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-	
-	if( (bad_char = wcsvarname( dest ) ) )
-	{
-		sb_printf( sb_err, BUILTIN_ERR_VARCHAR, argv[0], *bad_char );
-		builtin_print_help( argv[0], sb_err );
-		free( dest );
-		return 1;
-	}
-	
-	if( slice && erase && (scope != ENV_USER) )
-	{
-		free( dest );
-		sb_printf( sb_err, _(L"%ls: Can not specify scope when erasing array slice\n"), argv[0] );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-	
-	/*
-	  set assignment can work in two modes, either using slices or
-	  using the whole array. We detect which mode is used here.
-	*/
-	
-	if( slice )
-	{
-
-		/*
-		  Slice mode
-		*/
-		int idx_count, val_count;
-		array_list_t values;
-		array_list_t indexes;
-		array_list_t result;
-		
-		al_init(&values);
-		al_init(&indexes);
-		al_init(&result);
-		
-		tokenize_variable_array( env_get(dest), &result );
-		
-		for( ; woptind<argc; woptind++ )
-		{			
-			if( !parse_index( &indexes, argv[woptind], dest, al_get_count( &result ) ) )
-			{
-				builtin_print_help( argv[0], sb_err );
-				retcode = 1;
-				break;
-			}
-			
-			val_count = argc-woptind-1;
-			idx_count = al_get_count( &indexes );
-
-			if( !erase )
-			{
-				if( val_count < idx_count )
-				{
-					sb_printf( sb_err, _(BUILTIN_SET_ARG_COUNT), argv[0] );
-					builtin_print_help( argv[0], sb_err );
-					retcode=1;
-					break;
-				}
-				if( val_count == idx_count )
-				{
-					woptind++;
-					break;
-				}
-			}
-		}		
-
-		if( !retcode )
-		{
-			/*
-			  Slice indexes have been calculated, do the actual work
-			*/
-
-			if( erase )
-			{
-				erase_values(&result, &indexes);
-				my_env_set( dest, &result, scope);
-			}
-			else
-			{
-				array_list_t value;
-				al_init(&value);
-
-				while( woptind < argc ) 
-				{
-					al_push(&value, argv[woptind++]);
-				}
-
-				if( update_values( &result, 
-								   &indexes,
-								   &value ) )
-				{
-					sb_printf( sb_err, L"%ls: ", argv[0] );
-					sb_printf( sb_err, ARRAY_BOUNDS_ERR );
-					sb_append( sb_err, L"\n" );
-				}
-				
-				my_env_set(dest,
-						   &result,
-						   scope);
-								
-				al_destroy( &value );
-								
-			}			
-		}
-
-		al_foreach( &result, &free );
-		al_destroy( &result );
-
-		al_destroy(&indexes);
-		al_destroy(&values);
-		
-	}
-	else
-	{
-		woptind++;
-		
-		/*
-		  No slicing
-		*/
-		if( erase )
-		{
-			if( woptind != argc )
-			{
-				sb_printf( sb_err, 
-						   _(L"%ls: Values cannot be specfied with erase\n"),
-						   argv[0] );
-				builtin_print_help( argv[0], sb_err );
-				retcode=1;
-			}
-			else
-			{
-				retcode = env_remove( dest, scope );
-			}
-		}
-		else
-		{
-			array_list_t val;
-			al_init( &val );
-			
-			for( i=woptind; i<argc; i++ )
-			{
-				al_push( &val, argv[i] );
-			}
-
-			retcode = my_env_set( dest, &val, scope );
-						
-			al_destroy( &val );			
-			
-		}		
-	}
-	
-	free( dest );
-	
-	return retcode;
-
-}
-

builtin_set.cpp

@@ -0,0 +1,836 @@
+/** \file builtin_set.c Functions defining the set builtin
+
+Functions used for implementing the set builtin. 
+
+*/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <signal.h>
+#include <vector>
+#include <algorithm>
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "env.h"
+#include "expand.h"
+#include "common.h"
+#include "wgetopt.h"
+#include "proc.h"
+#include "parser.h"
+
+/* We know about these buffers */
+extern wcstring stdout_buffer, stderr_buffer;
+
+/**
+   Error message for invalid path operations
+*/
+#define BUILTIN_SET_PATH_ERROR L"%ls: Warning: path component %ls may not be valid in %ls.\n"
+
+/**
+   Hint for invalid path operation with a colon
+*/
+#define BUILTIN_SET_PATH_HINT L"%ls: Did you mean 'set %ls $%ls %ls'?\n"
+
+/**
+   Error for mismatch between index count and elements
+*/
+#define BUILTIN_SET_ARG_COUNT L"%ls: The number of variable indexes does not match the number of values\n"
+
+/**
+   Test if the specified variable should be subject to path validation
+*/
+static int is_path_variable( const wchar_t *env )
+{
+	return contains(env, L"PATH", L"CDPATH" );
+}
+
+/**
+   Call env_set. If this is a path variable, e.g. PATH, validate the
+   elements. On error, print a description of the problem to stderr.
+*/
+static int my_env_set( const wchar_t *key, const wcstring_list_t &val, int scope )
+{
+    size_t i;
+    int retcode = 0;
+    const wchar_t *val_str=NULL;
+    
+    if( is_path_variable( key ) )
+    {
+        /* Fix for https://github.com/fish-shell/fish-shell/issues/199 . Return success if any path setting succeeds. */
+        bool any_success = false, any_error = false;
+        
+        for( i=0; i< val.size() ; i++ )
+        {
+            bool show_perror = false;
+            int show_hint = 0;
+            bool error = false;
+            
+            struct stat buff;
+            const wchar_t *dir = val[i].c_str();
+            
+            if( wstat( dir, &buff ) )
+            {
+                error = true;
+                show_perror = true;
+            }
+            
+            if( !( S_ISDIR(buff.st_mode) ) )
+            {
+                error = true;
+            }
+            
+            if( !error )
+            {
+                any_success = true;
+            }
+            else
+            {
+                any_error = true;
+                const wchar_t *colon;
+                append_format(stderr_buffer, _(BUILTIN_SET_PATH_ERROR), L"set", dir, key);
+                colon = wcschr( dir, L':' );
+                
+                if( colon && *(colon+1) ) 
+                {
+                    show_hint = 1;
+                }
+                
+            }
+            
+            if( show_perror )
+            {
+                builtin_wperror( L"set" );
+            }
+            
+            if( show_hint )
+            {
+                append_format(stderr_buffer, _(BUILTIN_SET_PATH_HINT), L"set", key, key, wcschr( dir, L':' )+1);
+            }
+            
+        }
+        
+        /* Fail at setting the path if we tried to set it to something non-empty, but it wound up empty. */
+        if( ! val.empty() && ! any_success )
+        {
+            return 1;
+        }
+        
+    }
+    
+    wcstring sb;
+    if(  val.size() )
+    {
+        for( i=0; i< val.size() ; i++ )
+        {
+            sb.append(val[i]);
+            if( i<val.size() - 1 )
+            {
+                sb.append( ARRAY_SEP_STR );
+            }
+        }
+        val_str = sb.c_str();
+    }
+    
+    switch( env_set( key, val_str, scope | ENV_USER ) )
+    {
+        case ENV_PERM:
+        {
+            append_format(stderr_buffer, _(L"%ls: Tried to change the read-only variable '%ls'\n"), L"set", key);
+            retcode=1;
+            break;
+        }
+            
+        case ENV_INVALID:
+        {
+            append_format(stderr_buffer, _(L"%ls: Unknown error"), L"set" );
+            retcode=1;
+            break;
+        }
+    }
+    
+    return retcode;
+}
+
+
+
+/** 
+	Extract indexes from a destination argument of the form name[index1 index2...]
+
+	\param indexes the list to insert the new indexes into
+	\param src the source string to parse
+	\param name the name of the element. Return null if the name in \c src does not match this name
+	\param var_count the number of elements in the array to parse. 
+
+	\return the total number of indexes parsed, or -1 on error
+*/
+static int parse_index( std::vector<long> &indexes,
+						const wchar_t *src,
+						const wchar_t *name,
+						size_t var_count )
+{
+	size_t len;
+	
+	int count = 0;
+	const wchar_t *src_orig = src;
+	
+	if (src == 0)
+	{
+		return 0;
+	}
+	
+	while (*src != L'\0' && (iswalnum(*src) || *src == L'_'))
+	{
+		src++;
+	}
+	
+	if (*src != L'[')
+	{
+		append_format(stderr_buffer, _(BUILTIN_SET_ARG_COUNT), L"set" );					
+		return 0;
+	}
+	
+	len = src-src_orig;
+	
+	if( (wcsncmp( src_orig, name, len )!=0) || (wcslen(name) != (len)) )
+	{
+		append_format(stderr_buffer, 
+				   _(L"%ls: Multiple variable names specified in single call (%ls and %.*ls)\n"),
+				   L"set", 
+				   name,
+				   len,
+				   src_orig);
+		return 0;
+	}
+
+	src++;	
+
+	while (iswspace(*src)) 
+	{
+		src++;
+	}
+	
+	while (*src != L']') 
+	{
+		wchar_t *end;
+		
+		long l_ind;
+
+		errno = 0;
+		
+		l_ind = wcstol(src, &end, 10);
+		
+		if( end==src || errno ) 
+		{
+			append_format(stderr_buffer, _(L"%ls: Invalid index starting at '%ls'\n"), L"set", src);
+			return 0;
+		}
+
+		if( l_ind < 0 )
+		{
+			l_ind = var_count+l_ind+1;
+		}
+		
+		src = end;
+		if ( *src==L'.' && *(src+1)==L'.' ){
+			src+=2;
+			long l_ind2 = wcstol( src, &end, 10 );
+			if( end==src || errno )
+			{
+				return 1;
+			}
+			src = end;
+
+			if( l_ind2 < 0 )
+			{
+				l_ind2 = var_count+l_ind2+1;
+			}
+			int direction = l_ind2<l_ind ? -1 : 1 ;
+			for (long jjj = l_ind; jjj*direction <= l_ind2*direction; jjj+=direction) {
+				// debug(0, L"Expand range [set]: %i\n", jjj); 
+				indexes.push_back( jjj );
+		count++;
+			}
+		}
+		else {
+			indexes.push_back( l_ind );
+			count++;
+		}
+		while (iswspace(*src)) src++;
+	}
+
+	return count;
+}
+
+static int update_values( wcstring_list_t &list, 
+						  std::vector<long> &indexes,
+						  wcstring_list_t &values ) 
+{
+	size_t i;
+
+	/* Replace values where needed */
+	for( i = 0; i < indexes.size(); i++ ) 
+	{
+		/*
+		  The '- 1' below is because the indices in fish are
+		  one-based, but the vector uses zero-based indices
+		*/
+		long ind = indexes[i] - 1;
+		const wcstring newv = values[ i ];
+		if( ind < 0 )
+		{
+			return 1;
+		}
+        if ( (size_t)ind >= list.size() )
+        {
+            list.resize( ind+1 );
+        }
+		
+//		free((void *) al_get(list, ind));
+		list[ ind ] = newv; 
+	}
+  
+	return 0;
+}
+
+/**
+   Erase from a list of wcstring values at specified indexes 
+*/
+static void erase_values(wcstring_list_t &list, const std::vector<long> &indexes) 
+{
+    // Make a set of indexes.
+    // This both sorts them into ascending order and removes duplicates.
+    const std::set<long> indexes_set(indexes.begin(), indexes.end());
+    
+    // Now walk the set backwards, so we encounter larger indexes first, and remove elements at the given (1-based) indexes.
+    std::set<long>::const_reverse_iterator iter;
+    for (iter = indexes_set.rbegin(); iter != indexes_set.rend(); iter++) {
+        long val = *iter;
+        if (val > 0 && (size_t)val <= list.size()) {
+            // One-based indexing!
+            list.erase(list.begin() + val - 1);
+        }
+    }
+}
+
+
+/**
+   Print the names of all environment variables in the scope, with or without shortening,
+   with or without values, with or without escaping
+*/
+static void print_variables(int include_values, int esc, bool shorten_ok, int scope) 
+{
+    wcstring_list_t names = env_get_names(scope);
+    sort(names.begin(), names.end());
+	
+	for( size_t i = 0; i < names.size(); i++ )
+	{
+		const wcstring key = names.at(i);
+        const wcstring e_key = escape_string(key, 0);
+
+		stdout_buffer.append(e_key);
+		
+		if( include_values ) 
+		{
+			env_var_t value = env_get_string(key);
+			if( !value.missing() )
+			{
+				int shorten = 0;
+				
+				if( shorten_ok && value.length() > 64 )
+				{
+					shorten = 1;
+					value.resize(60);
+				}
+				
+				wcstring e_value = esc ? expand_escape_variable(value) : value;
+				
+                stdout_buffer.append(L" ");
+                stdout_buffer.append(e_value);
+				
+				if( shorten )
+				{
+					stdout_buffer.append(L"\u2026");
+				}
+
+			}
+		}
+		
+		stdout_buffer.append(L"\n");
+	}
+}
+
+
+
+/**
+   The set builtin. Creates, updates and erases environment variables
+   and environemnt variable arrays.
+*/
+static int builtin_set( parser_t &parser, wchar_t **argv ) 
+{
+	
+	/**
+	   Variables used for parsing the argument list
+	*/
+	static const struct woption
+		long_options[] = 
+		{
+			{ 
+				L"export", no_argument, 0, 'x' 
+			}
+			,
+			{ 
+				L"global", no_argument, 0, 'g' 
+			}
+			,
+			{ 
+				L"local", no_argument, 0, 'l'  
+			}
+			,
+			{ 
+				L"erase", no_argument, 0, 'e'  
+			}
+			,
+			{ 
+				L"names", no_argument, 0, 'n' 
+			} 
+			,
+			{ 
+				L"unexport", no_argument, 0, 'u' 
+			} 
+			,
+			{ 
+				L"universal", no_argument, 0, 'U'
+			}
+            ,
+			{ 
+				L"long", no_argument, 0, 'L'
+			} 
+			,
+			{ 
+				L"query", no_argument, 0, 'q' 
+			} 
+			,
+			{ 
+				L"help", no_argument, 0, 'h' 
+			} 
+			,
+			{ 
+				0, 0, 0, 0 
+			}
+		}
+	;
+	
+	const wchar_t *short_options = L"+xglenuULqh";
+
+	int argc = builtin_count_args(argv);
+
+	/*
+	  Flags to set the work mode
+	*/
+	int local = 0, global = 0, exportv = 0;
+	int erase = 0, list = 0, unexport=0;
+	int universal = 0, query=0;
+	bool shorten_ok = true;
+
+	/*
+	  Variables used for performing the actual work
+	*/
+	wchar_t *dest = 0;
+	int retcode=0;
+	int scope;
+	int slice=0;
+	int i;
+	
+	wchar_t *bad_char;
+	
+	
+	/* Parse options to obtain the requested operation and the modifiers */
+	woptind = 0;
+	while (1) 
+	{
+		int c = wgetopt_long(argc, argv, short_options, long_options, 0);
+
+		if (c == -1) 
+		{
+			break;
+		}
+    
+		switch(c) 
+		{
+			case 0:
+				break;
+
+			case 'e':
+				erase = 1;
+				break;
+
+			case 'n':
+				list = 1;
+				break;
+
+			case 'x':
+				exportv = 1;
+				break;
+
+			case 'l':
+				local = 1;
+				break;
+
+			case 'g':
+				global = 1;
+				break;
+
+			case 'u':
+				unexport = 1;
+				break;
+
+			case 'U':
+				universal = 1;
+				break;
+            
+            case 'L':
+                shorten_ok = false;
+                break;
+
+			case 'q':
+				query = 1;
+				break;
+
+			case 'h':
+				builtin_print_help( parser, argv[0], stdout_buffer );
+				return 0;
+
+			case '?':
+				builtin_unknown_option( parser, argv[0], argv[woptind-1] );
+				return 1;
+
+			default:
+				break;
+		}
+	}
+
+	/*
+	  Ok, all arguments have been parsed, let's validate them
+	*/
+
+	/*
+	  If we are checking the existance of a variable (-q) we can not
+	  also specify scope
+	*/
+
+	if( query && (erase || list) )
+	{
+		append_format(stderr_buffer,
+				  BUILTIN_ERR_COMBO,
+				  argv[0] );
+		
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+	
+
+	/* We can't both list and erase varaibles */
+	if( erase && list ) 
+	{
+		append_format(stderr_buffer,
+				  BUILTIN_ERR_COMBO,
+				  argv[0] );		
+
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+
+	/*
+	  Variables can only have one scope
+	*/
+	if( local + global + universal > 1 ) 
+	{
+		append_format(stderr_buffer,
+				   BUILTIN_ERR_GLOCAL,
+				   argv[0] );
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+
+	/*
+	  Variables can only have one export status
+	*/
+	if( exportv && unexport ) 
+	{
+		append_format(stderr_buffer,
+				   BUILTIN_ERR_EXPUNEXP,
+				   argv[0] );
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+
+	/*
+	  Calculate the scope value for variable assignement
+	*/
+	scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (exportv ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; 
+
+	if( query )
+	{
+		/*
+		  Query mode. Return the number of variables that do not exist
+		  out of the specified variables.
+		*/
+		int i;
+		for( i=woptind; i<argc; i++ )
+		{
+			wchar_t *arg = argv[i];
+			int slice=0;
+
+			if( !(dest = wcsdup(arg)))
+			{
+				DIE_MEM();		
+			}
+
+			if( wcschr( dest, L'[' ) )
+			{
+				slice = 1;
+				*wcschr( dest, L'[' )=0;
+			}
+			
+			if( slice )
+			{
+				std::vector<long> indexes;
+				wcstring_list_t result;
+				size_t j;
+				
+                env_var_t dest_str = env_get_string(dest);
+                if (! dest_str.missing())
+                    tokenize_variable_array( dest_str, result );
+								
+				if( !parse_index( indexes, arg, dest, result.size() ) )
+				{
+					builtin_print_help( parser, argv[0], stderr_buffer );
+					retcode = 1;
+					break;
+				}
+				for( j=0; j < indexes.size() ; j++ )
+				{
+					long idx = indexes[j];
+					if( idx < 1 || (size_t)idx > result.size() )
+					{
+						retcode++;
+					}
+				}
+			}
+			else
+			{
+				if( !env_exist( arg, scope ) )
+				{
+					retcode++;
+				}
+			}
+			
+			free( dest );
+			
+		}
+		return retcode;
+	}
+	
+	if( list ) 
+	{
+		/* Maybe we should issue an error if there are any other arguments? */
+		print_variables(0, 0, shorten_ok, scope);
+		return 0;
+	} 
+	
+	if( woptind == argc )
+	{
+		/*
+		  Print values of variables
+		*/
+
+		if( erase ) 
+		{
+			append_format(stderr_buffer,
+					   _(L"%ls: Erase needs a variable name\n"), 
+					   argv[0] );
+			
+			builtin_print_help( parser, argv[0], stderr_buffer );
+			retcode = 1;
+		}
+		else
+		{
+			print_variables( 1, 1, shorten_ok, scope );
+		}
+		
+		return retcode;
+	}
+
+	if( !(dest = wcsdup(argv[woptind])))
+	{
+		DIE_MEM();		
+	}
+
+	if( wcschr( dest, L'[' ) )
+	{
+		slice = 1;
+		*wcschr( dest, L'[' )=0;
+	}
+	
+	if( !wcslen( dest ) )
+	{
+		free( dest );
+		append_format(stderr_buffer, BUILTIN_ERR_VARNAME_ZERO, argv[0] );
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+	
+	if( (bad_char = wcsvarname( dest ) ) )
+	{
+		append_format(stderr_buffer, BUILTIN_ERR_VARCHAR, argv[0], *bad_char );
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		free( dest );
+		return 1;
+	}
+	
+	if( slice && erase && (scope != ENV_USER) )
+	{
+		free( dest );
+		append_format(stderr_buffer, _(L"%ls: Can not specify scope when erasing array slice\n"), argv[0] );
+		builtin_print_help( parser, argv[0], stderr_buffer );
+		return 1;
+	}
+	
+	/*
+	  set assignment can work in two modes, either using slices or
+	  using the whole array. We detect which mode is used here.
+	*/
+	
+	if( slice )
+	{
+
+		/*
+		  Slice mode
+		*/
+		size_t idx_count, val_count;
+		wcstring_list_t values;
+		std::vector<long> indexes;
+		wcstring_list_t result;
+		
+        const env_var_t dest_str = env_get_string(dest);
+        if (! dest_str.missing())
+            tokenize_variable_array( dest_str, result );
+		
+		for( ; woptind<argc; woptind++ )
+		{			
+			if( !parse_index( indexes, argv[woptind], dest, result.size() ) )
+			{
+				builtin_print_help( parser, argv[0], stderr_buffer );
+				retcode = 1;
+				break;
+			}
+			
+			val_count = argc-woptind-1;
+			idx_count = indexes.size();
+
+			if( !erase )
+			{
+				if( val_count < idx_count )
+				{
+					append_format(stderr_buffer, _(BUILTIN_SET_ARG_COUNT), argv[0] );
+					builtin_print_help( parser, argv[0], stderr_buffer );
+					retcode=1;
+					break;
+				}
+				if( val_count == idx_count )
+				{
+					woptind++;
+					break;
+				}
+			}
+		}		
+
+		if( !retcode )
+		{
+			/*
+			  Slice indexes have been calculated, do the actual work
+			*/
+
+			if( erase )
+			{
+				erase_values(result, indexes);
+				my_env_set( dest, result, scope);
+			}
+			else
+			{
+				wcstring_list_t value;
+//				al_init(&value);
+
+				while( woptind < argc ) 
+				{
+					value.push_back( argv[woptind++] );
+				}
+
+				if( update_values( result, 
+								   indexes,
+								   value ) )
+				{
+					append_format(stderr_buffer, L"%ls: ", argv[0] );
+					append_format(stderr_buffer, ARRAY_BOUNDS_ERR );
+					stderr_buffer.push_back(L'\n');
+				}
+				
+				my_env_set(dest, result, scope);
+								
+//				al_destroy( &value );
+								
+			}			
+		}
+
+//		al_foreach( &result, &free );
+//		al_destroy( &result );
+
+//		al_destroy(&indexes);
+//		al_destroy(&values);
+		
+	}
+	else
+	{
+		woptind++;
+		
+		/*
+		  No slicing
+		*/
+		if( erase )
+		{
+			if( woptind != argc )
+			{
+				append_format(stderr_buffer, 
+						   _(L"%ls: Values cannot be specfied with erase\n"),
+						   argv[0] );
+				builtin_print_help( parser, argv[0], stderr_buffer );
+				retcode=1;
+			}
+			else
+			{
+				retcode = env_remove( dest, scope );
+			}
+		}
+		else
+		{
+            wcstring_list_t val;
+			for( i=woptind; i<argc; i++ )
+                val.push_back(argv[i]);
+			retcode = my_env_set( dest, val, scope );
+		}		
+	}
+	
+	free( dest );
+	
+	return retcode;
+
+}
+

builtin_test.cpp

@@ -0,0 +1,745 @@
+/** \file builtin_test.cpp Functions defining the test builtin
+
+Functions used for implementing the test builtin. 
+Implemented from scratch (yes, really) by way of IEEE 1003.1 as reference.
+
+*/
+
+#include "config.h"
+#include "common.h"
+#include "builtin.h"
+#include "wutil.h"
+#include "proc.h"
+#include <sys/stat.h>
+#include <memory>
+
+
+enum {
+    BUILTIN_TEST_SUCCESS = STATUS_BUILTIN_OK,
+    BUILTIN_TEST_FAIL = STATUS_BUILTIN_ERROR
+};
+
+
+int builtin_test( parser_t &parser, wchar_t **argv );
+
+static const wchar_t * const condstr[] = {
+    L"!", L"&&", L"||", L"==", L"!=", L"<", L">", L"-nt", L"-ot", L"-ef", L"-eq",
+    L"-ne", L"-lt", L"-gt", L"-le", L"-ge", L"=~"
+};
+
+namespace test_expressions {
+    
+    enum token_t {
+        test_unknown,               // arbitrary string
+        
+        test_bang,                  // "!", inverts sense
+        
+        test_filetype_b,            // "-b", for block special files
+        test_filetype_c,            // "-c" for character special files
+        test_filetype_d,            // "-d" for directories
+        test_filetype_e,            // "-e" for files that exist
+        test_filetype_f,            // "-f" for for regular files
+        test_filetype_g,            // "-g" for set-group-id
+        test_filetype_h,            // "-h" for symbolic links
+        test_filetype_L,            // "-L", same as -h
+        test_filetype_p,            // "-p", for FIFO
+        test_filetype_S,            // "-S", socket
+        
+        test_filesize_s,            // "-s", size greater than zero
+        
+        test_filedesc_t,            // "-t", whether the fd is associated with a terminal
+        
+        test_fileperm_r,            // "-r", read permission
+        test_fileperm_u,            // "-u", whether file is setuid
+        test_fileperm_w,            // "-w", whether file write permission is allowed
+        test_fileperm_x,            // "-x", whether file execute/search is allowed
+        
+        test_string_n,              // "-n", non-empty string
+        test_string_z,              // "-z", true if length of string is 0
+        test_string_equal,          // "=", true if strings are identical
+        test_string_not_equal,      // "!=", true if strings are not identical
+        
+        test_number_equal,          // "-eq", true if numbers are equal
+        test_number_not_equal,      // "-ne", true if numbers are not equal
+        test_number_greater,        // "-gt", true if first number is larger than second
+        test_number_greater_equal,  // "-ge", true if first number is at least second
+        test_number_lesser,         // "-lt", true if first number is smaller than second
+        test_number_lesser_equal,   // "-le", true if first number is at most second
+        
+        test_combine_and,            // "-a", true if left and right are both true
+        test_combine_or,             // "-o", true if either left or right is true
+        
+        test_paren_open,             // "(", open paren
+        test_paren_close,             // ")", close paren
+    };
+    
+    static bool binary_primary_evaluate(test_expressions::token_t token, const wcstring &left, const wcstring &right, wcstring_list_t &errors);
+    static bool unary_primary_evaluate(test_expressions::token_t token, const wcstring &arg, wcstring_list_t &errors);
+
+    
+    enum {
+        UNARY_PRIMARY = 1 << 0,
+        BINARY_PRIMARY = 1 << 1
+    };
+    
+    static const struct token_info_t { token_t tok; const wchar_t *string; unsigned int flags; } token_infos[] =
+    {
+        {test_unknown, L"", 0},
+        {test_bang, L"!", 0},
+        {test_filetype_b, L"-b", UNARY_PRIMARY},
+        {test_filetype_c, L"-c", UNARY_PRIMARY},
+        {test_filetype_d, L"-d", UNARY_PRIMARY},
+        {test_filetype_e, L"-e", UNARY_PRIMARY},
+        {test_filetype_f, L"-f", UNARY_PRIMARY},
+        {test_filetype_g, L"-g", UNARY_PRIMARY},
+        {test_filetype_h, L"-h", UNARY_PRIMARY},
+        {test_filetype_L, L"-L", UNARY_PRIMARY},
+        {test_filetype_p, L"-p", UNARY_PRIMARY},
+        {test_filetype_S, L"-S", UNARY_PRIMARY},
+        {test_filesize_s, L"-s", UNARY_PRIMARY},
+        {test_filedesc_t, L"-t", UNARY_PRIMARY},
+        {test_fileperm_r, L"-r", UNARY_PRIMARY},
+        {test_fileperm_u, L"-u", UNARY_PRIMARY},
+        {test_fileperm_w, L"-w", UNARY_PRIMARY},
+        {test_fileperm_x, L"-x", UNARY_PRIMARY},
+        {test_string_n, L"-n", UNARY_PRIMARY},
+        {test_string_z, L"-z", UNARY_PRIMARY},
+        {test_string_equal, L"=", BINARY_PRIMARY},
+        {test_string_not_equal, L"!=", BINARY_PRIMARY},
+        {test_number_equal, L"-eq", BINARY_PRIMARY},
+        {test_number_not_equal, L"-ne", BINARY_PRIMARY},
+        {test_number_greater, L"-gt", BINARY_PRIMARY},
+        {test_number_greater_equal, L"-ge", BINARY_PRIMARY},
+        {test_number_lesser, L"-lt", BINARY_PRIMARY},
+        {test_number_lesser_equal, L"-le", BINARY_PRIMARY},
+        {test_combine_and, L"-a", 0},
+        {test_combine_or, L"-o", 0},
+        {test_paren_open, L"(", 0},
+        {test_paren_close, L")", 0}
+    };
+    
+    const token_info_t *token_for_string(const wcstring &str) {
+        for (size_t i=0; i < sizeof token_infos / sizeof *token_infos; i++) {
+            if (str == token_infos[i].string) {
+                return &token_infos[i];
+            }
+        }
+        return &token_infos[0]; //unknown
+    }
+
+    
+    /* Grammar.
+    
+        <expr> = <combining_expr>
+                 
+        <combining_expr> = <unary_expr> and/or <combining_expr> |
+                           <unary_expr>
+        
+        <unary_expr> = bang <unary_expr> |
+                      <primary>
+                     
+        <primary> = <unary_primary> arg |
+                    arg <binary_primary> arg |
+                    '(' <expr> ')'
+                
+    */
+    
+    class expression;
+    class test_parser {
+        private:
+        wcstring_list_t strings;
+        wcstring_list_t errors;
+        
+        expression *error(const wchar_t *fmt, ...);
+        void add_error(const wchar_t *fmt, ...);
+        
+        const wcstring &arg(unsigned int idx) { return strings.at(idx); }
+        
+        public:
+        test_parser(const wcstring_list_t &val) : strings(val)
+        { }
+        
+        expression *parse_expression(unsigned int start, unsigned int end);
+        expression *parse_combining_expression(unsigned int start, unsigned int end);
+        expression *parse_unary_expression(unsigned int start, unsigned int end);
+        
+        expression *parse_primary(unsigned int start, unsigned int end);
+        expression *parse_parenthentical(unsigned int start, unsigned int end);
+        expression *parse_unary_primary(unsigned int start, unsigned int end);
+        expression *parse_binary_primary(unsigned int start, unsigned int end);
+        expression *parse_just_a_string(unsigned int start, unsigned int end);
+        
+        static expression *parse_args(const wcstring_list_t &args, wcstring &err);
+    };
+    
+    struct range_t {
+        unsigned int start;
+        unsigned int end;
+        
+        range_t(unsigned s, unsigned e) : start(s), end(e) { }
+    };
+
+
+    /* Base class for expressions */
+    class expression {
+        protected:
+        expression(token_t what, range_t where) : token(what), range(where) { }
+        
+        public:
+        const token_t token;
+        range_t range;
+        
+        virtual ~expression() { }
+        
+        // evaluate returns true if the expression is true (i.e. BUILTIN_TEST_SUCCESS)
+        virtual bool evaluate(wcstring_list_t &errors) = 0;
+    };
+
+    typedef std::auto_ptr<expression> expr_ref_t;
+
+    /* Single argument like -n foo or "just a string" */
+    class unary_primary : public expression {
+        public:
+        wcstring arg;
+        unary_primary(token_t tok, range_t where, const wcstring &what) : expression(tok, where), arg(what) { }
+        bool evaluate(wcstring_list_t &errors);
+    };
+
+    /* Two argument primary like foo != bar */
+    class binary_primary : public expression {
+        public:
+        wcstring arg_left;
+        wcstring arg_right;
+        
+        binary_primary(token_t tok, range_t where, const wcstring &left, const wcstring &right) : expression(tok, where), arg_left(left), arg_right(right)
+        { }
+        bool evaluate(wcstring_list_t &errors);
+    };
+    
+    /* Unary operator like bang */
+    class unary_operator : public expression {
+        public:
+        expr_ref_t subject;        
+        unary_operator(token_t tok, range_t where, expr_ref_t &exp) : expression(tok, where), subject(exp) { }
+        bool evaluate(wcstring_list_t &errors);
+    };
+    
+    /* Combining expression. Contains a list of AND or OR expressions. It takes more than two so that we don't have to worry about precedence in the parser. */
+    class combining_expression : public expression {
+        public:
+        const std::vector<expression *> subjects;
+        const std::vector<token_t> combiners;
+        
+        combining_expression(token_t tok, range_t where, const std::vector<expression *> &exprs, const std::vector<token_t> &combs) : expression(tok, where), subjects(exprs), combiners(combs)
+        {
+            /* We should have one more subject than combiner */
+            assert(subjects.size() == combiners.size() + 1);
+        }
+        
+        /* We are responsible for destroying our expressions */
+        virtual ~combining_expression() {
+            for (size_t i=0; i < subjects.size(); i++) {
+                delete subjects[i];
+            }
+        }
+        
+        bool evaluate(wcstring_list_t &errors);
+    };
+    
+    /* Parenthetical expression */
+    class parenthetical_expression : public expression {
+        public:
+        expr_ref_t contents;
+        parenthetical_expression(token_t tok, range_t where, expr_ref_t &expr) : expression(tok, where), contents(expr) { }
+        
+        virtual bool evaluate(wcstring_list_t &errors);
+    };
+    
+    void test_parser::add_error(const wchar_t *fmt, ...) {
+        assert(fmt != NULL);
+        va_list va;
+        va_start(va, fmt);
+        this->errors.push_back(vformat_string(fmt, va));
+        va_end(va);    
+    }
+    
+    expression *test_parser::error(const wchar_t *fmt, ...) {
+        assert(fmt != NULL);
+        va_list va;
+        va_start(va, fmt);
+        this->errors.push_back(vformat_string(fmt, va));
+        va_end(va);
+        return NULL;
+    }
+    
+    expression *test_parser::parse_unary_expression(unsigned int start, unsigned int end) {
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        token_t tok = token_for_string(arg(start))->tok;
+        if (tok == test_bang) {
+            expr_ref_t subject(parse_unary_expression(start + 1, end));
+            if (subject.get()) {
+                return new unary_operator(tok, range_t(start, subject->range.end), subject);
+            } else {
+                return NULL;
+            }
+        } else {
+            return parse_primary(start, end);
+        }
+    }
+    
+    /* Parse a combining expression (AND, OR) */
+    expression *test_parser::parse_combining_expression(unsigned int start, unsigned int end) {
+        if (start >= end)
+            return NULL;
+        
+        std::vector<expression *> subjects;
+        std::vector<token_t> combiners;
+        unsigned int idx = start;
+        
+        while (idx < end) {
+            
+            if (! subjects.empty()) {
+                /* This is not the first expression, so we expect a combiner. */
+                token_t combiner = token_for_string(arg(idx))->tok;
+                if (combiner != test_combine_and && combiner != test_combine_or) {
+                    /* Not a combiner, we're done */
+                    break;
+                }
+                combiners.push_back(combiner);
+                idx++;
+            }
+            
+            /* Parse another expression */
+            expression *expr = parse_unary_expression(idx, end);
+            if (! expr) {
+                add_error(L"Missing argument at index %u", idx);
+                break;
+            }
+            
+            /* Go to the end of this expression */
+            idx = expr->range.end;
+            subjects.push_back(expr);
+        }
+        
+        if (! subjects.empty()) {
+            /* Our new expression takes ownership of all expressions we created. The token we pass is irrelevant. */
+            return new combining_expression(test_combine_and, range_t(start, idx), subjects, combiners);
+        } else {
+            /* No subjects */
+            return NULL;
+        }
+    }
+    
+    expression *test_parser::parse_unary_primary(unsigned int start, unsigned int end) {
+        /* We need two arguments */
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        if (start + 1 >= end) {
+            return error(L"Missing argument at index %u", start + 1);
+        }
+        
+        /* All our unary primaries are prefix, so the operator is at start. */
+        const token_info_t *info = token_for_string(arg(start));
+        if (! (info->flags & UNARY_PRIMARY))
+            return NULL;
+        
+        return new unary_primary(info->tok, range_t(start, start + 2), arg(start + 1));
+    }
+    
+    expression *test_parser::parse_just_a_string(unsigned int start, unsigned int end) {
+        /* Handle a string as a unary primary that is not a token of any other type.
+           e.g. 'test foo -a bar' should evaluate to true
+           We handle this with a unary primary of test_string_n
+        */
+        
+        /* We need one arguments */
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        
+        const token_info_t *info = token_for_string(arg(start));
+        if (info->tok != test_unknown) {
+            return error(L"Unexpected argument type at index %u", start);
+        }
+        
+        /* This is hackish; a nicer way to implement this would be with a "just a string" expression type */
+        return new unary_primary(test_string_n, range_t(start, start + 1), arg(start));
+    }
+    
+#if 0
+    expression *test_parser::parse_unary_primary(unsigned int start, unsigned int end) {
+        /* We need either one or two arguments */
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        
+        /* The index of the argument to the unary primary */
+        unsigned int arg_idx;
+        
+        /* All our unary primaries are prefix, so any operator is at start. But it also may just be a string, with no operator. */
+        const token_info_t *info = token_for_string(arg(start));
+        if (info->flags & UNARY_PRIMARY) {
+            /* We have an operator. Skip the operator argument */
+            arg_idx = start + 1;
+            
+            /* We have some freedom here...do we allow other tokens for the argument to operate on?
+               For example, should 'test -n =' work? I say yes. So no typechecking on the next token. */
+               
+        } else if (info->tok == test_unknown) {
+            /* "Just a string. */
+            arg_idx = start;
+        } else {
+            /* Here we don't allow arbitrary tokens as "just a string." I.e. 'test = -a =' should have a parse error. We could relax this at some point. */
+            return error(L"Parse error at argument index %u", start);
+        }
+        
+        /* Verify we have the argument we want, i.e. test -n should fail to parse */
+        if (arg_idx >= end) {
+            return error(L"Missing argument at index %u", arg_idx);
+        }
+        
+        return new unary_primary(info->tok, range_t(start, arg_idx + 1), arg(arg_idx));
+    }
+#endif
+    
+    expression *test_parser::parse_binary_primary(unsigned int start, unsigned int end) {
+        /* We need three arguments */
+        for (unsigned int idx = start; idx < start + 3; idx++) {
+            if (idx >= end) {
+                return error(L"Missing argument at index %u", idx);
+            }
+        }
+        
+        /* All our binary primaries are infix, so the operator is at start + 1. */
+        const token_info_t *info = token_for_string(arg(start + 1));
+        if (! (info->flags & BINARY_PRIMARY))
+            return NULL;
+        
+        return new binary_primary(info->tok, range_t(start, start + 3), arg(start), arg(start + 2));
+    }
+    
+    expression *test_parser::parse_parenthentical(unsigned int start, unsigned int end) {
+        /* We need at least three arguments: open paren, argument, close paren */
+        if (start + 3 >= end)
+            return NULL;
+        
+        /* Must start with an open expression */
+        const token_info_t *open_paren = token_for_string(arg(start));
+        if (open_paren->tok != test_paren_open)
+            return NULL;
+            
+        /* Parse a subexpression */
+        expression *subexr_ptr = parse_expression(start + 1, end);
+        if (! subexr_ptr)
+            return NULL;
+        expr_ref_t subexpr(subexr_ptr);
+        
+        /* Parse a close paren */
+        unsigned close_index = subexpr->range.end;
+        assert(close_index <= end);
+        if (close_index == end) {
+            return error(L"Missing close paren at index %u", close_index);
+        }
+        const token_info_t *close_paren = token_for_string(arg(close_index));
+        if (close_paren->tok != test_paren_close) {
+            return error(L"Expected close paren at index %u", close_index);
+        }
+        
+        /* Success */
+        return new parenthetical_expression(test_paren_open, range_t(start, close_index+1), subexpr);
+    }
+
+    expression *test_parser::parse_primary(unsigned int start, unsigned int end) {
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        
+        expression *expr = NULL;
+        if (! expr) expr = parse_parenthentical(start, end);
+        if (! expr) expr = parse_unary_primary(start, end);
+        if (! expr) expr = parse_binary_primary(start, end);
+        if (! expr) expr = parse_just_a_string(start, end);
+        return expr;
+    }
+
+    expression *test_parser::parse_expression(unsigned int start, unsigned int end) {
+        if (start >= end) {
+            return error(L"Missing argument at index %u", start);
+        }
+        
+        return parse_combining_expression(start, end);
+    }
+    
+    expression *test_parser::parse_args(const wcstring_list_t &args, wcstring &err) {
+        /* Empty list and one-arg list should be handled by caller */
+        assert(args.size() > 1);
+        
+        test_parser parser(args);
+        expression *result = parser.parse_expression(0, (unsigned int)args.size());
+        
+        /* Handle errors */
+        bool errored = false;
+        for (size_t i = 0; i < parser.errors.size(); i++) {
+            err.append(L"test: ");
+            err.append(parser.errors.at(i));
+            err.push_back(L'\n');
+            errored = true;
+            // For now we only show the first error
+            break;
+        }
+        
+        if (! errored && result) {
+            /* It's also an error if there are any unused arguments. This is not detected by parse_expression() */
+            assert(result->range.end <= args.size());
+            if (result->range.end < args.size()) {
+                append_format(err, L"test: unexpected argument at index %lu: '%ls'\n", (unsigned long)result->range.end, args.at(result->range.end).c_str());
+                delete result;
+                result = NULL;
+                errored = true;
+            }
+        }
+        
+        
+        return result;
+    }
+    
+    bool unary_primary::evaluate(wcstring_list_t &errors) {
+        return unary_primary_evaluate(token, arg, errors);
+    }
+    
+    bool binary_primary::evaluate(wcstring_list_t &errors) {
+        return binary_primary_evaluate(token, arg_left, arg_right, errors);
+    }
+    
+    bool unary_operator::evaluate(wcstring_list_t &errors) {
+        switch (token) {
+            case test_bang:
+                assert(subject.get());
+                return ! subject->evaluate(errors);
+            default:
+                errors.push_back(format_string(L"Unknown token type in %s", __func__));
+                return false;
+
+        }
+    }
+    
+    bool combining_expression::evaluate(wcstring_list_t &errors) {
+        switch (token) {
+            case test_combine_and:
+            case test_combine_or:
+            {
+                /* One-element case */
+                if (subjects.size() == 1)
+                    return subjects.at(0)->evaluate(errors);
+                
+                /* Evaluate our lists, remembering that AND has higher precedence than OR. We can visualize this as a sequence of OR expressions of AND expressions. */
+                assert(combiners.size() + 1 == subjects.size());
+                assert(! subjects.empty());
+                
+                size_t idx = 0, max = subjects.size();
+                bool or_result = false;
+                while (idx < max) {
+                    if (or_result) {
+                        /* Short circuit */
+                        break;
+                    }
+                    
+                    /* Evaluate a stream of AND starting at given subject index. It may only have one element.  */
+                    bool and_result = true;
+                    for (; idx < max; idx++) {
+                        /* Evaluate it, short-circuiting */
+                        and_result = and_result && subjects.at(idx)->evaluate(errors);
+                        
+                        /* If the combiner at this index (which corresponding to how we combine with the next subject) is not AND, then exit the loop */
+                        if (idx + 1 < max && combiners.at(idx) != test_combine_and) {
+                            idx++;
+                            break;
+                        }
+                    }
+                    
+                    /* OR it in */
+                    or_result = or_result || and_result;
+                }
+                return or_result;
+            }
+            
+            default:
+                errors.push_back(format_string(L"Unknown token type in %s", __func__));
+                return BUILTIN_TEST_FAIL;
+
+        }
+    }
+    
+    bool parenthetical_expression::evaluate(wcstring_list_t &errors) {
+        return contents->evaluate(errors);
+    }
+
+    /* IEEE 1003.1 says nothing about what it means for two strings to be "algebraically equal". For example, should we interpret 0x10 as 0, 10, or 16? Here we use only base 10 and use wcstoll, which allows for leading + and -, and leading whitespace. This matches bash. */
+    static bool parse_number(const wcstring &arg, long long *out) {
+        const wchar_t *str = arg.c_str();
+        wchar_t *endptr = NULL;
+        *out = wcstoll(str, &endptr, 10);
+        return endptr && *endptr == L'\0';
+    }
+
+    static bool binary_primary_evaluate(test_expressions::token_t token, const wcstring &left, const wcstring &right, wcstring_list_t &errors) {
+        using namespace test_expressions;
+        long long left_num, right_num;
+        switch (token) {
+            case test_string_equal:
+                return left == right;
+            
+            case test_string_not_equal:
+                return left != right;
+            
+            case test_number_equal:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num == right_num;
+                
+            case test_number_not_equal:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num != right_num;
+            
+            case test_number_greater:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num > right_num;
+                
+            case test_number_greater_equal:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num >= right_num;
+                
+            case test_number_lesser:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num < right_num;
+                
+            case test_number_lesser_equal:
+                return parse_number(left, &left_num) && parse_number(right, &right_num) && left_num <= right_num;
+                
+            default:
+                errors.push_back(format_string(L"Unknown token type in %s", __func__));
+                return false;
+        }
+    }
+
+
+    static bool unary_primary_evaluate(test_expressions::token_t token, const wcstring &arg, wcstring_list_t &errors) {
+        using namespace test_expressions;
+        struct stat buf;
+        long long num;
+        switch (token) {
+            case test_filetype_b:            // "-b", for block special files
+                return !wstat(arg, &buf) && S_ISBLK(buf.st_mode);
+                
+            case test_filetype_c:            // "-c" for character special files
+                return !wstat(arg, &buf) && S_ISCHR(buf.st_mode);
+                
+            case test_filetype_d:            // "-d" for directories
+                return !wstat(arg, &buf) && S_ISDIR(buf.st_mode);
+                
+            case test_filetype_e:            // "-e" for files that exist
+                return !wstat(arg, &buf);
+                
+            case test_filetype_f:            // "-f" for for regular files
+                return !wstat(arg, &buf) && S_ISREG(buf.st_mode);
+            
+            case test_filetype_g:            // "-g" for set-group-id
+                return !wstat(arg, &buf) && (S_ISGID & buf.st_mode);
+                
+            case test_filetype_h:            // "-h" for symbolic links
+            case test_filetype_L:            // "-L", same as -h
+                return !lwstat(arg, &buf) && S_ISLNK(buf.st_mode);
+
+            case test_filetype_p:            // "-p", for FIFO
+                return !wstat(arg, &buf) && S_ISFIFO(buf.st_mode);
+                
+            case test_filetype_S:            // "-S", socket
+                return !wstat(arg, &buf) && S_ISSOCK(buf.st_mode);
+            
+            case test_filesize_s:            // "-s", size greater than zero
+                return !wstat(arg, &buf) && buf.st_size > 0;
+                
+            case test_filedesc_t:            // "-t", whether the fd is associated with a terminal
+                return parse_number(arg, &num) && num == (int)num && isatty((int)num);
+            
+            case test_fileperm_r:            // "-r", read permission
+                return !waccess(arg, R_OK);
+                
+            case test_fileperm_u:            // "-u", whether file is setuid
+                return !wstat(arg, &buf) && (S_ISUID & buf.st_mode);
+                
+            case test_fileperm_w:            // "-w", whether file write permission is allowed
+                return !waccess(arg, W_OK);
+                
+            case test_fileperm_x:            // "-x", whether file execute/search is allowed
+                return !waccess(arg, X_OK);
+            
+            case test_string_n:              // "-n", non-empty string
+                return ! arg.empty();
+                
+            case test_string_z:              // "-z", true if length of string is 0
+                return arg.empty();
+            
+            default:
+                errors.push_back(format_string(L"Unknown token type in %s", __func__));
+                return false;
+        }        
+    }
+
+};
+
+/*
+ * Evaluate a conditional expression given the arguments.
+ * If fromtest is set, the caller is the test or [ builtin;
+ * with the pointer giving the name of the command.
+ * for POSIX conformance this supports a more limited range
+ * of functionality.
+ *
+ * Return status is the final shell status, i.e. 0 for true,
+ * 1 for false and 2 for error.
+ */
+int builtin_test( parser_t &parser, wchar_t **argv )
+{
+    using namespace test_expressions;
+    
+    /* The first argument should be the name of the command ('test') */
+    if (! argv[0])
+        return BUILTIN_TEST_FAIL;
+    
+    size_t argc = 0;
+    while (argv[argc + 1])
+        argc++;
+    const wcstring_list_t args(argv + 1, argv + 1 + argc);
+
+    if (argc == 0) {
+        // Per 1003.1, exit false
+        return BUILTIN_TEST_FAIL;
+    } else if (argc == 1) {
+        // Per 1003.1, exit true if the arg is non-empty
+        return args.at(0).empty() ? BUILTIN_TEST_FAIL : BUILTIN_TEST_SUCCESS;
+    } else {
+        // Try parsing. If expr is not nil, we are responsible for deleting it.
+        wcstring err;
+        expression *expr = test_parser::parse_args(args, err);
+        if (! expr) {
+#if 0
+            printf("Oops! test was given args:\n");
+            for (size_t i=0; i < argc; i++) {
+                printf("\t%ls\n", args.at(i).c_str());
+            }
+            printf("and returned parse error: %ls\n", err.c_str());
+#endif
+            builtin_show_error(err);
+            return BUILTIN_TEST_FAIL;
+        } else {
+            wcstring_list_t eval_errors;
+            bool result = expr->evaluate(eval_errors);
+            if (! eval_errors.empty()) {
+                printf("test returned eval errors:\n");
+                for (size_t i=0; i < eval_errors.size(); i++) {
+                    printf("\t%ls\n", eval_errors.at(i).c_str());
+                }
+            }
+            delete expr;
+            return result ? BUILTIN_TEST_SUCCESS : BUILTIN_TEST_FAIL;
+        }
+    }
+    return 1;
+}

builtin_ulimit.cpp

@@ -49,7 +49,7 @@ struct resource_t
 /**
    Array of resource_t structs, describing all known resource types.
 */
-const static struct resource_t resource_arr[] =
+static const struct resource_t resource_arr[] =
 {
 	{
 		RLIMIT_CORE, L"Maximum size of core files created", L'c', 1024
@@ -144,9 +144,9 @@ static void print( int resource, int hard )
 	rlim_t l = get( resource, hard );
 
 	if( l == RLIM_INFINITY )
-		sb_append( sb_out, L"unlimited\n" );
+		stdout_buffer.append( L"unlimited\n" );
 	else
-		sb_printf( sb_out, L"%d\n", l / get_multiplier( resource ) );
+		append_format(stdout_buffer, L"%d\n", l / get_multiplier( resource ) );
 	
 }
 
@@ -170,9 +170,9 @@ static void print_all( int hard )
 		getrlimit( resource_arr[i].resource, &ls );
 		l = hard ? ls.rlim_max:ls.rlim_cur;
 
-		wchar_t *unit = ((resource_arr[i].resource==RLIMIT_CPU)?L"(seconds, ":(get_multiplier(resource_arr[i].resource)==1?L"(":L"(kB, "));
+		const wchar_t *unit = ((resource_arr[i].resource==RLIMIT_CPU)?L"(seconds, ":(get_multiplier(resource_arr[i].resource)==1?L"(":L"(kB, "));
 		
-		sb_printf( sb_out,
+		append_format(stdout_buffer,
 				   L"%-*ls %10ls-%lc) ", 
 				   w, 
 				   resource_arr[i].desc, 
@@ -181,11 +181,11 @@ static void print_all( int hard )
 		
 		if( l == RLIM_INFINITY )
 		{
-			sb_append( sb_out, L"unlimited\n" );
+			stdout_buffer.append( L"unlimited\n" );
 		}
 		else
 		{
-			sb_printf( sb_out, L"%d\n", l/get_multiplier(resource_arr[i].resource) );
+			append_format(stdout_buffer, L"%d\n", l/get_multiplier(resource_arr[i].resource) );
 		}
 	}
 		
@@ -240,7 +240,7 @@ static int set( int resource, int hard, int soft, rlim_t value )
 	if( setrlimit( resource, &ls ) )
 	{
 		if( errno == EPERM )
-			sb_printf( sb_err, L"ulimit: Permission denied when changing resource of type '%ls'\n", get_desc( resource ) );
+			append_format(stderr_buffer, L"ulimit: Permission denied when changing resource of type '%ls'\n", get_desc( resource ) );
 		else
 			builtin_wperror( L"ulimit" );
 		return 1;
@@ -252,7 +252,7 @@ static int set( int resource, int hard, int soft, rlim_t value )
    The ulimit builtin, used for setting resource limits. Defined in
    builtin_ulimit.c.
 */
-static int builtin_ulimit( wchar_t ** argv )
+static int builtin_ulimit( parser_t &parser, wchar_t ** argv )
 {
 	int hard=0;
 	int soft=0;
@@ -266,7 +266,7 @@ static int builtin_ulimit( wchar_t ** argv )
 	
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
@@ -347,11 +347,11 @@ static int builtin_ulimit( wchar_t ** argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-                sb_printf( sb_err,
+                append_format(stderr_buffer,
                            BUILTIN_ERR_UNKNOWN,
                            argv[0],
                            long_options[opt_index].name );
-				builtin_print_help( argv[0], sb_err );
+				builtin_print_help( parser, argv[0], stderr_buffer );
 
 				return 1;
 				
@@ -415,11 +415,11 @@ static int builtin_ulimit( wchar_t ** argv )
 #endif
 				
 			case L'h':
-				builtin_print_help( argv[0], sb_out );				
+				builtin_print_help( parser, argv[0], stdout_buffer );				
 				return 0;
 
 			case L'?':
-				builtin_unknown_option( argv[0], argv[woptind-1] );
+				builtin_unknown_option( parser, argv[0], argv[woptind-1] );
 				return 1;	
 		}
 	}		
@@ -432,11 +432,9 @@ static int builtin_ulimit( wchar_t ** argv )
 		}
 		else
 		{
-			sb_append( sb_err,
-						argv[0],
-						L": Too many arguments\n",
-						(void *)0 );
-			builtin_print_help( argv[0], sb_err );
+            stderr_buffer.append(argv[0]);
+            stderr_buffer.append(L": Too many arguments\n");
+			builtin_print_help( parser, argv[0], stderr_buffer );
 			return 1;
 		}
 
@@ -488,11 +486,11 @@ static int builtin_ulimit( wchar_t ** argv )
 				new_limit = wcstol( argv[woptind], &end, 10 );
 				if( errno || *end )
 				{
-					sb_printf( sb_err, 
+					append_format(stderr_buffer, 
 							   L"%ls: Invalid limit '%ls'\n", 
 							   argv[0], 
 							   argv[woptind] );
-					builtin_print_help( argv[0], sb_err );
+					builtin_print_help( parser, argv[0], stderr_buffer );
 					return 1;
 				}
 				new_limit *= get_multiplier( what );
@@ -503,11 +501,9 @@ static int builtin_ulimit( wchar_t ** argv )
 		
 		default:
 		{
-			sb_append( sb_err,
-						argv[0],
-						L": Too many arguments\n",
-						(void *)0 );
-			builtin_print_help( argv[0], sb_err );
+            stderr_buffer.append(argv[0]);
+            stderr_buffer.append(L": Too many arguments\n");
+			builtin_print_help( parser, argv[0], stderr_buffer );
 			return 1;
 		}
 		

color.cpp

@@ -0,0 +1,266 @@
+/** \file color.cpp Color class implementation
+*/
+
+#include "color.h"
+#include "fallback.h"
+
+bool rgb_color_t::try_parse_special(const wcstring &special) {
+    bzero(&data, sizeof data);
+    const wchar_t *name = special.c_str();
+    if (! wcscasecmp(name, L"normal")) {
+        this->type = type_normal;
+    } else if (! wcscasecmp(name, L"reset")) {
+        this->type = type_reset;
+    } else if (! wcscasecmp(name, L"ignore")) {
+        this->type = type_ignore;
+    } else {
+        this->type = type_none;
+    }
+    return this->type != type_none;
+}
+
+static int parse_hex_digit(wchar_t x) {
+    switch (x) {
+        case L'0': return 0x0;
+        case L'1': return 0x1;
+        case L'2': return 0x2;
+        case L'3': return 0x3;
+        case L'4': return 0x4;
+        case L'5': return 0x5;
+        case L'6': return 0x6;
+        case L'7': return 0x7;
+        case L'8': return 0x8;
+        case L'9': return 0x9;
+        case L'a':case L'A': return 0xA;
+        case L'b':case L'B': return 0xB;
+        case L'c':case L'C': return 0xC;
+        case L'd':case L'D': return 0xD;
+        case L'e':case L'E': return 0xE;
+        case L'f':case L'F': return 0xF;
+        default: return -1;
+    }
+}
+
+static unsigned long squared_difference(long p1, long p2)
+{
+    unsigned long diff = (unsigned long)labs(p1 - p2);
+    return diff * diff;
+}
+
+static unsigned char convert_color(const unsigned char rgb[3], const uint32_t *colors, size_t color_count) {
+    long r = rgb[0], g = rgb[1], b = rgb[2];
+    unsigned long best_distance = (unsigned long)(-1);
+    unsigned char best_index = (unsigned char)(-1);
+    for (unsigned char idx = 0; idx < color_count; idx++) {
+        uint32_t color = colors[idx];
+        long test_r = (color >> 16) & 0xFF, test_g = (color >> 8) & 0xFF, test_b = (color >> 0) & 0xFF;
+        unsigned long distance = squared_difference(r, test_r) + squared_difference(g, test_g) + squared_difference(b, test_b);
+        if (distance <= best_distance) {
+            best_index = idx;
+            best_distance = distance;
+        }
+    }
+    return best_index;
+
+}
+
+bool rgb_color_t::try_parse_rgb(const wcstring &name) {
+    bzero(&data, sizeof data);
+    /* We support the following style of rgb formats (case insensitive):
+        #FA3
+        #F3A035
+        FA3
+        F3A035
+    */
+    
+    size_t digit_idx = 0, len = name.size();
+    
+    /* Skip any leading # */
+    if (len > 0 && name.at(0) == L'#')
+        digit_idx++;
+    
+    bool success = false;
+    size_t i;
+    if (len - digit_idx == 3) {
+        // type FA3
+        for (i=0; i < 3; i++) {
+            int val = parse_hex_digit(name.at(digit_idx++));
+            if (val < 0) break;
+            data.rgb[i] = val*16+val;
+        }
+        success = (i == 3);
+    } else if (len - digit_idx == 6) {
+        // type F3A035
+        for (i=0; i < 3; i++) {
+            int hi = parse_hex_digit(name.at(digit_idx++));
+            int lo = parse_hex_digit(name.at(digit_idx++));
+            if (lo < 0 || hi < 0) break;
+            data.rgb[i] = hi*16+lo;
+        }
+        success = (i == 3);
+    } 
+    if (success) {
+        this->type = type_rgb;
+    }
+    return success;
+}
+
+struct named_color_t {
+    const wchar_t * name;
+    unsigned char idx;
+    unsigned char rgb[3];
+};
+
+static const named_color_t named_colors[11] = {
+    {L"black", 0, {0, 0, 0}},
+    {L"red", 1, {0xFF, 0, 0}},
+    {L"green", 2, {0, 0xFF, 0}},
+    {L"brown", 3, {0x72, 0x50, 0}},
+    {L"yellow", 3, {0xFF, 0xFF, 0}},
+    {L"blue", 4, {0, 0, 0xFF}},
+    {L"magenta", 5, {0xFF, 0, 0xFF}},
+    {L"purple", 5, {0xFF, 0, 0xFF}},
+    {L"cyan", 6, {0, 0xFF, 0xFF}},
+    {L"white", 7, {0xFF, 0xFF, 0xFF}},
+    {L"normal", 8, {0xFF, 0xFF, 0XFF}}
+};
+
+bool rgb_color_t::try_parse_named(const wcstring &str) {
+    bzero(&data, sizeof data);
+    size_t max = sizeof named_colors / sizeof *named_colors;
+    for (size_t idx=0; idx < max; idx++) {
+        if (0 == wcscasecmp(str.c_str(), named_colors[idx].name)) {
+            data.name_idx = named_colors[idx].idx;
+            this->type = type_named;
+            return true;
+        }
+    }
+    return false;
+}
+
+static const wchar_t *name_for_color_idx(unsigned char idx) {
+    size_t max = sizeof named_colors / sizeof *named_colors;
+    for (size_t i=0; i < max; i++) {
+        if (named_colors[i].idx == idx) {
+            return named_colors[i].name;
+        }
+    }
+    return L"unknown";
+}
+
+rgb_color_t::rgb_color_t(unsigned char t, unsigned char i) : type(t), flags(), data() {
+    data.name_idx = i;
+}
+
+rgb_color_t rgb_color_t::normal() { return rgb_color_t(type_normal); }    
+rgb_color_t rgb_color_t::reset() { return rgb_color_t(type_reset); }
+rgb_color_t rgb_color_t::ignore() { return rgb_color_t(type_ignore); }
+rgb_color_t rgb_color_t::none() { return rgb_color_t(type_none); }
+rgb_color_t rgb_color_t::white() { return rgb_color_t(type_named, 7); }
+rgb_color_t rgb_color_t::black() { return rgb_color_t(type_named, 0); }
+
+static unsigned char term8_color_for_rgb(const unsigned char rgb[3]) {
+    const uint32_t kColors[] = {
+        0x000000, //Black
+        0xFF0000, //Red
+        0x00FF00, //Green
+        0xFFFF00, //Yellow
+        0x0000FF, //Blue
+        0xFF00FF, //Magenta
+        0x00FFFF, //Cyan
+        0xFFFFFF, //White
+    };
+    return convert_color(rgb, kColors, sizeof kColors / sizeof *kColors);
+}
+
+static unsigned char term256_color_for_rgb(const unsigned char rgb[3]) {
+    const uint32_t kColors[240] = {
+        0x000000, 0x00005f, 0x000087, 0x0000af, 0x0000d7, 0x0000ff, 0x005f00, 0x005f5f,
+        0x005f87, 0x005faf, 0x005fd7, 0x005fff, 0x008700, 0x00875f, 0x008787, 0x0087af,
+        0x0087d7, 0x0087ff, 0x00af00, 0x00af5f, 0x00af87, 0x00afaf, 0x00afd7, 0x00afff,
+        0x00d700, 0x00d75f, 0x00d787, 0x00d7af, 0x00d7d7, 0x00d7ff, 0x00ff00, 0x00ff5f,
+        0x00ff87, 0x00ffaf, 0x00ffd7, 0x00ffff, 0x5f0000, 0x5f005f, 0x5f0087, 0x5f00af,
+        0x5f00d7, 0x5f00ff, 0x5f5f00, 0x5f5f5f, 0x5f5f87, 0x5f5faf, 0x5f5fd7, 0x5f5fff,
+        0x5f8700, 0x5f875f, 0x5f8787, 0x5f87af, 0x5f87d7, 0x5f87ff, 0x5faf00, 0x5faf5f,
+        0x5faf87, 0x5fafaf, 0x5fafd7, 0x5fafff, 0x5fd700, 0x5fd75f, 0x5fd787, 0x5fd7af,
+        0x5fd7d7, 0x5fd7ff, 0x5fff00, 0x5fff5f, 0x5fff87, 0x5fffaf, 0x5fffd7, 0x5fffff,
+        0x870000, 0x87005f, 0x870087, 0x8700af, 0x8700d7, 0x8700ff, 0x875f00, 0x875f5f, 
+        0x875f87, 0x875faf, 0x875fd7, 0x875fff, 0x878700, 0x87875f, 0x878787, 0x8787af, 
+        0x8787d7, 0x8787ff, 0x87af00, 0x87af5f, 0x87af87, 0x87afaf, 0x87afd7, 0x87afff, 
+        0x87d700, 0x87d75f, 0x87d787, 0x87d7af, 0x87d7d7, 0x87d7ff, 0x87ff00, 0x87ff5f, 
+        0x87ff87, 0x87ffaf, 0x87ffd7, 0x87ffff, 0xaf0000, 0xaf005f, 0xaf0087, 0xaf00af, 
+        0xaf00d7, 0xaf00ff, 0xaf5f00, 0xaf5f5f, 0xaf5f87, 0xaf5faf, 0xaf5fd7, 0xaf5fff, 
+        0xaf8700, 0xaf875f, 0xaf8787, 0xaf87af, 0xaf87d7, 0xaf87ff, 0xafaf00, 0xafaf5f, 
+        0xafaf87, 0xafafaf, 0xafafd7, 0xafafff, 0xafd700, 0xafd75f, 0xafd787, 0xafd7af, 
+        0xafd7d7, 0xafd7ff, 0xafff00, 0xafff5f, 0xafff87, 0xafffaf, 0xafffd7, 0xafffff, 
+        0xd70000, 0xd7005f, 0xd70087, 0xd700af, 0xd700d7, 0xd700ff, 0xd75f00, 0xd75f5f, 
+        0xd75f87, 0xd75faf, 0xd75fd7, 0xd75fff, 0xd78700, 0xd7875f, 0xd78787, 0xd787af, 
+        0xd787d7, 0xd787ff, 0xd7af00, 0xd7af5f, 0xd7af87, 0xd7afaf, 0xd7afd7, 0xd7afff, 
+        0xd7d700, 0xd7d75f, 0xd7d787, 0xd7d7af, 0xd7d7d7, 0xd7d7ff, 0xd7ff00, 0xd7ff5f, 
+        0xd7ff87, 0xd7ffaf, 0xd7ffd7, 0xd7ffff, 0xff0000, 0xff005f, 0xff0087, 0xff00af, 
+        0xff00d7, 0xff00ff, 0xff5f00, 0xff5f5f, 0xff5f87, 0xff5faf, 0xff5fd7, 0xff5fff, 
+        0xff8700, 0xff875f, 0xff8787, 0xff87af, 0xff87d7, 0xff87ff, 0xffaf00, 0xffaf5f, 
+        0xffaf87, 0xffafaf, 0xffafd7, 0xffafff, 0xffd700, 0xffd75f, 0xffd787, 0xffd7af, 
+        0xffd7d7, 0xffd7ff, 0xffff00, 0xffff5f, 0xffff87, 0xffffaf, 0xffffd7, 0xffffff, 
+        0x080808, 0x121212, 0x1c1c1c, 0x262626, 0x303030, 0x3a3a3a, 0x444444, 0x4e4e4e, 
+        0x585858, 0x626262, 0x6c6c6c, 0x767676, 0x808080, 0x8a8a8a, 0x949494, 0x9e9e9e, 
+        0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada, 0xe4e4e4, 0xeeeeee
+    };
+    return 16 + convert_color(rgb, kColors, sizeof kColors / sizeof *kColors);
+}
+
+unsigned char rgb_color_t::to_term256_index() const {
+    assert(type == type_rgb);
+    return term256_color_for_rgb(data.rgb);
+}
+
+unsigned char rgb_color_t::to_name_index() const {
+    assert(type == type_named || type == type_rgb);
+    if (type == type_named) {
+        return data.name_idx;
+    } else if (type == type_rgb) {
+        return term8_color_for_rgb(data.rgb);
+    } else {
+        /* This is an error */
+        return (unsigned char)(-1);
+    }
+}
+
+void rgb_color_t::parse(const wcstring &str) {
+    bool success = false;
+    if (! success) success = try_parse_special(str);
+    if (! success) success = try_parse_named(str);
+    if (! success) success = try_parse_rgb(str);
+    if (! success) {
+        bzero(this->data.rgb, sizeof this->data.rgb);
+        this->type = type_none;
+    }
+}
+
+rgb_color_t::rgb_color_t(const wcstring &str) {
+    this->parse(str);
+}
+
+rgb_color_t::rgb_color_t(const std::string &str) {
+    this->parse(str2wcstring(str));
+}
+
+wcstring rgb_color_t::description() const {
+    switch (type) {
+        case type_none:
+            return L"none";
+        case type_named:
+            return format_string(L"named(%d: %ls)", (int)data.name_idx, name_for_color_idx(data.name_idx));
+        case type_rgb:
+            return format_string(L"rgb(0x%02x%02x%02x)", data.rgb[0], data.rgb[1], data.rgb[2]);
+        case type_reset:
+            return L"reset";
+        case type_normal:
+            return L"normal";
+        case type_ignore:
+            return L"ignore";
+        default:
+            abort();
+            return L"";
+    }
+}

color.h

@@ -0,0 +1,133 @@
+/** \file color.h Color class.
+  */
+#ifndef FISH_COLOR_H
+#define FISH_COLOR_H
+
+#include <stdint.h>
+#include <cstddef>
+#include "config.h"
+#include "common.h"
+
+
+/* A type that represents a color. We work hard to keep it at a size of 4 bytes. */
+class rgb_color_t {
+
+    /* Types */
+    enum {
+        type_none,
+        type_named,
+        type_rgb,
+        type_normal,
+        type_reset,
+        type_ignore
+    };
+    unsigned char type:4;
+    
+    /* Flags */
+    enum {
+        flag_bold = 1 << 0,
+        flag_underline = 1 << 1
+    };
+    unsigned char flags:4;
+    
+    union {
+        unsigned char name_idx; //0-10
+        unsigned char rgb[3];
+    } data;
+            
+    /** Try parsing a special color name like "normal" */
+    bool try_parse_special(const wcstring &str);
+    
+    /** Try parsing an rgb color like "#F0A030" */
+    bool try_parse_rgb(const wcstring &str);
+
+    /** Try parsing an explicit color name like "magenta" */
+    bool try_parse_named(const wcstring &str);
+
+    /* Parsing entry point */
+    void parse(const wcstring &str);
+
+    /** Private constructor */
+    explicit rgb_color_t(unsigned char t, unsigned char i=0);
+    
+    public:
+    
+    /** Default constructor of type none */
+    explicit rgb_color_t() : type(type_none), flags(), data() {}
+    
+    /** Parse a color from a string */
+    explicit rgb_color_t(const wcstring &str);
+    explicit rgb_color_t(const std::string &str);
+
+    /** Returns white */    
+    static rgb_color_t white();
+    
+    /** Returns black */
+    static rgb_color_t black();
+    
+    /** Returns the reset special color */
+    static rgb_color_t reset();
+    
+    /** Returns the normal special color */
+    static rgb_color_t normal();
+    
+    /** Returns the ignore special color */
+    static rgb_color_t ignore();
+    
+    /** Returns the none special color */
+    static rgb_color_t none();
+        
+    /** Returns whether the color is the ignore special color */
+    bool is_ignore(void) const { return type == type_ignore; }
+
+    /** Returns whether the color is the normal special color */
+    bool is_normal(void) const { return type == type_normal; }
+    
+    /** Returns whether the color is the reset special color */
+    bool is_reset(void) const { return type == type_reset; }
+    
+    /** Returns whether the color is the none special color */
+    bool is_none(void) const { return type == type_none; }
+    
+    /** Returns whether the color is a named color (like "magenta") */
+    bool is_named(void) const { return type == type_named; }
+    
+    /** Returns whether the color is specified via RGB components */
+    bool is_rgb(void) const { return type == type_rgb; }
+    
+    /** Returns whether the color is special, that is, not rgb or named */
+    bool is_special(void) const { return type != type_named && type != type_rgb; }
+
+    /** Returns a description of the color */
+    wcstring description() const;
+
+    /** Returns the name index for the given color. Requires that the color be named or RGB. */
+    unsigned char to_name_index() const;
+    
+    /** Returns the term256 index for the given color. Requires that the color be named or RGB. */
+    unsigned char to_term256_index() const;
+    
+    /** Returns whether the color is bold */
+    bool is_bold() const { return flags & flag_bold; }
+    
+    /** Set whether the color is bold */
+    void set_bold(bool x) { if (x) flags |= flag_bold; else flags &= ~flag_bold; }
+    
+    /** Returns whether the color is underlined */
+    bool is_underline() const { return !! (flags & flag_underline); }
+    
+    /** Set whether the color is underlined */
+    void set_underline(bool x) { if (x) flags |= flag_underline; else flags &= ~flag_underline; }
+    
+    /** Compare two colors for equality */
+    bool operator==(const rgb_color_t &other) const {
+        return type == other.type && ! memcmp(&data, &other.data, sizeof data);
+    }
+    
+    /** Compare two colors for inequality */
+    bool operator!=(const rgb_color_t &other) const {
+        return !(*this == other);
+    }
+};
+
+#endif

common.h

@@ -12,9 +12,22 @@
 #include <stdio.h>
 #include <wchar.h>
 #include <termios.h>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <pthread.h>
+#include <string.h>
 
+#include <errno.h>
+#include <assert.h>
 #include "util.h"
 
+class completion_t;
+
+/* Common string type */
+typedef std::wstring wcstring;
+typedef std::vector<wcstring> wcstring_list_t;
+
 /**
    Maximum number of bytes used by a single utf-8 character
 */
@@ -40,24 +53,36 @@
 */
 #define BYTE_MAX 0xffu
 
-/*
-  Escape special fish syntax characters liek the semicolon
+/**
+  Escape special fish syntax characters like the semicolon
  */
 #define UNESCAPE_SPECIAL 1
-/*
+
+/**
   Allow incomplete escape sequences
  */
 #define UNESCAPE_INCOMPLETE 2
 
-/**
-   Escape all characters, including magic characters like the semicolon
- */
-#define ESCAPE_ALL 1
-/**
-   Do not try to use 'simplified' quoted escapes, and do not use empty quotes as the empty string
- */
-#define ESCAPE_NO_QUOTED 2
+/* Flags for the escape() and escape_string() functions */
+enum {
+    /** Escape all characters, including magic characters like the semicolon */
+     ESCAPE_ALL = 1 << 0,
+     
+    /** Do not try to use 'simplified' quoted escapes, and do not use empty quotes as the empty string */
+    ESCAPE_NO_QUOTED = 1 << 1,
+    
+    /** Do not escape tildes */
+    ESCAPE_NO_TILDE = 1 << 2
+};
+typedef unsigned int escape_flags_t;
 
+/**
+ Helper macro for errors
+ */
+#define VOMIT_ON_FAILURE(a) do { if (0 != (a)) { int err = errno; fprintf(stderr, "%s failed on line %d in file %s: %d (%s)\n", #a, __LINE__, __FILE__, err, strerror(err)); abort(); }} while (0)
+
+/** Exits without invoking destructors (via _exit), useful for code after fork. */
+void exit_without_destructors(int code) __attribute__ ((noreturn));
 
 /** 
 	Save the shell mode on startup so we can restore them on exit
@@ -85,7 +110,7 @@ extern char *profile;
    Name of the current program. Should be set at startup. Used by the
    debug function.
 */
-extern wchar_t *program_name;
+extern const wchar_t *program_name;
 
 /**
    This macro is used to check that an input argument is not null. It
@@ -97,7 +122,7 @@ extern wchar_t *program_name;
 	if( !(arg) )														\
 	{																	\
 		debug( 0,														\
-			   _( L"function %s called with null value for argument %s. " ), \
+			   "function %s called with null value for argument %s. ",  \
 			   __func__,												\
 			   #arg );													\
 		bugreport();													\
@@ -108,13 +133,13 @@ extern wchar_t *program_name;
 /**
    Pause for input, then exit the program. If supported, print a backtrace first.
 */
-#define FATAL_EXIT()							\
-	{											\
-		char c;									\
-		show_stackframe();						\
-		read( 0, &c, 1 );						\
-		exit( 1 );								\
-	}											\
+#define FATAL_EXIT()											\
+	{															\
+		char exit_read_buff;			\
+		show_stackframe();										\
+		read( 0, &exit_read_buff, 1 );			\
+		exit_without_destructors( 1 );												\
+	}															\
 		
 
 /**
@@ -123,8 +148,8 @@ extern wchar_t *program_name;
 #define DIE_MEM()														\
 	{																	\
 		fwprintf( stderr,												\
-				  L"fish: Out of memory on line %d of file %s, shutting down fish\n", \
-				  __LINE__,												\
+				  L"fish: Out of memory on line %ld of file %s, shutting down fish\n", \
+				  (long)__LINE__,												\
 				  __FILE__ );											\
 		FATAL_EXIT();														\
 	}
@@ -137,7 +162,7 @@ extern wchar_t *program_name;
 	if( signal_is_blocked() )											\
 	{																	\
 		debug( 0,														\
-			   _( L"function %s called while blocking signals. " ),		\
+			    "function %s called while blocking signals. ",  		\
 			   __func__);												\
 		bugreport();													\
 		show_stackframe();												\
@@ -147,7 +172,7 @@ extern wchar_t *program_name;
 /**
    Shorthand for wgettext call
 */
-#define _(wstr) wgettext(wstr)
+#define _(wstr) wgettext((const wchar_t *)wstr)
 
 /**
    Noop, used to tell xgettext that a string should be translated,
@@ -155,39 +180,27 @@ extern wchar_t *program_name;
 */
 #define N_(wstr) wstr
 
-#define contains( str,... ) contains_internal( str, __VA_ARGS__, (void *)0 )
-#define wcsdupcat( str,... ) wcsdupcat_internal( str, __VA_ARGS__, (void *)0 )
+/**
+   Check if the specified string element is a part of the specified string list
+ */
+#define contains( str,... ) contains_internal( str, __VA_ARGS__, NULL )
 
-/*
+/**
   Print a stack trace to stderr
 */
 void show_stackframe();
 
-/**
-   Take an array_list_t containing wide strings and converts them to a
-   single null-terminated wchar_t **. The array is allocated using
-   malloc, and needs to be fred's by the caller.
-*/
-wchar_t **list_to_char_arr( array_list_t *l );
 
 /**
-   Read a line from the stream f into the buffer buff of length len. If
-   buff is to small, it will be reallocated, and both buff and len will
-   be updated to reflect this. Returns the number of bytes read or -1
-   on failiure. 
+   Read a line from the stream f into the string. Returns 
+   the number of bytes read or -1 on failiure.
 
    If the carriage return character is encountered, it is
    ignored. fgetws() considers the line to end if reading the file
    results in either a newline (L'\n') character, the null (L'\\0')
    character or the end of file (WEOF) character.
 */
-int fgetws2( wchar_t **buff, int *len, FILE *f );
-
-/**
-   Sorts an array_list of wide strings according to the
-   wcsfilecmp-function from the util library
-*/
-void sort_list( array_list_t *comp );
+int fgetws2(wcstring *s, FILE *f);
 
 /**
    Returns a newly allocated wide character string equivalent of the
@@ -198,6 +211,16 @@ void sort_list( array_list_t *comp );
 */
 wchar_t *str2wcs( const char *in );
 
+/**
+ Returns a newly allocated wide character string equivalent of the
+ specified multibyte character string
+ 
+ This function encodes illegal character sequences in a reversible
+ way using the private use area.
+ */
+wcstring str2wcstring( const char *in );
+wcstring str2wcstring( const std::string &in );
+
 /**
    Converts the narrow character string \c in into it's wide
    equivalent, stored in \c out. \c out must have enough space to fit
@@ -216,6 +239,35 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out );
    way using the private use area.
 */
 char *wcs2str( const wchar_t *in );
+std::string wcs2string(const wcstring &input);
+
+/** Test if a string prefixes another. Returns true if a is a prefix of b */
+bool string_prefixes_string(const wcstring &proposed_prefix, const wcstring &value);
+bool string_prefixes_string(const wchar_t *proposed_prefix, const wcstring &value);
+
+/** Test if a string is a suffix of another */
+bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &value);
+bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value);
+
+
+/** Test if a string prefixes another without regard to case. Returns true if a is a prefix of b */
+bool string_prefixes_string_case_insensitive(const wcstring &proposed_prefix, const wcstring &value);
+
+/** Test if a list contains a string using a linear search. */
+bool list_contains_string(const wcstring_list_t &list, const wcstring &str);
+
+
+void assert_is_main_thread(const char *who);
+#define ASSERT_IS_MAIN_THREAD_TRAMPOLINE(x) assert_is_main_thread(x)
+#define ASSERT_IS_MAIN_THREAD() ASSERT_IS_MAIN_THREAD_TRAMPOLINE(__FUNCTION__)
+
+void assert_is_background_thread(const char *who);
+#define ASSERT_IS_BACKGROUND_THREAD_TRAMPOLINE(x) assert_is_background_thread(x)
+#define ASSERT_IS_BACKGROUND_THREAD() ASSERT_IS_BACKGROUND_THREAD_TRAMPOLINE(__FUNCTION__)
+
+/* Useful macro for asserting that a lock is locked. This doesn't check whether this thread locked it, which it would be nice if it did, but here it is anyways. */
+void assert_is_locked(void *mutex, const char *who, const char *caller);
+#define ASSERT_IS_LOCKED(x) assert_is_locked((void *)(&x), #x, __FUNCTION__)
 
 /**
    Converts the wide character string \c in into it's narrow
@@ -227,28 +279,244 @@ char *wcs2str( const wchar_t *in );
 */
 char *wcs2str_internal( const wchar_t *in, char *out );
 
+/** Format the specified size (in bytes, kilobytes, etc.) into the specified stringbuffer. */
+wcstring format_size(long long sz);
+
+/** Version of format_size that does not allocate memory. */
+void format_size_safe(char buff[128], unsigned long long sz);
+
+/** Our crappier versions of debug which is guaranteed to not allocate any memory, or do anything other than call write(). This is useful after a call to fork() with threads. */
+void debug_safe(int level, const char *msg, const char *param1 = NULL, const char *param2 = NULL, const char *param3 = NULL, const char *param4 = NULL, const char *param5 = NULL, const char *param6 = NULL, const char *param7 = NULL, const char *param8 = NULL, const char *param9 = NULL, const char *param10 = NULL, const char *param11 = NULL, const char *param12 = NULL);
+
+/** Writes out a long safely */
+void format_long_safe(char buff[128], long val);
+void format_long_safe(wchar_t buff[128], long val);
+
+
+template<typename T>
+T from_string(const wcstring &x) {
+    T result;
+    std::wstringstream stream(x);
+    stream >> result;
+    return result;
+}
+
+template<typename T>
+T from_string(const std::string &x) {
+    T result = T();
+    std::stringstream stream(x);
+    stream >> result;
+    return result;
+}
+
+template<typename T>
+wcstring to_string(const T &x) {
+    std::wstringstream stream;
+    stream << x;
+    return stream.str();
+}
+
+/* wstringstream is a huge memory pig. Let's provide some specializations where we can. */
+template<>
+inline wcstring to_string(const long &x) {
+    wchar_t buff[128];
+    format_long_safe(buff, x);
+    return wcstring(buff);
+}
+
+template<>
+inline bool from_string(const std::string &x) {
+    return ! x.empty() && strchr("YTyt1", x.at(0));
+}
+
+template<>
+inline bool from_string(const wcstring &x) {
+    return ! x.empty() && wcschr(L"YTyt1", x.at(0));
+}
+
+template<>
+inline wcstring to_string(const int &x) {
+    return to_string(static_cast<long>(x));
+}
+
+
+/* Helper class for managing a null-terminated array of null-terminated strings (of some char type) */
+template <typename CharType_t>
+class null_terminated_array_t {
+    CharType_t **array;
+    
+    typedef std::basic_string<CharType_t> string_t;
+    typedef std::vector<string_t> string_list_t;
+
+    void swap(null_terminated_array_t<CharType_t> &him) { std::swap(array, him.array); }
+
+    /* Silly function to get the length of a null terminated array of...something */
+    template <typename T>
+    static size_t count_not_null(const T *arr) {
+        size_t len;
+        for (len=0; arr[len] != T(0); len++)
+            ;
+        return len;        
+    }
+
+    size_t size() const {
+        return count_not_null(array);
+    }
+
+    void free(void) {
+        if (array != NULL) {
+            for (size_t i = 0; array[i] != NULL; i++) {
+                delete [] array[i];
+            }
+            delete [] array;
+            array = NULL;
+        }
+    }
+        
+    public:
+    null_terminated_array_t() : array(NULL) { }
+    null_terminated_array_t(const string_list_t &argv) : array(NULL) { this->set(argv); }
+    ~null_terminated_array_t() { this->free(); }
+    
+    /** operator=. Notice the pass-by-value parameter. */
+    null_terminated_array_t& operator=(null_terminated_array_t rhs) {
+        if (this != &rhs)
+            this->swap(rhs);
+        return *this;
+    }
+    
+    /* Copy constructor. */
+    null_terminated_array_t(const null_terminated_array_t &him) : array(NULL) {
+        this->set(him.array);
+    }
+    
+    void set(const string_list_t &argv) {
+        /* Get rid of the old argv */
+        this->free();
+
+        /* Allocate our null-terminated array of null-terminated strings */
+        size_t i, count = argv.size();
+        this->array = new CharType_t * [count + 1];
+        for (i=0; i < count; i++) {
+            const string_t &str = argv.at(i);
+            this->array[i] = new CharType_t [1 + str.size()];
+            std::copy(str.begin(), str.end(), this->array[i]);
+            this->array[i][str.size()] = CharType_t(0);
+        }
+        this->array[count] = NULL;
+    }
+    
+    void set(const CharType_t * const *new_array) {
+        if (new_array == array)
+            return;
+            
+        /* Get rid of the old argv */
+        this->free();
+        
+        /* Copy the new one */
+        if (new_array) {
+            size_t i, count = count_not_null(new_array);
+            this->array = new CharType_t * [count + 1];
+            for (i=0; i < count; i++) {
+                size_t len = count_not_null(new_array[i]);
+                this->array[i] = new CharType_t [1 + len];
+                std::copy(new_array[i], new_array[i] + len, this->array[i]);
+                this->array[i][len] = CharType_t(0);
+            }
+            this->array[count] = NULL;
+        }
+    }
+    
+    CharType_t **get() { return array; }
+    const CharType_t * const *get() const { return array; }
+    
+    string_list_t to_list() const {
+        string_list_t lst;
+        if (array != NULL) {
+            size_t count = this->size();
+            lst.reserve(count);
+            lst.insert(lst.end(), array, array + count);
+        }
+        return lst;
+    }
+};
+
+/* Helper function to convert from a null_terminated_array_t<wchar_t> to a null_terminated_array_t<char_t> */
+null_terminated_array_t<char> convert_wide_array_to_narrow(const null_terminated_array_t<wchar_t> &arr);
+
+/* Helper class to cache a narrow version of a wcstring in a malloc'd buffer, so that we can read it after fork() */
+class narrow_string_rep_t {
+    private:
+    const char *str;
+    
+    /* No copying */
+    narrow_string_rep_t &operator=(const narrow_string_rep_t &);
+    narrow_string_rep_t(const narrow_string_rep_t &x);
+    
+    public:
+    ~narrow_string_rep_t() {
+        free((void *)str);
+    }
+    
+    narrow_string_rep_t() : str(NULL) {}
+    
+    void set(const wcstring &s) {
+        free((void *)str);
+        str = wcs2str(s.c_str());
+    }
+    
+    const char *get() const {
+        return str;
+    }
+};
+
+bool is_forked_child();
+
+/* Basic scoped lock class */
+class scoped_lock {
+    pthread_mutex_t *lock_obj;
+    bool locked;
+    
+    /* No copying */
+    scoped_lock &operator=(const scoped_lock &);
+    scoped_lock(const scoped_lock &);
+
+public:
+    void lock(void);
+    void unlock(void);
+    scoped_lock(pthread_mutex_t &mutex);
+    ~scoped_lock();
+};
+
+/* Wrapper around wcstok */
+class wcstokenizer {
+    wchar_t *buffer, *str, *state;
+    const wcstring sep;
+    
+    /* No copying */
+    wcstokenizer &operator=(const wcstokenizer &);
+    wcstokenizer(const wcstokenizer &);
+    
+public:
+    wcstokenizer(const wcstring &s, const wcstring &separator);
+    bool next(wcstring &result);
+    ~wcstokenizer();
+};
+
+/** 
+ Appends a path component, with a / if necessary
+ */
+void append_path_component(wcstring &path, const wcstring &component);
+
+wcstring format_string(const wchar_t *format, ...);
+wcstring vformat_string(const wchar_t *format, va_list va_orig);
+void append_format(wcstring &str, const wchar_t *format, ...);
+
 /**
    Returns a newly allocated wide character string array equivalent of
    the specified multibyte character string array
 */
-char **wcsv2strv( const wchar_t **in );
-
-/**
-   Returns a newly allocated multibyte character string array equivalent of the specified wide character string array
-*/
-wchar_t **strv2wcsv( const char **in );
-
-
-/**
-   Returns a newly allocated concatenation of the specified wide
-   character strings. The last argument must be a null pointer.
-*/
-__sentinel wchar_t *wcsdupcat_internal( const wchar_t *a, ... );
-
-/**
-   Test if the given string is a valid variable name
-*/
-
+char **wcsv2strv( const wchar_t * const *in );
 
 /**
    Test if the given string is a valid variable name. 
@@ -265,7 +533,7 @@ wchar_t *wcsvarname( const wchar_t *str );
    \return null if this is a valid name, and a pointer to the first invalid character otherwise
 */
 
-wchar_t *wcsfuncname( const wchar_t *str );
+const wchar_t *wcsfuncname( const wchar_t *str );
 
 /**
    Test if the given string is valid in a variable name 
@@ -306,7 +574,7 @@ void error_reset();
    the user is using a Unicode character set, and if so, use the
    unicode ellipsis character as ellipsis, instead of '$'.      
 */
-const wchar_t *wsetlocale( int category, const wchar_t *locale );
+wcstring wsetlocale( int category, const wchar_t *locale );
 
 /**
    Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero.
@@ -315,14 +583,27 @@ const wchar_t *wsetlocale( int category, const wchar_t *locale );
 
    \return zero if needle is not found, of if needle is null, non-zero otherwise
 */
-__sentinel int contains_internal( const wchar_t *needle, ... );
+__sentinel bool contains_internal( const wchar_t *needle, ... );
+__sentinel bool contains_internal( const wcstring &needle, ... );
 
 /**
    Call read while blocking the SIGCHLD signal. Should only be called
    if you _know_ there is data available for reading, or the program
    will hang until there is data.
 */
-int read_blocked(int fd, void *buf, size_t count);
+long read_blocked(int fd, void *buf, size_t count);
+
+/**
+   Loop a write request while failiure is non-critical. Return -1 and set errno
+   in case of critical error.
+ */
+ssize_t write_loop(int fd, const char *buff, size_t count);
+
+/**
+   Loop a read request while failiure is non-critical. Return -1 and set errno
+   in case of critical error.
+ */
+ssize_t read_loop(int fd, void *buff, size_t count);
 
 
 /**
@@ -343,6 +624,7 @@ int read_blocked(int fd, void *buf, size_t count);
 
    will print the string 'fish: Pi = 3.141', given that debug_level is 1 or higher, and that program_name is 'fish'.
 */
+void debug( int level, const char *msg, ... );
 void debug( int level, const wchar_t *msg, ... );
 
 /**
@@ -354,7 +636,8 @@ void debug( int level, const wchar_t *msg, ... );
    \return The escaped string, or 0 if there is not enough memory
 */
 
-wchar_t *escape( const wchar_t *in, int escape_all );
+wchar_t *escape( const wchar_t *in, escape_flags_t flags );
+wcstring escape_string( const wcstring &in, escape_flags_t flags );
 
 /**
    Expand backslashed escapes and substitute them with their unescaped
@@ -370,16 +653,9 @@ wchar_t *escape( const wchar_t *in, int escape_all );
 wchar_t *unescape( const wchar_t * in, 
 				   int escape_special );
 
-/**
-   Attempt to acquire a lock based on a lockfile, waiting LOCKPOLLINTERVAL 
-   milliseconds between polls and timing out after timeout seconds, 
-   thereafter forcibly attempting to obtain the lock if force is non-zero.
-   Returns 1 on success, 0 on failure.
-   To release the lock the lockfile must be unlinked.
-   A unique temporary file named by appending characters to the lockfile name 
-   is used; any pre-existing file of the same name is subject to deletion.
-*/
-int acquire_lock_file( const char *lockfile, const int timeout, int force );
+bool unescape_string( wcstring &str, 
+                  int escape_special );
+
 
 /** 
     Returns the width of the terminal window, so that not all
@@ -409,17 +685,14 @@ void common_handle_winch( int signal );
    Write paragraph of output to the specified stringbuffer, and redo
    the linebreaks to fit the current screen.
 */
-void write_screen( const wchar_t *msg, string_buffer_t *buff );
+void write_screen( const wcstring &msg, wcstring &buff );
 
 /**
-   Tokenize the specified string into the specified array_list_t.
-   Each new element is allocated using malloc and must be freed by the
-   caller.
-   
+   Tokenize the specified string into the specified wcstring_list_t.   
    \param val the input string. The contents of this string is not changed.
    \param out the list in which to place the elements. 
 */
-void tokenize_variable_array( const wchar_t *val, array_list_t *out );
+void tokenize_variable_array( const wcstring &val, wcstring_list_t &out);
 
 /**
    Make sure the specified direcotry exists. If needed, try to create
@@ -427,7 +700,7 @@ void tokenize_variable_array( const wchar_t *val, array_list_t *out );
 
    \return 0 if, at the time of function return the directory exists, -1 otherwise.
 */
-int create_directory( wchar_t *d );
+int create_directory( const wcstring &d );
 
 /**
    Print a short message about how to file a bug report to stderr
@@ -435,10 +708,40 @@ int create_directory( wchar_t *d );
 void bugreport();
 
 /**
-   Format the specified size (in bytes, kilobytes, etc.) into the specified stringbuffer.
-*/
-void sb_format_size( string_buffer_t *sb,
-		     long long sz );
+   Return the number of seconds from the UNIX epoch, with subsecond
+   precision. This function uses the gettimeofday function, and will
+   have the same precision as that function.
+
+   If an error occurs, NAN is returned.
+ */
+double timef();
+
+/**
+	Call the following function early in main to set the main thread.
+    This is our replacement for pthread_main_np().
+ */
+void set_main_thread();
+bool is_main_thread();
+
+/** Configures thread assertions for testing */
+void configure_thread_assertions_for_testing();
+
+/** Set up a guard to complain if we try to do certain things (like take a lock) after calling fork */
+void setup_fork_guards(void);
+
+/** Save the value of tcgetpgrp so we can restore it on exit */
+void save_term_foreground_process_group(void);
+void restore_term_foreground_process_group(void);
+
+/** Return whether we are the child of a fork */
+bool is_forked_child(void);
+void assert_is_not_forked_child(const char *who);
+#define ASSERT_IS_NOT_FORKED_CHILD_TRAMPOLINE(x) assert_is_not_forked_child(x)
+#define ASSERT_IS_NOT_FORKED_CHILD() ASSERT_IS_NOT_FORKED_CHILD_TRAMPOLINE(__FUNCTION__)
+
+extern "C" {
+__attribute__((noinline)) void debug_thread_error(void);
+}
+
 
 #endif
-

complete.h

@@ -12,10 +12,11 @@
 */
 #define FISH_COMPLETE_H
 
+
 #include <wchar.h>
 
 #include "util.h"
-
+#include "common.h"
 /** 
 	Use all completions 
 */
@@ -66,46 +67,60 @@
 */
 #define PROG_COMPLETE_SEP L'\t'
 
-/**
-   Do not insert space afterwards if this is the only completion. (The
-   default is to try insert a space)
-*/
-#define COMPLETE_NO_SPACE 1
+enum {
+    /**
+       Do not insert space afterwards if this is the only completion. (The
+       default is to try insert a space)
+    */
+    COMPLETE_NO_SPACE = 1 << 0,
 
-/**
-   This compeltion is case insensitive. 
+    /**
+       This compeltion is case insensitive. 
 
-   Warning: The contents of the completion_t structure is actually
-   different if this flag is set! Specifically, the completion string
-   contains the _entire_ completion token, not only the current
-*/
-#define COMPLETE_NO_CASE 2
+       Warning: The contents of the completion_t structure is actually
+       different if this flag is set! Specifically, the completion string
+       contains the _entire_ completion token, not only the current
+    */
+    COMPLETE_NO_CASE = 1 << 1,
 
-/**
-   This compeltion is the whole argument, not just the remainder. This
-   flag must never be set on completions returned from the complete()
-   function. It is strictly for internal use in the completion code.
-*/
-#define COMPLETE_WHOLE_ARGUMENT 4
+    /**
+       This compeltion is the whole argument, not just the remainder. This
+       flag must never be set on completions returned from the complete()
+       function. It is strictly for internal use in the completion code.
+    */
+    COMPLETE_WHOLE_ARGUMENT = 1 << 2,
 
-/**
-   This completion may or may not want a space at the end - guess by
-   checking the last character of the completion.
-*/
-#define COMPLETE_AUTO_SPACE 8
+    /**
+       This completion may or may not want a space at the end - guess by
+       checking the last character of the completion.
+    */
+    COMPLETE_AUTO_SPACE = 1 << 3,
 
-typedef struct
+    /**
+       This completion should be inserted as-is, without escaping.
+    */
+    COMPLETE_DONT_ESCAPE = 1 << 4
+};
+typedef int complete_flags_t;
+
+
+class completion_t
 {
 
+private:
+    /* No public default constructor */
+	completion_t();
+public:
+
 	/**
 	   The completion string
 	*/
-	const wchar_t *completion;
+	wcstring completion;
 
 	/**
 	   The description for this completion
 	*/
-	const wchar_t *description;
+	wcstring description;
 
 	/**
 	   Flags determining the completion behaviour. 
@@ -118,10 +133,30 @@ typedef struct
 	   is case insensitive.
 	*/
 	int flags;
+    
+    bool is_case_insensitive() const { return !! (flags & COMPLETE_NO_CASE); }
+    
+    /* Construction. Note: defining these so that they are not inlined reduces the executable size. */
+    completion_t(const wcstring &comp, const wcstring &desc = L"", int flags_val = 0);
+    completion_t(const completion_t &);
+    completion_t &operator=(const completion_t &);
+    
+    /* The following are needed for sorting and uniquing completions */
+	bool operator < (const completion_t& rhs) const;
+	bool operator == (const completion_t& rhs) const;
+	bool operator != (const completion_t& rhs) const;
+};
 
-}
-	completion_t;
+enum complete_type_t {
+    COMPLETE_DEFAULT,
+    COMPLETE_AUTOSUGGEST
+};
 
+/** Given a list of completions, returns a list of their completion fields */
+wcstring_list_t completions_to_wcstring_list( const std::vector<completion_t> &completions );
+
+/** Sorts a list of completions */
+void sort_completions( std::vector<completion_t> &completions);
 
 /**
 
@@ -163,68 +198,59 @@ typedef struct
   \param comp A space separated list of completions which may contain subshells.
   \param desc A description of the completion.
   \param condition a command to be run to check it this completion should be used. If \c condition is empty, the completion is always used.
-
+  \param flags A set of completion flags
 */
 void complete_add( const wchar_t *cmd, 
-				   int cmd_type, 
-				   wchar_t short_opt,
-				   const wchar_t *long_opt,
-				   int long_mode, 
-				   int result_mode, 
-				   const wchar_t *condition,
-				   const wchar_t *comp,
-				   const wchar_t *desc,
-				   int flags ); 
+                   bool cmd_is_path,
+                   wchar_t short_opt,
+                   const wchar_t *long_opt,
+                   int long_mode,
+                   int result_mode,
+                   const wchar_t *condition,
+                   const wchar_t *comp,
+                   const wchar_t *desc,
+                   int flags ); 
 /**
   Sets whether the completion list for this command is complete. If
   true, any options not matching one of the provided options will be
   flagged as an error by syntax highlighting.
 */
-void complete_set_authoritative( const wchar_t *cmd,
-							   int cmd_type,
-							   int authoritative );
+void complete_set_authoritative( const wchar_t *cmd, bool cmd_type, bool authoritative );
 
 /**
   Remove a previously defined completion
 */
 void complete_remove( const wchar_t *cmd, 
-					  int cmd_type, 
-					  wchar_t short_opt,
-					  const wchar_t *long_opt );
+                      bool cmd_is_path, 
+                      wchar_t short_opt,
+                      const wchar_t *long_opt );
+
+
+/** Find all completions of the command cmd, insert them into out. If to_load is not NULL, append all commands that we would autoload, but did not (presumably because this is not the main thread) */
+void complete( const wcstring &cmd, std::vector<completion_t> &comp, complete_type_t type, wcstring_list_t *to_load = NULL );
 
 /**
-  Find all completions of the command cmd, insert them into out. The
-  caller must free the variables returned in out.  The results are
-  returned in the array_list_t 'out', in the format of wide character
-  strings, with each element consisting of a suggested completion and
-  a description of what kind of object this completion represents,
-  separated by a separator of type COMPLETE_SEP.
+   Print a list of all current completions into the string. 
 
-  Values returned by this function should be freed by the caller.
+   \param out The string to write completions to
 */
-void complete( const wchar_t *cmd, array_list_t *out );
-
-/**
-   Print a list of all current completions into the string_buffer_t. 
-
-   \param out The string_buffer_t to write completions to
-*/
-void complete_print( string_buffer_t *out );
+void complete_print( wcstring &out );
 
 /**
    Tests if the specified option is defined for the specified command
 */
-int complete_is_valid_option( const wchar_t *str, 
-							  const wchar_t *opt, 
-							  array_list_t *errors );
+int complete_is_valid_option( const wcstring &str,
+							  const wcstring &opt,
+							  wcstring_list_t *inErrorsOrNull,
+							  bool allow_autoload );
 
 /**
    Tests if the specified argument is valid for the specified option
    and command
 */
-int complete_is_valid_argument( const wchar_t *str, 
-								const wchar_t *opt, 
-								const wchar_t *arg );
+bool complete_is_valid_argument( const wcstring &str,
+								 const wcstring &opt,
+								 const wcstring &arg );
 
 
 /**
@@ -236,20 +262,18 @@ int complete_is_valid_argument( const wchar_t *str,
    \param cmd the command for which to load command-specific completions
    \param reload should the commands completions be reloaded, even if they where previously loaded. (This is set to true on actual completions, so that changed completion are updated in running shells)
 */
-void complete_load( const wchar_t *cmd, int reload );
+void complete_load( const wcstring &cmd, bool reload );
 
 /**
    Create a new completion entry
 
-   \param context The halloc context to use for allocating new memory
-   \pram comp The completion string
+   \param completions The array of completions to append to
+   \param comp The completion string
    \param desc The description of the completion
    \param flags completion flags
+
 */
-void completion_allocate( array_list_t *context,
-			  const wchar_t *comp,
-			  const wchar_t *desc,
-			  int flags );
+void append_completion(std::vector<completion_t> &completions, const wcstring &comp, const wcstring &desc = L"", int flags = 0);
 
 
 #endif

configure.ac

@@ -9,29 +9,37 @@
 # configure the build process.
 #
 
-AC_INIT(fish,1.23.0,fish-users@lists.sf.net)
+AC_INIT(fish,2.0.0,fish-users@lists.sf.net)
 
+#
+# preserve configure arguments for xsel
+#
+
+conf_arg=$@
 
 #
 # List of output variables produced by this configure script
 #
 
-AC_SUBST( docdir )
-AC_SUBST( HAVE_GETTEXT )
-AC_SUBST( LDFLAGS_FISH )
-AC_SUBST( LIBS_FISH )
-AC_SUBST( LIBS_FISH_INDENT )
-AC_SUBST( LIBS_FISH_PAGER )
-AC_SUBST( LIBS_FISHD )
-AC_SUBST( LIBS_MIMEDB )
-AC_SUBST( LIBS_SET_COLOR )
-AC_SUBST( localedir )
-AC_SUBST( optbindirs )
-AC_SUBST( prefix )
-AC_SUBST( SEQ_FALLBACK )
-AC_SUBST( XSEL )
-AC_SUBST( XSEL_MAN )
-AC_SUBST( XSEL_MAN_PATH )
+AC_SUBST(docdir)
+AC_SUBST(HAVE_GETTEXT)
+AC_SUBST(LDFLAGS_FISH)
+AC_SUBST(LIBS_FISH)
+AC_SUBST(LIBS_FISH_INDENT)
+AC_SUBST(LIBS_FISH_PAGER)
+AC_SUBST(LIBS_FISHD)
+AC_SUBST(LIBS_MIMEDB)
+AC_SUBST(LIBS_SET_COLOR)
+AC_SUBST(localedir)
+AC_SUBST(optbindirs)
+AC_SUBST(prefix)
+AC_SUBST(SEQ_FALLBACK)
+AC_SUBST(XSEL)
+AC_SUBST(XSEL_MAN)
+AC_SUBST(XSEL_BIN)
+AC_SUBST(XSEL_MAN_PATH)
+
+
 
 #
 # If needed, run autoconf to regenerate the configure file
@@ -54,7 +62,7 @@ if test configure -ot configure.ac; then
 		fi
 		exit 1
 	else
-		AC_MSG_ERROR( 
+		AC_MSG_ERROR(
 			[cannot find the autoconf program in your path.
 This program needs to be run whenever the configure.ac file is modified.
 Please install it and try again.]
@@ -79,7 +87,7 @@ if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
 		AC_MSG_NOTICE([running autoheader])
 		autoheader || exit 1
 	else
-		AC_MSG_ERROR( 
+		AC_MSG_ERROR(
 			[cannot find the autoheader program in your path.
 This program needs to be run whenever the configure.ac file is modified.
 Please install it and try again.]
@@ -98,13 +106,14 @@ fi
 # This mostly helps OS X users, since fink usually installs out of
 # tree and doesn't update CFLAGS.
 #
+# It also helps FreeBSD which puts libiconv in /usr/local/lib
 
-for i in /usr/pkg /sw /opt /opt/local; do
+for i in /usr/pkg /sw /opt /opt/local /usr/local; do
 
 	AC_MSG_CHECKING([for $i/include include directory])
 	if test -d $i/include; then
 		AC_MSG_RESULT(yes)
-		CPPFLAGS="$CPPFLAGS -I$i/include/"
+		CXXFLAGS="$CXXFLAGS -I$i/include/"
 		CFLAGS="$CFLAGS -I$i/include/"
 	else
 	AC_MSG_RESULT(no)
@@ -113,7 +122,7 @@ for i in /usr/pkg /sw /opt /opt/local; do
 	AC_MSG_CHECKING([for $i/lib library directory])
 	if test -d $i/lib; then
 		AC_MSG_RESULT(yes)
-		LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+		LDFLAGS="$LDFLAGS -L$i/lib/ -Wl,-rpath,$i/lib/"
 	else
 		AC_MSG_RESULT(no)
 	fi
@@ -130,7 +139,7 @@ done
 
 
 #
-# Tell autoconf to create config.h header 
+# Tell autoconf to create config.h header
 #
 AC_CONFIG_HEADERS(config.h)
 
@@ -144,8 +153,8 @@ AH_BOTTOM([#if __GNUC__ >= 3
 #define __warn_unused __attribute__ ((warn_unused_result))
 #define __sentinel __attribute__ ((sentinel))
 #else
-#define __warn_unused 
-#define __sentinel 
+#define __warn_unused
+#define __sentinel
 #endif])
 
 
@@ -153,10 +162,7 @@ AH_BOTTOM([#if __GNUC__ >= 3
 # Set up various programs needed for install
 #
 
-# Here we look for c99 before cc as Sun Studio compiler supports c99
-# through the c99 binary.
-
-AC_PROG_CC([gcc c99 cc])
+AC_PROG_CXX([g++ c++])
 AC_PROG_CPP
 AC_PROG_INSTALL
 
@@ -195,20 +201,22 @@ fi
 # Optionally drop xsel command
 #
 
-AC_ARG_WITH( 
-	xsel, 
+AC_ARG_WITH(
+	xsel,
 	AC_HELP_STRING(
 		[--without-xsel],
-		[do not build the xsel program needed for X clipboard integration]
+		[do not build the xsel program needed for X clipboard integration.
+		 If build xsel, it will be configured with the same options as fish.]
 	),
 	[xsel=$withval],
-	[xsel=with_xsel] 
+	[xsel=with_xsel]
 )
 
 if [[ "$xsel" = "with_xsel" ]]; then
-	XSEL=xsel-0.9.6/xsel
+	XSEL=xsel-1.2.0
+	XSEL_BIN=$XSEL/xsel
 	XSEL_MAN=xsel.1x
-	XSEL_MAN_PATH=xsel-0.9.6/xsel.1x
+	XSEL_MAN_PATH=$XSEL/xsel.1x
 fi
 
 
@@ -226,60 +234,18 @@ AC_ARG_WITH(
 	[local_gettext=yes]
 )
 
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext])
 fi
 
 
-#
-# Test if the compiler accepts the -std=c99 flag. If so, using it
-# increases the odds of correct compilation, since we want to use the
-# *wprintf functions, which where defined in C99.
-#
-# NOTE: Never versions of autoconf has AC_CHECK_PROG_CC_C99
-#
-
-if test "$CC" != "c99"; then
-  XCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -std=c99"
-	XCPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS -std=c99"
-	AC_MSG_CHECKING(if -std=c99 works)
-
-	AC_CACHE_VAL(
-  	  local_cv_has__std_c99,
-    	[
-      	  AC_TRY_RUN(
-        	    [
-          	      #include <stdlib.h>
-            	    #include <stdio.h>
-
-              	  int main()
-                	{
-                  	  return 0;
-	                }
-	            ],
-	            local_cv_has__std_c99=yes,
-	            local_cv_has__std_c99=no,
-  	      )
-    	]
-	)
-
-	AC_MSG_RESULT($local_cv_has__std_c99)
-	case x$local_cv_has__std_c99 in
-	xno)
-  	  CFLAGS="$XCFLAGS"
-    	CPPFLAGS="$XCPPFLAGS" ;;
-	esac
-fi
-
 #
 # Try to enable large file support. This will make sure that on systems
 # where off_t can be either 32 or 64 bit, the latter size is used. On
 # other systems, this should do nothing. (Hopefully)
 #
 
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 
 #
 # If we are using gcc, set some flags that increase the odds of the
@@ -298,14 +264,15 @@ if test "$GCC" = yes; then
 	# bug has been verified to not exist on Linux using GCC 3.3.3.
 	#
 
-	CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
+	CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls"
 
 
 	#
 	# -Wall is there to keep me on my toes
 	#
 
-	CFLAGS="$CFLAGS -Wall"
+	# Some day...
+	CXXFLAGS="$CXXFLAGS -Wall"
 
 	#
 	# This is needed in order to get the really cool backtraces
@@ -338,9 +305,9 @@ AC_RUN_IFELSE(
 				return STATUS;
 			]
 		)
-	], 
-	[glibc=yes], 
-	[glibc=no] 
+	],
+	[glibc=yes],
+	[glibc=no]
 )
 
 if test "$glibc" = yes; then
@@ -383,7 +350,7 @@ fi
 
 AC_MSG_CHECKING([if we are under Solaris])
 case $target_os in
-	solaris*) 
+	solaris*)
 		AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris])
 		AC_MSG_RESULT(yes)
 		;;
@@ -397,7 +364,7 @@ AC_MSG_CHECKING([if we are using non varargs tparm.])
 AC_COMPILE_IFELSE(
 	[
 		AC_LANG_PROGRAM(
-			[			
+			[
 				#include <curses.h>
 				#include <term.h>
 			],
@@ -406,8 +373,8 @@ AC_COMPILE_IFELSE(
 			]
 		)
 	],
-	[tparm_solaris_kludge=no], 
-	[tparm_solaris_kludge=yes] 
+	[tparm_solaris_kludge=no],
+	[tparm_solaris_kludge=yes]
 )
 if test "x$tparm_solaris_kludge" = "xyes"; then
 	AC_MSG_RESULT(yes)
@@ -427,7 +394,7 @@ fi
 
 AC_MSG_CHECKING([if we are under BSD])
 case $target_os in
-	*bsd*) 
+	*bsd*)
 		AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD])
 		AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD])
 		AC_MSG_RESULT(yes)
@@ -486,7 +453,7 @@ AC_CHECK_FILES([/proc/self/stat])
 #
 
 AC_DEFINE(
-	[HAVE_TRANSLATE_H], 
+	[HAVE_TRANSLATE_H],
 	[1],
 	[Define to 1 if the wgettext function should be used for translating strings.]
 )
@@ -504,68 +471,74 @@ LIBS_COMMON=$LIBS
 LIBS=""
 AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
 AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
 AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
 LIBS_SHARED=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish. 
+# Check for libraries needed by fish.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
+# Check for libiconv_open if we can't find iconv_open. Silly OS X does
+# weird macro magic for the sole purpose of amusing me.
+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
 
-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
 LIBS_FISH=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish_indent. 
+# Check for libraries needed by fish_indent.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_FISH_INDENT=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish_pager. 
+# Check for libraries needed by fish_pager.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
 LIBS_FISH_PAGER=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fishd. 
+# Check for libraries needed by fishd.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
 LIBS_FISHD=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by mimedb. 
+# Check for libraries needed by mimedb.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_MIMEDB=$LIBS
@@ -573,12 +546,12 @@ LIBS=$LIBS_COMMON
 
 
 #
-# Check for libraries needed by set_color 
+# Check for libraries needed by set_color
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_SET_COLOR=$LIBS
@@ -588,14 +561,14 @@ LIBS=$LIBS_COMMON
 # Check presense of various header files
 #
 
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h ncurses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h sys/termios.h libintl.h execinfo.h])
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h ncurses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h sys/termios.h libintl.h execinfo.h spawn.h])
 
 AC_CHECK_HEADER(
 	[regex.h],
 	[
 		AC_DEFINE(
-			[HAVE_REGEX_H], 
-			[1], 
+			[HAVE_REGEX_H],
+			[1],
 			[Define to 1 if you have the <regex.h> header file.]
 		)
 	],
@@ -632,7 +605,7 @@ AC_CHECK_HEADER(
 # conditional definition of __EXTENSIONS__, to avoid redundant tests.
 #
 
-XCFLAGS="$CFLAGS"
+XCFLAGS="$CXXFLAGS"
 
 echo Checking how to use -D_XOPEN_SOURCE=600 and -D_POSIX_C_SOURCE=200112L...
 local_found_posix_switch=no
@@ -682,20 +655,20 @@ for i in "" "-D_POSIX_C_SOURCE=200112L" "-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=2
 		[
 			/* Avert high-level optimisation, by making the program's
 			 * return value depend on all tested identifiers. */
-			int ret = 0;
+			long ret = 0;
 			/* POSIX only: might be unhidden by _POSIX_C_SOURCE. */
 			struct sigaction sa;
 			sigset_t ss;
 			siginfo_t info;
-			ret += (int)(void *)&info + kill( 0, 0 ) +
+			ret += (long)(void *)&info + kill( 0, 0 ) +
 				sigaction( 0, &sa, 0 ) + sigemptyset( &ss );
 			/* Extended-POSIX: might be unhidden by _XOPEN_SOURCE. */
 			ret += killpg( 0, 0 );
 			/* Non-standard: might be hidden by the macros. */
-			{ 
+			{
 				struct winsize termsize;
-				ret += (int)(void *)&termsize;
-				ret += SIGWINCH + TIOCGWINSZ + SIGIO; 
+				ret += (long)(void *)&termsize;
+				ret += SIGWINCH + TIOCGWINSZ + SIGIO;
 			}
 			return ret;
 
@@ -739,7 +712,7 @@ AC_CHECK_FUNCS( dcgettext backtrace backtrace_symbols sysconf )
 # the translations should be installed.
 #
 
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 )
 fi
 
@@ -763,22 +736,22 @@ AC_RUN_IFELSE(
 				#include <stdlib.h>
 			],
 			[
-				int status; 
-				char *res; 
-				res = realpath( "somefile", 0 ); 
-				status = !(res != 0 || errno == ENOENT); 
+				int status;
+				char *res;
+				res = realpath( "somefile", 0 );
+				status = !(res != 0 || errno == ENOENT);
 				exit( status );
 			]
 		)
-	], 
-	[have_realpath_null=yes], 
-	[have_realpath_null=no] 
+	],
+	[have_realpath_null=yes],
+	[have_realpath_null=no]
 )
 
 if test "$have_realpath_null" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE_REALPATH_NULL], 
+		[HAVE_REALPATH_NULL],
 		[1],
 		[Define to 1 if realpath accepts null for its second argument.]
 	)
@@ -805,15 +778,15 @@ AC_LINK_IFELSE(
 				#endif
 			],
 			[
-				struct winsize termsize = {0}; 
+				struct winsize termsize = {0};
 				TIOCGWINSZ;
 			]
 		)
-	], 
+	],
 	[
-		AC_MSG_RESULT(yes); 
+		AC_MSG_RESULT(yes);
 		AC_DEFINE([HAVE_WINSIZE], [1], [Define to 1 if the winsize struct and TIOCGWINSZ macro exist])
-	], 
+	],
 	[
 		AC_MSG_RESULT(no)
 	]
@@ -849,7 +822,7 @@ if test "$ac_cv_func_fwprintf" = yes; then
 		[
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
-		] 
+		]
 	)
 
 fi
@@ -865,19 +838,19 @@ AC_TRY_LINK(
 	],
 	[
 		extern int  _nl_msg_cat_cntr;
-		int tmp = _nl_msg_cat_cntr; 
+		int tmp = _nl_msg_cat_cntr;
 		exit(tmp);
 	],
-	have__nl_msg_cat_cntr=yes, 
+	have__nl_msg_cat_cntr=yes,
 	have__nl_msg_cat_cntr=no
 )
 if test "$have__nl_msg_cat_cntr" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE__NL_MSG_CAT_CNTR], 
+		[HAVE__NL_MSG_CAT_CNTR],
 		[1],
 		[Define to 1 if the _nl_msg_cat_cntr symbol is exported.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -890,19 +863,19 @@ AC_TRY_LINK(
 	],
 	[
 		extern char **__environ;
-		char **tmp = __environ; 
+		char **tmp = __environ;
 		exit(tmp!=0);
 	],
-	have___environ=yes, 
+	have___environ=yes,
 	have___environ=no
 )
 if test "$have___environ" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE___ENVIRON], 
+		[HAVE___ENVIRON],
 		[1],
 		[Define to 1 if the __environ symbol is exported.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -919,26 +892,26 @@ AC_TRY_LINK(
 		static struct option
 			long_options[] =
 			{
-				0, 0, 0, 0 
+				0, 0, 0, 0
 			}
 		;
 		int opt = getopt_long( 0,
-							   0, 
 							   0,
-							   long_options, 
+							   0,
+							   long_options,
 							   0 );
-		
+
 	],
-	have_working_getopt_long=yes, 
+	have_working_getopt_long=yes,
 	have_working_getopt_long=no
 )
 if test "$have_working_getopt_long" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE_WORKING_GETOPT_LONG], 
+		[HAVE_WORKING_GETOPT_LONG],
 		[1],
 		[Define to 1 if getopt_long exists and works.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -970,6 +943,12 @@ if test ! x$local_found_posix_switch = xyes; then
 	echo "Some fish features may be disabled."
 fi
 
+if [[ "$xsel" = "with_xsel" ]]; then
+	echo "Now configure xsel with $conf_arg"
+	rm -rf $XSEL
+	tar xf $XSEL.tar.gz
+	cd $XSEL && ./configure $conf_arg
+fi
 echo "fish is now configured."
 echo "Use 'make' and 'make install' to build and install fish."
 

doc_src/alias.txt

@@ -12,7 +12,7 @@ shells. For other uses, it is recommended to define a <a
 href='#function'>function</a>.
 
 Alias does not keep track of which functions have been defined using
-alias, nor does it allow erasing of aliases. 
+alias, nor does it allow erasing of aliases.
 
 - NAME is the name of the function to define
 - DEFINITION is the body of the function. The string " $argv" will be appended to the body.

doc_src/and.txt

@@ -17,7 +17,7 @@ variable.
 \subsection and-example Example
 
 The following code runs the \c make command to build a program, if the
-build succceeds, the program is installed. If either step fails,
+build succeeds, the program is installed. If either step fails,
 <tt>make clean</tt> is run, which removes the files created by the
 build process
 

doc_src/begin.txt

@@ -37,7 +37,7 @@ In the following code, all output is redirected to the file out.html.
 begin
 	echo $xml_header
 	echo $html_header
-	if test -e $file 
+	if test -e $file
 		...
 	end
 	...

doc_src/bind.txt

@@ -8,9 +8,15 @@
 The <tt>bind</tt> builtin causes fish to add a key binding from the specified sequence.
 
 SEQUENCE is the character sequence to bind to. Usually, one would use
-fish escape sequences to express them. For example, Alt-w can be
-written as <tt>\\ew</tt>, and Control-x can be written as
-<tt>\\cx</tt>.
+fish escape sequences to express them. For example, because pressing
+the Alt key and another character sends that character prefixed with
+an escape character, Alt-based key bindings can be written using the
+\c \\e escape. For example, Alt-w can be written as
+<tt>\\ew</tt>. Control character can be written in much the same way
+using the \c \\c escape, for example Control-x can be written as
+<tt>\\cx</tt>. Note that Alt-based key bindings are case sensitive and
+Control base key bindings are not. This is not a design choice in
+fish, it is simply how terminals work.
 
 If SEQUENCE is the empty string, i.e. an empty set of quotes, this is
 interpreted as the default keybinding. It will be used whenever no
@@ -39,6 +45,9 @@ bind to the function name. This way it becomes significantly easier to
 test the function while editing, and the result is usually more
 readable as well.
 
+If you want to autoload bindings each time you start shell, you should 
+define them inside fish_user_key_bindings function.
+
 - <tt>-a</tt> or <tt>--all</tt> If --key-names is specified, show all key names, not only the ones that actually are defined for the current terminal. If erase mode is specified, this switch will cause all current bindings to be erased.
 - <tt>-e</tt> or <tt>--erase</tt> Erase mode. All non-switch arguments are interpreted as character sequences and any commands associated with those sequences are erased.
 - <tt>-h</tt> or <tt>--help</tt> Display help and exit

doc_src/case.txt

@@ -19,7 +19,7 @@ regular wildcard expansion using filenames.
 
 Note that fish does not fall through on case statements. Though the
 syntax may look a bit like C switch statements, it behaves more like
-the case statementes of traditional shells.
+the case statements of traditional shells.
 
 Also note that command substitutions in a case statement will be
 evaluated even if it's body is not taken. This may seem

doc_src/commandline.txt

@@ -13,9 +13,9 @@
 
 The following switches change what the commandline builtin does
 
-- \c -C or \c --cursor set or get the current cursor position, not 
+- \c -C or \c --cursor set or get the current cursor position, not
   the contents of the buffer. If no argument is given, the current
-  cursor position is printed, otherwise the argument is interpreted 
+  cursor position is printed, otherwise the argument is interpreted
   as the new cursor position.
 - \c -f or \c --function inject readline functions into the
   reader. This option can not be combined with any other option. It
@@ -44,7 +44,7 @@ or updated
 - \c -t or \c --current-token select the current token.
 
 The following switch changes the way \c commandline prints the current
-commandline buffer 
+commandline buffer
 
 - \c -c or \c --cut-at-cursor only print selection up until the
   current cursor position

doc_src/commands.hdr.in

@@ -1,5 +1,5 @@
 /** \page commands Commands, functions and builtins bundled with fish
-Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below. 
+Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below.
 
 @command_list@
 

doc_src/complete.txt

@@ -6,7 +6,7 @@
 \subsection complete-description Description
 
 For an introduction to how to specify completions, see the section <a
-href='index.html#completions-own'>Writing your own completions</a> of
+href='index.html#completion-own'>Writing your own completions</a> of
 the fish manual.
 
 - <tt>COMMAND</tt> is the name of the command for which to add a completion

doc_src/contains.txt

@@ -5,6 +5,7 @@
 
 \subsection contains-description Description
 
+- \c -i or \c --index print the the word index
 - \c -h or \c --help display this message
 
 Test if the set VALUES contains the string KEY. Return status is 0 if

doc_src/design.hdr

@@ -7,8 +7,8 @@ design fish. The fish design has three high level goals. These are:
 
 -# Everything that can be done in other shell languages should be
 possible to do in fish, though fish may rely on external commands in
-doing so. 
--# Fish should be user friendly, but not at the expense of expressiveness. 
+doing so.
+-# Fish should be user friendly, but not at the expense of expressiveness.
 Most tradeoffs between power and ease of use can be avoided with careful design.
 -# Whenever possible without breaking the above goals, fish should
 follow the Posix syntax.
@@ -33,7 +33,7 @@ program harder to maintain and update.
 Examples:
 
 - Here documents are too similar to using echo inside of a pipeline.
-- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. 
+- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function.
 - Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish functions have none of the drawbacks of either syntax.
 - The many Posix quoting styles are silly, especially \$''.
 
@@ -57,14 +57,14 @@ take the whole system down.
 Examples:
 
 - Builtin commands should only be created when it cannot be
-avoided. \c echo, \c kill, \c printf and \c time are among the commands 
-that fish does not implement internally since they can be provided as 
-external commands. Several other commands that are commonly implemented 
+avoided. \c echo, \c kill, \c printf and \c time are among the commands
+that fish does not implement internally since they can be provided as
+external commands. Several other commands that are commonly implemented
 as builtins and can not be implemented as external commands,
 including \c type, \c vared, \c pushd and \c popd are implemented as shellscript
 functions in fish.
 - Mathematical calculations, regex matching, generating lists of numbers
-and many other funtions can easily be done in external programs. They 
+and many other funtions can easily be done in external programs. They
 should not be supported internally by the shell.
 
 The law of minimalism does not imply that a large feature set is
@@ -122,8 +122,8 @@ Examples:
 
 - There should only be one type of input to the shell, lists of commands. Loops, conditionals and variable assignments are all performed through regular commands.
 - The differences between builtin commands, shellscript functions and builtin commands should be made as small as possible. Builtins and shellscript functions should have exactly the same types of argument expansion as other commands, should be possible to use in any position in a pipeline, and should support any io redirection.
-- Instead of forking when performing command substitution to provide a fake variable scope, all fish commands are performed from the same process, and fish instead supports true scoping
-- All blocks end with the \c end builtin
+- Instead of forking when performing command substitution to provide a fake variable scope, all fish commands are performed from the same process, and fish instead supports true scoping.
+- All blocks end with the \c end builtin.
 
 \section disc The law of discoverability
 
@@ -147,7 +147,7 @@ until the next time she/he uses the same program.
 
 Examples:
 
-- Everything should be tab-completable, and every tab completion should have a description
+- Everything should be tab-completable, and every tab completion should have a description.
 - Every syntax error and error in a builtin command should contain an error message describing what went wrong and a relevant help page. Whenever possible, errors should be flagged red by the syntax highlighter.
 - The help manual should be easy to read, easily available from the shell, complete and contain many examples
 - The language should be uniform, so that once the user understands the command/argument syntax, he will know the whole language, and be able to use tab-completion to discover new featues.

doc_src/dirh.txt

@@ -3,6 +3,6 @@
 \subsection dirh-synopsis Synopsis
 <tt>dirh</tt>
 
-\subsection dirh-description Description 
+\subsection dirh-description Description
 <tt>dirh</tt> prints the current directory history. The current position in the
 history is highlighted using <tt>$fish_color_history_current</tt>.

doc_src/dirs.txt

@@ -3,5 +3,5 @@
 \subsection dirs-synopsis Synopsis
 <tt>dirs</tt>
 
-\subsection dirs-description Description 
+\subsection dirs-description Description
 <tt>dirs</tt> prints the current directory stack.

doc_src/echo.txt

@@ -0,0 +1,16 @@
+\section echo echo - display a line of text
+
+\subsection echo-synopsis Synopsis
+ <tt>echo [STRING]</tt>
+
+\subsection echo-description Description                                                                                                                             
+                                                                                                                                                                          
+Display a line of text.                                                                                                           
+                                                                                                                                                                          
+- \c -n, \c Do not output a newline
+- \c -s, \c Do not separate arguments with spaces                                                                                                                                
+- \c -h, \c --help Display this help
+
+\subsection echo-example Example
+
+<tt>echo 'Hello World'</tt> Print hello world to stdout

doc_src/else.txt

@@ -13,5 +13,5 @@ status is 0, the commands COMMANDS_TRUE will execute.  If it is not 0 and
 
 The command <tt>if test -f foo.txt; echo foo.txt exists; else; echo foo.txt does not exist; end</tt>
 will print <tt>foo.txt exists</tt> if the file foo.txt
-exists and is a regular file, otherwise it will print 
+exists and is a regular file, otherwise it will print
 <tt>foo.txt does not exist</tt>.

doc_src/emit.txt

@@ -5,7 +5,7 @@
 
 \subsection emit-description Description
 
-The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers. 
+The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers.
 
 \subsection emit-example Example
 

doc_src/faq.hdr

@@ -7,6 +7,7 @@
 - <a href='#faq-default'>How do I make fish my default shell?</a>
 - <a href='#faq-titlebar'>I'm seeing weird output before each prompt when using screen. What's wrong?</a>
 - <a href='#faq-greeting'>How do I change the greeting message?</a>
+- <a href='#faq-history'>Why doesn't history substitution ("!$" etc.) work?</a>
 
 <hr>
 
@@ -32,7 +33,7 @@ parent is ~. This issue is not possible to fix without either making
 every single command into a builtin, breaking Unix semantics or
 implementing kludges in every single command.
 
-This issue can also be seen when doing IO redirection. 
+This issue can also be seen when doing IO redirection.
 
 Another related issue is that many programs that operate on recursive
 directory trees, like the find command, silently ignore symlinked
@@ -55,9 +56,9 @@ feature, write <code>set CDPATH .</code> on the commandline.
 
 If fish is unable to locate a command with a given name, fish will
 test if a directory of that name exists. If it does, it is implicitly
-assumed that you want to change working directory. For example, the 
-fastest way to switch to your home directory is to simply type
-<code>~</code>.
+assumed that you want to change working directory. For example, the
+fastest way to switch to your home directory is to simply press
+<code>~</code> and enter.
 
 <hr>
 
@@ -92,8 +93,8 @@ In order to change your default shell, type:
 
 You may need to adjust the above path to e.g. /usr/bin/fish. Use the command <code>which fish</code> if you are unsure of where fish is installed.
 
-You will need to log out and back in again for the change to take
-effect.
+Unfortunatly, there is no way to make the changes take effect at once,
+you will need to log out and back in again.
 
 <hr>
 
@@ -104,7 +105,7 @@ Quick answer:
 Run the following command in fish:
 
 <pre>
-echo function fish_title;end ~/.config/fish/config.fish
+echo 'function fish_title;end' &gt; ~/.config/fish/config.fish
 </pre>
 
 Problem solved!
@@ -136,5 +137,25 @@ the greeting use:
 set fish_greeting
 </pre>
 
+<hr>
+
+\section faq-history Why doesn't history substitution ("!$" etc.) work?
+
+Because history substitution is an awkward interface that was invented before
+interactive line editing was even possible.  Fish drops it in favor of
+perfecting the interactive history recall interface.  Switching requires a
+small change of habits: if you want to modify an old line/word, first recall
+it, then edit.  E.g. don't type "sudo !!" - first press Up, then Home, then
+type "sudo ".
+
+Fish history recall is very simple yet effective:
+
+ - As in any modern shell, the Up arrow recalls whole lines, starting from the last line executed.  A single press replaces "!!", later presses replace "!-3" and the like.
+    - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
+ - Alt+Up recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
+    - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press Alt+Up.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
+    - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (Alt+D and Alt+Backspace are your friends).
+
+See <a href='index.html#editor'>documentation</a> for more details about line editing in fish.
 
 */

doc_src/fish_config.txt

@@ -0,0 +1,5 @@
+\section fish_config fish_config - Start up the web-based configuration interface
+
+\subsection fish_config-description Description
+
+This command starts up the web-based configuration interface, which allows you to edit your colors and view your functions, variables, and history.

doc_src/fish_indent.txt

@@ -1,15 +1,15 @@
-\section fish_indent fish_indent - indenter and prettyfier
+\section fish_indent fish_indent - indenter and prettifier
 
 \subsection fish_indent-synopsis Synopsis
  <tt>fish_indent [options]</tt>
 
 \subsection fish_indent-description Description
 
-\c fish_indent is used to indent or otherwise prettyfy a piece of fish
+\c fish_indent is used to indent or otherwise prettify a piece of fish
 code. \c fish_indent reads commands from standard input and outputs
 them to standard output.
 
-\c fish_indent underatands the following options:
+\c fish_indent understands the following options:
 
 - <tt>-h</tt> or <tt>--help</tt> displays this help message and then exits
 - <tt>-i</tt> or <tt>--no-indent</tt> do not indent commands

doc_src/fish_prompt.txt

@@ -1,6 +1,6 @@
-\section fish_prompt fish_prompt - define the apperance of the command line promp
+\section fish_prompt fish_prompt - define the apperance of the command line prompt
 
-\subsection fish_promt-synopsis Synopsis
+\subsection fish_prompt-synopsis Synopsis
 <pre>function fish_prompt
     ...
 end</pre>
@@ -11,6 +11,9 @@ By defining the \c fish_prompt function, the user can choose a custom
 prompt. The \c fish_prompt function is executed when the prompt is to
 be shown, and the output is used as a prompt.
 
+Please keep in mind that the function is executed by <a
+href='index.html#expand-command-substitution'>command substitution</a>, and so the exit status of commands within fish_prompt will not modify the <a href="index.html#variables-status">$status</a> seen outside of fish_prompt.
+
 \subsection fish_prompt-example Example
 
 A simple prompt:

doc_src/fish_right_prompt.txt

@@ -0,0 +1,23 @@
+\section fish_right_prompt fish_right_prompt - define the apperance of the right-side command line prompt
+
+\subsection fish_right_prompt-synopsis Synopsis
+<pre>function fish_right_prompt
+    ...
+end</pre>
+
+\subsection fish_right_prompt-description Description
+
+\c fish_right_prompt is similar to \c fish_prompt, except that it appears on the right side of the terminal window.
+
+Multiple lines are not supported in \c fish_right_prompt.
+
+\subsection fish_prompt-example Example
+
+A simple right prompt:
+
+<pre>
+function fish_right_prompt -d "Write out the right prompt"
+    date "+%m/%d/%y"
+end
+</pre>
+

doc_src/fish_update_completions.txt

@@ -0,0 +1,6 @@
+\section fish_update_completions fish_update_completions - Update man-page completions
+
+\subsection fish_update_completions-description Description
+
+This command parses your installed man pages and writes completion files to the fish config directory. This does not overwrite custom completions.
+

doc_src/for.txt

@@ -11,7 +11,7 @@ not be executed at all.
 
 \subsection for-example Example
 
-The command 
+The command
 
 <tt>for i in foo bar baz; echo $i; end</tt>
 
@@ -21,5 +21,5 @@ would output:
 foo
 bar
 baz
-</pre>		
+</pre>
 

doc_src/funced.txt

@@ -0,0 +1,14 @@
+\section funced funced - edit a function interactively
+
+\subsection funced-synopsis Synopsis
+ <code>funced [OPTIONS] NAME</code>
+
+\subsection funced-description Description
+
+Use the funced command to edit the definition of a
+function. If there is no function with the name specified, a skeleton function is inserted, if a function exist, the definition will be shown in your editor or on the command line.
+
+By default, funced edits functions using the text editor in your $EDITOR variable, if set; otherwise it uses the built-in editor.
+
+- <code>-e command</code> or <code>--editor command</code> Open the function body inside the text editor given by the command (for example, "vi"). The command 'fish' will use the built-in editor.
+- <code>-i</code> or <code>--interactive</code> Open function body in built-in editor.

doc_src/funcsave.txt

@@ -0,0 +1,12 @@
+\section funcsave funcsave - save the definition of a function to the users autoload directory
+
+\subsection funcsave-synopsis Synopsis
+ <tt>funcsave FUNCTION_NAME</tt>
+
+\subsection funcsave-description Description
+
+funcsave is used to save the current definition of a function to
+a file which will be autoloaded by current and future fish
+sessions. This can be useful if you have interactively created a new
+function and wish to save it for later use.
+

doc_src/function.txt

@@ -6,6 +6,7 @@
 \subsection function-description Description
 
 - <code>-d DESCRIPTION</code> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
+- <code>-e</code> or <code>--on-event EVENT_NAME</code> tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt.
 - <code>-j PID</code> or <code> --on-job-exit PID</code> tells fish to run this function when the job with group id PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
 - <code>-p PID</code> or <code> --on-process-exit PID</code> tells fish to run this function when the fish child process with process id PID exits
 - <code>-s</code> or <code>--on-signal SIGSPEC</code> tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP)
@@ -26,6 +27,11 @@ will write <code>hello</code> whenever the user enters \c hi.
 If the user enters any additional arguments after the function, they
 are inserted into the environment <a href="index.html#variables-arrays">variable array</a> argv.
 
+By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the <a href='#emit">emit</a> builtin. Fish generates the following named events:
+
+- \c fish_prompt, which is emitted whenever a new fish prompt is about to be displayed
+- \c fish_command_not_found, which is emitted whenever a command lookup failed
+
 \subsection function-example Example
 
 <pre>

doc_src/functions.txt

@@ -8,6 +8,7 @@
 This builtin command is used to print or erase functions.
 
 - <code>-a</code> or <code>--all</code> list all functions, even those whose name start with an underscore.
+- <code>-c OLDNAME NEWNAME</code> or <code>--copy OLDNAME NEWNAME</code> creates a new function named NEWNAME, using the definition of the OLDNAME function.
 - <code>-d DESCRIPTION</code> or <code>--description=DESCRIPTION</code> change the description of this function
 - <code>-e</code> or <code>--erase</code> causes the specified functions to be erased.
 - <code>-h</code> or <code>--help</code> display a help message and exit
@@ -17,11 +18,14 @@ This builtin command is used to print or erase functions.
 The default behavior of \c functions when called with no arguments,
 is to print the names and definitions of all defined functions. If any
 non-switch parameters are given, only the definition of the specified
-functions are printed. 
+functions are printed.
 
 Automatically loaded functions can not be removed using functions
 -e. Either remove the definition file or change the
 $fish_function_path variable to remove autoloaded functions.
 
+Function copies, created with -c, will not have any event/signal/on-exit 
+notifications that the original may have had.
+
 The exit status of the functions builtin is the number functions
 specified in the argument list that do not exist.

doc_src/history.txt

@@ -0,0 +1,36 @@
+\section history history - Show and manipulate user's command history 
+
+\subsection history-synopsis Synopsis
+<pre>
+history (--save | --clear)
+history (--search | --delete ) (--prefix "prefix string" | --contains "search string")
+</pre>
+
+\subsection history-description Description
+
+history is used to list, search and delete user's command history
+
+\subsection history-examples Example
+
+<pre>
+history --save
+Save all changes in history file
+
+history --clear
+Delete all history items
+
+history --search --contains "foo"
+Searches commands containing "foo" string
+
+history --search --prefix "foo"
+Searches for commands with prefix "foo"
+
+history --delete --contains "foo"
+Interactively delete commands containing string "foo"
+
+history --delete --prefix "foo"
+Interactively delete commands with prefix "foo"
+
+history --delete "foo"
+Delete command "foo" from history
+</pre>

doc_src/if.txt

@@ -1,14 +1,14 @@
 \section if if - conditionally execute a command
 
 \subsection if-synopsis Synopsis
-<tt>if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end</tt>
+<tt>if CONDITION; COMMANDS_TRUE...; [else if CONDITION2; COMMANDS_TRUE2...;] [else; COMMANDS_FALSE...;] end</tt>
 
 \subsection if-description Description
 
 <tt>if</tt> will execute the command CONDITION.  If the condition's
 exit status is 0, the commands COMMANDS_TRUE will execute.  If the
 exit status is not 0 and <tt>else</tt> is given, COMMANDS_FALSE will
-be executed.  
+be executed.
 
 In order to use the exit status of multiple commands as the condition
 of an if block, use <a href="#begin"><tt>begin; ...; end</tt></a> and
@@ -24,10 +24,13 @@ variable.
 <pre>
 if test -f foo.txt
 	echo foo.txt exists
+else if test -f bar.txt
+	echo bar.txt exists
 else
-	echo foo.txt does not exist
+	echo foo.txt and bar.txt do not exist
 end
-</pre>
-will print <tt>foo.txt exists</tt> if the file foo.txt
-exists and is a regular file, otherwise it will print 
-<tt>foo.txt does not exist</tt>.
+</pre>will print <tt>foo.txt exists</tt> if the file foo.txt
+exists and is a regular file, otherwise it will print
+<tt>bar.txt exists</tt> if the file bar.txt exists
+and is a regular file, otherwise it will print
+<tt>foo.txt and bar.txt do not exist</tt>.

doc_src/index.hdr.in

@@ -11,7 +11,7 @@ This is the documentation for \c fish, the friendly interactive
 shell. \c fish is a user friendly commandline shell intended
 mostly for interactive use. A shell is a program used to execute other
 programs. For the latest information on \c fish, please visit the <a
-href="http://www.fishshell.org"><code>fish</code> homepage</a>.
+href="http://ridiculousfish.com/shell/"><code>fish</code> homepage</a>.
 
 \section syntax Syntax overview
 
@@ -59,7 +59,7 @@ Here is a list of some useful commands:
 - \c mv, move (rename) files
 - \c cp, copy files
 - \c open, open files with the default application associated with each filetype
-- \c less, list the contents of files 
+- \c less, list the contents of files
 
 Commands and parameters are separated by the space character
 (&nbsp;). Every command ends with either a newline (i.e. by pressing
@@ -80,7 +80,7 @@ while '-f' will turn it off.
 
 \subsection quotes Quotes
 
-Sometimes features such as <a href="#globbing">parameter expansion</a>
+Sometimes features such as <a href="#expand">parameter expansion</a>
 and <a href="#escapes">character escapes</a> get in the way. When that
 happens, the user can write a parameter within quotes, either '
 (single quote) or " (double quote). There is one important difference
@@ -124,7 +124,7 @@ these characters, so called escape sequences are provided. These are:
 - <code>'\\*'</code>, escapes the star character
 - <code>'\\?'</code>, escapes the question mark character
 - <code>'\\~'</code>, escapes the tilde character
-- <code>'\\%'</code>, escapes the percent character
+- <code>'\\%%'</code>, escapes the percent character
 - <code>'\\#'</code>, escapes the hash character
 - <code>'\\('</code>, escapes the left parenthesis character
 - <code>'\\)'</code>, escapes the right parenthesis character
@@ -135,11 +135,15 @@ these characters, so called escape sequences are provided. These are:
 - <code>'\\\<'</code>, escapes the less than character
 - <code>'\\\>'</code>, escapes the more than character
 - <code>'\\^'</code>, escapes the circumflex character
+- <code>'\\&'</code>, escapes the ampersand character
+- <code>'\\;'</code>, escapes the semicolon character
+- <code>'\\"'</code>, escapes the quote character
+- <code>'\\''</code>, escapes the apostrophe character
 - <code>'\\x<i>xx</i>'</code>, where <code><i>xx</i></code> is a hexadecimal number, escapes the ascii character with the specified value. For example, \\x9 is the tab character.
 - <code>'\\X<i>xx</i>'</code>, where <code><i>xx</i></code> is a hexadecimal number, escapes a byte of data with the specified value. If you are using a mutibyte encoding, this can be used to enter invalid strings. Only use this if you know what you are doing.
 - <code>'\\<i>ooo</i>'</code>, where <code><i>ooo</i></code> is an octal number, escapes the ascii character with the specified value. For example, \\011 is the tab character.
-- <code>'\\u<i>xxxx</i>'</code>, where <code><i>xxxx</i></code> is a hexadecimal number, escapes the 16-bit unicode character with the specified value. For example, \\u9 is the tab character.
-- <code>'\\U<i>xxxxxxxx</i>'</code>, where <code><i>xxxxxxxx</i></code> is a hexadecimal number, escapes the 32-bit unicode character with the specified value. For example, \\U9 is the tab character.
+- <code>'\\u<i>xxxx</i>'</code>, where <code><i>xxxx</i></code> is a hexadecimal number, escapes the 16-bit Unicode character with the specified value. For example, \\u9 is the tab character.
+- <code>'\\U<i>xxxxxxxx</i>'</code>, where <code><i>xxxxxxxx</i></code> is a hexadecimal number, escapes the 32-bit Unicode character with the specified value. For example, \\U9 is the tab character.
 - <code>'\\c<i>x</i>'</code>, where <code><i>x</i></code> is a letter of the alphabet, escapes the control sequence generated by pressing the control key and the specified letter. For example, \\ci is the tab character
 
 \subsection redirects IO redirection
@@ -147,7 +151,7 @@ these characters, so called escape sequences are provided. These are:
 Most program use three types of input/output (IO), each represented by
 a number called a file descriptor (FD). These are:
 
-- Standard input, FD 0, for reading, defaults to reading from the keyboard. 
+- Standard input, FD 0, for reading, defaults to reading from the keyboard.
 - Standard output, FD 1, for writing, defaults to writing to the screen.
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
@@ -160,13 +164,13 @@ default through a simple mechanism called a redirection.
 An example of a file redirection is <code> echo hello \>output.txt</code>,
 which directs the output of the echo command to the file error.txt.
 
-- To redirect standard input, write <code>\<SOURCE_FILE</code> 
-- To redirect standard output, write <code>\>DESTINATION</code> 
-- To redirect standard error, write <code>^DESTINATION</code> 
+- To redirect standard input, write <code>\<SOURCE_FILE</code>
+- To redirect standard output, write <code>\>DESTINATION</code>
+- To redirect standard error, write <code>^DESTINATION</code>
 - To redirect standard output to a file which will be appended, write <code>\>\>DESTINATION_FILE</code>
-- To redirect standard error to a file which will be appended, write <code>^^DESTINATION_FILE</code> 
+- To redirect standard error to a file which will be appended, write <code>^^DESTINATION_FILE</code>
 
-<code>DESTINATION</code> can be one of the following: 
+<code>DESTINATION</code> can be one of the following:
 
 - A filename. The output will be written to the specified file.
 - An ampersand (\&) followed by the number of another file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
@@ -182,7 +186,7 @@ Any FD can be redirected in an arbitrary way by prefixing the
 redirection with the number of the FD.
 
 - To redirect input of FD number N, write <code>N\<DESTINATION</code>
-- To redirect output of FD number N, write <code>N\>DESTINATION</code> 
+- To redirect output of FD number N, write <code>N\>DESTINATION</code>
 - To redirect output of FD number N to a file which will be appended, write <code>N\>\>DESTINATION_FILE</code>
 
 Example: <code>echo Hello 2\>-</code> and <code>echo Hello ^-</code> are
@@ -230,7 +234,7 @@ Example:
 
 <code>emacs \&</code>
 
-will start the emacs text editor in the background. 
+will start the emacs text editor in the background.
 
 \subsection syntax-job-control Job control
 
@@ -306,7 +310,7 @@ a filename consisting of the name of the function plus the suffix
 
 The default value for \$fish_function_path is \c ~/.config/fish/functions
 \c /etc/fish/functions \c /usr/share/fish/functions. The exact path
-to the last two of these may be slighly different depending on what
+to the last two of these may be slightly different depending on what
 install path prefix was chosen at configuration time. The rationale
 behind having three different directories is that the first one is for
 user specific functions, the second one is for system-wide additional
@@ -323,10 +327,10 @@ function already be loaded, i.e. a circular dependency.
 \subsection syntax-conditional Conditional execution of code
 
 There are four fish builtins that let you execute commands only if a
-specific criterion is met. These builtins are 
-<a href="commands.html#if">if</a>, 
-<a href="commands.html#switch">switch</a>, 
-<a href="commands.html#and">and</a> and 
+specific criterion is met. These builtins are
+<a href="commands.html#if">if</a>,
+<a href="commands.html#switch">switch</a>,
+<a href="commands.html#and">and</a> and
 <a href="commands.html#or">or</a>.
 
 The \c switch command is used to execute one of possibly many blocks
@@ -335,7 +339,7 @@ for <a href="commands.html#switch">switch</a> for more information.
 
 The other conditionals use the <a href='#variables-status'>exit
 status</a> of a command to decide if a command or a block of commands
-should be executed. See the documentation for 
+should be executed. See the documentation for
 <a href="commands.html#if">if</a>, <a href="commands.html#and">and</a>
 and <a href="commands.html#or">or</a> for more information.
 
@@ -392,13 +396,13 @@ These are the general purpose tab completions that \c fish provides:
 of these completions are simple options like the \c -l option for \c
 ls, but some are more advanced. The latter include:
 
-- The programs 'man' and 'whatis' show all installed 
+- The programs 'man' and 'whatis' show all installed
 manual pages as completions.
-- The 'make' program uses all targets in the Makefile in 
+- The 'make' program uses all targets in the Makefile in
 the current directory as completions.
 - The 'mount' command uses all mount points specified in fstab as completions.
-- The 'ssh' command uses all hosts that are stored 
-in the known_hosts file as completions. (see the ssh documentation for more information) 
+- The 'ssh' command uses all hosts that are stored
+in the known_hosts file as completions. (see the ssh documentation for more information)
 - The 'su' command uses all users on the system as completions.
 - The \c apt-get, \c rpm and \c yum commands use all installed packages as completions.
 
@@ -415,7 +419,7 @@ this can be specified as <code>complete -c myprog -a 'start
 stop'</code>. The argument to the \c -a switch is always a single
 string. At completion time, it will be tokenized on spaces and tabs,
 and variable expansion, command substitution and other forms of
-parameter expansion will take place. 
+parameter expansion will take place.
 
 Fish has a special syntax to support specifying switches accepted by a
 command. The switches \c -s, \c -l and \c -o are used to specify a
@@ -466,11 +470,11 @@ prints a list of all user groups with the groups members as description.
 
 <pre>__fish_complete_pids</pre>
 
-prints a list of all procceses IDs with the command name as description.
+prints a list of all processes IDs with the command name as description.
 
 <pre>__fish_complete_suffix SUFFIX</pre>
 
-performs file completion allowing only files ending in SUFFIX. The mimetype database is usded to find a suitable description.
+performs file completion allowing only files ending in SUFFIX. The mimetype database is used to find a suitable description.
 
 <pre>__fish_complete_users</pre>
 
@@ -494,7 +498,7 @@ prints a list of all known network interfaces.
 <pre>__fish_print_packages</pre>
 
 prints a list of all installed packages. This function currently handles
-debian, rpm and gentoo packages.
+Debian, rpm and Gentoo packages.
 
 
 
@@ -509,7 +513,7 @@ of the name of the command to complete and the suffix '.fish'.
 
 The default value for \$fish_complete_path is ~/.config/fish/completions,
 /etc/fish/completions and /usr/share/fish/completions. The exact
-path to the last two of these may be slighly different depending on
+path to the last two of these may be slightly different depending on
 what install path prefix was chosen at configuration time. If a
 suitable file is found in one of these directories, it will be
 automatically loaded and the search will be stopped. The rationale
@@ -519,20 +523,20 @@ completions and the last one is for default fish completions.
 
 If you have written new completions for a common
 Unix command, please consider sharing your work by sending it to <a
-href='mailto: fish-users@lists.sf.net'>the fish mailinglist</a>.
+href='mailto: fish-users@lists.sf.net'>the fish mailing list</a>.
 
 
 \section expand Parameter expansion (Globbing)
 
 When an argument for a program is given on the commandline, it
 undergoes the process of parameter expansion before it is sent on to
-the command. Parameter expansion is a powerful set of mechamisms that
+the command. Parameter expansion is a powerful set of mechanisms that
 allow you to expand the parameter in various ways, including
 performing wildcard matching on files, inserting the value of
 environment variables into the parameter or even using the output of
 another command as a parameter list.
 
-\subsection expand-wildcard Wildcards 
+\subsection expand-wildcard Wildcards
 
 If a star (*) or a question mark (?) is present in the parameter, \c
 fish attempts to match the given parameter to any files in such a
@@ -577,6 +581,9 @@ A command substitution will not change the value of the <a
 href='#variables-status'>status</a> variable outside of the command
 substitution.
 
+Only part of the output can be used, see <a href='#expand-index-range'>index
+range expansion</a> for details.
+
 Example:
 
 The command <code>echo (basename image.jpg .jpg).png</code> will
@@ -609,7 +616,7 @@ href="#variables"> Environment variables</a> section.
 Example:
 
 <code> echo \$HOME</code> prints the home directory of the current
-user. 
+user.
 
 If you wish to combine environment variables with text, you can
 encase the variables within braces to embed a variable inside running
@@ -620,9 +627,8 @@ The {$USER}san syntax might need a bit of an elaboration.  Posix
 shells allow you to specify a variable name using '$VARNAME' or
 '${VARNAME}'. Fish supports the former, and has no support whatsoever
 for the latter or anything like it. So what is '{$VARNAME}' then?
-Well, '{WHATEVER}' is <a href='#brace'>brace expansion</a>, identical
-to that supported by e.g. bash.  'a{b,c}d' -> 'abd acd' works
-both in bash and on fish. So '{$VARNAME}' is a bracket-expansion with
+Well, '{WHATEVER}' is <a href='#brace'>brace expansion</a>, e.g. 'a{b,c}d' -> 'abd acd'.
+So '{$VARNAME}' is a bracket-expansion with
 only a single element, i.e.  it becomes expanded to '$VARNAME', which
 will be variable expanded to the value of the variable 'VARNAME'. So
 you might think that the brackets don't actually do anything, and that
@@ -671,6 +677,50 @@ element of the foo variable should be dereferenced and never that the fifth
 element of the doubly dereferenced variable foo. The latter can
 instead be expressed as $$foo[1][5].
 
+\subsection expand-index-range Index range expansion
+
+Both command substitution and environment variables support accessing only 
+specific items by providing a set of indices in square brackets. It's 
+often needed to access a sequence of elements. To do this, one can use
+range operator '..' for this. A range 'a..b', where range limits 'a' and 'b' 
+are integer numbers, is expanded into a sequence of indices 
+'a a+1 a+2 ... b' or 'a a-1 a-2 ... b' depending on which of 'a' or 'b' 
+is higher. The negative range limits are calculated from the end of the array
+or command substitution.
+
+Some examples:
+<pre>
+# Limit the command substitution output
+echo (seq 10)[2..5] # will use elements from 2 to 5
+# Output is:
+# 2 3 4 5
+
+# Use overlapping ranges:
+echo (seq 10)[2..5 1..3] # will take elements from 2 to 5 and then elements from 1 to 3 
+# Output is:
+# 2 3 4 5 1 2 3
+
+# Reverse output
+echo (seq 10)[-1..1] # will use elements from the last output line to the first one in reverse direction
+# Output is:
+# 10 9 8 7 6 5 4 3 2 1
+</pre>
+
+The same works when setting or expanding variables:
+<pre>
+# Reverse path variable
+set PATH $PATH[-1..1]
+# or 
+set PATH[-1..1] $PATH
+
+# Use only n last items of the PATH
+set n -3
+echo $PATH[$n..-1]
+</pre>
+
+NOTE: Currently variables are allowed inside variables index expansion, but not in indices, 
+used for command substitution.
+
 \subsection expand-home Home directory expansion
 
 The ~ (tilde) character at the beginning of a parameter, followed by a
@@ -684,12 +734,12 @@ The \% (percent) character at the beginning of a parameter followed by
 a string is expanded into a process id. The following expansions are
 performed:
 
-- If the string is the entire word \c self, the shells pid is the result
+- If the string is the entire word \c self, the shells pid is the result.
 - Otherwise, if the string is the id of a job, the result is the process
 group id of the job.
-- Otherwise, if any child processes match the specified string, their 
-pids are the result of the expansion. 
-- Otherwise, if any processes owned by the user match the specified 
+- Otherwise, if any child processes match the specified string, their
+pids are the result of the expansion.
+- Otherwise, if any processes owned by the user match the specified
 string, their pids are the result of the expansion.
 
 This form of expansion is useful for commands like kill and fg, which
@@ -739,7 +789,7 @@ expansion</a>.
 To set a variable value, use the <a href="commands.html#set"> \c set
 command</a>.
 
-Example: 
+Example:
 
 To set the variable \c smurf_color to the value \c blue, use the command
 <code>set smurf_color blue</code>.
@@ -749,7 +799,7 @@ the shell through <a href="expand-variable">variable expansion</a>.
 
 Example:
 
-To use the value of a the variable \c smurf, write $ (dollar symbol)
+To use the value of the variable \c smurf, write $ (dollar symbol)
 followed by the name of the variable, like <code>echo Smurfs are
 usually $smurf_color</code>, which would print the result 'Smurfs are
 usually blue'.
@@ -868,8 +918,8 @@ echo $PATH[3]
 </pre>
 
 Note that array indices start at 1 in fish, not 0, as is more common
-in other languages. This is because many common unix tools like seq
-are more suited to such use. 
+in other languages. This is because many common Unix tools like seq
+are more suited to such use.
 
 If you do not use any brackets, all the elements of the array will be
 written as separate items. This means you can easily iterate over an
@@ -906,6 +956,9 @@ If you specify a negative index when expanding or assigning to an
 array variable, the index will be calculated from the end of the
 array. For example, the index -1 means the last index of an array.
 
+A range of indices can be specified, see <a href='#expand-index-range'>index
+range expansion</a> for details.
+
 \subsection variables-special Special variables
 
 The user can change the settings of \c fish by changing the values of
@@ -921,14 +974,14 @@ certain environment variables.
 
 \c fish also sends additional information to the user through the
 values of certain environment variables. The user can not change the
-values of most of these variables. 
+values of most of these variables.
 
 - \c _, which is the name of the currently running command.
 - \c argv, which is an array of arguments to the shell or function. \c argv is only defined when inside a function call, or if fish was invoked with a list of arguments, like 'fish myscript.fish foo bar'. This variable can be changed by the user.
 - \c history, which is an array containing the last commands that where entered.
 - \c HOME, which is the users home directory. This variable can only be changed by the root user.
-- \c PWD, which is the current working directory. 
-- \c status, which is the exit status of the last foreground job to exit. 
+- \c PWD, which is the current working directory.
+- \c status, which is the exit status of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number.
 - \c USER, which is the username. This variable can only be changed by the root user.
 
 The names of these variables are mostly derived from the csh family of
@@ -967,6 +1020,8 @@ variable may also be set to a specific value:
 - 126 means that while a file with the specified name was located, it was not executable
 - 127 means that no function, builtin or command with the given name could be located
 
+If a process exits through a signal, the exit status will be 128 plus the number of the signal.
+
 \subsection variables-color Variables for changing highlighting colors
 
 The colors used by fish for syntax highlighting can be configured by
@@ -975,7 +1030,7 @@ variables can be one of the colors accepted by the <a
 href='commands.html#set_color'>set_color</a> command. The \c --bold
 or \c -b switches accepted by \c set_color are also accepted.
 
-The following variables are available to change the highligting colors
+The following variables are available to change the highlighting colors
 in fish:
 
 - \c fish_color_normal, the default color
@@ -999,6 +1054,7 @@ highlighting in the completion pager:
 - \c fish_pager_color_completion, the color of the completion itself
 - \c fish_pager_color_description, the color of the completion description
 - \c fish_pager_color_progress, the color of the progress bar at the bottom left corner
+- \c fish_pager_color_secondary, the background color of the every second completion
 
 Example:
 
@@ -1022,7 +1078,7 @@ variables set the specified aspect of the locale information. LANG
 is a fallback value, it will be used if none of the LC_ variables are
 specified.
 
-\section builtin-overview Builtins 
+\section builtin-overview Builtins
 
 Many other shells have a large library of builtin commands. Most of
 these commands are also available as standalone commands, but have
@@ -1040,7 +1096,7 @@ switch of the command.
 
 The \c fish editor features copy and paste, a searchable history and
 many editor functions that can be bound to special keyboard
-shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function. 
+shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function.
 Here are some of the commands available in the editor:
 
 - Tab completes the current token
@@ -1050,7 +1106,7 @@ Here are some of the commands available in the editor:
 - Alt-left and Alt-right moves one word left or right, or moves forward/backward in the directory history if the commandline is empty
 - Up and down search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the <a href='#history'>history </a>section for more information on history searching.
 - Alt-up and Alt-down search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the <a href='#history'>history </a>section for more information on history searching.
-- Delete and backspace removes one character forwards or backwards respecitvely
+- Delete and backspace removes one character forwards or backwards respectively
 - Ctrl-c deletes entire line
 - Ctrl-d delete one character to the right of the cursor, unless the buffer is empty, in which case the shell will exit
 - Ctrl-k move contents from the cursor to the end of line to the <a href="#killring">killring</a>
@@ -1058,12 +1114,12 @@ Here are some of the commands available in the editor:
 - Ctrl-l clear and repaint screen
 - Ctrl-w move previous word to the <a href="#killring">killring</a>
 - Alt-d move next word to the <a href="#killring">killring</a>
-- Alt-w prints a short description of the command under the cursor 
-- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed 
+- Alt-w prints a short description of the command under the cursor
+- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed
 - Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged.
 
-You can change these key bindings using the 
-<a href="commands.html#bind">bind</a> builtin command. 
+You can change these key bindings using the
+<a href="commands.html#bind">bind</a> builtin command.
 
 
 - \c backward-char, moves one character to the left
@@ -1094,7 +1150,7 @@ If such a script produces output, the script needs to finish by
 calling 'commandline -f repaint' in order to tell fish that a repaint
 is in order.
 
-\subsection killring Copy and paste (Kill Ring) 
+\subsection killring Copy and paste (Kill Ring)
 
 \c fish uses an Emacs style kill ring for copy and paste
 functionality. Use Ctrl-K to cut from the current cursor position to
@@ -1105,7 +1161,7 @@ Meta-Y to rotate to the previous kill.
 
 If the environment variable DISPLAY is set, \c fish will try to
 connect to the X-windows server specified by this variable, and use
-the clipboard on the X server for copying and pasting. 
+the clipboard on the X server for copying and pasting.
 
 \subsection history Searchable history
 
@@ -1140,7 +1196,7 @@ than a single line:
 
 - Pressing the enter key while a block of commands is unclosed, i.e. when one or more block commands such as 'for', 'begin' or 'if' do not have a corresponding 'end' command.
 - Pressing Alt-enter instead of pressing the enter key.
-- By backslash escaping a newline, i.e. by inserting a backslash (\\) character pefore pressing the enter key.
+- By backslash escaping a newline, i.e. by inserting a backslash (\\) character before pressing the enter key.
 
 The fish commandline editor works exactly the same in single line mode
 and in multiline mode. To move between lines use the left and right
@@ -1156,7 +1212,7 @@ graphical user interface from the terminal, and then be able to
 continue using the shell. In such cases, there are several ways in
 which the user can change <code>fish</code>'s behavior.
 
--# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. 
+-# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard.
 -# By pressing ^Z, the user stops a currently running foreground  program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running.
 -# By using the <a href="commands.html#fg">fg</a> and <a href="commands.html#bg">bg</a> builtin commands, the user can send any currently running job into the foreground or background.
 
@@ -1222,8 +1278,8 @@ fish_color_substitution, \c fish_color_redirection, \c fish_color_end,
 \c fish_color_error, \c fish_color_param, \c fish_color_comment, \c
 fish_color_match, \c fish_color_search_match, \c fish_color_cwd, \c
 fish_pager_color_prefix, \c fish_pager_color_completion, \c
-fish_pager_color_description and \c
-fish_pager_color_progress. Usually, the value of these variables will
+fish_pager_color_description, \c fish_pager_color_progress
+and \c fish_pager_color_secondary. Usually, the value of these variables will
 be one of \c black, \c red, \c green, \c brown, \c yellow, \c blue, \c
 magenta, \c purple, \c cyan, \c white or \c normal, but they can be an
 array containing any color options for the set_color command.
@@ -1241,11 +1297,11 @@ fish_title function is executed before and after a new command is
 executed or put into the foreground and the output is used as a
 titlebar message. The $_ environment variable will always contain the
 name of the job to be put into the foreground (Or 'fish' if control is
-returning to the shell) when the fish_prompt function is called.
+returning to the shell) when the \c fish_prompt function is called.
 
 Example:
 <p>
-The default \c fish title is 
+The default \c fish title is
 </p>
 <p>
 <pre>
@@ -1256,6 +1312,12 @@ end
 </pre>
 </p>
 
+\subsection greeting Configurable greeting
+
+If a function named fish_greeting exists after initialization, it will
+be run when entering interactive mode. Otherwise,if an environment
+variable named fish_greeting exists, it will be printed.
+
 \subsection event Event handlers
 
 When defining a new function in fish, it is possible to make it into an
@@ -1266,6 +1328,7 @@ specific event takes place. Events that can trigger a handler currently are:
 - When a process or job exits
 - When the value of a variable is updated
 - When the prompt is about to be shown
+- When a command lookup fails
 
 Example:
 
@@ -1280,9 +1343,9 @@ For more information on how to define new event handlers, see the
 documentation for the <a href='commands.html#function'>function</a>
 command.
 
-\subsection debuging Debuging fish scripts
+\subsection debugging Debugging fish scripts
 
-Fish includes a built in debuger. The debuger allows you to stop
+Fish includes a built in debugger. The debugger allows you to stop
 execution of a script at an arbitrary point and launch a prompt. This
 prompt can then be used to check or change the value of any variables
 or perform any shellscript command. To resume normal execution of the
@@ -1290,15 +1353,15 @@ script, simply exit the prompt.
 
 To start the debugger, simply call the builtin command
 'breakpoint'. The default action of the TRAP signal is to call this
-builtin, so a running script can be debuged by sending it the TRAP
-signal. Once in the debuger, it is easy to insert new breakpoints by
+builtin, so a running script can be debugged by sending it the TRAP
+signal. Once in the debugger, it is easy to insert new breakpoints by
 using the funced function to edit the definition of a function.
 
 \section issues Common issues with fish
 
 If you install fish in your home directory, fish will not work
 correctly for any other user than yourself. This is because fish needs
-its initalization files to function properly. To solve this
+its initialization files to function properly. To solve this
 problem, either copy the initialization files to each fish users home
 directory, or install them in /etc.
 
@@ -1310,15 +1373,15 @@ making a translation. Currently, only the shell itself can be
 translated, a future version of fish should also include translated
 manuals.
 
-To make a translation of fish, you will first need the sourcecode,
-available from the <a href='http://www.fishshell.org'>fish
+To make a translation of fish, you will first need the source code,
+available from the <a href='http://ridiculousfish.com/shell/'>fish
 homepage</a>. Download the latest version, and then extract it using a
 command like <code>tar -zxf fish-VERSION.tar.gz</code>.
 
 Next, cd into the newly created fish directory using <code>cd
 fish-VERSION</code>.
 
-You will now need to configure the sourcecode using the command
+You will now need to configure the source code using the command
 <code>./configure</code>. This step might take a while.
 
 Before you continue, you will need to know the ISO 639 language code
@@ -1326,7 +1389,7 @@ of the language you are translating to. These codes can be found <a
 href='http://www.w3.org/WAI/ER/IG/ert/iso639.htm'>here</a>. For
 example, the language code for Uighur is ug.
 
-Now you have the sourcecode and it is properly configured. Lets start
+Now you have the source code and it is properly configured. Lets start
 translating. To do this, first create an empty translation table for
 the language you wish to translate to by writing <code>make
 po/[LANGUAGE CODE].po</code> in the fish terminal. For example, if you
@@ -1346,7 +1409,7 @@ msgstr ""
 </pre>
 
 The first line is the English string to translate, the second line
-should contain your translation. For example, in swedish the above
+should contain your translation. For example, in Swedish the above
 might become:
 
 <pre>
@@ -1370,9 +1433,9 @@ href='fish-users@lists.sf.net'>fish-users@lists.sf.net</a>.
 \subsection todo-features Missing features
 
 - Complete vi-mode key bindings
-- More completions (for example konsole, gnome-terminal, 
+- More completions (for example konsole, gnome-terminal,
 rlogin, rsync, arch, finger, bibtex, aspell, xpdf,
-compress, wine, dig, batch, 
+compress, wine, dig, batch,
 g++, javac, java, gcj, lpr, doxygen, whois)
 - Undo support
 - wait shellscript
@@ -1382,7 +1445,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 
 \subsection todo-possible Possible features
 
-- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh 
+- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh
   installed would be awesome
 - suggest a completion on unique matches by writing it out in an understated color
 - Highlight beginning/end of block when moving over a block command
@@ -1395,12 +1458,11 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - Selectable completions in the pager
 - Per process output redirection
 - Reduce the space of the pager by one line to allow the commandline to remain visible.
-- down-arrow could be used to save the current command to the history. Or give the next command in-sequnce. Or both.
-- Drop support for inputrc-files. Use shellscripts and the bind builtin. Also, redo the syntax for the bind builtin to something more sane.
+- down-arrow could be used to save the current command to the history. Or give the next command in-sequence. Or both.
 - History could reload itself when the file is updated. This would need to be done in a clever way to avoid chain reactions
 - The error function should probably be moved into it's own library, and be made mere general purpose.
 - The code validation functions should be moved from the parser to parse_util.
-- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate. 
+- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate.
 - The code validator should warn about unknown commands.
 - Auto-newlines
 - A fault injector could be written to increase robustness and testing of error recovery paths
@@ -1409,24 +1471,24 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - exec_subshell should be either merged with eval or moved to parser.c
 - Don't use expand_string to perform completions. wildcard_complete can be called directly, the brace expansion handling should be universal, and the process expansion can be moved to complete.c.
 - Make the history search support incremental searching
-- An automatic logout feature 
+- An automatic logout feature
+- Make tab completions completely silent by default, i.e. kill stderr when running completion commands. This needs to be overridalbe for debugging purposes.
+- Move history to an environment variable
 
 \subsection bugs Known bugs and issues
 
 - Suspending and then resuming pipelines containing a builtin or a shellscript function is broken. Ideally, the exec function in exec.c should be able to resume execution of a partially executed job.
 - delete-word is broken on the commandline 'sudo update-alternatives --config x-'
 - Sometimes autoheader needs to be run on a fresh tarball. Fix dates before creating tarballs.
-- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions. 
-- There have been stray reports of issues with strang values of the PATH variable during startup. 
+- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions.
+- There have been stray reports of issues with strange values of the PATH variable during startup.
+- bindings in config.fish are overwritten by default key bindings.
+- Adding 'bind -k ...' doesn't overwrite non-keybinding binds of the same sequence.
+- History file does not remove duplicates.
+- History file should apply some kind of maximum history length.
+- Older versions of Doxygen has bugs in the man-page generation which cause the builtin help to render incorrectly. Version 1.2.14 is known to have this problem.
 
 If you think you have found a bug not described here, please send a
 report to <a href="mailto:fish-users@lists.sf.net">fish-users@lists.sf.net</a>.
 
-
-\subsection issues Known issues
-
-Older versions of Doxygen has bugs in the man-page generation which
-cause the builtin help to render incorrectly. Version 1.2.14 is known
-to have this problem.
-
 */

doc_src/license.hdr

@@ -1,28 +1,11 @@
 /** \page license Licenses
 
-Fish Copyright (C) 2005-2006 Axel Liljencrantz. Fish is released under
+<h2>License for fish</h2>
+
+Fish Copyright (C) 2005-2009 Axel Liljencrantz. Fish is released under
 the GNU General Public License, version 2. The license agreement is
 included below.
 
-Fish contains code under the BSD license, namely versions of the
-two functions strlcat and strlcpy, modified for use with wide
-character strings. This code is copyrighted by Todd C. Miller. The
-license agreement is included below.
-
-The XSel command, written and copyrighted by Conrad Parker, is
-distributed together with, and used by fish. It is released under the MIT
-license. The license agreement is included below.
-
-The xdgmime library, written and copyrighted by Red Hat, Inc, is used
-by the mimedb command, which is a part of fish. It is released under
-the LGPL. The license agreement is included below.
-
-Fish contains code from the glibc library, namely the wcstok
-function. This code is licensed under the LGPL. The license agreement
-is included below.
-
-
-<HR>
 
 <H2><A NAME="SEC1" HREF="gpl.html#TOC1">GNU GENERAL PUBLIC LICENSE</A></H2>
 <P>
@@ -31,7 +14,7 @@ Version 2, June 1991
 </P>
 
 <PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
@@ -464,7 +447,7 @@ PERFORMANCE OF THIS SOFTWARE.
 <h2>License for XSel</h2>
 
 The XSel command, written and copyrighted by Conrad Parker, is
-distributed together with \c fish. 
+distributed together with \c fish.
 
 
 It is Copyright (C) 2001 Conrad Parker <conrad@vergenet.net>
@@ -480,6 +463,18 @@ without express or implied warranty.
 
 <HR>
 
+<h2>License for xdgmime and glibc</h2>
+
+The xdgmime library, written and copyrighted by Red Hat, Inc, is used
+by the mimedb command, which is a part of fish. It is released under
+the LGPL, version 2 or later, or under the Academic Free License,
+version 2. Version 2 of the LGPL license agreement is included below.
+
+Fish contains code from the glibc library, namely the wcstok
+function. This code is licensed under the LGPL, version 2 or
+later. Version 2 of the LPGL license agreement is included below.
+
+
 <H2><A NAME="SEC1" HREF="#TOC1">GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
 
 <P>
@@ -807,7 +802,7 @@ of these things:
     that the user who changes the contents of definitions files in the
     Library will not necessarily be able to recompile the application
     to use the modified definitions.)
-	 
+
     <LI><STRONG>b)</STRONG> Use a suitable shared library mechanism for linking with the
     Library.  A suitable mechanism is one that (1) uses at run time a
     copy of the library already present on the user's computer system,

doc_src/math.txt

@@ -9,7 +9,7 @@
 math is used to perform mathematical calculations. It is only a very
 thin wrapper for the bc program, that makes it possible to specify an
 expression from the command line without using non-standard extensions
-or a pipeline. Simply use a command like <code>math 1+1</code>. 
+or a pipeline. Simply use a command like <code>math 1+1</code>.
 
 For a description of the syntax supported by math, see the manual for
 the bc program. Keep in mind that parameter expansion takes place on

doc_src/mimedb.txt

@@ -5,7 +5,7 @@
 
 \subsection mimedb-description Description
 
-- \c FILES is a list of files to analyse 
+- \c FILES is a list of files to analyse
 - \c -t, \c --input-file-data the specified files type should be determined both by their filename and by their contents (Default)
 - \c -f, \c --input-filename the specified files type should be determined by their filename
 - \c -i, \c --input-mime the arguments are not files but mimetypes

doc_src/not.txt

@@ -5,7 +5,7 @@
 
 \subsection not-description Description
 
-The \c not builtin is used to negate the exit status of another command. 
+The \c not builtin is used to negate the exit status of another command.
 
 \subsection not-example Example
 

doc_src/open.txt

@@ -1,12 +1,12 @@
-\section open open - open file in it's default application
+\section open open - open file in its default application
 
 \subsection open-synopsis Synopsis
  <tt>open FILES...</tt>
 
 \subsection open-description Description
 
-The \c open command is used to open a file in it's default application. \c open is implemented using the <a href="commands.html#mimedb">mimedb</a> command.
+The \c open command is used to open a file in its default application. \c open is implemented using the \c xdg-open command if it exists, or else the <a href="commands.html#mimedb">mimedb</a> command.
 
 \subsection open-example Example
 
-<tt>open *.txt</tt> opens all the text files in the current directory using your systems default text editor.
+<tt>open *.txt</tt> opens all the text files in the current directory using your system's default text editor.

doc_src/or.txt

@@ -17,7 +17,7 @@ variable.
 \subsection or-example Example
 
 The following code runs the \c make command to build a program, if the
-build succceeds, the program is installed. If either step fails,
+build succeeds, the program is installed. If either step fails,
 <tt>make clean</tt> is run, which removes the files created by the
 build process
 

doc_src/popd.txt

@@ -3,6 +3,6 @@
 \subsection popd-synopsis Synopsis
 <tt>popd</tt>
 
-\subsection popd-description Description 
-<tt>popd</tt> removes the top directory from the directory stack and 
+\subsection popd-description Description
+<tt>popd</tt> removes the top directory from the directory stack and
 cd's to the new top directory.

doc_src/prevd.txt

@@ -3,7 +3,7 @@
 \subsection prevd-synopsis Synopsis
 <tt>prevd [-l | --list] [pos]</tt>
 
-\subsection prevd-description Description 
+\subsection prevd-description Description
 
 <tt>prevd</tt> moves backwards <tt>pos</tt> positions in the history
 of visited directories; if the beginning of the history has been hit,

doc_src/pushd.txt

@@ -3,7 +3,7 @@
 \subsection pushd-synopsis Synopsis
 <tt>pushd [DIRECTORY]</tt>
 
-\subsection pushd-description Description 
+\subsection pushd-description Description
 The <tt>pushd</tt> function adds DIRECTORY to the top of the directory stack
 and makes it the current directory. Use <tt>popd</tt> to pop it off and and
 return to the original directory.

doc_src/pwd.txt

@@ -0,0 +1,8 @@
+\section pwd pwd - returns the current directory
+
+\subsection pwd-synopsis Synopsis
+ <tt>pwd</tt>
+
+\subsection pwd-description Description
+
+Returns the current directory. Note that fish always resolves symbolic links in the current directory path.

doc_src/random.txt

@@ -21,4 +21,4 @@ for i in (seq (random) -1 1)
 	echo $i
 	sleep
 end
-</pre> 
+</pre>

doc_src/read.txt

@@ -6,12 +6,12 @@
 \subsection read-description Description
 
 The <tt>read</tt> builtin causes fish to read one line from standard
-input and store the result in one or more environment variables. 
+input and store the result in one or more environment variables.
 
 - <tt>-c CMD</tt> or <tt>--command=CMD</tt> specifies that the initial string in the interactive mode command buffer should be CMD.
-- <tt>-e</tt> or <tt>--export</tt> specifies that the variables will be exported to subshells.
 - <tt>-g</tt> or <tt>--global</tt> specifies that the variables will be made global.
-- <tt>-m NAME</tt> or <tt>--mode-name=NAME</tt> specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available. 
+- <tt>-l</tt> or <tt>--local</tt> specifies that the variables will be made local.
+- <tt>-m NAME</tt> or <tt>--mode-name=NAME</tt> specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available.
 - <tt>-p PROMPT_CMD</tt> or <tt>--prompt=PROMPT_CMD</tt> specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is <tt>set_color green; echo read; set_color normal; echo "> "</tt>.
 - <code>-s</code> or <code>--shell</code> Use syntax highlighting, tab completions and command termination suitable for entering shellscript code
 - <code>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes

doc_src/return.txt

@@ -3,7 +3,7 @@
 \subsection return-synopsis Synopsis
 <tt>function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end</tt>
 
-\subsection return-description Description 
+\subsection return-description Description
 
 The \c return builtin is used to halt a currently running function. It
 is usually added inside of a conditional block such as an <a

doc_src/save_function.txt

@@ -1,12 +0,0 @@
-\section save_function save_function - save the definition of a function to the users autoload directory
-
-\subsection save_function-synopsis Synopsis
- <tt>save_function FUNCTION_NAME</tt>
-
-\subsection save_function-description Description
-
-save_function is used to save the current definition of a function to
-a file which will be autoloaded by current and future fish
-sessions. This can be useful if you have interactively created a new
-function and wish to save it for later use.
-

doc_src/set_color.txt

@@ -7,7 +7,11 @@
 
 Change the foreground and/or background color of the terminal.
 COLOR is one of black, red, green, brown, yellow, blue, magenta,
-purple, cyan, white and normal. 
+purple, cyan, white and normal.
+
+If your terminal supports term256 (modern xterms and OS X Lion),
+you can specify an RGB value with three or six hex digits, such
+as A0FF33 or f2f. fish will choose the closest supported color.
 
 - \c -b, \c --background Set the background color
 - \c -c, \c --print-colors Prints a list of all valid color names
@@ -28,3 +32,9 @@ result in a white font color.
 Not all terminal emulators support all these features. This is not a
 bug in set_color but a missing feature in the terminal emulator.
 
+set_color uses the terminfo database to look up how to change terminal
+colors on whatever terminal is in use. Some systems have old and
+incomplete terminfo databases, and may lack color information for
+terminals that support it. Download and install the latest version of
+ncurses and recompile fish against it in order to fix this issue.
+

doc_src/source.txt

@@ -3,7 +3,7 @@
 \subsection source-synopsis Synopsis
 <tt>. FILENAME [ARGUMENTS...]</tt>
 
-\subsection source-description Description 
+\subsection source-description Description
 
 Evaluates the commands of the specified file in the current
 shell. This is different from starting a new process to perform the
@@ -22,7 +22,7 @@ execute. If something goes wrong while opening or reading the file,
 
 \subsection source-example Example
 
-<tt>. ~/.fish</tt>
+<tt>. ~/.config/fish/config.fish</tt>
 
 causes fish to reread its initialization file.
 

doc_src/status.txt

@@ -14,5 +14,5 @@
 - <tt>-f</tt> or <tt>--current-filename</tt> prints the filename of the currently running script
 - <tt>-n</tt> or <tt>--current-line-number</tt> prints the line number of the currently running script
 - <tt>-j CONTROLTYPE</tt> or <tt>--job-control=CONTROLTYPE</tt> set the job control type.  Can be one of: none, full, interactive
-- <tt>-t</tt> or <tt>--print-stack-trace</tt>
+- <tt>-t</tt> or <tt>--print-stack-trace</tt> prints a stack trace of all function calls on the call stack
 - <tt>-h</tt> or <tt>--help</tt> display a help message and exit

doc_src/test.txt

@@ -0,0 +1,43 @@
+\section test test - perform tests on files and text
+
+\subsection test-synopsis Synopsis
+ <tt>test [EXPRESSION]</tt>
+
+\subsection test-description Description                                                                                                                             
+                                                                                                                                                                          
+Tests the expression given and returns true or false.                                                                                                           
+
+- \c -h, \c Display this help
+- \c -G, \c File owned by effective group ID
+- \c -L, \c File is syslink
+- \c -O, \c File owned by effective user ID
+- \c -S, \c File is socket
+- \c -a, \c Logical and 
+- \c -b, \c File is block device 
+- \c -c, \c File is character device 
+- \c -d, \c File is a directory
+- \c -e, \c File exists
+- \c -f, \c File is regular 
+- \c -f, \c File is set-group-ID 
+- \c -k, \c File has sticky bit set 
+- \c -n, \c String length is non-zero
+- \c -o, \c Logical or
+- \c -p, \c File is named pipe
+- \c -r, \c File is readable
+- \c -s, \c File size is non-zero
+- \c -t, \c FD is terminal
+- \c -u, \c File set-user-ID bit is set
+- \c -w, \c File is writable
+- \c -x, \c File is executable 
+- \c -z, \c String length is zero
+
+\subsection test-example Example
+
+<pre>
+    if test -d "/"
+	echo "Fish is cool"
+    end
+</pre> 
+
+Because "/" is a directory the expression will evaluate
+to true, and "Fish is cool" will be echoed

doc_src/ulimit.txt

@@ -27,7 +27,7 @@ Note that not all these limits are available in all operating systems.
 The value of limit can be a number in the unit specified for
 the resource or one of the special values hard, soft, or unlimited,
 which stand for the current hard limit, the current soft limit, and no
-limit, respectively. 
+limit, respectively.
 
 If limit is given, it is the new value of the specified resource. If
 no option is given, then -f is assumed. Values are in kilobytes,
@@ -56,7 +56,7 @@ The fish implementation of ulimit should behave identically to the
 implementation in bash, except for these differences:
 
 - Fish ulimit supports GNU-style long options for all switches
-- Fish ulimit does not support the -p option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Fish does not do this because it this method of determining pipe sixe is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish.
+- Fish ulimit does not support the -p option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Fish does not do this because it this method of determining pipe size is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish.
 - Fish ulimit does not support getting or setting multiple limits in one command, except reporting all values using the -a switch
 
 \subsection ulimit-example Example

doc_src/vared.txt

@@ -1,4 +1,4 @@
-\section vared vared - interactively edit the value of an environment variable 
+\section vared vared - interactively edit the value of an environment variable
 
 \subsection vared-synopsis Synopsis
  <tt>vared VARIABLE_NAME</tt>
@@ -7,7 +7,7 @@
 
 vared is used to interactively edit the value of an environment
 variable. Array variables as a whole can not be edited using vared,
-but individual array elements can. 
+but individual array elements can.
 
 \subsection vared-example Example
 

env.h

@@ -6,8 +6,10 @@
 #define FISH_ENV_H
 
 #include <wchar.h>
+#include <map>
 
 #include "util.h"
+#include "common.h"
 
 /**
    Flag for local (to the current block) variable
@@ -50,11 +52,20 @@ enum{
 }
 ;
 
+/* A struct of configuration directories, determined in main() that fish will optionally pass to env_init.
+ */
+struct config_paths_t
+{
+    wcstring data;      // e.g. /usr/local/share
+    wcstring sysconf;   // e.g. /usr/local/etc
+    wcstring doc;       // e.g. /usr/local/share/doc/fish
+    wcstring bin;       // e.g. /usr/local/bin
+};
 
 /**
    Initialize environment variable data
 */
-void env_init();
+void env_init(const struct config_paths_t *paths = NULL);
 
 /**
    Destroy environment variable data
@@ -79,9 +90,7 @@ void env_destroy();
    * ENV_INVALID, the variable name or mode was invalid
 */
 
-int env_set( const wchar_t *key, 
-			 const wchar_t *val,
-			 int mode );
+int env_set(const wcstring &key, const wchar_t *val, int mode);
 
 
 /**
@@ -91,7 +100,40 @@ int env_set( const wchar_t *key,
   valid until the next call to env_get(), env_set(), env_push() or
   env_pop() takes place.
 */
-wchar_t *env_get( const wchar_t *key );
+//const wchar_t *env_get( const wchar_t *key );
+
+class env_var_t : public wcstring {
+private:
+    bool is_missing;
+public:
+    static env_var_t missing_var(void);
+    env_var_t(const env_var_t &x) : wcstring(x), is_missing(x.is_missing) { }
+    env_var_t(const wcstring & x) : wcstring(x), is_missing(false) { }
+    env_var_t(const wchar_t *x) : wcstring(x), is_missing(false) { }
+    env_var_t() : wcstring(L""), is_missing(false) { }
+    bool missing(void) const { return is_missing; }
+    bool missing_or_empty(void) const { return missing() || empty(); }
+    const wchar_t *c_str(void) const;
+    env_var_t &operator=(const env_var_t &s) {
+        is_missing = s.is_missing;
+        wcstring::operator=(s);
+        return *this;
+    }
+    
+    bool operator==(const env_var_t &s) const {
+        if (is_missing &&  s.is_missing)
+            return true;
+        else if (s.is_missing || s.is_missing)
+            return false;
+        else
+            return *static_cast<const wcstring *>(this) == *static_cast<const wcstring *>(&s);
+    }
+
+};
+/**
+ Gets the variable with the specified name, or an empty string if it does not exist.
+ */
+env_var_t env_get_string( const wcstring &key );
 
 /**
    Returns 1 if the specified key exists. This can't be reliably done
@@ -110,7 +152,7 @@ int env_exist( const wchar_t *key, int mode );
 
    \return zero if the variable existed, and non-zero if the variable did not exist
 */
-int env_remove( const wchar_t *key, int mode );
+int env_remove( const wcstring &key, int mode );
 
 /**
   Push the variable stack. Used for implementing local variables for functions and for-loops.
@@ -122,14 +164,44 @@ void env_push( int new_scope );
 */
 void env_pop();
 
-/**
-   Returns an array containing all exported variables in a format suitable for execv.
-*/
-char **env_export_arr( int recalc );
+/** Returns an array containing all exported variables in a format suitable for execv. */
+char **env_export_arr( bool recalc );
+void env_export_arr(bool recalc, null_terminated_array_t<char> &result);
 
 /**
-  Insert all variable names into l. These are not copies of the strings and should not be freed after use.
+  Returns all variable names.
 */
-void env_get_names( array_list_t *l, int flags );
+wcstring_list_t env_get_names( int flags );
+
+
+
+/**
+   Update the PWD variable
+   directory
+*/
+int env_set_pwd();
+
+class env_vars_snapshot_t {
+    std::map<wcstring, wcstring> vars;
+    bool is_current() const;
+
+public:
+    env_vars_snapshot_t(const wchar_t * const * keys);
+    env_vars_snapshot_t(void);
+    
+    env_var_t get(const wcstring &key) const;
+    
+    // Returns the fake snapshot representing the live variables array
+    static const env_vars_snapshot_t &current();
+    
+    // vars necessary for highlighting
+    static const wchar_t * const highlighting_keys[];
+};
+
+extern bool g_log_forks;
+extern int g_fork_count;
+
+extern bool g_use_posix_spawn;
+
 
 #endif

env_universal.cpp

@@ -61,7 +61,7 @@ static int get_socket_count = 0;
 static wchar_t * path;
 static wchar_t *user;
 static void (*start_fishd)();
-static void (*external_callback)( int type, const wchar_t *name, const wchar_t *val );
+static void (*external_callback)( fish_message_type_t type, const wchar_t *name, const wchar_t *val );
 
 /**
    Flag set to 1 when a barrier reply is recieved
@@ -113,7 +113,7 @@ static int get_socket( int fork_ok )
 		uname = strdup( pw->pw_name );
 	}
 	
-	name = malloc( strlen(dir) +
+	name = (char *)malloc( strlen(dir) +
 				   strlen(uname) + 
 				   strlen(SOCK_FILENAME) + 
 				   2 );
@@ -165,7 +165,7 @@ static int get_socket( int fork_ok )
 /**
    Callback function used whenever a new fishd message is recieved
 */
-static void callback( int type, const wchar_t *name, const wchar_t *val )
+static void callback( fish_message_type_t type, const wchar_t *name, const wchar_t *val )
 {	
 	if( type == BARRIER_REPLY )
 	{
@@ -198,7 +198,7 @@ static void check_connection()
 		
 		env_universal_server.fd = -1;
 		env_universal_server.killme=0;
-		env_universal_server.input.used=0;	
+		env_universal_server.input.clear();	
 		env_universal_read_all();
 	}	
 }
@@ -208,22 +208,17 @@ static void check_connection()
 */
 static void env_universal_remove_all()
 {
-	array_list_t lst;
-	int i;
+	size_t i;
 	
-	al_init( &lst );
-	
-	env_universal_common_get_names( &lst, 
+	wcstring_list_t lst;
+	env_universal_common_get_names( lst, 
 									1,
 									1 );
-
-	for( i=0; i<al_get_count( &lst ); i++ )
+	for( i=0; i<lst.size(); i++ )
 	{
-		wchar_t *key = (wchar_t *)al_get( &lst, i );
+		const wcstring &key = lst.at(i);
 		env_universal_common_remove( key );
 	}
-
-	al_destroy( &lst );
 	
 }
 
@@ -255,7 +250,7 @@ static void reconnect()
 void env_universal_init( wchar_t * p, 
 						 wchar_t *u, 
 						 void (*sf)(),
-						 void (*cb)( int type, const wchar_t *name, const wchar_t *val ))
+						 void (*cb)( fish_message_type_t type, const wchar_t *name, const wchar_t *val ))
 {
 	path=p;
 	user=u;
@@ -323,28 +318,25 @@ int env_universal_read_all()
 	}		
 }
 
-wchar_t *env_universal_get( const wchar_t *name )
+wchar_t *env_universal_get( const wcstring &name )
 {
 	if( !init)
 		return 0;
 
-	CHECK( name, 0 );
-	
 	return env_universal_common_get( name );
 }
 
-int env_universal_get_export( const wchar_t *name )
+int env_universal_get_export( const wcstring &name )
 {
 	if( !init)
 		return 0;
-
-	CHECK( name, 0 );
 	
 	return env_universal_common_get_export( name );
 }
 
 void env_universal_barrier()
 {
+    ASSERT_IS_MAIN_THREAD();
 	message_t *msg;
 	fd_set fds;
 
@@ -358,7 +350,7 @@ void env_universal_barrier()
 	*/
 	msg= create_message( BARRIER, 0, 0);
 	msg->count=1;
-	q_put( &env_universal_server.unsent, msg );
+    env_universal_server.unsent->push(msg);
 
 	/*
 	  Wait until barrier request has been sent
@@ -369,7 +361,7 @@ void env_universal_barrier()
 		try_send_all( &env_universal_server );	
 		check_connection();		
 		
-		if( q_empty( &env_universal_server.unsent ) )
+		if( env_universal_server.unsent->empty() )
 			break;
 		
 		if( env_universal_server.fd == -1 )
@@ -405,26 +397,24 @@ void env_universal_barrier()
 }
 
 
-void env_universal_set( const wchar_t *name, const wchar_t *value, int export )
+void env_universal_set( const wcstring &name, const wcstring &value, int exportv )
 {
 	message_t *msg;
 	
 	if( !init )
 		return;
 
-	CHECK( name, );
-		
-	debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name, value );
+	debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name.c_str(), value.c_str() );
 
 	if( is_dead() )
 	{
-		env_universal_common_set( name, value, export );
+		env_universal_common_set( name.c_str(), value.c_str(), exportv );
 	}
 	else
 	{
-		msg = create_message( export?SET_EXPORT:SET, 
-							  name, 
-							  value);
+		msg = create_message( exportv?SET_EXPORT:SET, 
+							  name.c_str(), 
+							  value.c_str());
 
 		if( !msg )
 		{
@@ -433,7 +423,7 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export )
 		}
 		
 		msg->count=1;
-		q_put( &env_universal_server.unsent, msg );
+        env_universal_server.unsent->push(msg);
 		env_universal_barrier();
 	}
 }
@@ -455,29 +445,27 @@ int env_universal_remove( const wchar_t *name )
 		
 	if( is_dead() )
 	{
-		env_universal_common_remove( name );
+		env_universal_common_remove( wcstring(name) );
 	}
 	else
 	{
 		msg= create_message( ERASE, name, 0);
 		msg->count=1;
-		q_put( &env_universal_server.unsent, msg );
+        env_universal_server.unsent->push(msg);
 		env_universal_barrier();
 	}
 	
 	return res;
 }
 
-void env_universal_get_names( array_list_t *l,
+void env_universal_get_names2( wcstring_list_t &lst,
                               int show_exported,
                               int show_unexported )
 {
 	if( !init )
 		return;
 
-	CHECK( l, );
-	
-	env_universal_common_get_names( l, 
+	env_universal_common_get_names( lst, 
 									show_exported,
 									show_unexported );	
 }

env_universal.h

@@ -17,7 +17,10 @@ extern connection_t env_universal_server;
 /**
    Initialize the envuni library
 */
-void env_universal_init();
+void env_universal_init( wchar_t * p, 
+                        wchar_t *u, 
+                        void (*sf)(),
+                        void (*cb)( fish_message_type_t type, const wchar_t *name, const wchar_t *val ));
 /**
   Free memory used by envuni
 */
@@ -26,18 +29,18 @@ void env_universal_destroy();
 /**
    Get the value of a universal variable
 */
-wchar_t *env_universal_get( const wchar_t *name );
+wchar_t *env_universal_get( const wcstring &name );
 
 /**
    Get the export flag of the variable with the specified
    name. Returns 0 if the variable doesn't exist.
 */
-int env_universal_get_export( const wchar_t *name );
+int env_universal_get_export( const wcstring &name );
 
 /**
    Set the value of a universal variable
 */
-void env_universal_set( const wchar_t *name, const wchar_t *val, int export );
+void env_universal_set( const wcstring &name, const wcstring &val, int exportv );
 /**
    Erase a universal variable
    
@@ -57,7 +60,7 @@ int env_universal_read_all();
    \param show_exported whether exported variables should be shown
    \param show_unexported whether unexported variables should be shown
 */
-void env_universal_get_names( array_list_t *l,
+void env_universal_get_names2( wcstring_list_t &list,
 							  int show_exported,
 							  int show_unexported );
 

env_universal_common.cpp

@@ -28,6 +28,7 @@
 #include <dirent.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <map>
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -92,42 +93,33 @@
 */
 typedef struct var_uni_entry
 {
-	int export; /**< Whether the variable should be exported */
-	wchar_t val[1]; /**< The value of the variable */
+	int exportv; /**< Whether the variable should be exported */
+	wcstring val; /**< The value of the variable */
+	var_uni_entry():exportv(0), val() { }
 }
 var_uni_entry_t;
 
 
 static void parse_message( wchar_t *msg,
-						   connection_t *src );
+			   connection_t *src );
 
 /**
    The table of all universal variables
 */
-hash_table_t env_universal_var;
+typedef std::map<wcstring, var_uni_entry_t*> env_var_table_t;
+env_var_table_t env_universal_var;
 
 /**
    Callback function, should be called on all events
 */
-void (*callback)( int type, 
+static void (*callback)( fish_message_type_t type,
 				  const wchar_t *key, 
 				  const wchar_t *val );
 
-/**
-   Variable used by env_get_names to communicate auxiliary information
-   to add_key_to_hash
-*/
-static int get_names_show_exported;
-/**
-   Variable used by env_get_names to communicate auxiliary information
-   to add_key_to_hash
-*/
-static int get_names_show_unexported;
-
 /**
    List of names for the UTF-8 character set.
  */
-static char *iconv_utf8_names[]=
+static const char *iconv_utf8_names[]=
   {
     "utf-8", "UTF-8",
     "utf8", "UTF8",
@@ -138,7 +130,7 @@ static char *iconv_utf8_names[]=
 /**
     List of wide character names, undefined byte length.
  */
-static char *iconv_wide_names_unknown[]=
+static const char *iconv_wide_names_unknown[]=
   {
     "wchar_t", "WCHAR_T", 
     "wchar", "WCHAR", 
@@ -149,7 +141,7 @@ static char *iconv_wide_names_unknown[]=
 /**
    List of wide character names, 4 bytes long.
  */
-static char *iconv_wide_names_4[]=
+static const char *iconv_wide_names_4[]=
   {
     "wchar_t", "WCHAR_T", 
     "wchar", "WCHAR", 
@@ -164,7 +156,7 @@ static char *iconv_wide_names_4[]=
 /**
    List of wide character names, 2 bytes long.
  */
-static char *iconv_wide_names_2[]=
+static const char *iconv_wide_names_2[]=
   {
     "wchar_t", "WCHAR_T", 
     "wchar", "WCHAR", 
@@ -176,8 +168,30 @@ static char *iconv_wide_names_2[]=
   }
   ;
 
+template<class T>
+class sloppy {}; 
 
-wchar_t *utf2wcs( const char *in )
+static size_t hack_iconv(iconv_t cd, const char * const* inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    /* FreeBSD has this prototype: size_t iconv (iconv_t, const char **...)
+       OS X and Linux this one: size_t iconv (iconv_t, char **...)
+       AFAIK there's no single type that can be passed as both char ** and const char **.
+       Therefore, we let C++ figure it out, by providing a struct with an implicit conversion to both char** and const char **.
+    */
+    struct sloppy_char
+    {
+        const char * const * t;
+        operator char** () const { return (char **)t; }
+        operator const char** () const { return (const char**)t; }
+    } slop_inbuf = {inbuf};
+    
+    return iconv( cd, slop_inbuf, inbytesleft, outbuf, outbytesleft );
+}
+
+/**
+   Convert utf-8 string to wide string
+ */
+static wchar_t *utf2wcs( const char *in )
 {
 	iconv_t cd=(iconv_t) -1;
 	int i,j;
@@ -190,7 +204,7 @@ wchar_t *utf2wcs( const char *in )
 	  really the character set used by wchar_t, but it is the best
 	  assumption we can make.
 	*/
-	char **to_name=0;
+	const char **to_name=0;
 
 	switch (sizeof (wchar_t))
 	{
@@ -212,14 +226,14 @@ wchar_t *utf2wcs( const char *in )
 	/*
 	  The line protocol fish uses is always utf-8. 
 	*/
-	char **from_name = iconv_utf8_names;
+	const char **from_name = iconv_utf8_names;
 
 	size_t in_len = strlen( in );
 	size_t out_len =  sizeof( wchar_t )*(in_len+2);
 	size_t nconv;
 	char *nout;
 	
-	out = malloc( out_len );
+	out = (wchar_t *)malloc( out_len );
 	nout = (char *)out;
 
 	if( !out )
@@ -253,7 +267,12 @@ wchar_t *utf2wcs( const char *in )
 		return 0;		
 	}
 	
-	nconv = iconv( cd, (const char **)&in, &in_len, &nout, &out_len );
+    /* FreeBSD has this prototype: size_t iconv (iconv_t, const char **...)
+       OS X and Linux this one: size_t iconv (iconv_t, char **...)
+       AFAIK there's no single type that can be passed as both char ** and const char **.
+       So we cast the function pointer instead (!)
+    */
+    nconv = hack_iconv( cd, &in, &in_len, &nout, &out_len );
 		
 	if (nconv == (size_t) -1)
 	{
@@ -287,7 +306,12 @@ wchar_t *utf2wcs( const char *in )
 	return out;	
 }
 
-char *wcs2utf( const wchar_t *in )
+
+
+/**
+   Convert wide string to utf-8
+ */
+static char *wcs2utf( const wchar_t *in )
 {
 	iconv_t cd=(iconv_t) -1;
 	int i,j;
@@ -301,7 +325,7 @@ char *wcs2utf( const wchar_t *in )
 	  really the character set used by wchar_t, but it is the best
 	  assumption we can make.
 	*/
-	char **from_name=0;
+	const char **from_name=0;
 
 	switch (sizeof (wchar_t))
 	{
@@ -319,14 +343,14 @@ char *wcs2utf( const wchar_t *in )
 			break;
 	}
 
-	char **to_name = iconv_utf8_names;
+	const char **to_name = iconv_utf8_names;
 
 	size_t in_len = wcslen( in );
 	size_t out_len =  sizeof( char )*( (MAX_UTF8_BYTES*in_len)+1);
 	size_t nconv;
 	char *nout;
 	
-	out = malloc( out_len );
+	out = (char *)malloc( out_len );
 	nout = (char *)out;
 	in_len *= sizeof( wchar_t );
 
@@ -361,7 +385,7 @@ char *wcs2utf( const wchar_t *in )
 		return 0;		
 	}
 	
-	nconv = iconv( cd, &char_in, &in_len, &nout, &out_len );
+    nconv = hack_iconv( cd, &char_in, &in_len, &nout, &out_len );
 	
 
 	if (nconv == (size_t) -1)
@@ -381,38 +405,33 @@ char *wcs2utf( const wchar_t *in )
 
 
 
-void env_universal_common_init( void (*cb)(int type, const wchar_t *key, const wchar_t *val ) )
+void env_universal_common_init( void (*cb)(fish_message_type_t type, const wchar_t *key, const wchar_t *val ) )
 {
 	callback = cb;
-	hash_init( &env_universal_var, &hash_wcs_func, &hash_wcs_cmp );
-}
-
-/**
-   Free both key and data
-*/
-static void erase( void *key,
-				   void *data )
-{
-	free( (void *)key );
-	free( (void *)data );
 }
 
 
 void env_universal_common_destroy()
 {
-	hash_foreach( &env_universal_var, &erase );
-	hash_destroy( &env_universal_var );
+	env_var_table_t::iterator iter;
+	
+	for(iter = env_universal_var.begin(); iter != env_universal_var.end(); ++iter)
+	{	
+		var_uni_entry_t* value = iter->second;
+		delete value;
+	}
 }
 
+/**
+   Read one byte of date form the specified connection
+ */
 static int read_byte( connection_t *src )
 {
 
 	if( src->buffer_consumed >= src->buffer_used )
 	{
 
-		int res;
-
-		res = read( src->fd, src->buffer, ENV_UNIVERSAL_BUFFER_SIZE );
+		ssize_t res = read( src->fd, src->buffer, ENV_UNIVERSAL_BUFFER_SIZE );
 		
 //		debug(4, L"Read chunk '%.*s'", res, src->buffer );
 		
@@ -471,13 +490,13 @@ void read_message( connection_t *src )
 			{
 				src->killme = 1;
 				debug( 3, L"Fd %d has reached eof, set killme flag", src->fd );
-				if( src->input.used > 0 )
+				if( src->input.size() > 0 )
 				{
 					char c = 0;
-					b_append( &src->input, &c, 1 );
+					src->input.push_back(c);
 					debug( 1, 
 						   L"Universal variable connection closed while reading command. Partial command recieved: '%s'", 
-						   (wchar_t *)src->input.buff  );
+						   &src->input.at(0));
 				}
 				return;
 			}
@@ -490,16 +509,16 @@ void read_message( connection_t *src )
 			wchar_t *msg;
 			
 			b = 0;
-			b_append( &src->input, &b, 1 );
+            src->input.push_back(b);
 			
-			msg = utf2wcs( src->input.buff );
+			msg = utf2wcs( &src->input.at(0) );
 			
 			/*
 			  Before calling parse_message, we must empty reset
 			  everything, since the callback function could
 			  potentially call read_message.
 			*/
-			src->input.used=0;
+			src->input.clear();
 			
 			if( msg )
 			{
@@ -507,7 +526,7 @@ void read_message( connection_t *src )
 			}
 			else
 			{
-				debug( 0, _(L"Could not convert message '%s' to wide character string"), src->input.buff );
+				debug( 0, _(L"Could not convert message '%s' to wide character string"), &src->input.at(0) );
 			}
 			
 			free( msg );
@@ -515,7 +534,7 @@ void read_message( connection_t *src )
 		}
 		else
 		{
-			b_append( &src->input, &b, 1 );
+            src->input.push_back(b);
 		}
 	}
 }
@@ -523,15 +542,15 @@ void read_message( connection_t *src )
 /**
    Remove variable with specified name
 */
-void env_universal_common_remove( const wchar_t *name )
+void env_universal_common_remove( const wcstring &name )
 {
-	void *k, *v;
-	hash_remove( &env_universal_var, 
-				 name,
-				 &k,
-				 &v );
-	free( k );
-	free( v );
+	env_var_table_t::iterator result =  env_universal_var.find(name);
+	if (result != env_universal_var.end())
+	{
+		var_uni_entry_t* v = result->second;		
+		env_universal_var.erase(result);
+		delete v;
+	}
 }
 
 /**
@@ -549,30 +568,23 @@ static int match( const wchar_t *msg, const wchar_t *cmd )
 	return 1;
 }
 
-void env_universal_common_set( const wchar_t *key, const wchar_t *val, int export )
+void env_universal_common_set( const wchar_t *key, const wchar_t *val, int exportv )
 {
 	var_uni_entry_t *entry;
-	wchar_t *name;
 
 	CHECK( key, );
 	CHECK( val, );
 	
-	entry = malloc( sizeof(var_uni_entry_t) + sizeof(wchar_t)*(wcslen(val)+1) );			
-	name = wcsdup(key);
+	entry = new var_uni_entry_t;
+
+	entry->exportv=exportv;
+	entry->val = val;
+	env_universal_common_remove( key );
 	
-	if( !entry || !name )
-		DIE_MEM();
-	
-	entry->export=export;
-	
-	wcscpy( entry->val, val );
-	env_universal_common_remove( name );
-	
-	hash_put( &env_universal_var, name, entry );
-			
+    env_universal_var[key] = entry;
 	if( callback )
 	{
-		callback( export?SET_EXPORT:SET, name, val );
+		callback( exportv?SET_EXPORT:SET, key, val );
 	}
 }
 
@@ -580,7 +592,7 @@ void env_universal_common_set( const wchar_t *key, const wchar_t *val, int expor
 /**
    Parse message msg
 */
-static void parse_message( wchar_t *msg, 
+static void parse_message( wchar_t *msg,
 						   connection_t *src )
 {
 //	debug( 3, L"parse_message( %ls );", msg );
@@ -591,9 +603,9 @@ static void parse_message( wchar_t *msg,
 	if( match( msg, SET_STR ) || match( msg, SET_EXPORT_STR ))
 	{
 		wchar_t *name, *tmp;
-		int export = match( msg, SET_EXPORT_STR );
+		int exportv = match( msg, SET_EXPORT_STR );
 		
-		name = msg+(export?wcslen(SET_EXPORT_STR):wcslen(SET_STR));
+		name = msg+(exportv?wcslen(SET_EXPORT_STR):wcslen(SET_STR));
 		while( wcschr( L"\t ", *name ) )
 			name++;
 		
@@ -603,14 +615,15 @@ static void parse_message( wchar_t *msg,
 			wchar_t *key;
 			wchar_t *val;
 			
-			key = malloc( sizeof( wchar_t)*(tmp-name+1));
+			key = (wchar_t *)malloc( sizeof( wchar_t)*(tmp-name+1));
 			memcpy( key, name, sizeof( wchar_t)*(tmp-name));
 			key[tmp-name]=0;
 			
 			val = tmp+1;
 			val = unescape( val, 0 );
 			
-			env_universal_common_set( key, val, export );
+			if (key && val)
+			    env_universal_common_set( key, val, exportv );
 			
 			free( val );
 			free( key );
@@ -650,7 +663,7 @@ static void parse_message( wchar_t *msg,
 	{
 		message_t *msg = create_message( BARRIER_REPLY, 0, 0 );
 		msg->count = 1;
-		q_put( &src->unsent, msg );
+        src->unsent->push(msg);
 		try_send_all( src );
 	}
 	else if( match( msg, BARRIER_REPLY_STR ) )
@@ -676,17 +689,17 @@ static int try_send( message_t *msg,
 {
 
 	debug( 3,
-		   L"before write of %d chars to fd %d", strlen(msg->body), fd );	
+		   L"before write of %d chars to fd %d", msg->body.size(), fd );
 
-	int res = write( fd, msg->body, strlen(msg->body) );
+	ssize_t res = write( fd, msg->body.c_str(), msg->body.size() );
 
 	if( res != -1 )
 	{
-		debug( 4, L"Wrote message '%s'", msg->body );
+		debug( 4, L"Wrote message '%s'", msg->body.c_str() );
 	}
 	else
 	{
-		debug( 4, L"Failed to write message '%s'", msg->body );
+		debug( 4, L"Failed to write message '%s'", msg->body.c_str() );
 	}
 	
 	if( res == -1 )
@@ -710,7 +723,7 @@ static int try_send( message_t *msg,
 	
 	if( !msg->count )
 	{
-		free( msg );
+		delete msg;
 	}
 	return 1;
 }
@@ -720,12 +733,12 @@ void try_send_all( connection_t *c )
 /*	debug( 3,
 		   L"Send all updates to connection on fd %d", 
 		   c->fd );*/
-	while( !q_empty( &c->unsent) )
+	while( !c->unsent->empty() )
 	{
-		switch( try_send( (message_t *)q_peek( &c->unsent), c->fd ) )
+		switch( try_send( c->unsent->front(), c->fd ) )
 		{
 			case 1:
-				q_get( &c->unsent);
+				c->unsent->pop();
 				break;
 				
 			case 0:
@@ -740,43 +753,77 @@ void try_send_all( connection_t *c )
 	}
 }
 
-static wchar_t *full_escape( const wchar_t *in )
+/* The universal variable format has some funny escaping requirements; here we try to be safe */
+static bool is_universal_safe_to_encode_directly(wchar_t c)
 {
-	string_buffer_t out;
-	sb_init( &out );
+    if (c < 32 || c > 128)
+        return false;
+    
+    return iswalnum(c) || wcschr(L"/", c);
+}
+
+/**
+   Escape specified string
+ */
+static wcstring full_escape( const wchar_t *in )
+{
+	wcstring out;
 	for( ; *in; in++ )
 	{
-		if( *in < 32 )
+        wchar_t c = *in;
+        if (is_universal_safe_to_encode_directly(c))
+        {
+            out.push_back(c);
+        }
+		else if (c < 256)
 		{
-			sb_printf( &out, L"\\x%.2x", *in );
+			append_format(out, L"\\x%.2x", c);
 		}
-		else if( *in < 128 )
+		else if (c < 65536)
 		{
-			sb_append_char( &out, *in );
-		}
-		else if( *in < 65536 )
-		{
-			sb_printf( &out, L"\\u%.4x", *in );
+			append_format(out, L"\\u%.4x", c);
 		}
 		else
 		{
-			sb_printf( &out, L"\\U%.8x", *in );
+			append_format(out, L"\\U%.8x", c);
 		}
 	}
-	return (wchar_t *)out.buff;
+	return out;
 }
 
-
-message_t *create_message( int type,
-						   const wchar_t *key_in, 
-						   const wchar_t *val_in )
+/* Sets the body of a message to the null-terminated list of null terminated const char *. */
+void set_body(message_t *msg, ...)
 {
-	message_t *msg=0;
+    /* Start by counting the length of all the strings */
+    size_t body_len = 0;
+    const char *arg;
+    va_list arg_list;
+	va_start(arg_list, msg);
+	while ((arg = va_arg(arg_list, const char *)) != NULL)
+		body_len += strlen(arg);
+	va_end(arg_list);
+    
+    /* Reserve that length in the string */
+    msg->body.reserve(body_len + 1); //+1 for trailing NULL? Do I need that?
+    
+    /* Set the string contents */
+	va_start(arg_list, msg);
+	while ((arg = va_arg(arg_list, const char *)) != NULL)
+		msg->body.append(arg);
+	va_end(arg_list);
+}
+
+/* Returns an instance of message_t allocated via new */
+message_t *create_message( fish_message_type_t type,
+                          const wchar_t *key_in,
+                          const wchar_t *val_in )
+{
+	message_t *msg = new message_t;
+    msg->count = 0;
 	
 	char *key=0;
-	size_t sz;
-
-//	debug( 4, L"Crete message of type %d", type );
+    
+    //	debug( 4, L"Crete message of type %d", type );
 	
 	if( key_in )
 	{
@@ -790,8 +837,8 @@ message_t *create_message( int type,
 		if( !key )
 		{
 			debug( 0,
-				   L"Could not convert %ls to narrow character string",
-				   key_in );
+                  L"Could not convert %ls to narrow character string",
+                  key_in );
 			return 0;
 		}
 	}
@@ -807,152 +854,108 @@ message_t *create_message( int type,
 				val_in=L"";
 			}
 			
-			wchar_t *esc = full_escape( val_in );
-			if( !esc )
-				break;
-			
-			char *val = wcs2utf(esc );
-			free(esc);
-						
-			sz = strlen(type==SET?SET_MBS:SET_EXPORT_MBS) + strlen(key) + strlen(val) + 4;
-			msg = malloc( sizeof( message_t ) + sz );
-			
-			if( !msg )
-				DIE_MEM();
-			
-			strcpy( msg->body, (type==SET?SET_MBS:SET_EXPORT_MBS) );
-			strcat( msg->body, " " );
-			strcat( msg->body, key );
-			strcat( msg->body, ":" );
-			strcat( msg->body, val );
-			strcat( msg->body, "\n" );
-			
+			wcstring esc = full_escape( val_in );
+			char *val = wcs2utf(esc.c_str());
+            set_body(msg, (type==SET?SET_MBS:SET_EXPORT_MBS), " ", key, ":", val, "\n", NULL);
 			free( val );
 			
 			break;
 		}
-
+            
 		case ERASE:
 		{
-            sz = strlen(ERASE_MBS) + strlen(key) + 3;
-            msg = malloc( sizeof( message_t ) + sz );
-
-			if( !msg )
-				DIE_MEM();
-			
-            strcpy( msg->body, ERASE_MBS " " );
-            strcat( msg->body, key );
-            strcat( msg->body, "\n" );
+            set_body(msg, ERASE_MBS, " ", key, "\n", NULL);
             break;
 		}
-
+            
 		case BARRIER:
 		{
-			msg = malloc( sizeof( message_t )  + 
-						  strlen( BARRIER_MBS ) +2);
-			if( !msg )
-				DIE_MEM();
-			strcpy( msg->body, BARRIER_MBS "\n" );
+            set_body(msg, BARRIER_MBS, "\n", NULL);
 			break;
 		}
-		
+            
 		case BARRIER_REPLY:
 		{
-			msg = malloc( sizeof( message_t )  +
-						  strlen( BARRIER_REPLY_MBS ) +2);
-			if( !msg )
-				DIE_MEM();
-			strcpy( msg->body, BARRIER_REPLY_MBS "\n" );
+            set_body(msg, BARRIER_REPLY_MBS, "\n", NULL);
 			break;
 		}
-		
+            
 		default:
 		{
 			debug( 0, L"create_message: Unknown message type" );
 		}
 	}
-
+    
 	free( key );
-
-	if( msg )
-		msg->count=0;
-
-//	debug( 4, L"Message body is '%s'", msg->body );
-
+    
+    //	debug( 4, L"Message body is '%s'", msg->body );
+    
 	return msg;	
 }
 
 /**
-   Function used with hash_foreach to insert keys of one table into
-   another
-*/
-static void add_key_to_hash( void *key, 
-							 void *data,
-							 void *aux )
-{
-	var_uni_entry_t *e = (var_uni_entry_t *)data;
-	if( ( e->export && get_names_show_exported) || 
-		( !e->export && get_names_show_unexported) )
-		al_push( (array_list_t *)aux, key );
-}
-
-void env_universal_common_get_names( array_list_t *l,
+	Put exported or unexported variables in a string list
+*/	
+void env_universal_common_get_names( wcstring_list_t &lst,
 									 int show_exported,
 									 int show_unexported )
 {
-	get_names_show_exported = show_exported;
-	get_names_show_unexported = show_unexported;
+	env_var_table_t::const_iterator iter;
+	for (iter = env_universal_var.begin(); iter != env_universal_var.end(); ++iter)
+	{
+		const wcstring& key = iter->first;
+		const var_uni_entry_t *e = iter->second; 
+		if( ( e->exportv && show_exported) || 
+		( !e->exportv && show_unexported) )
+		{
+    	    lst.push_back(key);
+		}
 	
-	hash_foreach2( &env_universal_var, 
-				   add_key_to_hash,
-				   l );
+	} 
+
 }
 
-wchar_t *env_universal_common_get( const wchar_t *name )
+
+wchar_t *env_universal_common_get( const wcstring &name )
 {
-	var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name );	
-	if( e )
-		return e->val;
+	env_var_table_t::const_iterator result = env_universal_var.find(name);
+
+	if (result != env_universal_var.end() )
+	{
+		const var_uni_entry_t *e = result->second;
+		if( e )
+			return const_cast<wchar_t*>(e->val.c_str());
+	}
+
 	return 0;	
 }
 
-int env_universal_common_get_export( const wchar_t *name )
+int env_universal_common_get_export( const wcstring &name )
 {
-	var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name );
-	if( e )
-		return e->export;
+	env_var_table_t::const_iterator result = env_universal_var.find(name);
+	if (result != env_universal_var.end() )
+	{
+		const var_uni_entry_t *e = result->second;
+		if (e != NULL)
+			return e->exportv;
+	}
 	return 0;
 }
 
-/**
-   Adds a variable creation message about the specified variable to
-   the specified queue. The function signature is non-obvious since
-   this function is used together with hash_foreach2, which requires
-   the specified function signature.
-
-   \param k the variable name
-   \param v the variable value
-   \param q the queue to add the message to
-*/
-static void enqueue( void *k,
-					 void *v,
-					 void *q)
-{
-	const wchar_t *key = (const wchar_t *)k;
-	const var_uni_entry_t *val = (const var_uni_entry_t *)v;
-	dyn_queue_t *queue = (dyn_queue_t *)q;
-	
-	message_t *msg = create_message( val->export?SET_EXPORT:SET, key, val->val );
-	msg->count=1;
-	
-	q_put( queue, msg );
-}
-
 void enqueue_all( connection_t *c )
 {
-	hash_foreach2( &env_universal_var,
-	               &enqueue, 
-	               (void *)&c->unsent );
+	env_var_table_t::const_iterator iter;
+
+	for (iter = env_universal_var.begin(); iter != env_universal_var.end(); ++iter)
+	{
+		const wcstring &key = iter->first;
+		const var_uni_entry_t *val = iter->second;
+	
+		message_t *msg = create_message( val->exportv?SET_EXPORT:SET, key.c_str(), val->val.c_str() );
+		msg->count=1;
+		c->unsent->push(msg);
+	}
+
 	try_send_all( c );
 }
 
@@ -961,15 +964,13 @@ void connection_init( connection_t *c, int fd )
 {
 	memset (c, 0, sizeof (connection_t));
 	c->fd = fd;
-	b_init( &c->input );
-	q_init( &c->unsent );
+    c->unsent = new std::queue<message_t *>;
 	c->buffer_consumed = c->buffer_used = 0;	
 }
 
 void connection_destroy( connection_t *c)
 {
-	q_destroy( &c->unsent );
-	b_destroy( &c->input );
+    if (c->unsent) delete c->unsent;
 
 	/*
 	  A connection need not always be open - we only try to close it

env_universal_common.h

@@ -2,7 +2,8 @@
 #define FISH_ENV_UNIVERSAL_COMMON_H
 
 #include <wchar.h>
-
+#include <queue>
+#include <string>
 #include "util.h"
 
 /**
@@ -39,21 +40,39 @@
 /**
    The different types of commands that can be sent between client/server
 */
-enum
+typedef enum
 {
 	SET,
 	SET_EXPORT,
 	ERASE,
 	BARRIER,
 	BARRIER_REPLY,
-}
-	;
+} fish_message_type_t;
 
 /**
    The size of the buffer used for reading from the socket
 */
 #define ENV_UNIVERSAL_BUFFER_SIZE 1024
 
+/**
+   A struct representing a message to be sent between client and server
+*/
+typedef struct 
+{
+	/**
+	   Number of queues that contain this message. Once this reaches zero, the message should be deleted
+	*/
+	int count;
+
+	/**
+	   Message body. The message must be allocated using enough memory to actually contain the message.
+	*/
+	std::string body;
+    
+} message_t;
+
+typedef std::queue<message_t *> message_queue_t;
+
 /**
    This struct represents a connection between a universal variable server/client
 */
@@ -66,7 +85,7 @@ typedef struct connection
 	/**
 	   Queue of onsent messages
 	*/
-	dyn_queue_t unsent;
+    message_queue_t *unsent;
 	/**
 	   Set to one when this connection should be killed
 	*/
@@ -75,7 +94,7 @@ typedef struct connection
 	   The input string. Input from the socket goes here. When a
 	   newline is encountered, the buffer is parsed and cleared.
 	*/
-	buffer_t input;
+	std::vector<char> input;
 	
 	/**
 	   The read buffer. 
@@ -85,12 +104,12 @@ typedef struct connection
 	/**
 	   Number of bytes that have already been consumed.
 	*/
-	int buffer_consumed;
+	size_t buffer_consumed;
 	
 	/**
 	   Number of bytes that have been read into the buffer. 
 	*/
-	int buffer_used;
+	size_t buffer_used;
 	
 
 	/**
@@ -100,22 +119,6 @@ typedef struct connection
 }
 	connection_t;
 
-/**
-   A struct representing a message to be sent between client and server
-*/
-typedef struct 
-{
-	/**
-	   Number of queues that contain this message. Once this reaches zero, the message should be deleted
-	*/
-	int count;
-	/**
-	   Message body. The message must be allocated using enough memory to actually contain the message.
-	*/
-	char body[1];
-}
-	message_t;
-
 /**
    Read all available messages on this connection
 */
@@ -129,12 +132,12 @@ void try_send_all( connection_t *c );
 /**
    Create a messge with the specified properties
 */
-message_t *create_message( int type, const wchar_t *key, const wchar_t *val );
+message_t *create_message( fish_message_type_t type, const wchar_t *key, const wchar_t *val );
 
 /**
    Init the library
 */
-void env_universal_common_init(void (*cb)(int type, const wchar_t *key, const wchar_t *val ) );
+void env_universal_common_init(void (*cb)(fish_message_type_t type, const wchar_t *key, const wchar_t *val ) );
 
 /**
    Destroy library data
@@ -147,7 +150,7 @@ void env_universal_common_destroy();
    This function operate agains the local copy of all universal
    variables, it does not communicate with any other process.
 */
-void env_universal_common_get_names( array_list_t *l,
+void env_universal_common_get_names( wcstring_list_t &lst,
 									 int show_exported,
 									 int show_unexported );
 
@@ -160,7 +163,7 @@ void env_universal_common_get_names( array_list_t *l,
    Do not call this function. Create a message to do it. This function
    is only to be used when fishd is dead.
 */
-void env_universal_common_set( const wchar_t *key, const wchar_t *val, int export );
+void env_universal_common_set( const wchar_t *key, const wchar_t *val, int exportv );
 
 /**
    Remove the specified variable. 
@@ -171,7 +174,7 @@ void env_universal_common_set( const wchar_t *key, const wchar_t *val, int expor
    Do not call this function. Create a message to do it. This function
    is only to be used when fishd is dead.
 */
-void env_universal_common_remove( const wchar_t *key );
+void env_universal_common_remove( const wcstring &key );
 
 /**
    Get the value of the variable with the specified name
@@ -179,7 +182,7 @@ void env_universal_common_remove( const wchar_t *key );
    This function operate agains the local copy of all universal
    variables, it does not communicate with any other process.
 */
-wchar_t *env_universal_common_get( const wchar_t *name );
+wchar_t *env_universal_common_get( const wcstring &name );
 
 /**
    Get the export flag of the variable with the specified
@@ -188,7 +191,7 @@ wchar_t *env_universal_common_get( const wchar_t *name );
    This function operate agains the local copy of all universal
    variables, it does not communicate with any other process.
 */
-int env_universal_common_get_export( const wchar_t *name );
+int env_universal_common_get_export( const wcstring &name );
 
 /**
    Add messages about all existing variables to the specified connection

etc/config.fish

@@ -1,7 +1,6 @@
 #
 # Init file for fish
 #
-# @configure_input@
 
 #
 # Some things should only be done for login terminals
@@ -38,17 +37,6 @@ if status --is-login
 	end
 end
 
-#
-# There are variables that contain colons that are not arrays. This 
-# reverts them back to regular strings.
-#
-
-for i in DISPLAY
-	if set -q $i
-		set -- $i (printf ":%s" $$i|cut -c 2-)
-	end
-end
-
 #
 # Load additional initialization files
 #

event.c

@@ -1,722 +0,0 @@
-/** \file event.c
-
-	Functions for handling event triggers
-
-*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <unistd.h>
-#include <termios.h>
-#include <signal.h>
-#include <string.h>
-
-#include "fallback.h"
-#include "util.h"
-
-#include "wutil.h"
-#include "function.h"
-#include "proc.h"
-#include "parser.h"
-#include "common.h"
-#include "event.h"
-#include "signal.h"
-
-#include "halloc_util.h"
-
-/**
-   Number of signals that can be queued before an overflow occurs
-*/
-#define SIG_UNHANDLED_MAX 64
-
-/**
-   This struct contains a list of generated signals waiting to be
-   dispatched
-*/
-typedef struct
-{
-	/**
-	   Number of delivered signals
-	*/
-	int count;
-	/**
-	   Whether signals have been skipped
-	*/
-	int overflow;	
-	/**
-	   Array of signal events
-	*/
-	int signal[SIG_UNHANDLED_MAX];	
-}
-	signal_list_t;
-
-/**
-  The signal event list. Actually two separate lists. One which is
-  active, which is the one that new events is written to. The inactive
-  one contains the events that are currently beeing performed.
-*/
-static signal_list_t sig_list[]={{0,0},{0,0}};
-
-/**
-   The index of sig_list that is the list of signals currently written to
-*/
-static int active_list=0;
-
-/**
-   List of event handlers
-*/
-static array_list_t *events;
-/**
-   List of event handlers that should be removed
-*/
-static array_list_t *killme;
-
-/**
-   List of events that have been sent but have not yet been delivered because they are blocked.
-*/
-static array_list_t *blocked;
-
-/**
-   Tests if one event instance matches the definition of a event
-   class. If both the class and the instance name a function,
-   they must name the same function.
-
-*/
-static int event_match( event_t *class, event_t *instance )
-{
-
-	if( class->function_name && instance->function_name )
-	{
-		if( wcscmp( class->function_name, instance->function_name ) != 0 )
-			return 0;
-	}
-
-	if( class->type == EVENT_ANY )
-		return 1;
-	
-	if( class->type != instance->type )
-		return 0;
-	
-
-	switch( class->type )
-	{
-		
-		case EVENT_SIGNAL:
-			if( class->param1.signal == EVENT_ANY_SIGNAL )
-				return 1;
-			return class->param1.signal == instance->param1.signal;
-			
-		case EVENT_VARIABLE:
-			return wcscmp( instance->param1.variable,
-				       class->param1.variable )==0;
-			
-		case EVENT_EXIT:
-			if( class->param1.pid == EVENT_ANY_PID )
-				return 1;
-			return class->param1.pid == instance->param1.pid;
-
-		case EVENT_JOB_ID:
-			return class->param1.job_id == instance->param1.job_id;
-
-		case EVENT_GENERIC:
-			return wcscmp( instance->param1.param,
-				       class->param1.param )==0;
-
-	}
-	
-	/**
-	   This should never be reached
-	*/
-	return 0;	
-}
-
-
-/**
-   Create an identical copy of an event. Use deep copying, i.e. make
-   duplicates of any strings used as well.
-*/
-static event_t *event_copy( event_t *event, int copy_arguments )
-{
-	event_t *e = malloc( sizeof( event_t ) );
-	
-	if( !e )
-		DIE_MEM();
-	
-	memcpy( e, event, sizeof(event_t));
-
-	if( e->function_name )
-		e->function_name = wcsdup( e->function_name );
-
-	if( e->type == EVENT_VARIABLE )
-		e->param1.variable = wcsdup( e->param1.variable );
-	else if( e->type == EVENT_GENERIC )
-		e->param1.param = wcsdup( e->param1.param );
-		
-	al_init( &e->arguments );
-	if( copy_arguments )
-	{
-		int i;
-		for( i=0; i<al_get_count( &event->arguments ); i++ )
-		{
-			al_push( &e->arguments, wcsdup( (wchar_t *)al_get( &event->arguments, i ) ) );
-		}
-				
-	}
-	
-	return e;
-}
-
-/**
-   Test if specified event is blocked
-*/
-static int event_is_blocked( event_t *e )
-{
-	block_t *block;
-	event_block_t *eb;
-	
-	for( block = current_block; block; block = block->outer )
-	{
-		for( eb = block->first_event_block; eb; eb=eb->next )
-		{
-			if( eb->type & (1<<EVENT_ANY ) )
-				return 1;
-			if( eb->type & (1<<e->type) )
-				return 1;
-		}
-	}
-	for( eb = global_event_block; eb; eb=eb->next )
-	{
-		if( eb->type & (1<<EVENT_ANY ) )
-			return 1;
-		if( eb->type & (1<<e->type) )
-			return 1;
-		return 1;
-		
-	}
-	
-	return 0;
-}
-
-const wchar_t *event_get_desc( event_t *e )
-{
-
-	/*
-	  String buffer used for formating event descriptions in event_get_desc()
-	*/
-	static string_buffer_t *get_desc_buff=0;
-
-	CHECK( e, 0 );
-
-	if( !get_desc_buff )
-	{
-		get_desc_buff=sb_halloc( global_context );
-	}
-	else
-	{
-		sb_clear( get_desc_buff );
-	}
-	
-	switch( e->type )
-	{
-		
-		case EVENT_SIGNAL:
-			sb_printf( get_desc_buff, _(L"signal handler for %ls (%ls)"), sig2wcs(e->param1.signal ), signal_get_desc( e->param1.signal ) );
-			break;
-		
-		case EVENT_VARIABLE:
-			sb_printf( get_desc_buff, _(L"handler for variable '%ls'"), e->param1.variable );
-			break;
-		
-		case EVENT_EXIT:
-			if( e->param1.pid > 0 )
-			{
-				sb_printf( get_desc_buff, _(L"exit handler for process %d"), e->param1.pid );
-			}
-			else
-			{
-				job_t *j = job_get_from_pid( -e->param1.pid );
-				if( j )
-					sb_printf( get_desc_buff, _(L"exit handler for job %d, '%ls'"), j->job_id, j->command );
-				else
-					sb_printf( get_desc_buff, _(L"exit handler for job with process group %d"), -e->param1.pid );
-			}
-			
-			break;
-		
-		case EVENT_JOB_ID:
-		{
-			job_t *j = job_get( e->param1.job_id );
-			if( j )
-				sb_printf( get_desc_buff, _(L"exit handler for job %d, '%ls'"), j->job_id, j->command );
-			else
-				sb_printf( get_desc_buff, _(L"exit handler for job with job id %d"), j->job_id );
-
-			break;
-		}
-		
-		case EVENT_GENERIC:
-			sb_printf( get_desc_buff, _(L"handler for generic event '%ls'"), e->param1.param );
-			break;
-			
-		default:
-			sb_printf( get_desc_buff, _(L"Unknown event type") );
-			break;
-			
-	}
-	
-	return (const wchar_t *)get_desc_buff->buff;
-}
-
-
-void event_add_handler( event_t *event )
-{
-	event_t *e;
-
-	CHECK( event, );
-	
-	e = event_copy( event, 0 );
-
-	if( !events )
-		events = al_new();
-
-	if( e->type == EVENT_SIGNAL )
-	{
-		signal_handle( e->param1.signal, 1 );
-	}
-	
-	al_push( events, e );	
-}
-
-void event_remove( event_t *criterion )
-{
-	int i;
-	array_list_t *new_list=0;
-	event_t e;
-	
-	CHECK( criterion, );
-
-	/*
-	  Because of concurrency issues (env_remove could remove an event
-	  that is currently being executed), env_remove does not actually
-	  free any events - instead it simply moves all events that should
-	  be removed from the event list to the killme list, and the ones
-	  that shouldn't be killed to new_list, and then drops the empty
-	  events-list.
-	*/
-	
-	if( !events )
-		return;
-
-	for( i=0; i<al_get_count( events); i++ )
-	{
-		event_t *n = (event_t *)al_get( events, i );		
-		if( event_match( criterion, n ) )
-		{
-			if( !killme )
-				killme = al_new();
-			
-			al_push( killme, n );			
-
-			/*
-			  If this event was a signal handler and no other handler handles
-			  the specified signal type, do not handle that type of signal any
-			  more.
-			*/
-			if( n->type == EVENT_SIGNAL )
-			{
-				e.type = EVENT_SIGNAL;
-				e.param1.signal = n->param1.signal;
-				e.function_name = 0;
-				
-				if( event_get( &e, 0 ) == 1 )
-				{
-					signal_handle( e.param1.signal, 0 );
-				}		
-			}
-		}
-		else
-		{
-			if( !new_list )
-				new_list = al_new();
-			al_push( new_list, n );
-		}
-	}
-	al_destroy( events );
-	free( events );	
-	events = new_list;
-}
-
-int event_get( event_t *criterion, array_list_t *out )
-{
-	int i;
-	int found = 0;
-	
-	if( !events )
-		return 0;	
-
-	CHECK( criterion, 0 );
-	
-	for( i=0; i<al_get_count( events); i++ )
-	{
-		event_t *n = (event_t *)al_get( events, i );		
-		if( event_match(criterion, n ) )
-		{
-			found++;
-			if( out )
-				al_push( out, n );
-		}		
-	}
-	return found;
-}
-
-/**
-   Free all events in the kill list
-*/
-static void event_free_kills()
-{
-	int i;
-	if( !killme )
-		return;
-	
-	for( i=0; i<al_get_count( killme ); i++ )
-	{
-		event_t *roadkill = (event_t *)al_get( killme, i );
-		event_free( roadkill );
-	}
-	al_truncate( killme, 0 );
-}
-
-/**
-   Test if the specified event is waiting to be killed
-*/
-static int event_is_killed( event_t *e )
-{
-	int i;
-	if( !killme )
-		return 0;
-	
-	for( i=0; i<al_get_count( killme ); i++ )
-	{
-		event_t *roadkill = (event_t *)al_get( events, i );
-		if( roadkill ==e )
-			return 1;
-		
-	}
-	return 0;
-}	
-
-/**
-   Perform the specified event. Since almost all event firings will
-   not be matched by even a single event handler, we make sure to
-   optimize the 'no matches' path. This means that nothing is
-   allocated/initialized unless needed.
-*/
-static void event_fire_internal( event_t *event )
-{
-	int i, j;
-	string_buffer_t *b=0;
-	array_list_t *fire=0;
-	
-	/*
-	  First we free all events that have been removed
-	*/
-	event_free_kills();	
-
-	if( !events )
-		return;
-
-	/*
-	  Then we iterate over all events, adding events that should be
-	  fired to a second list. We need to do this in a separate step
-	  since an event handler might call event_remove or
-	  event_add_handler, which will change the contents of the \c
-	  events list.
-	*/
-	for( i=0; i<al_get_count( events ); i++ )
-	{
-		event_t *criterion = (event_t *)al_get( events, i );
-		
-		/*
-		  Check if this event is a match
-		*/
-		if(event_match( criterion, event ) )
-		{
-			if( !fire )
-				fire = al_new();
-			al_push( fire, criterion );
-		}
-	}
-	
-	/*
-	  No matches. Time to return.
-	*/
-	if( !fire )
-		return;
-		
-	/*
-	  Iterate over our list of matching events
-	*/
-	
-	for( i=0; i<al_get_count( fire ); i++ )
-	{
-		event_t *criterion = (event_t *)al_get( fire, i );
-		int prev_status;
-
-		/*
-		  Check if this event has been removed, if so, dont fire it
-		*/
-		if( event_is_killed( criterion ) )
-			continue;
-
-		/*
-		  Fire event
-		*/
-		if( !b )
-			b = sb_new();
-		else
-			sb_clear( b );
-		
-		sb_append( b, criterion->function_name );
-		
-		for( j=0; j<al_get_count(&event->arguments); j++ )
-		{
-			wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 1 );		
-			sb_append( b, L" " );
-			sb_append( b, arg_esc );
-			free( arg_esc );				
-		}
-
-//		debug( 1, L"Event handler fires command '%ls'", (wchar_t *)b->buff );
-		
-		/*
-		  Event handlers are not part of the main flow of code, so
-		  they are marked as non-interactive
-		*/
-		proc_push_interactive(0);
-		prev_status = proc_get_last_status();
-		parser_push_block( EVENT );
-		current_block->param1.event = event;
-		eval( (wchar_t *)b->buff, 0, TOP );
-		parser_pop_block();
-		proc_pop_interactive();					
-		proc_set_last_status( prev_status );
-	}
-
-	if( b )
-	{
-		sb_destroy( b );
-		free( b );		
-	}
-	
-	if( fire )
-	{
-		al_destroy( fire );
-		free( fire );
-	}
-	
-	/*
-	  Free killed events
-	*/
-	event_free_kills();	
-	
-}
-
-/**
-   Handle all pending signal events
-*/
-static void event_fire_delayed()
-{
-
-	int i;
-
-	/*
-	  If is_event is one, we are running the event-handler non-recursively. 
-
-	  When the event handler has called a piece of code that triggers
-	  another event, we do not want to fire delayed events because of
-	  concurrency problems.
-	*/
-	if( blocked && is_event==1)
-	{
-		array_list_t *new_blocked = 0;
-		
-		for( i=0; i<al_get_count( blocked ); i++ )
-		{
-			event_t *e = (event_t *)al_get( blocked, i );
-			if( event_is_blocked( e ) )
-			{
-				if( !new_blocked )
-					new_blocked = al_new();
-				al_push( new_blocked, e );			
-			}
-			else
-			{
-				event_fire_internal( e );
-				event_free( e );
-			}
-		}		
-		al_destroy( blocked );
-		free( blocked );
-		blocked = new_blocked;
-	}
-	
-	while( sig_list[active_list].count > 0 )
-	{
-		signal_list_t *lst;
-		event_t e;
-		al_init( &e.arguments );		
-
-		/*
-		  Switch signal lists
-		*/
-		sig_list[1-active_list].count=0;
-		sig_list[1-active_list].overflow=0;
-		active_list=1-active_list;
-
-		/*
-		  Set up 
-		*/
-		e.type=EVENT_SIGNAL;
-		e.function_name=0;
-		
-		lst = &sig_list[1-active_list];
-		
-		if( lst->overflow )
-		{
-			debug( 0, _( L"Signal list overflow. Signals have been ignored." ) );
-		}
-		
-		/*
-		  Send all signals in our private list
-		*/
-		for( i=0; i<lst->count; i++ )
-		{
-			e.param1.signal = lst->signal[i];
-			al_set( &e.arguments, 0, sig2wcs( e.param1.signal ) );			
-			if( event_is_blocked( &e ) )
-			{
-				if( !blocked )
-					blocked = al_new();
-				al_push( blocked, event_copy(&e, 1) );			
-			}
-			else
-			{
-				event_fire_internal( &e );
-			}
-		}
-		
-		al_destroy( &e.arguments );
-		
-	}	
-}
-
-
-void event_fire( event_t *event )
-{
-	is_event++;
-	
-	if( event && (event->type == EVENT_SIGNAL) )
-	{
-		/*
-		  This means we are in a signal handler. We must be very
-		  careful not do do anything that could cause a memory
-		  allocation or something else that might be bad when in a
-		  signal handler.
-		*/
-		if( sig_list[active_list].count < SIG_UNHANDLED_MAX )
-			sig_list[active_list].signal[sig_list[active_list].count++]=event->param1.signal;
-		else
-			sig_list[active_list].overflow=1;
-	}
-	else
-	{
-		/*
-		  Fire events triggered by signals
-		*/
-		event_fire_delayed();
-			
-		if( event )
-		{
-			if( event_is_blocked( event ) )
-			{
-				if( !blocked )
-					blocked = al_new();
-				
-				al_push( blocked, event_copy(event, 1) );
-			}
-			else
-			{
-				event_fire_internal( event );
-			}
-		}
-		
-	}	
-	is_event--;
-}
-
-
-void event_init()
-{
-}
-
-void event_destroy()
-{
-
-	if( events )
-	{
-		al_foreach( events, (void (*)(void *))&event_free );
-		al_destroy( events );
-		free( events );		
-		events=0;
-	}
-
-	if( killme )
-	{
-		al_foreach( killme, (void (*)(void *))&event_free );
-		al_destroy( killme );
-		free( killme );		
-		killme=0;		
-	}	
-}
-
-void event_free( event_t *e )
-{
-	CHECK( e, );
-
-	/*
-	  When apropriate, we clear the argument vector
-	*/
-	al_foreach( &e->arguments, &free );
-	al_destroy( &e->arguments );
-
-	free( (void *)e->function_name );
-	if( e->type == EVENT_VARIABLE )
-	{
-		free( (void *)e->param1.variable );
-	}
-	else if( e->type == EVENT_GENERIC )
-	{
-		free( (void *)e->param1.param );
-	}
-	free( e );
-}
-
-
-void event_fire_generic(const wchar_t *name)
-{
-	event_t ev;
-
-	CHECK( name, );
-	
-	ev.type = EVENT_GENERIC;
-	ev.param1.param = name;
-	ev.function_name=0;
-	
-	al_init( &ev.arguments );
-	event_fire( &ev );
-}
-
-	
-

event.cpp

@@ -0,0 +1,667 @@
+/** \file event.c
+
+	Functions for handling event triggers
+
+*/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <unistd.h>
+#include <termios.h>
+#include <signal.h>
+#include <string.h>
+#include <algorithm>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "function.h"
+#include "proc.h"
+#include "parser.h"
+#include "common.h"
+#include "event.h"
+#include "signal.h"
+
+/**
+   Number of signals that can be queued before an overflow occurs
+*/
+#define SIG_UNHANDLED_MAX 64
+
+/**
+   This struct contains a list of generated signals waiting to be
+   dispatched
+*/
+typedef struct
+{
+	/**
+	   Number of delivered signals
+	*/
+	int count;
+	/**
+	   Whether signals have been skipped
+	*/
+	int overflow;	
+	/**
+	   Array of signal events
+	*/
+	int signal[SIG_UNHANDLED_MAX];	
+}
+	signal_list_t;
+
+/**
+  The signal event list. Actually two separate lists. One which is
+  active, which is the one that new events is written to. The inactive
+  one contains the events that are currently beeing performed.
+*/
+static signal_list_t sig_list[]={{0,0},{0,0}};
+
+/**
+   The index of sig_list that is the list of signals currently written to
+*/
+static int active_list=0;
+
+typedef std::vector<event_t *> event_list_t; 
+
+/**
+   List of event handlers.
+   Note this is inspected by our signal handler, so we must block signals around manipulating it.
+*/
+static event_list_t events;
+/**
+   List of event handlers that should be removed
+*/
+static event_list_t killme;
+
+/**
+   List of events that have been sent but have not yet been delivered because they are blocked.
+*/
+static event_list_t blocked;
+
+/**
+   Tests if one event instance matches the definition of a event
+   class. If both the class and the instance name a function,
+   they must name the same function.
+
+*/
+static int event_match( const event_t *classv, const event_t *instance )
+{
+
+    /* If the function names are both non-empty and different, then it's not a match */
+	if( ! classv->function_name.empty() &&
+        ! instance->function_name.empty() &&
+          classv->function_name != instance->function_name)
+	{
+        return 0;
+	}
+
+	if( classv->type == EVENT_ANY )
+		return 1;
+	
+	if( classv->type != instance->type )
+		return 0;
+	
+
+	switch( classv->type )
+	{
+		
+		case EVENT_SIGNAL:
+			if( classv->param1.signal == EVENT_ANY_SIGNAL )
+				return 1;
+			return classv->param1.signal == instance->param1.signal;
+			
+		case EVENT_VARIABLE:
+			return instance->str_param1 == classv->str_param1;
+			
+		case EVENT_EXIT:
+			if( classv->param1.pid == EVENT_ANY_PID )
+				return 1;
+			return classv->param1.pid == instance->param1.pid;
+
+		case EVENT_JOB_ID:
+			return classv->param1.job_id == instance->param1.job_id;
+
+		case EVENT_GENERIC:
+			return instance->str_param1 == classv->str_param1;
+
+	}
+	
+	/**
+	   This should never be reached
+	*/
+	return 0;	
+}
+
+
+/**
+   Create an identical copy of an event. Use deep copying, i.e. make
+   duplicates of any strings used as well.
+*/
+static event_t *event_copy( const event_t *event, int copy_arguments )
+{
+    event_t *e = new event_t(*event);
+    
+    e->arguments.reset(new wcstring_list_t);
+	if( copy_arguments && event->arguments.get() != NULL )
+	{
+        *(e->arguments) = *(event->arguments);				
+	}
+	
+	return e;
+}
+
+/**
+   Test if specified event is blocked
+*/
+static int event_is_blocked( event_t *e )
+{
+	block_t *block;
+	parser_t &parser = parser_t::principal_parser();
+	for( block = parser.current_block; block; block = block->outer )
+	{
+        if (event_block_list_blocks_type(block->event_blocks, e->type))
+            return true;
+	}
+    return event_block_list_blocks_type(parser.global_event_blocks, e->type);
+}
+
+wcstring event_get_desc( const event_t *e )
+{
+
+	CHECK( e, 0 );
+
+	wcstring result;	
+	switch( e->type )
+	{
+		
+		case EVENT_SIGNAL:
+            result = format_string(_(L"signal handler for %ls (%ls)"), sig2wcs(e->param1.signal ), signal_get_desc( e->param1.signal ));
+			break;
+		
+		case EVENT_VARIABLE:
+			result = format_string(_(L"handler for variable '%ls'"), e->str_param1.c_str() );
+			break;
+		
+		case EVENT_EXIT:
+			if( e->param1.pid > 0 )
+			{
+				result = format_string(_(L"exit handler for process %d"), e->param1.pid );
+			}
+			else
+			{
+				job_t *j = job_get_from_pid( -e->param1.pid );
+				if( j )
+					result = format_string(_(L"exit handler for job %d, '%ls'"), j->job_id, j->command_wcstr() );
+				else
+					result = format_string(_(L"exit handler for job with process group %d"), -e->param1.pid );
+			}
+			
+			break;
+		
+		case EVENT_JOB_ID:
+		{
+			job_t *j = job_get( e->param1.job_id );
+			if( j )
+				result = format_string(_(L"exit handler for job %d, '%ls'"), j->job_id, j->command_wcstr() );
+			else
+				result = format_string(_(L"exit handler for job with job id %d"), e->param1.job_id );
+
+			break;
+		}
+		
+		case EVENT_GENERIC:
+			result = format_string(_(L"handler for generic event '%ls'"), e->str_param1.c_str() );
+			break;
+			
+		default:
+			result = format_string(_(L"Unknown event type") );
+			break;
+			
+	}
+	
+	return result;
+}
+
+#if 0
+static void show_all_handlers(void) {
+    puts("event handlers:");
+    for (event_list_t::const_iterator iter = events.begin(); iter != events.end(); ++iter) {
+        const event_t *foo = *iter;
+        wcstring tmp = event_get_desc(foo);
+        printf("    handler now %ls\n", tmp.c_str());
+    }
+}
+#endif
+
+void event_add_handler( const event_t *event )
+{
+	event_t *e;
+
+	CHECK( event, );
+	
+	e = event_copy( event, 0 );
+
+	if( e->type == EVENT_SIGNAL )
+	{
+		signal_handle( e->param1.signal, 1 );
+	}
+    
+    // Block around updating the events vector
+    signal_block();
+    events.push_back(e);
+    signal_unblock();
+}
+
+void event_remove( event_t *criterion )
+{
+
+	size_t i;
+	event_list_t new_list;
+	
+	CHECK( criterion, );
+
+	/*
+	  Because of concurrency issues (env_remove could remove an event
+	  that is currently being executed), env_remove does not actually
+	  free any events - instead it simply moves all events that should
+	  be removed from the event list to the killme list, and the ones
+	  that shouldn't be killed to new_list, and then drops the empty
+	  events-list.
+	*/
+	
+	if( events.empty() )
+		return;
+
+	for( i=0; i<events.size(); i++ )
+	{
+		event_t *n = events.at(i);
+		if( event_match( criterion, n ) )
+		{
+            killme.push_back(n);
+
+			/*
+			  If this event was a signal handler and no other handler handles
+			  the specified signal type, do not handle that type of signal any
+			  more.
+			*/
+			if( n->type == EVENT_SIGNAL )
+			{
+                event_t e = event_t::signal_event(n->param1.signal);
+				if( event_get( &e, 0 ) == 1 )
+				{
+					signal_handle( e.param1.signal, 0 );
+				}		
+			}
+		}
+		else
+		{
+            new_list.push_back(n);
+		}
+	}
+    signal_block();
+	events.swap(new_list);
+    signal_unblock();
+}
+
+int event_get( event_t *criterion, std::vector<event_t *> *out )
+{
+	size_t i;
+	int found = 0;
+	
+	if( events.empty() )
+		return 0;	
+
+	CHECK( criterion, 0 );
+	
+	for( i=0; i<events.size(); i++ )
+	{
+		event_t *n = events.at(i);
+		if( event_match(criterion, n ) )
+		{
+			found++;
+			if( out )
+                out->push_back(n);
+		}		
+	}
+	return found;
+}
+
+bool event_is_signal_observed(int sig)
+{
+    /* We are in a signal handler! Don't allocate memory, etc.
+       This does what event_match does, except it doesn't require passing in an event_t.
+    */
+    size_t i, max = events.size();
+    for (i=0; i < max; i++)
+    {
+        const event_t *event = events[i];
+        if (event->type == EVENT_ANY)
+        {
+            return true;
+        }
+        else if (event->type == EVENT_SIGNAL)
+        {
+            if( event->param1.signal == EVENT_ANY_SIGNAL || event->param1.signal == sig)
+                return true;
+        }
+    }
+    return false;
+}
+
+/**
+   Free all events in the kill list
+*/
+static void event_free_kills()
+{
+    for_each(killme.begin(), killme.end(), event_free);
+    killme.resize(0);
+}
+
+/**
+   Test if the specified event is waiting to be killed
+*/
+static int event_is_killed( event_t *e )
+{
+    return std::find(killme.begin(), killme.end(), e) != killme.end();
+}	
+
+/**
+   Perform the specified event. Since almost all event firings will
+   not be matched by even a single event handler, we make sure to
+   optimize the 'no matches' path. This means that nothing is
+   allocated/initialized unless needed.
+*/
+static void event_fire_internal( const event_t *event )
+{
+
+	size_t i, j;
+	event_list_t fire;
+	
+	/*
+	  First we free all events that have been removed
+	*/
+	event_free_kills();	
+
+	if( events.empty() )
+		return;
+
+	/*
+	  Then we iterate over all events, adding events that should be
+	  fired to a second list. We need to do this in a separate step
+	  since an event handler might call event_remove or
+	  event_add_handler, which will change the contents of the \c
+	  events list.
+	*/
+	for( i=0; i<events.size(); i++ )
+	{
+		event_t *criterion = events.at(i);
+		
+		/*
+		  Check if this event is a match
+		*/
+		if(event_match( criterion, event ) )
+		{
+            fire.push_back(criterion);
+		}
+	}
+	
+	/*
+	  No matches. Time to return.
+	*/
+	if( fire.empty() )
+		return;
+		
+	/*
+	  Iterate over our list of matching events
+	*/
+	
+	for( i=0; i<fire.size(); i++ )
+	{
+		event_t *criterion = fire.at(i);
+		int prev_status;
+
+		/*
+		  Check if this event has been removed, if so, dont fire it
+		*/
+		if( event_is_killed( criterion ) )
+			continue;
+
+		/*
+		  Fire event
+		*/
+		wcstring buffer = criterion->function_name;
+		
+        if (event->arguments.get())
+        {
+            for( j=0; j< event->arguments->size(); j++ )
+            {
+                wcstring arg_esc = escape_string( event->arguments->at(j), 1 );		
+                buffer += L" ";
+                buffer += arg_esc;
+            }
+        }
+
+//		debug( 1, L"Event handler fires command '%ls'", buffer.c_str() );
+		
+		/*
+		  Event handlers are not part of the main flow of code, so
+		  they are marked as non-interactive
+		*/
+		proc_push_interactive(0);
+		prev_status = proc_get_last_status();
+        parser_t &parser = parser_t::principal_parser();
+        
+        block_t *block = new event_block_t(event);
+		parser.push_block(block);
+		parser.eval( buffer, io_chain_t(), TOP );
+		parser.pop_block();
+		proc_pop_interactive();					
+		proc_set_last_status( prev_status );
+	}
+
+	/*
+	  Free killed events
+	*/
+	event_free_kills();	
+	
+}
+
+/**
+   Handle all pending signal events
+*/
+static void event_fire_delayed()
+{
+
+	size_t i;
+
+	/*
+	  If is_event is one, we are running the event-handler non-recursively. 
+
+	  When the event handler has called a piece of code that triggers
+	  another event, we do not want to fire delayed events because of
+	  concurrency problems.
+	*/
+	if( ! blocked.empty() && is_event==1)
+	{
+		event_list_t new_blocked;
+		
+		for( i=0; i<blocked.size(); i++ )
+		{
+			event_t *e = blocked.at(i);
+			if( event_is_blocked( e ) )
+			{
+                new_blocked.push_back(e);
+			}
+			else
+			{
+				event_fire_internal( e );
+				event_free( e );
+			}
+		}		
+        blocked.swap(new_blocked);
+	}
+	
+	while( sig_list[active_list].count > 0 )
+	{
+		signal_list_t *lst;
+
+		/*
+		  Switch signal lists
+		*/
+		sig_list[1-active_list].count=0;
+		sig_list[1-active_list].overflow=0;
+		active_list=1-active_list;
+
+		/*
+		  Set up 
+		*/
+        event_t e = event_t::signal_event(0);
+        e.arguments.reset(new wcstring_list_t(1)); //one element
+		lst = &sig_list[1-active_list];
+		
+		if( lst->overflow )
+		{
+			debug( 0, _( L"Signal list overflow. Signals have been ignored." ) );
+		}
+		
+		/*
+		  Send all signals in our private list
+		*/
+		for( int i=0; i < lst->count; i++ )
+		{
+			e.param1.signal = lst->signal[i];
+            e.arguments->at(0) = sig2wcs( e.param1.signal );
+			if( event_is_blocked( &e ) )
+			{
+                blocked.push_back(event_copy(&e, 1));
+			}
+			else
+			{
+				event_fire_internal( &e );
+			}
+		}
+		
+        e.arguments.reset(NULL);
+		
+	}	
+}
+
+void event_fire_signal(int signal)
+{
+    /*
+      This means we are in a signal handler. We must be very
+      careful not do do anything that could cause a memory
+      allocation or something else that might be bad when in a
+      signal handler.
+    */
+    if( sig_list[active_list].count < SIG_UNHANDLED_MAX )
+        sig_list[active_list].signal[sig_list[active_list].count++]=signal;
+    else
+        sig_list[active_list].overflow=1;
+}
+
+
+void event_fire( event_t *event )
+{
+	
+	if( event && (event->type == EVENT_SIGNAL) )
+	{
+        event_fire_signal(event->param1.signal);
+	}
+	else
+	{
+        is_event++;
+
+		/*
+		  Fire events triggered by signals
+		*/
+		event_fire_delayed();
+			
+		if( event )
+		{
+			if( event_is_blocked( event ) )
+			{
+                blocked.push_back(event_copy(event, 1));
+			}
+			else
+			{
+				event_fire_internal( event );
+			}
+		}
+        is_event--;
+	}	
+}
+
+
+void event_init()
+{
+}
+
+void event_destroy()
+{
+
+    for_each(events.begin(), events.end(), event_free);
+    events.clear();
+    
+    for_each(killme.begin(), killme.end(), event_free);
+    killme.clear();
+}
+
+void event_free( event_t *e )
+{
+	CHECK( e, );
+    delete e;
+}
+
+
+void event_fire_generic_internal(const wchar_t *name, ...)
+{
+	va_list va;
+	wchar_t *arg;
+
+	CHECK( name, );
+
+	event_t ev(EVENT_GENERIC);
+	ev.str_param1 = name;
+    ev.arguments.reset(new wcstring_list_t);
+	va_start( va, name );
+	while( (arg=va_arg(va, wchar_t *) )!= 0 )
+	{
+        ev.arguments->push_back(arg);
+	}
+	va_end( va );
+	
+	event_fire( &ev );
+    ev.arguments.reset(NULL);
+}
+
+event_t event_t::signal_event(int sig) {
+    event_t event(EVENT_SIGNAL);
+    event.param1.signal = sig;
+    return event;
+}
+
+event_t event_t::variable_event(const wcstring &str) {
+    event_t event(EVENT_VARIABLE);
+    event.str_param1 = str;
+    return event;
+}
+
+event_t event_t::generic_event(const wcstring &str) {
+    event_t event(EVENT_GENERIC);
+    event.str_param1 = str;
+    return event;
+}
+
+event_t::event_t(const event_t &x) :
+                type(x.type),
+                param1(x.param1),
+                str_param1(x.str_param1),
+                function_name(x.function_name)
+{
+    const wcstring_list_t *ptr = x.arguments.get();
+    if (ptr)
+        arguments.reset(new wcstring_list_t(*ptr));
+}