Bump version number

darcs-hash:20060729173243-ac50b-641e89defc78e0660cac6601acfb22c73c1cd32e.gz

Doxyfile.user

@@ -93,7 +93,7 @@ DISABLE_INDEX          = YES
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
 TREEVIEW_WIDTH         = 250
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex

INSTALL

@@ -2,41 +2,44 @@
 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.
+Fish is developed using GCC, with the goal of using only C89 language
+features. Fish does, however use the *wprintf family of functions,
+which are new to the C99 standrard. It is not unlikely that any given
+release contains a few GCC:isms, but ICC 9.0.030 has been found to
+produce working binaries. GCC 2.95.* won't compile fish, but GCC 3.2.3
+is known to work. Patches to fix any remaining GNU:isms are welcome.
 
-In version 1.9.2, the installation prefix for fish rpms and debs has
-changed from /usr/local to /usr. The package should automatically
-change any instances of /usr/local/bin/fish in /etc/passwd to
-/usr/bin/fish, but some programs, like screen, may need to be
-restarted to notice the changes.  You may also run into problems when
-switching between using a package and personal builds.
+Older versions of Doxygen has bugs in the man-page generation which
+cause the builtin help to render incorrectly. Doxygen 1.2.14 is known
+to have this problem.
 
 
 Prerequisites
 =============
 
-Fish requires the following packages to build:
+Fish requires the following programs and libraries to build:
 
  - Doxygen
  - Curses or Ncurses
+ - GNU make
+ - GCC
 
 fish also relies on standard unix tools such as cat, cut, grep, sed,
-whoami and echo. Fish does not support cross-compilation, separate
-build directories or any other fancy configure options. Use a recent
-version of Doxygen, since older versions have bugs that make the
-builtin help pages render incorrectly. Version 1.2.14 is known to be
-broken.
+whoami, bc and echo. Fish does not yet support cross-compilation,
+separate build directories or any other fancy configure options.
 
 
 Simple install procedure
 ========================
 
+If you have downloaded the darcs repository of fish, you need to run
+the autoconf command first. Then use the following commands to compile
+fish:
+
  % ./configure
- % make                                  #Compile fish
- % make install                          #Install fish
- % echo /usr/local/bin/fish >>/etc/shells #Add fish to list of shells
+ % make                                   # Compile fish
+ % make install                           # Install fish
+ % echo /usr/local/bin/fish >>/etc/shells # Add fish to list of shells
 
 If you wish to use fish as your default shell, use the following
 command:
@@ -49,6 +52,9 @@ chsh will prompt you for your password, and change your default shell.
 Local install procedure
 =======================
 
+If you have downloaded the darcs repository of fish, you need to run
+autoconf to generate the configure script.
+
 To install fish in your own home directory (typically as non-root),
 type:
 
@@ -57,6 +63,6 @@ type:
  % make install			# Install fish
 
 You will not be able to use fish as the default shell unless you also
-add the corresponding line to /etc/shells, which kind of defeats the
-point of a local install. But you can at least build and run fish.
-
+add the corresponding line to /etc/shells, which mostly defeats the
+point of a local install. As a workaround, you can add fish as the
+last command of the init files for your regular shell.

Makefile.in

@@ -16,10 +16,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
+#
+# @configure_input@
+#
+
 #
 # Makefile for the fish shell. Can build fish and associated
 # applications, install them, recalculate dependencies and also create
-# binary distributions in tar.bz2 tar.gz and rpm formats.
+# binary distributions in tar.bz2, tar.gz and rpm formats.
 #
 
 #
@@ -28,64 +32,78 @@
 # hallucinations.
 #
 
-# Compiler flags
-
+# Programs
 CC := @CC@
-CFLAGS := @CFLAGS@ @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS:= -l@CURSESLIB@ @LIBS@ @LDFLAGS@ @LIBDIR@
 INSTALL:=@INSTALL@
 
+# Installation directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
-fishdir = @fishdir@
-fishfile = @fishfile@
-fishinputfile = @fishinputfile@
 docdir = @docdir@
+localedir = @localedir@
+prefix = @prefix@
+optbindirs = @optbindirs@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
-# All objects used by fish, that are compiled from an ordinary .c file
-# using an ordinary .h file.
-COMMON_OBJS := function.o builtin.o common.o complete.o env.o exec.o	\
+MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
+CFLAGS=@CFLAGS@ $(MACROS)
+CPPFLAGS=@CPPFLAGS@
+LDFLAGS= @LIBS@ @LDFLAGS@ 
+
+
+#etc files to install
+ETC_DIR_INSTALL = etc/fish_interactive.fish 
+
+# Set to 1 if we have gettext
+HAVE_GETTEXT=@HAVE_GETTEXT@
+
+#Additional .c files used by common.o. These also have a corresponding
+#.h file.
+COMMON_FILES := util.c halloc.c halloc_util.c fallback.c
+
+# All objects that the system needs to build fish, except main.o
+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 util.o wildcard.o wgetopt.o wutil.o input.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
+	input_common.o event.o signal.o io.o parse_util.o common.o \
 
-# builtin_help.h exists, but builtin_help.c is autogenerated
-COMMON_OBJS_WITH_HEADER := builtin_help.o
+# Additional files used by builtin.o
+BUILTIN_FILES := builtin_help.c builtin_set.c builtin_commandline.c	\
+	builtin_ulimit.c builtin_complete.c builtin_jobs.c
 
-# main.c exists, but main.h does not, etc.
-COMMON_OBJS_WITH_CODE := builtin_set.o builtin_commandline.o builtin_ulimit.c
+# All objects that the system needs to build fish_pager
+FISH_PAGER_OBJS := fish_pager.o output.o wutil.o		\
+	tokenizer.o input_common.o env_universal.o env_universal_common.o	\
+	common.o
 
-# All objects that the system needs to build fish
-FISH_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) main.o
-FISH_PAGER_OBJS := fish_pager.o common.o output.o util.o wutil.o tokenizer.o input_common.o env_universal.o env_universal_common.o
-FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) fish_tests.o 
-FISHD_OBJS := fishd.o env_universal_common.o common.o util.o wutil.o	\
+# All objects that the system needs to build fish_tests
+FISH_TESTS_OBJS := $(FISH_OBJS) fish_tests.o
 
+# All objects that the system needs to build fishd
+FISHD_OBJS := fishd.o env_universal_common.o wutil.o	\
+	doc_src/fishd.o common.o
 
-#All objects that the system needs to build mimedb
-MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o	\
-	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o
+# All objects needed to build mimedb
+MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o		\
+	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o common.o
 
 #
-# Files containing documentation for builtins. Should be listed
-# alphabetically, since this is the order in which they will be written
-# in the help file.
+# Files containing documentation for builtins. 
 #
-
 BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt					\
 	doc_src/begin.txt doc_src/bg.txt doc_src/bind.txt					\
-	doc_src/break.txt doc_src/builtin.txt doc_src/case.txt				\
-	doc_src/cd.txt doc_src/command.txt doc_src/commandline.txt			\
-	doc_src/complete.txt doc_src/continue.txt doc_src/else.txt			\
-	doc_src/end.txt doc_src/eval.txt doc_src/exec.txt doc_src/exit.txt	\
-	doc_src/fg.txt doc_src/for.txt doc_src/function.txt					\
-	doc_src/functions.txt doc_src/if.txt doc_src/jobs.txt				\
-	doc_src/not.txt doc_src/or.txt doc_src/random.txt					\
+	doc_src/block.txt doc_src/break.txt doc_src/builtin.txt				\
+	doc_src/case.txt doc_src/cd.txt doc_src/command.txt					\
+	doc_src/commandline.txt doc_src/complete.txt doc_src/continue.txt	\
+	doc_src/else.txt doc_src/end.txt doc_src/eval.txt doc_src/exec.txt	\
+	doc_src/exit.txt doc_src/fg.txt doc_src/for.txt						\
+	doc_src/function.txt doc_src/functions.txt doc_src/if.txt			\
+	doc_src/jobs.txt doc_src/not.txt doc_src/or.txt doc_src/random.txt	\
 	doc_src/return.txt doc_src/read.txt doc_src/set.txt					\
 	doc_src/status.txt doc_src/switch.txt doc_src/ulimit.txt			\
 	doc_src/while.txt
@@ -96,23 +114,24 @@ BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt					\
 BUILTIN_DOC_HDR := $(BUILTIN_DOC_SRC:.txt=.doxygen)
 
 #
-# Files containing documentation for external commands. Should be listed
-# alphabetically, since this is the order in which they will be written
-# in the help file.
+# Files containing documentation for external commands. 
 #
-
-CMD_DOC_SRC := doc_src/count.txt doc_src/dirh.txt doc_src/dirs.txt	\
-	doc_src/fishd.txt doc_src/help.txt doc_src/mimedb.txt			\
-	doc_src/nextd.txt doc_src/open.txt doc_src/popd.txt				\
-	doc_src/prevd.txt doc_src/psub.txt doc_src/pushd.txt			\
-	doc_src/set_color.txt doc_src/tokenize.txt doc_src/type.txt		\
-	doc_src/umask.txt
+CMD_DOC_SRC := doc_src/contains.txt doc_src/count.txt doc_src/dirh.txt	\
+	doc_src/dirs.txt doc_src/fish_pager.txt doc_src/fishd.txt			\
+	doc_src/help.txt doc_src/mimedb.txt doc_src/nextd.txt				\
+	doc_src/open.txt doc_src/popd.txt doc_src/prevd.txt					\
+	doc_src/psub.txt doc_src/pushd.txt doc_src/set_color.txt			\
+	doc_src/trap.txt doc_src/type.txt doc_src/umask.txt					\
+	doc_src/vared.txt
 
 #
 # Files generated by running doxygen on the files in $(CMD_DOC_SRC)
 #
 CMD_DOC_HDR := $(CMD_DOC_SRC:.txt=.doxygen)
 
+#
+# Files in the test directory
+#
 TEST_IN := $(wildcard tests/test*.in)
 
 #
@@ -124,44 +143,70 @@ DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/doc.hdr	\
 	$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/fish.1.in
 
 # Files in ./
-MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure			\
-    configure.ac config.h.in install-sh set_color.c count.c				\
-    key_reader.c tokenize.c gen_hdr.sh gen_hdr2.c $(MIME_OBJS:.o=.h)	\
-    $(MIME_OBJS:.o=.c) $(COMMON_OBJS_WITH_HEADER:.o=.h)					\
-    $(COMMON_OBJS:.o=.h) $(COMMON_OBJS_WITH_CODE:.o=.c)					\
-    $(COMMON_OBJS:.o=.c) builtin_help.hdr fish.spec.in INSTALL README	\
-    user_doc.head.html xsel-0.9.6.tar ChangeLog config.sub				\
-    config.guess fish_tests.c main.c fish_pager.c fishd.c
+MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure		\
+    configure.ac config.h.in install-sh set_color.c count.c			\
+    key_reader.c gen_hdr.sh gen_hdr2.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)		\
+    builtin_help.hdr fish.spec.in INSTALL README user_doc.head.html	\
+    xsel-0.9.6.tar ChangeLog config.sub config.guess fish_tests.c	\
+    main.c fish_pager.c fishd.c seq.in
 
-# Files in ./init/
-INIT_DIR_FILES :=init/fish.in init/fish_complete.fish	\
-	init/fish_function.fish init/fish_inputrc			\
-	init/fish_interactive.fish
+# Files in ./etc/
+ETC_DIR_FILES :=etc/fish.in etc/fish_inputrc	\
+	etc/fish_interactive.fish.in
+
+# Files in ./share/
+SHARE_DIR_FILES :=share/fish.in
 
 # Files in ./tests/
 TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
 	$(TEST_IN:.in=.status) tests/test.fish tests/gen_output.fish
 
-COMPLETIONS_DIR_FILES := $(wildcard init/completions/*.fish)
+# Files in ./share/completions/
+COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish)
+
+# Files in ./share/functions/
+FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
 
 # Programs to build
-PROGRAMS:=fish set_color tokenize @XSEL@ mimedb count fish_pager fishd
+PROGRAMS:=fish set_color @XSEL@ @SEQ_FALLBACK@ mimedb count fish_pager fishd
 
 # Manuals to install
 MANUALS:=doc_src/fish.1 @XSEL_MAN_PATH@			\
 	doc_src/builtin_doc/man/man1/mimedb.1		\
 	doc_src/builtin_doc/man/man1/set_color.1	\
-	doc_src/builtin_doc/man/man1/tokenize.1		\
-	doc_src/builtin_doc/man/man1/count.1
+	doc_src/builtin_doc/man/man1/count.1 \
+	doc_src/builtin_doc/man/man1/fishd.1 \
+	doc_src/builtin_doc/man/man1/fish_pager.1
+
+#All translation message catalogs
+TRANSLATIONS_SRC := $(wildcard po/*.po)
+TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
 
 #Make everything needed for installing fish
-all: $(PROGRAMS) user_doc 
+all: $(PROGRAMS) user_doc etc/fish share/fish etc/fish_interactive.fish $(TRANSLATIONS)
+	@echo fish has now been built. 
+	@echo Use \'make install\' to install fish.
+.PHONY: all
+
+configure: configure.ac
+	./config.status --recheck
+
+Makefile: Makefile.in configure
+	./config.status
+
+debug:
+	make fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g"
+.PHONY: debug
 
 # User documentation, describing the features of the fish shell.
-user_doc: doc.h Doxyfile.user user_doc.head.html
+user_doc: doc_src/doc.hdr Doxyfile.user user_doc.head.html
+	$(MAKE) doc.h # Depend on the source (doc.hdr) and manually make the intermediate as needed
 	doxygen Doxyfile.user
+	touch user_doc
 
-#Source code documentation. Also includes user documentation.
+# Source code documentation. Also includes user documentation.
 doc: *.h *.c doc.h Doxyfile builtin_help.c
 	doxygen; 
 
@@ -175,6 +220,7 @@ doc/refman.pdf: doc
 
 test: $(PROGRAMS) fish_tests
 	./fish_tests; cd tests; ../fish <test.fish;
+.PHONY: test
 
 xsel-0.9.6:
 	tar -xf xsel-0.9.6.tar
@@ -189,11 +235,11 @@ xsel-0.9.6/xsel: xsel-0.9.6
 doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat doc_src/doc.hdr >doc.h; 
 	echo "/** \page builtins Builtin commands" >>doc.h; 
-	cat $(BUILTIN_DOC_SRC) >>doc.h; 
+	cat `printf "%s\n" $(BUILTIN_DOC_SRC)|sort` >>doc.h; 
 	echo "*/" >>doc.h
 	echo "/** \page commands External commands" >>doc.h; 
 	echo "\c fish is shipped with commands which do not use any internal parts of the shell, and are therefore not written as builtins, but separate commands." >>doc.h
-	cat $(CMD_DOC_SRC) >>doc.h; 
+	cat `printf "%s\n" $(CMD_DOC_SRC)|sort` >>doc.h; 
 	echo "*/" >>doc.h
 
 # This rule creates complete doxygen headers from each of the various
@@ -205,6 +251,41 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat $*.txt >>$@; 
 	echo "*/" >>$@
 
+%: %.in Makefile
+	sed <$@.in >$@ -e "s,@sysconfdir\@,$(sysconfdir)," -e "s,@datadir\@,$(datadir)," -e "s,@docdir\@,$(docdir)," -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|" -e "s,@prefix\@,$(prefix)," -e "s,@optbindirs\@,$(optbindirs)," 
+#-e "s,@\@,$()," 
+
+# Compile translation file
+%.gmo:
+	if test $(HAVE_GETTEXT) = 1; then \
+		msgfmt -o $*.gmo $*.po; \
+	fi
+
+# Update existing po file or copy messages.pot
+%.po:messages.pot
+	if test $(HAVE_GETTEXT) = 1;then \
+		if test -f $*.po; then \
+			msgmerge -U --backup=existing $*.po messages.pot;\
+		else \
+			cp messages.pot $*.po;\
+		fi; \
+	fi
+
+# Create a template translation object
+messages.pot: *.c *.h etc/*.in share/fish 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_ -LShell etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq -o messages.pot; then \
+			echo "Your xgettext version is too old to build the messages.pot file"\
+			rm messages.pot\
+			false;\
+		fi; \
+	fi
+
+builtin.o: $(BUILTIN_FILES)
+
+common.o: $(COMMON_FILES)
+
 # Generate the internal help functions by making doxygen create
 # man-pages which are then converted into C code. The convertion path
 # looks like this: 
@@ -237,14 +318,24 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 # Which is an awful, clunky and ugly way of producing
 # documentation. There ought to be something simpler.
 
-builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh builtin_help.hdr $(CMD_DOC_HDR)
-	cd doc_src; doxygen; cd ..; 
+doc_src/builtin_doc: $(BUILTIN_DOC_SRC) doc_src/count.txt builtin_help.hdr $(CMD_DOC_SRC)
+	for i in $(BUILTIN_DOC_SRC) $(CMD_DOC_SRC); do \
+		FILE=doc_src/`basename $$i .txt`.doxygen; \
+		echo  "/** \page" `basename $$i .txt` >$$FILE; \
+		cat $$i >>$$FILE; \
+		echo "*/" >>$$FILE; \
+	done
+	cd doc_src; doxygen; cd ..;
+	touch doc_src/builtin_doc
+
+builtin_help.c: doc_src/builtin_doc gen_hdr.sh
+	$(MAKE) gen_hdr2 # Don't depend on gen_hdr2, because then we would need to rebuild the docs whenever we use a fresh tarball
 	cp builtin_help.hdr builtin_help.c; 
+	if ! test -x gen_hdr.sh; then chmod 755 gen_hdr.sh; fi
 	for i in $(BUILTIN_DOC_HDR) doc_src/count.doxygen ; do \
-		echo '    hash_put( &tbl, L"'`basename $$i .doxygen`'",' >>$@; \
+		echo '	hash_put( &tbl, L"'`basename $$i .doxygen`'",' >>$@; \
 		./gen_hdr.sh $$i >>$@; \
-		echo " );" >>$@; \
-		echo >>$@; \
+		printf " );\n\n" >>$@; \
 	done;
 	echo "}" >>builtin_help.c
 
@@ -253,7 +344,8 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
 # mimedb. Depends on builtin_help.c to make sure doxygen gets run to
 # generate the man files.
 #
-%.c : %.doxygen gen_hdr2 builtin_help.c
+%.c : %.doxygen 
+	$(MAKE) gen_hdr2 builtin_help.c # These should really be filed as dependencis for %.c above instead, but that seems to confuse make
 	echo "// This file was automatically generated, do not edit" >$@
 	echo "#include <stdlib.h>" >>$@
 	echo "#include <stdio.h>" >>$@
@@ -261,82 +353,182 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
 	echo "void print_help()" >>$@
 	echo "{" >>$@
 	echo '    printf( "%s",' >>$@
+	chmod 755 gen_hdr.sh
 	./gen_hdr.sh $*.doxygen >>$@
 	echo ");" >>$@
 	echo "}" >>$@
-#man -- doc_src/builtin_doc/man/man1/`basename $@ .c`.1 | cat -s | ./gen_hdr2 >>$@
 
-install: all 
+#
+# The build rules for installing/uninstalling fish
+#
+
+# Check for an incompatible installed fish version, and fail with an
+# error if found
+
+check-uninstall:
+	if test -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish -o -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish; then \
+		echo;\
+		echo ERROR;\
+		echo;\
+		echo An older fish installation using an incompatible filesystem hierarchy was detected;\
+		echo You must uninstall this fish version before installing proceeding;\
+		echo type \'make uninstall-legacy\' to uninstall these files,;\
+		echo or type \'make force-install\' to force installation.;\
+		echo The latter may result in a broken installation.;\
+		echo;\
+		false;\
+	fi;
+.PHONY: check-uninstall
+
+# Try to install after checking for incompatible installed versions
+install: all check-uninstall install-force
+.PHONY: install
+
+# Force installation, even in presense of incompatible previous
+# version
+install-force: all install-translations
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
 	done;
-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)$(fishdir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)$(fishdir)/completions
-	$(INSTALL) -m 644 init/fish $(DESTDIR)$(sysconfdir)$(fishfile)
-	for i in init/fish_interactive.fish init/fish_function.fish init/fish_complete.fish ; do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)$(fishdir); \
+	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish.d
+	$(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 644 etc/fish $(DESTDIR)$(sysconfdir)/fish
+	$(INSTALL) -m 644 share/fish $(DESTDIR)$(datadir)/fish
+	for i in $(ETC_DIR_INSTALL); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)/fish.d; \
 	done;
 	for i in $(COMPLETIONS_DIR_FILES); do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)$(fishdir)/completions/; \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
 	done;
-	$(INSTALL) -m 644 init/fish_inputrc $(DESTDIR)$(sysconfdir)$(fishinputfile);
+	for i in $(FUNCTIONS_DIR_FILES); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \
+	done;
+	$(INSTALL) -m 644 etc/fish_inputrc $(DESTDIR)$(sysconfdir)/fish_inputrc;
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
 	for i in user_doc/html/* ChangeLog; do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		if test -f $$i; then \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		fi; \
 	done;
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	for i in $(MANUALS); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
 	done;
-	@echo If you want to use fish as the default shell, remember to first
-	@echo add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
+	@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 Have fun!
+.PHONY: install-force
 
-uninstall:
+
+# Uninstall this fish version
+
+uninstall: uninstall-translations
 	for i in $(PROGRAMS); do \
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
 	rm -f $(DESTDIR)$(bindir)/xsel
-	rm -f $(DESTDIR)$(sysconfdir)$(fishfile)
-	rm -f $(DESTDIR)$(sysconfdir)$(fishinputfile)
-	rm -r $(DESTDIR)$(sysconfdir)$(fishdir)
-	rm -r $(DESTDIR)$(docdir)
-	for i in fish.1* @XSEL_MAN@ mimedb.1* set_color.1* tokenize.1* count.1*; do \
-		rm $(DESTDIR)$(mandir)/man1/$$i; \
+	rm -f $(DESTDIR)$(sysconfdir)/fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish_inputrc
+	if test -d $(DESTDIR)$(datadir)/fish; then \
+		rm -r $(DESTDIR)$(datadir)/fish; \
+	fi
+	if test -d $(DESTDIR)$(docdir); then \
+		rm -r $(DESTDIR)$(docdir);\
+	fi
+	for i in fish.1 @XSEL_MAN@ mimedb.1 fishd.1 set_color.1 count.1; do \
+		rm -f $(DESTDIR)$(mandir)/man1/$$i*; \
 	done;
+.PHONY: uninstall
 
-# The fish shell
-fish: $(FISH_OBJS) 
-	$(CC) $(FISH_OBJS) $(LDFLAGS) -o $@
+# Uninstall older fish release. This is not the default uninstall
+# since there is a slight chance that it removes a file put in place by
+# the sysadmin.
+
+uninstall-legacy: uninstall
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_interactive.fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish
+	if test -d $(DESTDIR)$(sysconfdir)/fish.d/completions; then \
+		for i in $(COMPLETIONS_DIR_FILES); do \
+			basename=`basename $$i`; \
+			if test -f $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; then \
+				rm $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; \
+			fi; \
+		done; \
+	fi;
+	rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions; true
+	rmdir $(DESTDIR)$(sysconfdir)/fish.d; true
+	@echo The previous fish installation has been removed. 
+.PHONY: uninstall-legacy
+
+install-translations: $(TRANSLATIONS)
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS); do \
+			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES; \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \
+			echo $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo;\
+		done; \
+	fi;
+.PHONY: install-translations
+
+uninstall-translations: 
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS_SRC); do \
+			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
+		done; \
+	fi
+.PHONY: uninstall-translations
+
+#
+# The build rules for all the commands
+#
+
+fish: $(FISH_OBJS) main.o 
+	$(CC) $(FISH_OBJS) main.o $(LDFLAGS) -o $@
 
 fish_pager: $(FISH_PAGER_OBJS)
 	$(CC) $(FISH_PAGER_OBJS) $(LDFLAGS) -o $@
 
-fishd: $(FISHD_OBJS)
+fishd: $(FISHD_OBJS) 
 	$(CC) $(FISHD_OBJS) $(LDFLAGS) -o $@
 
 fish_tests: $(FISH_TESTS_OBJS)
 	$(CC) $(FISH_TESTS_OBJS) $(LDFLAGS) -o $@
 
+# mimedb does not need any libraries, so we don't use LDFLAGS here
+mimedb: $(MIME_OBJS) doc_src/mimedb.o
+	$(CC) $(MIME_OBJS) doc_src/mimedb.o $(LDFLAGS) -o $@
 
-mimedb: $(MIME_OBJS) util.o common.o doc_src/mimedb.c
-	$(CC) ${MIME_OBJS} util.o common.o doc_src/mimedb.c $(LDFLAGS) -o $@
+# count does not need any libraries, so we don't use LDFLAGS here
+count: count.o
+	$(CC) count.o -o $@
 
-set_color: set_color.o doc_src/set_color.c 
-	$(CC) set_color.o doc_src/set_color.c $(LDFLAGS) -o $@
-
-tokenize: tokenize.o doc_src/tokenize.c 
-	$(CC) tokenize.o doc_src/tokenize.c $(LDFLAGS) -o $@
+set_color: set_color.o doc_src/set_color.o common.o
+	$(CC) set_color.o doc_src/set_color.o common.o $(LDFLAGS) -o $@
 
 # Test program for the tokenizer library
-tokenizer_test: tokenizer.c tokenizer.h util.o wutil.o common.o
-	$(CC) ${CFLAGS} tokenizer.c util.o wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
+tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o
+	$(CC) $(CFLAGS) tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
 
-key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o util.o wutil.o
-	$(CC) key_reader.o input_common.o common.o env_universal.o env_universal_common.o util.o wutil.o $(LDFLAGS) -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 $@
 
+#
+# Update dependencies
+#
 depend:
 	makedepend -fMakefile.in -Y *.c 
+	./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
@@ -344,40 +536,73 @@ depend:
 #
 # 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) $(INIT_DIR_FILES) $(TEST_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog
+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 doc_src/builtin_doc
 	rm -rf fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/init
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/init/completions
+	$(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@/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 $(INIT_DIR_FILES) fish-@PACKAGE_VERSION@/init/
-	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/init/completions/
+	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 -rf user_doc fish-@PACKAGE_VERSION@/
+	cp -rf doc_src/builtin_doc fish-@PACKAGE_VERSION@/doc_src/
 	tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
 	rm -rf fish-@PACKAGE_VERSION@
 
+tar: fish-@PACKAGE_VERSION@.tar
+.PHONY: tar
+
 fish-@PACKAGE_VERSION@.tar.gz: fish-@PACKAGE_VERSION@.tar
 	gzip -f --best -c fish-@PACKAGE_VERSION@.tar >fish-@PACKAGE_VERSION@.tar.gz
 
 fish-@PACKAGE_VERSION@.tar.bz2: fish-@PACKAGE_VERSION@.tar
 	bzip2 -f --best -k fish-@PACKAGE_VERSION@.tar
 
+dist: fish-@PACKAGE_VERSION@.tar.bz2
+.PHONY: dist
+
 # Create .rpm file for the current systems architecture and an
 # .src.rpm file.
 rpm: fish-@PACKAGE_VERSION@.tar.bz2
+	@if ! which rpmbuild; then \
+		echo Could not find the rpmbuild command, needed to build an rpm; \
+		echo You may be able to install it using the following command:; \
+		echo \'yum install rpm-build\'; \
+		false; \
+	fi
 	cp fish.spec /usr/src/redhat/SPECS/
 	cp fish-@PACKAGE_VERSION@.tar.bz2 /usr/src/redhat/SOURCES/
 	rpmbuild -ba --clean /usr/src/redhat/SPECS/fish.spec
 	mv /usr/src/redhat/RPMS/*/fish*@PACKAGE_VERSION@*.rpm .
 	mv /usr/src/redhat/SRPMS/fish*@PACKAGE_VERSION@*.src.rpm .
+.PHONY: rpm
+
+#
+# Cleanup targets
+#
+
+distclean: clean
+	rm -f fish.spec doc_src/fish.1 doc_src/Doxyfile 
+	rm -f etc/fish etc/fish_interactive.fish seq
+	rm -f config.status config.log config.h Makefile
+.PHONY: distclean
 
 clean:
-	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c 
-	rm -f config.status config.log config.h Makefile
-	rm -f tokenizer_test fish key_reader set_color tokenize gen_hdr2 mimedb
+	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c doc_src/*.o
+	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
+	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
+	rm -f fishd fish_pager count fish_tests 
 	rm -f fish-@PACKAGE_VERSION@.tar 
 	rm -f fish-@PACKAGE_VERSION@.tar.gz 
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2
@@ -386,71 +611,116 @@ clean:
 	rm -rf doc_src/builtin_doc
 	rm -rf fish-@PACKAGE_VERSION@
 	rm -rf xsel-0.9.6/
+	rm -f $(TRANSLATIONS)
+.PHONY: clean
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-builtin.o: config.h util.h wutil.h builtin.h function.h complete.h proc.h
-builtin.o: parser.h reader.h env.h expand.h common.h wgetopt.h sanity.h
-builtin.o: tokenizer.h builtin_help.h wildcard.h input_common.h input.h
-builtin.o: intern.h
-builtin_commandline.o: config.h util.h builtin.h common.h wgetopt.h reader.h
-builtin_commandline.o: proc.h parser.h tokenizer.h input_common.h input.h
-builtin_help.o: config.h util.h common.h builtin_help.h
-builtin_set.o: config.h util.h builtin.h env.h expand.h common.h wgetopt.h
-builtin_set.o: proc.h parser.h
-common.o: config.h util.h wutil.h common.h expand.h proc.h wildcard.h
-common.o: parser.h
-complete.o: config.h util.h tokenizer.h wildcard.h proc.h parser.h function.h
-complete.o: complete.h builtin.h env.h exec.h expand.h common.h reader.h
-complete.o: history.h intern.h wutil.h
-env.o: config.h util.h wutil.h proc.h common.h env.h sanity.h expand.h
-env.o: history.h reader.h parser.h env_universal.h env_universal_common.h
-env_universal.o: util.h common.h wutil.h env_universal_common.h
-env_universal.o: env_universal.h
-env_universal_common.o: util.h common.h wutil.h env_universal_common.h
-exec.o: config.h util.h common.h wutil.h proc.h exec.h parser.h builtin.h
-exec.o: function.h env.h wildcard.h sanity.h expand.h env_universal.h
-exec.o: env_universal_common.h
-expand.o: config.h util.h common.h wutil.h env.h proc.h parser.h expand.h
-expand.o: wildcard.h exec.h tokenizer.h complete.h
-fishd.o: util.h common.h wutil.h env_universal_common.h
-fish_pager.o: config.h util.h wutil.h common.h complete.h output.h
-fish_pager.o: input_common.h env_universal.h env_universal_common.h
-fish_tests.o: config.h util.h common.h proc.h reader.h builtin.h function.h
-fish_tests.o: complete.h wutil.h env.h expand.h parser.h tokenizer.h
-function.o: config.h util.h function.h proc.h parser.h common.h intern.h
-highlight.o: config.h util.h wutil.h highlight.h tokenizer.h proc.h parser.h
-highlight.o: builtin.h function.h env.h expand.h sanity.h common.h complete.h
-highlight.o: output.h
-history.o: config.h util.h wutil.h history.h common.h reader.h env.h sanity.h
-input.o: config.h util.h wutil.h reader.h proc.h common.h sanity.h
-input.o: input_common.h input.h parser.h env.h expand.h
-input_common.o: config.h util.h common.h wutil.h input_common.h
+builtin.o: config.h fallback.h util.h wutil.h builtin.h function.h complete.h
+builtin.o: proc.h io.h parser.h event.h reader.h env.h common.h wgetopt.h
+builtin.o: sanity.h tokenizer.h wildcard.h input_common.h input.h intern.h
+builtin.o: signal.h halloc.h halloc_util.h parse_util.h expand.h
+builtin.o: builtin_help.c builtin_set.c builtin_commandline.c
+builtin.o: builtin_complete.c builtin_ulimit.c builtin_jobs.c
+builtin_commandline.o: signal.h config.h fallback.h util.h wutil.h builtin.h
+builtin_commandline.o: common.h wgetopt.h reader.h proc.h io.h parser.h
+builtin_commandline.o: event.h tokenizer.h input_common.h input.h
+builtin_commandline.o: parse_util.h
+builtin_complete.o: signal.h config.h fallback.h util.h wutil.h builtin.h
+builtin_complete.o: common.h complete.h wgetopt.h parser.h proc.h io.h
+builtin_complete.o: event.h reader.h
+builtin_help.o: config.h util.h common.h halloc_util.h
+builtin_jobs.o: config.h fallback.h util.h wutil.h builtin.h proc.h io.h
+builtin_jobs.o: parser.h event.h common.h wgetopt.h
+builtin_set.o: signal.h config.h fallback.h util.h wutil.h builtin.h env.h
+builtin_set.o: expand.h common.h wgetopt.h proc.h io.h parser.h event.h
+builtin_ulimit.o: config.h fallback.h util.h builtin.h common.h 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: signal.h config.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: halloc.h halloc_util.h wutil.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 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: signal.h config.h fallback.h util.h wutil.h function.h proc.h io.h
+event.o: parser.h event.h common.h halloc_util.h
+exec.o: signal.h config.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 env_universal.h env_universal_common.h halloc.h
+exec.o: halloc_util.h parse_util.h
+expand.o: signal.h config.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_util.h
+fallback.o: config.h fallback.h util.h
+fishd.o: config.h signal.h fallback.h util.h common.h wutil.h
+fishd.o: env_universal_common.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
+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 halloc_util.h
+function.o: signal.h config.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: env.h expand.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: signal.h config.h fallback.h util.h wutil.h highlight.h
+highlight.o: tokenizer.h proc.h io.h parser.h event.h parse_util.h builtin.h
+highlight.o: function.h env.h expand.h sanity.h common.h complete.h output.h
+highlight.o: halloc.h halloc_util.h
+history.o: config.h fallback.h util.h wutil.h history.h common.h reader.h
+history.o: env.h sanity.h signal.h
+input.o: config.h signal.h fallback.h util.h wutil.h reader.h proc.h io.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
+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 util.h common.h intern.h
-kill.o: config.h util.h wutil.h kill.h proc.h sanity.h common.h env.h
-kill.o: expand.h exec.h parser.h
-main.o: config.h util.h common.h reader.h builtin.h function.h complete.h
-main.o: wutil.h env.h sanity.h proc.h parser.h expand.h intern.h
-mimedb.o: config.h xdgmime.h util.h
-output.o: config.h util.h wutil.h expand.h common.h output.h highlight.h
-parser.o: config.h util.h common.h wutil.h proc.h parser.h tokenizer.h exec.h
-parser.o: wildcard.h function.h builtin.h builtin_help.h env.h expand.h
-parser.o: reader.h sanity.h env_universal.h env_universal_common.h
-proc.o: config.h util.h wutil.h proc.h common.h reader.h sanity.h env.h
-reader.o: config.h util.h wutil.h highlight.h reader.h proc.h parser.h
-reader.o: complete.h history.h common.h sanity.h env.h exec.h expand.h
-reader.o: tokenizer.h kill.h input_common.h input.h function.h output.h
-sanity.o: config.h util.h common.h sanity.h proc.h history.h reader.h kill.h
-sanity.o: wutil.h
-set_color.o: config.h
-tokenize.o: config.h
-tokenizer.o: config.h util.h wutil.h tokenizer.h common.h wildcard.h
-util.o: config.h util.h common.h wutil.h
-wgetopt.o: config.h wgetopt.h wutil.h
-wildcard.o: config.h util.h wutil.h complete.h common.h wildcard.h reader.h
-wildcard.o: expand.h
-wutil.o: config.h util.h common.h wutil.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
+kill.o: signal.h config.h fallback.h util.h wutil.h kill.h proc.h io.h
+kill.o: sanity.h common.h env.h exec.h parser.h event.h halloc.h
+main.o: config.h signal.h fallback.h util.h common.h reader.h builtin.h
+main.o: function.h complete.h wutil.h env.h sanity.h proc.h io.h parser.h
+main.o: event.h expand.h intern.h exec.h output.h halloc_util.h history.h
+mimedb.o: config.h xdgmime.h fallback.h util.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
+parser.o: signal.h config.h fallback.h util.h common.h wutil.h proc.h io.h
+parser.o: parser.h event.h tokenizer.h exec.h wildcard.h function.h builtin.h
+parser.o: env.h expand.h reader.h sanity.h env_universal.h
+parser.o: env_universal_common.h intern.h parse_util.h halloc.h halloc_util.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: wildcard.h halloc_util.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: proc.h io.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 parse_util.h
+sanity.o: signal.h config.h fallback.h util.h common.h sanity.h proc.h io.h
+sanity.o: history.h reader.h kill.h wutil.h
+set_color.o: config.h fallback.h
+signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
+signal.o: reader.h proc.h io.h
+test.o: stringtab.h
+tokenizer.o: config.h fallback.h util.h wutil.h tokenizer.h common.h
+tokenizer.o: wildcard.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 expand.h
+wutil.o: config.h fallback.h util.h common.h wutil.h halloc.h halloc_util.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
 xdgmime.o: xdgmimeparent.h

builtin.h

@@ -17,11 +17,55 @@ enum
 }
 ;
 
-#define BUILTIN_ERR_MISSING L": Expected argument"
-#define BUILTIN_ERR_COMBO L": Invalid combination of options"
-#define BUILTIN_ERR_GLOCAL L": Variable can only be one of universal, global and local"
-#define BUILTIN_ERR_EXPUNEXP L": Variable can't be both exported and unexported"
-#define BUILTIN_ERR_UNKNOWN	L": Unknown option"
+/**
+   Error message on missing argument
+*/
+#define BUILTIN_ERR_MISSING _( L"%ls: Expected argument\n" )
+
+/**
+   Error message on invalid combination of options
+*/
+#define BUILTIN_ERR_COMBO _( L"%ls: Invalid combination of options\n" )
+
+/**
+   Error message on invalid combination of options
+*/
+#define BUILTIN_ERR_COMBO2 _( L"%ls: Invalid combination of options,\n%ls\n" )
+
+/**
+   Error message on multiple scope levels for variables
+*/
+#define BUILTIN_ERR_GLOCAL _( L"%ls: Variable scope can only be one of universal, global and local\n%ls\n" )
+
+/**
+   Error message for specifying both export and unexport to set/read
+*/
+#define BUILTIN_ERR_EXPUNEXP _( L"%ls: Variable can't be both exported and unexported\n%ls\n" )
+
+/**
+   Error message for unknown switch
+*/
+#define BUILTIN_ERR_UNKNOWN	_( L"%ls: Unknown option '%ls'\n" )
+
+/**
+   Error message for invalid character in variable name
+*/
+#define BUILTIN_ERR_VARCHAR _( L"%ls: Invalid character '%lc' in variable name. Only alphanumerical characters and underscores are valid in a variable name.\n" )
+
+/**
+   Error message for invalid (empty) variable name
+*/
+#define BUILTIN_ERR_VARNAME_ZERO _( L"%ls: Variable name can not be the empty string\n" )
+
+/**
+   Error message when second argument to for isn't 'in'
+*/
+#define BUILTIN_FOR_ERR_IN _( L"%ls: Second argument must be 'in'\n" )
+
+/**
+   Error message when too many arguments are supplied to a builtin
+*/
+#define BUILTIN_ERR_TOO_MANY_ARGUMENTS _( L"%ls: Too many arguments\n" )
 
 /**
    Stringbuffer used to represent standard output
@@ -92,26 +136,22 @@ void builtin_pop_io();
 */
 const wchar_t *builtin_get_desc( const wchar_t *b );
 
-/**
-   Counts the number of non null pointers in the specified array
-*/
-int builtin_count_args( wchar_t **argv );
 
 /**
-   Print help for the specified builtin. If \c b is sb_err, also print the line information
+   Slightly kludgy function used with 'complete -C' in order to make
+   the commandline builtin operate on the string to complete instead
+   of operating on whatever is to be completed.
 */
-void builtin_print_help( wchar_t *cmd, string_buffer_t *b );
+const wchar_t *builtin_complete_get_temporary_buffer();
 
 
-int builtin_set(wchar_t **argv);
-int builtin_commandline(wchar_t **argv);
-int builtin_ulimit(wchar_t **argv);
+/**
+   Return the help text for the specified builtin command. Use
+   non-wide characters since wide characters have some issues with
+   string formating escape sequences sometimes.
 
-/** 
-	This function works like wperror, but it prints its result into
-	the sb_err string_buffer_t instead of to stderr. Used by the builtin
-	commands.
+   \param cmd The command for which to obtain help text
 */
-void builtin_wperror( const wchar_t *s);
+char *builtin_help_get( const wchar_t *cmd );
 
 #endif

builtin_commandline.c

@@ -12,7 +12,11 @@ Functions used for implementing the commandline builtin.
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
+#include "wutil.h"
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
@@ -23,15 +27,17 @@ Functions used for implementing the commandline builtin.
 #include "input_common.h"
 #include "input.h"
 
+#include "parse_util.h"
+
 /**
    Which part of the comandbuffer are we operating on
 */
 enum
 {
-	STRING_MODE=1, // Operate on entire buffer
-	JOB_MODE, // Operate on job under cursor
-	PROCESS_MODE, // Operate on process under cursor
-	TOKEN_MODE // Operate on token under cursor
+	STRING_MODE=1, /**< Operate on entire buffer */
+	JOB_MODE, /**< Operate on job under cursor */
+	PROCESS_MODE, /**< Operate on process under cursor */
+	TOKEN_MODE /**< Operate on token under cursor */
 }
 	;
 
@@ -40,28 +46,55 @@ enum
 */
 enum
 {
-	REPLACE_MODE=1, // Replace current text
-	INSERT_MODE, // Insert at cursor position
-	APPEND_MODE // Insert at end of current token/command/buffer
+	REPLACE_MODE=1, /**< Replace current text */
+	INSERT_MODE, /**< Insert at cursor position */
+	APPEND_MODE /**< Insert at end of current token/command/buffer */
 }
 	;
 
+/**
+   Returns the current commandline buffer.
+*/
+static const wchar_t *get_buffer()
+{
+	const wchar_t *buff = builtin_complete_get_temporary_buffer();
+	if( !buff )
+		buff = reader_get_buffer();
+	return buff;
+}
 
-static void replace_part( wchar_t *begin,
-						  wchar_t *end,
+/**
+   Returns the position of the cursor
+*/
+static int get_cursor_pos()
+{
+	const wchar_t *buff = builtin_complete_get_temporary_buffer();
+	if( buff )
+		return wcslen( buff );
+	else
+		return reader_get_cursor_pos();
+}
+
+
+/**
+   Replace/append/insert the selection with/at/after the specified string.
+
+   \param begin beginning of selection
+   \param end end of selection
+   \param insert the string to insert
+   \param append_mode can be one of REPLACE_MODE, INSERT_MODE or APPEND_MODE, affects the way the test update is performed
+*/
+static void replace_part( const wchar_t *begin,
+						  const wchar_t *end,
 						  wchar_t *insert,
 						  int append_mode )
 {
-	wchar_t *buff = reader_get_buffer();
+	const wchar_t *buff = get_buffer();
 	string_buffer_t out;
-	int out_pos=reader_get_cursor_pos();
+	int out_pos=get_cursor_pos();
 					
 	sb_init( &out );
 
-//					wchar_t *tmp = wcsndup( begin, end-begin );
-					
-//					fwprintf( stderr, L"Commandline '%ls', current command '%ls'\n", reader_get_buffer(), tmp );
-					
 	sb_append_substring( &out, buff, begin-buff );
 					
 	switch( append_mode)
@@ -82,7 +115,7 @@ static void replace_part( wchar_t *begin,
 		}
 		case INSERT_MODE:
 		{
-			int cursor = reader_get_cursor_pos() -(begin-buff);
+			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 );
@@ -95,17 +128,25 @@ static void replace_part( wchar_t *begin,
 	sb_destroy( &out );
 }
 	
-void write_part( wchar_t *begin, 
-				 wchar_t *end, 
-				 int cut_at_cursor, 
-				 int tokenize )
+/**
+   Output the specified selection.
+
+   \param begin start of selection
+   \param end  end of selection
+   \param cut_at_cursor whether printing should stop at the surrent cursor position
+   \param tokenize whether the string should be tokenized, printing one string token on every line and skipping non-string tokens
+*/
+static void write_part( const wchar_t *begin, 
+						const wchar_t *end, 
+						int cut_at_cursor, 
+						int tokenize )
 {	
 	tokenizer tok;
 	string_buffer_t out;
 	wchar_t *buff;
 	int pos;
 
-	pos = reader_get_cursor_pos()-(begin-reader_get_buffer());
+	pos = get_cursor_pos()-(begin-get_buffer());
 
 	if( tokenize )
 	{
@@ -157,7 +198,7 @@ void write_part( wchar_t *begin,
    The commandline builtin. It is used for specifying a new value for
    the commandline.
 */
-int builtin_commandline( wchar_t **argv )
+static int builtin_commandline( wchar_t **argv )
 {
 
 	int buffer_part=0;
@@ -170,7 +211,7 @@ int builtin_commandline( wchar_t **argv )
 	
 	int tokenize = 0;	
 
-	if( !reader_get_buffer() )
+	if( !get_buffer() )
 	{
 		sb_append2( sb_err,
 					argv[0],
@@ -227,6 +268,10 @@ int builtin_commandline( wchar_t **argv )
 					L"tokenize", no_argument, 0, 'o'
 				}
 				,
+				{
+					L"help", no_argument, 0, 'h'
+				}
+				,
 				{
 					0, 0, 0, 0 
 				}
@@ -237,7 +282,7 @@ int builtin_commandline( wchar_t **argv )
 		
 		int opt = wgetopt_long( argc,
 								argv, 
-								L"aijpctwfo", 
+								L"aijpctwforh", 
 								long_options, 
 								&opt_index );
 		if( opt == -1 )
@@ -248,13 +293,10 @@ int builtin_commandline( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;
@@ -266,7 +308,11 @@ int builtin_commandline( wchar_t **argv )
 			case L'i':
 				append_mode = INSERT_MODE;
 				break;
-				
+
+			case L'r':
+				append_mode = REPLACE_MODE;
+				break;
+								
 			case 'c':
 				cut_at_cursor=1;
 				break;
@@ -291,6 +337,10 @@ int builtin_commandline( wchar_t **argv )
 				tokenize=1;
 				break;
 
+			case 'h':
+				builtin_print_help( argv[0], sb_out );
+				return 0;
+
 			case L'?':
 				builtin_print_help( argv[0], sb_err );				
 				return 1;	
@@ -306,10 +356,11 @@ int builtin_commandline( wchar_t **argv )
 		*/
 		if( buffer_part || cut_at_cursor || append_mode || tokenize )
 		{
+			sb_printf(sb_err,
+					  BUILTIN_ERR_COMBO,
+					  argv[0] );
+			
 			sb_append2(sb_err,
-					   argv[0],
-					   BUILTIN_ERR_COMBO,
-					   L"\n",
 					   parser_current_line(),
 					   L"\n",
 					   (void *)0);
@@ -319,10 +370,11 @@ int builtin_commandline( wchar_t **argv )
 
 		if( argc == woptind )
 		{
+			sb_printf( sb_err,
+					   BUILTIN_ERR_MISSING,
+					   argv[0] );
+			
 			sb_append2( sb_err,
-						argv[0],
-						BUILTIN_ERR_MISSING,
-						L"\n",
 						parser_current_line(),
 						L"\n",
 						(void *)0 );
@@ -378,22 +430,23 @@ int builtin_commandline( wchar_t **argv )
 	if( (tokenize || cut_at_cursor) && (argc-woptind) )
 	{
 		
-		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_COMBO,
-					L",\n --cut-at-cursor and --tokenize can not be used when setting the commandline",
-					(void *)0 );
+		sb_printf( sb_err,
+				   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 );
 		return 1;
 	}
 
 	if( append_mode && !(argc-woptind) )
 	{
-		sb_append2( sb_err,
+		sb_printf( sb_err,
+                    BUILTIN_ERR_COMBO2,
                     argv[0],
-                    BUILTIN_ERR_COMBO,
-                    L",\n insertion mode switches can not be used when not in insertion mode",
-                    (void *)0 );
+				   L"insertion mode switches can not be used when not in insertion mode" );
+
         builtin_print_help( argv[0], sb_err );		
         return 1;
 	}
@@ -417,26 +470,36 @@ int builtin_commandline( wchar_t **argv )
 	{
 		case STRING_MODE:
 		{			
-			begin = reader_get_buffer();
+			begin = (wchar_t *)get_buffer();
 			end = begin+wcslen(begin);
 			break;			
 		}
 
 		case PROCESS_MODE:
 		{
-			reader_current_process_extent( &begin, &end );
+			parse_util_process_extent( get_buffer(),
+									   get_cursor_pos(),
+									   &begin, 
+									   &end );
 			break;
 		}
 		
 		case JOB_MODE:
 		{
-			reader_current_job_extent( &begin, &end );					
+			parse_util_job_extent( get_buffer(),
+								   get_cursor_pos(),
+								   &begin,
+								   &end );					
 			break;			
 		}
 		
 		case TOKEN_MODE:
 		{
-			reader_current_token_extent( &begin, &end, 0, 0 );
+			parse_util_token_extent( get_buffer(),
+									 get_cursor_pos(),
+									 &begin, 
+									 &end, 
+									 0, 0 );
 			break;			
 		}
 				

builtin_complete.c

@@ -0,0 +1,613 @@
+/** \file builtin_complete.c Functions defining the complete builtin
+
+Functions used for implementing the complete builtin. 
+
+*/
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <signal.h>
+
+#include "config.h"
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "common.h"
+#include "complete.h"
+#include "wgetopt.h"
+#include "parser.h"
+#include "reader.h"
+
+
+/**
+   Internal storage for the builtin_get_temporary_buffer() function.
+*/
+const static wchar_t *temporary_buffer;
+
+/*
+  builtin_complete_* are a set of rather silly looping functions that
+  make sure that all the proper combinations of complete_add or
+  complete_remove get called. This is needed since complete allows you
+  to specify multiple switches on a single commandline, like 'complete
+  -s a -s b -s c', but the complete_add function only accepts one
+  short switch and one long switch.
+*/
+
+/**
+   Silly function
+*/
+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, 
+								   int result_mode, 
+								   int authorative,
+								   const wchar_t *condition,
+								   const wchar_t *comp,
+								   const wchar_t *desc )
+{
+	int i;
+	const wchar_t *s;
+	
+	for( s=short_opt; *s; s++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  *s,
+					  0,
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}
+	
+	for( i=0; i<al_get_count( gnu_opt ); i++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  (wchar_t *)al_get(gnu_opt, i ),
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}
+	
+	for( i=0; i<al_get_count( old_opt ); i++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  (wchar_t *)al_get(old_opt, i ),
+					  1,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}	
+
+	if( al_get_count( old_opt )+al_get_count( gnu_opt )+wcslen(short_opt) == 0 )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  0,
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}	
+}
+
+/**
+   Silly function
+*/
+static void	builtin_complete_add( array_list_t *cmd, 
+								  array_list_t *path,
+								  const wchar_t *short_opt,
+								  array_list_t *gnu_opt,
+								  array_list_t *old_opt, 
+								  int result_mode, 
+								  int authorative,
+								  const wchar_t *condition,
+								  const wchar_t *comp,
+								  const wchar_t *desc )
+{
+	int i;
+	
+	for( i=0; i<al_get_count( cmd ); i++ )
+	{
+		builtin_complete_add2( al_get( cmd, i ),
+							   COMMAND,
+							   short_opt, 
+							   gnu_opt,
+							   old_opt, 
+							   result_mode, 
+							   authorative,
+							   condition, 
+							   comp, 
+							   desc );
+	}
+	
+	for( i=0; i<al_get_count( path ); i++ )
+	{
+		builtin_complete_add2( al_get( path, i ),
+							   PATH,
+							   short_opt, 
+							   gnu_opt,
+							   old_opt, 
+							   result_mode, 
+							   authorative,
+							   condition, 
+							   comp, 
+							   desc );
+	}
+	
+}
+
+/**
+   Silly function
+*/
+static void builtin_complete_remove3( wchar_t *cmd,
+									  int cmd_type,
+									  wchar_t short_opt,
+									  array_list_t *long_opt )		
+{
+	int i;
+	
+	for( i=0; i<al_get_count( long_opt ); i++ )
+	{
+		complete_remove( cmd,
+						 cmd_type,
+						 short_opt,
+						 (wchar_t *)al_get( long_opt, i ) );
+	}	
+}
+
+/**
+   Silly function
+*/
+static void	builtin_complete_remove2( wchar_t *cmd,
+									  int cmd_type,
+									  const wchar_t *short_opt,
+									  array_list_t *gnu_opt,
+									  array_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 )
+			{
+				complete_remove(cmd,
+								cmd_type,
+								*s,
+								0 );
+				
+			}
+			else
+			{
+				builtin_complete_remove3( cmd,
+										  cmd_type,
+										  *s,
+										  gnu_opt );
+				builtin_complete_remove3( cmd,
+										  cmd_type,
+										  *s,
+										  old_opt );
+			}
+		}
+	}
+	else
+	{
+		builtin_complete_remove3( cmd,
+								  cmd_type,
+								  0,
+								  gnu_opt );
+		builtin_complete_remove3( cmd,
+								  cmd_type,
+								  0,
+								  old_opt );
+										  
+	}				
+
+	
+}
+
+/**
+   Silly function
+*/
+static void	builtin_complete_remove( array_list_t *cmd, 
+									 array_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++ )
+	{
+		builtin_complete_remove2( (wchar_t *)al_get( cmd, i ),
+								  COMMAND,
+								  short_opt, 
+								  gnu_opt,
+								  old_opt );
+	}
+	
+	for( i=0; i<al_get_count( path ); i++ )
+	{
+		builtin_complete_remove2( (wchar_t *)al_get( path, i ),
+								  PATH,
+								  short_opt, 
+								  gnu_opt,
+								  old_opt );
+	}
+	
+}
+
+
+const wchar_t *builtin_complete_get_temporary_buffer()
+{
+	return temporary_buffer;
+}
+
+/**
+   The complete builtin. Used for specifying programmable
+   tab-completions. Calls the functions in complete.c for any heavy
+   lifting. Defined in builtin_complete.c
+*/
+static int builtin_complete( wchar_t **argv )
+{
+	int res=0;
+	int argc=0;
+	int result_mode=SHARED;
+	int remove = 0;
+	int authorative = 1;
+	
+	string_buffer_t short_opt;
+	array_list_t gnu_opt, old_opt;
+	wchar_t *comp=L"", *desc=L"", *condition=L"";
+
+	wchar_t *do_complete = 0;
+	
+	array_list_t cmd;
+	array_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 )
+	{
+		const static struct woption
+			long_options[] =
+			{
+				{
+					L"exclusive", no_argument, 0, 'x' 
+				}
+				,
+				{
+					L"no-files", no_argument, 0, 'f' 
+				}
+				,
+				{
+					L"require-parameter", no_argument, 0, 'r' 
+				}
+				,
+				{
+					L"path", required_argument, 0, 'p'
+				}
+				,					
+				{
+					L"command", required_argument, 0, 'c' 
+				}
+				,					
+				{
+					L"short-option", required_argument, 0, 's' 
+				}
+				,
+				{
+					L"long-option", required_argument, 0, 'l'
+				}
+				,
+				{
+					L"old-option", required_argument, 0, 'o' 
+				}
+				,
+				{
+					L"description", required_argument, 0, 'd'
+				}
+				,
+				{
+					L"arguments", required_argument, 0, 'a'
+				}
+				,
+				{
+					L"erase", no_argument, 0, 'e'
+				}
+				,
+				{
+					L"unauthorative", no_argument, 0, 'u'
+				}
+				,
+				{
+					L"condition", required_argument, 0, 'n'
+				}
+				,
+				{
+					L"do-complete", required_argument, 0, 'C'
+				}
+				,
+				{
+					L"help", no_argument, 0, 'h'
+				}
+				,
+				{ 
+					0, 0, 0, 0 
+				}
+			}
+		;		
+		
+		int opt_index = 0;
+		
+		int opt = wgetopt_long( argc,
+								argv, 
+								L"a:c:p:s:l:o:d:frxeun:C::h", 
+								long_options, 
+								&opt_index );
+		if( opt == -1 )
+			break;
+			
+		switch( opt )
+		{
+			case 0:
+				if(long_options[opt_index].flag != 0)
+					break;
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
+				sb_append( sb_err, 
+						   parser_current_line() );
+				
+				builtin_print_help( argv[0], sb_err );
+
+				
+				res = 1;
+				break;
+				
+			case 'x':					
+				result_mode |= EXCLUSIVE;
+				break;
+					
+			case 'f':					
+				result_mode |= NO_FILES;
+				break;
+				
+			case 'r':					
+				result_mode |= NO_COMMON;
+				break;
+					
+			case 'p':	
+			case 'c':
+			{
+				wchar_t *a = unescape( woptarg, 1);
+				if( a )
+				{
+					al_push( (opt=='p'?&path:&cmd), a );
+				}
+				else
+				{
+					sb_printf( sb_err, L"%ls: Invalid token '%ls'\n", argv[0], woptarg );
+					res = 1;					
+				}				
+				break;
+			}
+				
+			case 'd':
+				desc = woptarg;
+				break;
+				
+			case 'u':
+				authorative=0;
+				break;
+				
+			case 's':
+				sb_append( &short_opt, woptarg );
+				break;
+					
+			case 'l':
+				al_push( &gnu_opt, woptarg );
+				break;
+				
+			case 'o':
+				al_push( &old_opt, woptarg );
+				break;
+
+			case 'a':
+				comp = woptarg;
+				break;
+				
+			case 'e':
+				remove = 1;
+				break;
+
+			case 'n':
+				condition = woptarg;
+				break;
+				
+			case 'C':
+				do_complete = woptarg?woptarg:reader_get_buffer();
+				break;
+				
+			case 'h':
+				builtin_print_help( argv[0], sb_out );
+				return 0;
+				
+			case '?':
+				sb_append( sb_err, 
+						   parser_current_line() );
+				builtin_print_help( argv[0], sb_err );
+				
+				res = 1;
+				break;
+				
+		}
+		
+	}
+
+	if( !res )
+	{
+		if( condition && wcslen( condition ) )
+		{
+			if( parser_test( condition, 0, 0 ) )
+			{
+				sb_printf( sb_err,
+						   L"%ls: Condition '%ls' contained a syntax error\n", 
+						   argv[0],
+						   condition );
+				
+				parser_test( condition, sb_err, argv[0] );
+				
+				res = 1;
+			}
+		}
+	}
+	
+	if( !res )
+	{
+		if( comp && wcslen( comp ) )
+		{
+			if( parser_test_args( comp, 0, 0 ) )
+			{
+				sb_printf( sb_err,
+						   L"%ls: Completion '%ls' contained a syntax error\n", 
+						   argv[0],
+						   comp );
+				
+				parser_test_args( comp, sb_err, argv[0] );
+				
+				res = 1;
+			}
+		}
+	}
+
+	if( !res )
+	{
+		if( do_complete )
+		{
+			array_list_t comp;
+			int i;
+
+			const wchar_t *prev_temporary_buffer = temporary_buffer;
+			temporary_buffer = do_complete;		
+
+			if( recursion_level < 1 )
+			{
+				recursion_level++;
+			
+				al_init( &comp );
+			
+				complete( do_complete, &comp );
+			
+				for( i=0; i<al_get_count( &comp ); i++ )
+				{
+					wchar_t *next = (wchar_t *)al_get( &comp, i );
+					wchar_t *sep = wcschr( next, COMPLETE_SEP );
+					if( sep )
+						*sep = L'\t';
+					sb_printf( sb_out, L"%ls\n", next );
+				}
+			
+				al_foreach( &comp, &free );
+				al_destroy( &comp );
+				recursion_level--;
+			}
+		
+			temporary_buffer = prev_temporary_buffer;		
+		
+		}
+		else if( woptind != argc )
+		{
+			sb_printf( sb_err, 
+					   _( L"%ls: Too many arguments\n" ),
+					   argv[0] );
+			sb_append( sb_err, 
+					   parser_current_line() );
+			builtin_print_help( argv[0], sb_err );
+
+			res = 1;
+		}
+		else if( (al_get_count( &cmd) == 0 ) && (al_get_count( &path) == 0 ) )
+		{
+			/* No arguments specified, meaning we print the definitions of
+			 * all specified completions to stdout.*/
+			complete_print( sb_out );		
+		}
+		else
+		{
+			if( remove )
+			{
+				builtin_complete_remove( &cmd,
+										 &path,
+										 (wchar_t *)short_opt.buff,
+										 &gnu_opt,
+										 &old_opt );									 
+			}
+			else
+			{
+				builtin_complete_add( &cmd, 
+									  &path,
+									  (wchar_t *)short_opt.buff,
+									  &gnu_opt,
+									  &old_opt, 
+									  result_mode, 
+									  authorative,
+									  condition,
+									  comp,
+									  desc ); 
+			}
+
+		}	
+	}
+	
+	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;
+}

builtin_help.h

@@ -1,32 +0,0 @@
-/** \file builtin_help.h 
-
-    Prototypes for functions for printing usage information of builtin commands. The
-	corresponding .c file is automatically generated by combining the
-	builtin_help.hdr file with doxygen output.
-*/
-
-#ifndef FISH_BUILTIN_HELP_H
-#define FISH_BUILTIN_HELP_H
-
-#include <wchar.h>
-
-/**
-   Return the help text for the specified builtin command. Use
-   non-wide characters since wide characters have some issues with
-   string formating escape sequences sometimes.
-
-   \param cmd The command for which to obtain help text
-*/
-char *builtin_help_get( wchar_t *cmd );
-
-/**
-   Initialize builtin help data
-*/
-void builtin_help_init();
-
-/**
-   Destory builtin help data
-*/
-void builtin_help_destroy();
-
-#endif

builtin_help.hdr

@@ -9,28 +9,36 @@
 #include <stdio.h>
 #include <strings.h>
 #include <wchar.h>
+#include <sys/types.h>
 
 #include "config.h"
 #include "util.h"
 #include "common.h"
-#include "builtin_help.h"
+#include "halloc_util.h"
 
 /**
 	Hashtable storing the help text
 */
 static hash_table_t tbl;
 
-char *builtin_help_get( wchar_t *cmd )
+static void builtin_help_init();
+
+char *builtin_help_get( const wchar_t *cmd )
 {
+	builtin_help_init();
+
 	return (char *)hash_get( &tbl, (void *)cmd );
 }
 
-void builtin_help_destroy()
-{
-	hash_destroy( &tbl );
-}
-
-
-void builtin_help_init()
+/**
+	Initialize help hash table. Don't invoke it manually, 
+	it is called by builtin_help_get automatically.
+*/
+static void builtin_help_init()
 {
+	static int is_help_init = 0;
+	if( is_help_init )
+		return;
+	is_help_init=1;
+	halloc_register_function( global_context, (void (*)(void *))&hash_destroy, &tbl );
 	hash_init( &tbl, &hash_wcs_func, &hash_wcs_cmp );

builtin_jobs.c

@@ -0,0 +1,352 @@
+/** \file builtin_jobs.c
+	Functions for executing the jobs builtin.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <unistd.h>
+#include <termios.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <wctype.h>
+
+#include "config.h"
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "proc.h"
+#include "parser.h"
+#include "common.h"
+#include "wgetopt.h"
+
+
+/**
+   Print modes for the jobs builtin
+*/
+enum
+{
+	JOBS_DEFAULT, /**< Print lots of general info */
+	JOBS_PRINT_PID, /**< Print pid of each process in job */
+	JOBS_PRINT_COMMAND, /**< Print command name of each process in job */
+	JOBS_PRINT_GROUP, /**< Print group id of job */
+}
+	;
+
+
+
+#ifdef HAVE__PROC_SELF_STAT
+/**
+   Calculates the cpu usage (in percent) of the specified job.
+*/
+static int cpu_use( job_t *j )
+{
+	double u=0;
+	process_t *p;
+
+	for( p=j->first_process; p; p=p->next )
+	{
+		struct timeval t;
+		int jiffies;
+		gettimeofday( &t, 0 );
+		jiffies = proc_get_jiffies( p );
+
+		double t1 = 1000000.0*p->last_time.tv_sec+p->last_time.tv_usec;
+		double t2 = 1000000.0*t.tv_sec+t.tv_usec;
+
+/*		fwprintf( stderr, L"t1 %f t2 %f p1 %d p2 %d\n",
+  t1, t2, jiffies, p->last_jiffies );
+*/
+
+		u += ((double)(jiffies-p->last_jiffies))/(t2-t1);
+	}
+	return u*1000000;
+}
+#endif
+
+/**
+   Print information about the specified job
+*/
+static void builtin_jobs_print( job_t *j, int mode, int header )
+{
+	process_t *p;
+	switch( mode )
+	{
+		case JOBS_DEFAULT:
+		{
+
+			if( header )
+			{
+				/*
+				  Print table header before first job
+				*/
+				sb_append( sb_out, _( L"Job\tGroup\t" ));
+#ifdef HAVE__PROC_SELF_STAT
+				sb_append( sb_out, _( L"CPU\t" ) );
+#endif
+				sb_append( sb_out, _( L"State\tCommand\n" ) );
+			}
+
+			sb_printf( sb_out, 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) );
+#endif
+			sb_append2( sb_out,
+						job_is_stopped(j)?_(L"stopped"):_(L"running"),
+						L"\t",
+						j->command,
+						L"\n",
+						(void *)0 );
+			break;
+		}
+
+		case JOBS_PRINT_GROUP:
+		{
+			if( header )
+			{
+				/*
+				  Print table header before first job
+				*/
+				sb_append( sb_out, _( L"Group\n" ));
+			}
+			sb_printf( sb_out, L"%d\n", j->pgid );
+			break;
+		}
+
+		case JOBS_PRINT_PID:
+		{
+			if( header )
+			{
+				/*
+				  Print table header before first job
+				*/
+				sb_append( sb_out, _( L"Procces\n" ));
+			}
+
+			for( p=j->first_process; p; p=p->next )
+			{
+				sb_printf( sb_out, L"%d\n", p->pid );
+			}
+			break;
+		}
+
+		case JOBS_PRINT_COMMAND:
+		{
+			if( header )
+			{
+				/*
+				  Print table header before first job
+				*/
+				sb_append( sb_out, _( L"Command\n" ));
+			}
+
+			for( p=j->first_process; p; p=p->next )
+			{
+				sb_printf( sb_out, L"%ls\n", p->argv[0] );
+			}
+			break;
+		}
+	}
+
+}
+
+
+
+/**
+   The jobs builtin. Used fopr printing running jobs. Defined in builtin_jobs.c.
+*/
+static int builtin_jobs( wchar_t **argv )
+{
+	int argc=0;
+	int found=0;
+	int mode=JOBS_DEFAULT;
+	int print_last = 0;
+	job_t *j;
+
+	argc = builtin_count_args( argv );
+	woptind=0;
+
+	while( 1 )
+	{
+		const static struct woption
+			long_options[] =
+			{
+				{
+					L"pid", no_argument, 0, 'p'
+				}
+				,
+				{
+					L"command", no_argument, 0, 'c'
+				}
+				,
+				{
+					L"group", no_argument, 0, 'g'
+				}
+				,
+				{
+					L"last", no_argument, 0, 'l'
+				}
+				,
+				{
+					L"help", no_argument, 0, 'h'
+				}
+				,
+				{
+					0, 0, 0, 0
+				}
+			}
+		;
+
+		int opt_index = 0;
+
+		int opt = wgetopt_long( argc,
+								argv,
+								L"pclgh",
+								long_options,
+								&opt_index );
+		if( opt == -1 )
+			break;
+
+		switch( opt )
+		{
+			case 0:
+				if(long_options[opt_index].flag != 0)
+					break;
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
+
+				sb_append( sb_err,
+						   parser_current_line() );
+				builtin_print_help( argv[0], sb_err );
+
+
+				return 1;
+
+
+			case 'p':
+				mode=JOBS_PRINT_PID;
+				break;
+
+			case 'c':
+				mode=JOBS_PRINT_COMMAND;
+				break;
+
+			case 'g':
+				mode=JOBS_PRINT_GROUP;
+				break;
+
+			case 'l':
+			{
+				print_last = 1;
+				break;
+			}
+
+			case 'h':
+				builtin_print_help( argv[0], sb_out );
+				return 0;				
+
+			case '?':
+				builtin_print_help( argv[0], sb_err );
+
+				return 1;
+
+		}
+	}
+
+
+	/*
+	  Do not babble if not interactive
+	*/
+	if( builtin_out_redirect )
+	{
+		found=1;
+	}
+
+	if( print_last )
+	{
+		/*
+		  Ignore unconstructed jobs, i.e. ourself.
+		*/
+		for( j=first_job; j; j=j->next )
+		{
+			if( j->constructed && !job_is_completed(j) )
+			{
+				builtin_jobs_print( j, mode, !found );
+				return 0;
+			}
+		}
+
+	}
+	else
+	{
+		if( woptind < argc )
+		{
+			int i;
+
+			found = 1;
+
+			for( i=woptind; i<argc; i++ )
+			{
+				long pid;
+				wchar_t *end;
+				errno=0;
+				pid=wcstol( argv[i], &end, 10 );
+				if( errno || *end )
+				{
+					sb_printf( sb_err,
+							   _( L"%ls: '%ls' is not a job\n" ),
+							   argv[0],
+							   argv[i] );
+					return 1;
+				}
+
+				j = job_get_from_pid( pid );
+
+				if( j && !job_is_completed( j ) )
+				{
+					builtin_jobs_print( j, mode, !found );
+				}
+				else
+				{
+					sb_printf( sb_err,
+							   _( L"%ls: No suitable job: %d\n" ),
+							   argv[0],
+							   pid );
+					return 1;
+				}
+			}
+		}
+		else
+		{
+			for( j= first_job; j; j=j->next )
+			{
+				/*
+				  Ignore unconstructed jobs, i.e. ourself.
+				*/
+				if( j->constructed && !job_is_completed(j) )
+				{
+					builtin_jobs_print( j, mode, !found );
+					found = 1;
+				}
+			}
+		}
+	}
+
+	if( !found )
+	{
+		sb_printf( sb_out,
+				   _( L"%ls: There are no jobs\n" ),
+				   argv[0] );
+	}
+
+	return 0;
+}
+

builtin_ulimit.c

@@ -1,8 +1,10 @@
-/** \file builtin_commandline.c Functions defining the commandline builtin
+/** \file builtin_ulimit.c Functions defining the ulimit builtin
 
-Functions used for implementing the commandline builtin. 
+Functions used for implementing the ulimit builtin. 
 
 */
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -12,82 +14,117 @@ Functions used for implementing the commandline builtin.
 #include <unistd.h>
 #include <errno.h>
 
-#include "config.h"
+#include "fallback.h"
 #include "util.h"
+
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
 
+
+/**
+   Struct describing a resource limit
+*/
 struct resource_t
 {
+	/**
+	   Resource id
+	 */
 	int resource;
+	/**
+	   Description of resource
+	*/
 	const wchar_t *desc;
+	/**
+	   Switch used on commandline to specify resource
+	*/
 	wchar_t switch_char;	
+	/**
+	   The implicit multiplier used when setting getting values
+	*/
+	int multiplier;	
 }
 	;
 
+/**
+   Array of resource_t structs, describing all known resource types.
+*/
 const static struct resource_t resource_arr[] =
 {
 	{
-		RLIMIT_CORE, L"Maximum size of core files created", L'c'
+		RLIMIT_CORE, L"Maximum size of core files created", L'c', 1024
 	}
 	,
 	{
-		RLIMIT_DATA, L"Maximum size of a process’s data segment", L'd'
+		RLIMIT_DATA, L"Maximum size of a process’s data segment", L'd', 1024
 	}
 	,
 	{
-		RLIMIT_FSIZE, L"Maximum size of files created by the shell", L'f'
+		RLIMIT_FSIZE, L"Maximum size of files created by the shell", L'f', 1024
+	}
+	,
+#ifdef RLIMIT_MEMLOCK
+	{
+		RLIMIT_MEMLOCK, L"Maximum size that may be locked into memory", L'l', 1024
+	}
+	,
+#endif
+#ifdef RLIMIT_RSS
+	{
+		RLIMIT_RSS, L"Maximum resident set size", L'm', 1024
+	}
+	,
+#endif
+	{
+		RLIMIT_NOFILE, L"Maximum number of open file descriptors", L'n', 1
 	}
 	,
 	{
-		RLIMIT_MEMLOCK, L"Maximum size that may be locked into memory", L'l'
+		RLIMIT_STACK, L"Maximum stack size", L's', 1024
 	}
 	,
 	{
-		RLIMIT_RSS, L"Maximum resident set size", L'm'
+		RLIMIT_CPU, L"Maximum amount of cpu time in seconds", L't', 1
 	}
 	,
+#ifdef RLIMIT_NPROC
 	{
-		RLIMIT_NOFILE, L"Maximum number of open file descriptors", L'n'
+		RLIMIT_NPROC, L"Maximum number of processes available to a single user", L'u', 1
 	}
 	,
+#endif
+#ifdef RLIMIT_AS
 	{
-		RLIMIT_STACK, L"Maximum stack size", L's'
-	}
-	,
-	{
-		RLIMIT_CPU, L"Maximum amount of cpu time in seconds", L't'
-	}
-	,
-	{
-		RLIMIT_NPROC, L"Maximum number of processes available to a single user", L'u'
-	}
-	,
-#if HAVE_RLIMIT_AS
-	{
-		RLIMIT_AS, L"Maximum amount of virtual memory available to the shell", L'v'
+		RLIMIT_AS, L"Maximum amount of virtual memory available to the shell", L'v', 1024
 	}	
 	,
 #endif
 	{
-		0, 0
+		0, 0, 0, 0
 	}
 }
 	;
 
+/**
+   Get the implicit multiplication factor for the specified resource limit
+*/
 static int get_multiplier( int what )
 {
-	if( ( what == RLIMIT_NPROC ) || 
-		( what == RLIMIT_NOFILE ) || 
-		( what == RLIMIT_CPU ) )
+	int i;
+	
+	for( i=0; resource_arr[i].desc; i++ )
 	{
-		return 1;
+		if( resource_arr[i].resource == what )
+		{
+			return resource_arr[i].multiplier;
+		}
 	}
-	return 1024;
+	return -1;
 }
 
-
+/**
+   Return the value for the specified resource limit
+*/
 static rlim_t get( int resource, int hard )
 {
 	struct rlimit ls;
@@ -97,6 +134,9 @@ static rlim_t get( int resource, int hard )
 	return hard ? ls.rlim_max:ls.rlim_cur;
 }
 
+/**
+   Print the value of the specified resource limit
+*/
 static void print( int resource, int hard )
 {
 	rlim_t l = get( resource, hard );
@@ -108,7 +148,9 @@ static void print( int resource, int hard )
 	
 }
 
-
+/**
+   Print values of all resource limits
+*/
 static void print_all( int hard )
 {
 	int i;
@@ -142,6 +184,9 @@ static void print_all( int hard )
 	}
 }
 
+/**
+   Returns the description for the specified resource limit
+*/
 static const wchar_t *get_desc( int what )
 {
 	int i;
@@ -156,7 +201,9 @@ static const wchar_t *get_desc( int what )
 	return L"Not a resource";
 }
 
-
+/**
+   Set the new value of the specified resource limit
+*/
 static int set( int resource, int hard, int soft, rlim_t value )
 {
 	struct rlimit ls;
@@ -194,6 +241,9 @@ static int set( int resource, int hard, int soft, rlim_t value )
 	return 0;	
 }
 
+/**
+   Set all resource limits
+*/
 static int set_all( int hard, int soft, rlim_t value )
 {
 	int i;
@@ -207,7 +257,11 @@ static int set_all( int hard, int soft, rlim_t value )
 	return res;
 }
 
-int builtin_ulimit( wchar_t ** argv )
+/**
+   The ulimit builtin, used for setting resource limits. Defined in
+   builtin_ulimit.c.
+*/
+static int builtin_ulimit( wchar_t ** argv )
 {
 	int hard=0;
 	int soft=0;
@@ -276,6 +330,10 @@ int builtin_ulimit( wchar_t ** argv )
 					L"virtual-memory-size", no_argument, 0, 'v'
 				}
 				,
+				{ 
+					L"help", no_argument, 0, 'h' 
+				} 
+				,
 				{
 					0, 0, 0, 0 
 				}
@@ -287,7 +345,7 @@ int builtin_ulimit( wchar_t ** argv )
 		
 		int opt = wgetopt_long( argc,
 								argv, 
-								L"aHScdflmnptuv", 
+								L"aHScdflmnptuvh", 
 								long_options, 
 								&opt_index );
 		if( opt == -1 )
@@ -298,13 +356,10 @@ int builtin_ulimit( wchar_t ** argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;
@@ -332,14 +387,17 @@ int builtin_ulimit( wchar_t ** argv )
 			case L'f':
 				what=RLIMIT_FSIZE;
 				break;
-				
+#ifdef RLIMIT_MEMLOCK
 			case L'l':
 				what=RLIMIT_MEMLOCK;
 				break;
-				
+#endif
+
+#ifdef RLIMIT_RSS				
 			case L'm':
 				what=RLIMIT_RSS;
 				break;
+#endif
 				
 			case L'n':
 				what=RLIMIT_NOFILE;
@@ -352,17 +410,23 @@ int builtin_ulimit( wchar_t ** argv )
 			case L't':
 				what=RLIMIT_CPU;
 				break;
-				
+			
+#ifdef RLIMIT_NPROC	
 			case L'u':
 				what=RLIMIT_NPROC;
 				break;
+#endif
 				
-#if HAVE_RLIMIT_AS				
+#ifdef RLIMIT_AS				
 			case L'v':
 				what=RLIMIT_AS;
 				break;
 #endif
 				
+			case L'h':
+				builtin_print_help( argv[0], sb_out );				
+				return 0;
+
 			case L'?':
 				builtin_print_help( argv[0], sb_err );				
 				return 1;	

common.h

@@ -3,52 +3,54 @@
 */
 
 #ifndef FISH_COMMON_H
+/**
+   Header guard
+*/
 #define FISH_COMMON_H
 
+#include <stdlib.h>
+#include <stdio.h>
 #include <wchar.h>
 #include <termios.h>
 
 #include "util.h"
 
 /**
-   Under curses, tputs expects an int (*func)(char) as its last parameter, but in ncurses, tputs expects a int (*func)(int) as its last parameter. tputs_arg_t is defined to always be what tputs expects. Hopefully.
-*/
-
-#ifdef NCURSES_VERSION
-typedef int tputs_arg_t;
-#else
-typedef char tputs_arg_t;
-#endif
-
-/**
-   Maximum number of bytes in a utf-8 character
+   Maximum number of bytes used by a single utf-8 character
 */
 #define MAX_UTF8_BYTES 6
 
 /**
-   Color code for set_color. Does not update the color.
+   This is in the unicode private use area.
 */
-
-#define FISH_COLOR_IGNORE -1
+#define ENCODE_DIRECT_BASE 0xf100
 
 /**
-   Color code for set_color. Sets the default color.
+  Highest legal ascii value
 */
-#define FISH_COLOR_RESET -2
+#define ASCII_MAX 127u
 
-/** Save the shell mode on startup so we can restore them on exit */
+/**
+  Highest legal 16-bit unicode value
+*/
+#define UCS2_MAX 0xffffu
+
+/**
+  Highest legal byte value
+*/
+#define BYTE_MAX 0xffu
+
+/** 
+	Save the shell mode on startup so we can restore them on exit
+*/
 extern struct termios shell_modes;      
 
 /**
-   The character to use where the text has been truncated. Is an ellipsis on unicode system and a $ on other systems.
+   The character to use where the text has been truncated. Is an
+   ellipsis on unicode system and a $ on other systems.
 */
 extern wchar_t ellipsis_char;
 
-/**
-   The maximum number of charset convertion errors to report
-*/
-extern int error_max;
-
 /**
    The verbosity of fish
 */
@@ -64,8 +66,52 @@ extern char *profile;
    debug function.
 */
 extern wchar_t *program_name;
+
 /**
-   Take an array_list_t containing wide strings and converts them to a wchar_t **.
+   This macro is used to check that an input argument is not null. It
+   is a bit lika a non-fatal form of assert. Instead of exit-ing on
+   failiure, the current function is ended at once. The second
+   parameter is the exit status of the current function on failiure.
+*/
+#define CHECK( arg, retval )					\
+	if( !(arg) )														\
+	{																	\
+		debug( 1,														\
+			   L"function %s called with null value for argument %s. "	\
+			   L"This is a bug. "										\
+			   L"If you can reproduce it, please send a bug report to %s.", \
+			   __func__,												\
+			   #arg,													\
+			   PACKAGE_BUGREPORT );										\
+		return retval;													\
+	}																	\
+		
+
+/**
+   Exit program at once, leaving an error message about running out of memory
+*/
+#define DIE_MEM()								\
+	{																	\
+		fwprintf( stderr, L"fish: Out of memory on line %d of file %s, shutting down fish\n", __LINE__, __FILE__ );	\
+		exit(1);														\
+	}																	\
+		
+/**
+   Shorthand for wgettext call
+*/
+#define _(wstr) wgettext(wstr)
+
+/**
+   Noop, used to tell xgettext that a string should be translated, even though it is not directly sent to wgettext.
+*/
+#define N_(wstr) wstr
+
+/**
+   Take an array_list_t containing wide strings and converts them to a
+   single null-terminated wchar_t **. The array is allocated using
+   halloc, and uses the \c context parameter as context. If \c context
+   is not noll, all elements of the \c array_list_t are also
+   registered to \c context using \c halloc_register().
 */
 wchar_t **list_to_char_arr( array_list_t *l );
 
@@ -83,22 +129,52 @@ wchar_t **list_to_char_arr( array_list_t *l );
 int fgetws2( wchar_t **buff, int *len, FILE *f );
 
 /**
-   Sorts a list of wide strings according to the wcsfilecmp-function from the util library
+   Sorts an array_list of wide strings according to the
+   wcsfilecmp-function from the util library
 */
 void sort_list( array_list_t *comp );
 
 /**
-   Returns a newly allocated wide character string equivalent of the specified multibyte character string
+   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.
 */
 wchar_t *str2wcs( const char *in );
 
 /**
-   Returns a newly allocated multibyte character string equivalent of the specified wide character string
+   Converts the narrow character string \c in into it's wide
+   equivalent, stored in \c out. \c out must have enough space to fit
+   the entire string.
+
+   This function encodes illegal character sequences in a reversible
+   way using the private use area.
+*/
+wchar_t *str2wcs_internal( const char *in, wchar_t *out );
+
+/**
+   Returns a newly allocated multibyte character string equivalent of
+   the specified wide character string
+
+   This function decodes illegal character sequences in a reversible
+   way using the private use area.
 */
 char *wcs2str( const wchar_t *in );
 
 /**
-   Returns a newly allocated wide character string array equivalent of the specified multibyte character string array
+   Converts the wide character string \c in into it's narrow
+   equivalent, stored in \c out. \c out must have enough space to fit
+   the entire string.
+
+   This function decodes illegal character sequences in a reversible
+   way using the private use area.
+*/
+char *wcs2str_internal( const wchar_t *in, char *out );
+
+/**
+   Returns a newly allocated wide character string array equivalent of
+   the specified multibyte character string array
 */
 char **wcsv2strv( const wchar_t **in );
 
@@ -108,74 +184,37 @@ char **wcsv2strv( const wchar_t **in );
 wchar_t **strv2wcsv( const char **in );
 
 /**
-   Returns a newly allocated concatenation of the specified wide character strings
+   Returns a newly allocated concatenation of the specified wide
+   character strings
 */
 wchar_t *wcsdupcat( const wchar_t *a, const wchar_t *b );
 
 /**
-   Returns a newly allocated concatenation of the specified wide character strings. The last argument must be a null pointer.
+   Returns a newly allocated concatenation of the specified wide
+   character strings. The last argument must be a null pointer.
 */
 wchar_t *wcsdupcat2( const wchar_t *a, ... );
 
-/**
-   Returns a newly allocated wide character string wich is a copy of the string in, but of length c or shorter. The returned string is always null terminated, and the null is not included in the string length.
-*/
-wchar_t *wcsndup( const wchar_t *in, int c );
-
-/**
-   Converts from wide char to digit in the specified base. If d is not
-   a valid digit in the specified base, return -1.
-*/
-long convert_digit( wchar_t d, int base );
-
-
-/**
-   Convert a wide character string to a number in the specified
-   base. This functions is the wide character string equivalent of
-   strtol. For bases of 10 or lower, 0..9 are used to represent
-   numbers. For bases below 36, a-z and A-Z are used to represent
-   numbers higher than 9. Higher bases than 36 are not supported.
-*/
-long wcstol(const wchar_t *nptr,
-			wchar_t **endptr,
-			int base);
-
-size_t
-wcslcat(wchar_t *dst, const wchar_t *src, size_t siz);
-
-size_t
-wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz);
-
-/**
-   Create a dublicate string. Wide string version of strdup.
-*/
-wchar_t *wcsdup(const wchar_t *in);
-
-/**
-   Case insensitive string compare function. Wide string version of
-   strcasecmp.
-
-   This implementation of wcscasecmp does not take into account
-   esoteric locales where uppercase and lowercase do not cleanly
-   transform between each other. Hopefully this should be fine since
-   fish only uses this function with one of the strings supplied by
-   fish and guaranteed to be a sane, english word.
-*/
-int wcscasecmp( const wchar_t *a, const wchar_t *b );
-int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
-
 /**
    Test if the given string is a valid variable name
 */
 
-int wcsvarname( wchar_t *str );
 
 /**
-   The prototype for this function is missing in some libc
-   implementations. Fish has a fallback implementation in case the
-   implementation is missing altogether.
+   Test if the given string is a valid variable name. 
+
+   \return null if this is a valid name, and a pointer to the first invalid character otherwise
 */
-int wcwidth( wchar_t c );
+
+wchar_t *wcsvarname( wchar_t *str );
+
+/**
+   Test if the given string is valid in a variable name 
+
+   \return 1 if this is a valid name, 0 otherwise
+*/
+
+int wcsvarchr( wchar_t chr );
 
 
 /**
@@ -184,7 +223,11 @@ int wcwidth( wchar_t c );
 int my_wcswidth( const wchar_t *c );
 
 /**
-   This functions returns the end of a quoted substring. It can handle nested single and double quotes.
+   This functions returns the end of the quoted substring beginning at
+   \c in. The type of quoting character is detemrined by examining \c
+   in. Returns 0 on error.
+
+   \param in the position of the opening quote
 */
 wchar_t *quote_end( const wchar_t *in );
 
@@ -199,14 +242,19 @@ wchar_t *quote_end( const wchar_t *in );
 void error_reset();
 
 /**
-   Set the locale, also change the ellipsis character
+   This function behaves exactly like a wide character equivalent of
+   the C function setlocale, except that it will also try to detect if
+   the user is using a Unicode character set, and if so, use the
+   unicode ellipsis character as ellipsis, instead of '$'.      
 */
-void fish_setlocale(int category, const wchar_t *locale);
+const wchar_t *wsetlocale( int category, const wchar_t *locale );
 
 /**
-   Checks if \c needle is included in the list of strings specified
+   Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero.
 
    \param needle the string to search for in the list 
+
+   \return zero is needle is not found, of if needle is null, non-zero otherwise
 */
 int contains_str( const wchar_t *needle, ... );
 
@@ -216,19 +264,6 @@ int contains_str( const wchar_t *needle, ... );
 */
 int read_blocked(int fd, void *buf, size_t count);
 
-/**
-   This is for writing process notification messages. Has to write to
-   stdout, so clr_eol and such functions will work correctly. Not an
-   issue since this function is only used in interactive mode anyway.
-*/
-int writeb( tputs_arg_t b );
-
-void die_mem();
-
-/**
-  Clean up 
-*/
-void common_destroy();
 
 /**
    Issue a debug message with printf-style string formating and
@@ -236,7 +271,7 @@ void common_destroy();
    program_name, followed by a colon and a whitespace.
    
    \param level the priority of the message. Lower number means higher priority. Messages with a priority_number higher than \c debug_level will be ignored..
-   \param the message format string. 
+   \param msg the message format string. 
 
    Example:
 
@@ -244,7 +279,7 @@ void common_destroy();
 
    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, wchar_t *msg, ... );
+void debug( int level, const wchar_t *msg, ... );
 
 /**
    Replace special characters with backslash escape sequences. Newline is
@@ -255,14 +290,31 @@ void debug( int level, 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, int escape_all );
 
-wchar_t *unescape( const wchar_t * in, int escape_special );
+/**
+   Expand backslashed escapes and substitute them with their unescaped
+   counterparts. Also optionally change the wildcards, the tilde
+   character and a few more into constants which are defined in a
+   private use area of Unicode. This assumes wchar_t is a unicode
+   character set.
 
-void block();
-void unblock();
+   The result must be free()d. The original string is not modified. If
+   an invalid sequence is specified, 0 is returned.
 
+*/
+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 );
 
 /** 
@@ -282,12 +334,29 @@ int common_get_width();
 */
 int common_get_height();
 
-/*
+/**
   Handle a window change event by looking up the new window size and
   saving it in an internal variable used by common_get_wisth and
   common_get_height().
 */
 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 );
+
+/**
+   Tokenize the specified string into the specified array_list_t.
+   Each new element is allocated using malloc and must be freed by the
+   caller.
+   
+   \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 );
+
+
 #endif
 

complete.h

@@ -1,49 +1,71 @@
 /** \file complete.h
 	Prototypes for functions related to tab-completion.
 
-	These functions are used for storing and retrieving tab-completion data, as well as for performing tab-completion.
+	These functions are used for storing and retrieving tab-completion
+	data, as well as for performing tab-completion.
 */
 
 #ifndef FISH_COMPLETE_H
+
+/**
+   Header guard
+*/
 #define FISH_COMPLETE_H
 
 #include <wchar.h>
 
 #include "util.h"
 
-/** Use all completions */
+/** 
+	Use all completions 
+*/
 #define SHARED 0
-/** Do not use file completion */
+/** 
+	Do not use file completion 
+*/
 #define NO_FILES 1
-/** Require a parameter after completion */
+/** 
+	Require a parameter after completion 
+*/
 #define NO_COMMON 2
-/** Only use the argument list specifies with completion after option. This is the same as (NO_FILES & NO_COMMON) */
+/** 
+	Only use the argument list specifies with completion after
+	option. This is the same as (NO_FILES & NO_COMMON)
+*/
 #define EXCLUSIVE 3
 
-/** Command is a path */
+/** 
+	Command is a path 
+*/
 #define PATH 1
-/** Command is not a path */
+/** 
+	Command is not a path 
+*/
 #define COMMAND 0
 
-/** Separateor between completion and description*/
+/** 
+	Separator between completion and description
+*/
 #define COMPLETE_SEP L'\004'
-/** Separateor between completion and description*/
+
+/** 
+	Separator between completion and description
+*/
 #define COMPLETE_SEP_STR L"\004"
 
 /**
-   Character that separates the completion and description on programmable completions
+   Separator between completion items in fish_pager. This is used for
+   completion grouping, e.g. when putting completions with the same
+   descriptions on the same line.
+*/
+#define COMPLETE_ITEM_SEP L'\uf500'
+
+/**
+   Character that separates the completion and description on
+   programmable completions
 */
 #define PROG_COMPLETE_SEP L'\t'
 
-/**
-  Initializes various structures used for tab-completion.
-*/
-void complete_init();
-
-/**
-   Destroys various structures used for tab-completion and free()s the memory used by them.
-*/
-void complete_destroy();
 
 /**
 
@@ -159,6 +181,6 @@ 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( wchar_t *cmd, int reload );
+void complete_load( const wchar_t *cmd, int reload );
 
 #endif

config.h.in

@@ -1,97 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* CPU type */
-#undef CPU
-
-/* Documentation directory */
-#undef DOCDIR
-
-/* Define to 1 if you have the `futimes' function. */
-#undef HAVE_FUTIMES
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-#undef HAVE_LIBRT
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <ncurses.h> header file. */
-#undef HAVE_NCURSES_H
-
-/* Define to 1 if HAVE_RLIMIT_AS is defined in <sys/resource.h>. */
-#undef HAVE_RLIMIT_AS
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `wcswidth' function. */
-#undef HAVE_WCSWIDTH
-
-/* Define to 1 if you have the `wcwidth' function. */
-#undef HAVE_WCWIDTH
-
-/* Define to 1 if you have the `wprintf' function. */
-#undef HAVE_WPRINTF
-
-/* Define to 1 if you have the file `AC_File'. */
-#undef HAVE__PROC_SELF_STAT
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Installation directory */
-#undef PREFIX
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* System configuration directory */
-#undef SYSCONFDIR
-
-/* Evil kludge to get Power based machines to work */
-#undef TPUTS_KLUDGE

config.sub

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2003-06-18'
+timestamp='2006-02-27'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2003-06-18'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +72,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +148,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -169,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,16 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -244,31 +258,38 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -276,6 +297,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -296,19 +320,19 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -317,34 +341,41 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -361,6 +392,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -378,6 +412,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -437,12 +474,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -465,6 +517,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -643,10 +699,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -659,6 +711,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -727,10 +782,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -738,9 +789,12 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -767,6 +821,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -823,6 +883,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -833,6 +897,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -956,6 +1026,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -999,6 +1073,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1029,6 +1107,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1045,13 +1126,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1124,19 +1202,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1154,12 +1236,15 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1172,6 +1257,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1193,6 +1281,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1215,6 +1306,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1251,6 +1345,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1282,9 +1379,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1328,9 +1425,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1463,9 +1566,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1490,7 +1599,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

configure.ac

@@ -1,24 +1,92 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.16.0,axel@liljencrantz.se)
+AC_INIT(fish,1.21.10,fish-users@lists.sf.net)
 
-AC_CANONICAL_TARGET
-
-if test $target_cpu = powerpc; then
-   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
+# If needed, run autoconf to regenerate the configure file
+AC_MSG_CHECKING([if autoconf needs to be run])
+if test configure -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoconf >/dev/null; then
+		# No need to provide any error messages if autoconf fails, the
+		# shell and autconf should take care of that themselves
+		AC_MSG_NOTICE([running autoconf])
+		if autoconf; then
+			./configure "$@"
+		fi
+		exit	
+	else
+		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.])
+	fi
+else
+	AC_MSG_RESULT([no])
 fi
 
-AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
 
+# If needed, run autoheader to regenerate config.h.in
+AC_MSG_CHECKING([if autoheader needs to be run])
+if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoheader >/dev/null; then
+		AC_MSG_NOTICE([running autoheader])
+		autoheader
+	else
+		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.])
+	fi
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+# Detect directories which may contain additional headers, libraries
+# and commands. This needs to be done early - before Autoconf starts
+# to mess with CFLAGS and all the other environemnt variables.
+for i in /usr/pkg /sw /opt /opt/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/"
+		CFLAGS="$CFLAGS -I$i/include/"
+	else
+   	AC_MSG_RESULT(no)
+	fi
+
+	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/"
+	else
+    	AC_MSG_RESULT(no)
+	fi
+
+	AC_MSG_CHECKING([for $i/bin command directory])
+	if test -d $i/bin; then
+		AC_MSG_RESULT(yes)
+		optbindirs="$optbindirs $i/bin"
+	else
+    	AC_MSG_RESULT(no)
+	fi
+
+done
+
+AC_SUBST( optbindirs, $optbindirs )
+
+# Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
 
-# Checks for programs.
+# Set up various programs needed for install
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-#AC_ISC_POSIX
-#AC_PROG_MAKE_SET
 
-# Optionally drop xsel
+# Check for seq command. If missing, make sure fallback shellscript
+# implementation is installed
+AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
+
+# Optionally drop xsel command
 AC_ARG_WITH( xsel, 
 			 AC_HELP_STRING([--without-xsel],
              [do not build the xsel program needed for X clipboard integration]),
@@ -35,66 +103,248 @@ else
     AC_SUBST( XSEL_MAN_PATH,[ ])
 fi
 
-if [[ "$prefix" = NONE ]]; then
-   	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
-	AC_SUBST( PREFIX, /usr/local)
-   	AC_SUBST(sysconfdir,[/etc])
-	export prefix=/usr/local
+#
+# 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.
+#
+
+XCFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -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" ;;
+esac
+
+#
+# If we are using gcc, set some flags that increase the odds of the
+# compiler producing a working binary...
+#
+
+if test "$CC" = gcc; then
+
+	#
+	# -fno-optimize-sibling-calls seems to work around a bug where
+	# sending a SIGWINCH to fish on NetBSD causes fish to exit when
+	# compiled with GCC 3.3.3. This is probably either a compiler bug
+	# or a libc bug, but adding this flag seems to fix things for
+	# now. Long term, the real problem should be tracked down and
+	# truly fixed, at which point we can remove this silly flag. This
+	# bug has been verified to not exist on Linux using GCC 3.3.3.
+	#
+
+	CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
+
+
+	#
+	# -Wall is there to keep me on my toes
+	#
+
+	CFLAGS="$CFLAGS -Wall"
+
+fi
+
+#
+# If we are compiling against glibc, set some flags to work around
+# some rather stupid attempts to hide prototypes for *wprintf
+# functions, as well as prototypes of various gnu extensions.
+#
+
+AC_MSG_CHECKING([if we are compiling against glibc])
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([
+#include <stdlib.h>
+#ifdef __GLIBC__
+#define STATUS 0
+#else
+#define STATUS 1
+#endif],
+		[return STATUS;])], 
+	[glibc=yes], 
+	[glibc=no] )
+
+if test "$glibc" = yes; then
+	AC_MSG_RESULT(yes)
+
+	#
+	# This gives us access to prototypes for gnu extensions and C99
+	# functions if we are compiling agains glibc. All GNU extensions
+	# that are used must have a fallback implementation available in
+	# fallback.h, in order to keep fish working on non-gnu platforms.
+	#
+
+	CFLAGS="$CFLAGS -D _GNU_SOURCE -D _ISOC99_SOURCE"
+
 else
-	AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory])
-	AC_SUBST( PREFIX, [$prefix])
-   	AC_SUBST(sysconfdir,[/etc])
+	AC_MSG_RESULT(no)
 fi
 
-if echo $prefix | grep \^$HOME >/dev/null; then
-  	AC_SUBST(sysconfdir,[$HOME/etc])
-	AC_MSG_NOTICE(["Install in $HOME"])
-fi
-AC_SUBST(fishdir,[/fish.d])
-AC_SUBST(fishfile,[/fish])
-AC_SUBST(fishinputfile,[/fish_inputrc])
+# Test cpu for special handling of ppc
+#
+# This is used to skip use of tputs on ppc systems, since it seemed to
+# be broken, at least on older debin-based systems. This is obviously
+# not the right way to to detect whether this workaround should be
+# used, since it catches far to many systems, but I do not have the
+# hardware available to narrow this problem down, and in practice, it
+# seems that tputs is never really needed.
+#
+AC_CANONICAL_TARGET
 
+if test $target_cpu = powerpc; then
+   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
+fi
+
+
+# Set up PREFIX and related preprocessor symbols. Fish needs to know
+# where it will be installed. One of the reasons for this is so that
+# it can make sure the fish installation directory is in the path
+# during startup.
+if [[ "$prefix" = NONE ]]; then
+	export prefix=/usr/local
+	AC_SUBST( prefix, /usr/local)
+else
+	AC_SUBST( prefix, [$prefix])
+fi
+
+
+# Set up the directory where the documentation files should be
+# installed
 AC_ARG_VAR( [docdir], [Documentation direcotry] )
 
 if test -z $docdir; then
-   AC_SUBST(docdir,[$datadir/doc/fish])
+   AC_SUBST(docdir, [$datadir/doc/fish] )
+else
+   AC_SUBST(docdir, [$docdir])
 fi
 
-AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] )
-AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$sysconfdir"], [System configuration directory] )
+# Set up locale directory. This is where the .po files will be
+# installed.
+AC_SUBST( [localedir], [$datadir/locale])
 
-# See if Linux procfs is present
+# See if Linux procfs is present. This is used to get extra
+# information about running processes.
 AC_CHECK_FILES([/proc/self/stat])
 
-# See if NetBSD pkgsrc is installed
-AC_CHECK_FILE([/usr/pkg/lib],[AC_SUBST(LIBDIR,[-L/usr/pkg/lib\ -R/usr/pkg/lib])])
-AC_CHECK_FILE([/usr/pkg/include],[AC_SUBST(INCLUDEDIR,[-I/usr/pkg/include])])
+# This is ued to tell the wgetopt library to translate strings. This
+# way wgetopt can be dropped into any project without requiring i18n.
 
-AC_CHECK_FUNCS( [wprintf futimes wcwidth wcswidth] ) 
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
+AC_DEFINE([HAVE_TRANSLATE_H], [1],
+			  [Define to 1 if the wgettext function should be used for translating strings.])
 
-# Check for RLIMIT_AS in sys/resource.h.
-AC_MSG_CHECKING([for RLIMIT_AS in sys/resource.h])
-AC_TRY_COMPILE([#include <sys/resource.h>],
-[int tmp; tmp=RLIMIT_AS;], have_rlimit_as=yes, have_rlimit_as=no)
-if test "$have_rlimit_as" = yes; then
-    AC_MSG_RESULT(yes)
-	AC_DEFINE([HAVE_RLIMIT_AS], [1],
-			  [Define to 1 if HAVE_RLIMIT_AS is defined in <sys/resource.h>.])
+# Check for presense of various libraries
+AC_SEARCH_LIBS( gettext, intl,,)
+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( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+
+# Check for presense of various header files
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h stropts.h])
+
+AC_CHECK_HEADER([regex.h],
+				[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
+				[AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])])
+
+# Check for presense of various functions
+AC_CHECK_FUNCS( gettext wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
+AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc )
+AC_CHECK_FUNCS( wcstol dcgettext wcslcat wcslcpy lrand48_r)
+
+# The Makefile also needs to know if we have gettext, so it knows if the translations should be installed.
+AC_CHECK_FUNC( gettext, AC_SUBST( HAVE_GETTEXT, 1 ), AC_SUBST( HAVE_GETTEXT, 0 ) )
+
+# Here follows a list of small programs used to test for various
+# features that Autoconf doesn't tell us about
+
+# Check if realpath accepts null for its second argument
+AC_MSG_CHECKING([if realpath accepts null for its second argument])
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>],
+		[int status; char *res; res = realpath( "somefile", 0 ); status = !(res != 0 || errno == ENOENT); exit( status );])], 
+	[have_realpath_null=yes], 
+	[have_realpath_null=no] )
+
+if test "$have_realpath_null" = yes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_REALPATH_NULL], [1],
+		[Define to 1 if realpath accepts null for its second argument.])
+else
+	AC_MSG_RESULT(no)
+fi
+
+# If we have a fwprintf in libc, test that it actually works. As of
+# March 2006, it is broken under Dragonfly BSD.
+if test "$ac_cv_func_fwprintf" = yes; then
+
+	AC_MSG_CHECKING([if fwprintf is broken])
+	AC_RUN_IFELSE(
+		[AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+#include <wchar.h>
+			],
+			[
+				setlocale( LC_ALL, "" );
+				fwprintf( stderr, L"%ls%ls", L"", L"fish:" );
+			])],
+	    [
+			AC_MSG_RESULT(no)
+		],
+	    [
+			AC_MSG_RESULT([yes])
+			AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
+		] )
+
+fi
+
+
+# Check for _nl_msg_cat_cntr symbol
+AC_MSG_CHECKING([for _nl_msg_cat_cntr symbol])
+AC_TRY_LINK([#if HAVE_LIBINTL_H]
+[#include <libintl.h>]
+[#endif],
+[extern int  _nl_msg_cat_cntr;]
+[int tmp = _nl_msg_cat_cntr; exit(tmp);], 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], [1],
+	          [Define to 1 if the _nl_msg_cat_cntr symbol is exported.])	
 else
     AC_MSG_RESULT(no)
 fi
 
-AC_CHECK_LIB(socket, connect)
-AC_CHECK_LIB(rt, nanosleep)
+# Check if we are using basic BSD curses - in that case we redefine
+# del_curterm as a no-op, to avoid a double-free
 
-# Check if we have ncurses, and use it rather than curses if possible.
-AC_CHECK_HEADERS([ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)],[AC_SUBST(CURSESLIB,[curses])])
+AC_MSG_CHECKING([If we are using BSD curses])
+case $target_os in
+	*bsd*)
+		AC_MSG_RESULT(yes)
+		AC_CHECK_LIB( ncurses, del_curterm, true, [AC_DEFINE([HAVE_BROKEN_DEL_CURTERM],[1],[We are using basic BSD curses, redefine del_curterm to a no-op to avoid a double-free bug])])
+		;;
+	*)
+		AC_MSG_RESULT(no)
+		;;
+esac
 
-#Force use of ncurses if it is avialable via NetBSD pkgsrc. This is an
-#ugly kludge to force NetBSD to use ncurses, since NetBSDs own version
-#does not properly support terminfo.
-AC_CHECK_FILE([/usr/pkg/include/ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)])
-
-AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish])
+# Tell the world what we know
+AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile seq])
 AC_OUTPUT
+
+echo "fish is now configured."
+echo "Use 'make' and 'make install' to build and install fish."

doc_src/and.txt

@@ -2,22 +2,23 @@
 \section and and - Conditionally execute a command
 
 \subsection and-synopsis Synopsis
- <tt>and COMMAND1; COMMAND2</tt>
+<tt>COMMAND1; and COMMAND2</tt>
 
 \subsection and-description Description
 
-The \c and builtin is used to execute one command, and if it returns
-zero status, also execute a second command. 
+The \c and builtin is used to execute a command if the current exit
+status (as set by the last previous command) is zero
+
+The and command does not change the current exit status.
 
 \subsection and-example Example
 
-The following code runs the \c make command to build a program, and if it suceeds, it runs <tt>make install</tt>, which installs the program.
-<pre>
-and make; make install
-</pre>
-
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
+The following code runs the \c make command to build a program, if the
+build succceds, the program is installed. If either step fails,
+<tt>make clean</tt> is run, which removes the files created by the
+build process
 
 <pre>
-or and make; make install; make clean
+make; and make install; or make clean
 </pre>
+

doc_src/begin.txt

@@ -7,11 +7,14 @@
 \subsection begin-description Description
 
 The \c begin builtin is used to create a new block of code. The block
-is unconditionally erxecuted. Begin is equivalent to <tt>if
-true</tt>. The begin command is used to group any number of commands
-into a block. The reason for this is usually either to introduce a new
-variable scope or to redirect the input ot output of this set of
-commands as a group.
+is unconditionally executed. <code>begin; ...; end</tt> is equivalent
+to <tt>if true; ...; end</tt>. The begin command is used to group any
+number of commands into a block. The reason for doing so is usually
+either to introduce a new variable scope, to redirect the input or
+output of a set of commands as a group, or to specify precedence when
+using the conditional commands like \c and.
+
+The \c begin command does not change the current exit status.
 
 \subsection begin-example Example
 
@@ -28,3 +31,17 @@ end
 # the block and was killed
 echo $PIRATE
 </pre>
+
+In the following code, all output is redirected to the file out.html.
+
+<pre>
+begin
+	echo $xml_header
+	echo $html_header
+	if test -e $file 
+		...
+	end
+	...
+
+end &gt; out.html
+</pre>

doc_src/block.txt

@@ -0,0 +1,19 @@
+
+\section block block - Temporarily block delivery of events
+
+\subsection block-synopsis Synopsis
+ <tt>block [OPTIONS...]</tt>
+
+\subsection block-description Description
+
+- <tt>-l</tt> or <tt>--local</tt> Release the block at the end of the currently innermost block scope
+- <tt>-g</tt> or <tt>--global</tt> Never automatically release the lock
+- <tt>-e</tt> or <tt>--erase</tt> Release global block
+
+\subsection block-example Example
+
+<pre>block -g
+\#Do something that should not be interrupted
+block -e
+</pre>
+

doc_src/break.txt

@@ -8,7 +8,7 @@
 The \c break builtin is used to halt a currently running loop, such as a <a href="#for">for</a> loop or a <a href="#while">while</a> loop. It is usually added inside of a conditional block such as an <a href="#if">if</a> statement or a <a href="#switch">switch</a> statement.
 
 \subsection break-example Example
-The following code searches all .c files for smurfs, and halts at the first occurance.
+The following code searches all .c files for smurfs, and halts at the first occurrence.
 <p>
 <tt>for i in *.c;
 <br>&nbsp;&nbsp;&nbsp;&nbsp;if grep smurf $i;

doc_src/case.txt

@@ -11,6 +11,22 @@ wildcarded values. The \c case statement is used together with the \c
 switch statement in order to determine which block should be
 performed.
 
+Each \c case command is given one or more parameter. The first \c case
+command with a parameter that matches the string specified in the
+switch command will be evaluated. \c case parameters may contain
+wildcards. These need to be escaped or quoted in order to avoid
+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 stamantes 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
+counterintuitive at first, but it is unavoidable, since it would be
+impossible to know if a case command will evaluate to true before all
+forms of parameter expansion have been performed for the case command.
+
 \subsection case-example Example
 
 If the variable \$animal contains the name of an animal, the following
@@ -23,13 +39,15 @@ switch $animal
         echo evil
     case wolf dog human moose dolphin whale
         echo mammal
-    case duck goose albatros
+    case duck goose albatross
         echo bird
     case shark trout stingray
         echo fish
+    case '*'
+        echo I have no idea what a $animal is
 end
 </pre>
 </p>
 <p>
-If the above code was run with \$animal set to \c whale, the output would be \c mammal.
+If the above code was run with \c \$animal set to \c whale, the output would be \c mammal.
 </p>

doc_src/cd.txt

@@ -3,10 +3,9 @@
 \subsection cd-synopsis Synopsis
 <tt>cd [DIRECTORY]</tt>
 
-\subsection cd-description Description
-Changes the current directory. If <tt>DIRECTORY</tt> is supplied it
-will become the new directory. If \c DIRECTORY is a relative path, the
-CDPATH environment variable will be separated using the : as
-separator, and the resulting list will be searched for a suitable new
-current directory. If CDPATH is not set, it is assumed to be '.'. If
-\c DIRECTORY is not specified, \$HOME will be the new directory.
+\subsection cd-description Description Changes the current
+directory. If <tt>DIRECTORY</tt> is supplied it will become the new
+directory. If \c DIRECTORY is a relative path, the paths found in the
+CDPATH environment variable array will be tried as prefixes for the
+specified path. If CDPATH is not set, it is assumed to be '.'. If \c
+DIRECTORY is not specified, \$HOME will be the new directory.

doc_src/commandline.txt

@@ -25,14 +25,14 @@ or updated
 - \c -b or \c --current-buffer select the entire buffer (default)
 - \c -j or \c --current-job select the current job
 - \c -p or \c --current-process select the current process
-- \c -t or \c --current_token select the current token. 
+- \c -t or \c --current_token select the current token.
 
 The following switch changes the way \c commandline prints the current
 commandline
 
 - \c -c or \c --cut-at-cursor only print selection up until the
   current cursor position
-- \c o or \c --tokenize tokenize the selection and print one string-type token per line
+- \c -o or \c --tokenize tokenize the selection and print one string-type token per line
 
 Other switches
 
@@ -43,6 +43,10 @@ Other switches
   that they will be returned to the reader before any additional
   actual keypresses are read.
 
+If commandline is called during a call to complete a given string
+using <code>complete -C STRING</code>, commandline will consider the
+specified string to be the current contents of the commandline.
+
 \subsection commandline-example Example
 
 <tt>commandline -j $history[3]</tt>

doc_src/complete.txt

@@ -1,18 +1,24 @@
-\section complete complete - edit command specific tab-completions. 
+\section complete complete - edit command specific tab-completions.
 
 \subsection complete-synopsis Synopsis
 <tt>complete (-c|--command|-p|--path) COMMAND [(-s|--short-option) SHORT_OPTION] [(-l|--long-option|-o|--old-option) LONG_OPTION [(-a||--arguments) OPTION_ARGUMENTS] [(-d|--description) DESCRIPTION] </tt>
 
 \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
+the fish manual.
+
 - <tt>COMMAND</tt> is the name of the command for which to add a completion
 - <tt>SHORT_OPTION</tt> is a one character option for the command
 - <tt>LONG_OPTION</tt> is a multi character option for the command
 - <tt>OPTION_ARGUMENTS</tt> is parameter containing a space-separated list of possible option-arguments, which may contain subshells
 - <tt>DESCRIPTION</tt> is a description of what the option and/or option arguments do
+- <tt>-C STRING</tt> or <tt>--do-complete=STRING</tt> makes complete try to find all possible completions for the specified string
 - <tt>-e</tt> or <tt>--erase</tt> implies that the specified completion should be deleted
 - <tt>-f</tt> or <tt>--no-files</tt> specifies that the option specified by this completion may not be followed by a filename
-- <tt>-n</tt> or <tt>--condition</tt> specides a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
-- <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash 				   
+- <tt>-n</tt> or <tt>--condition</tt> specifies a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
+- <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash
 - <tt>-p</tt> or <tt>--path</tt> implies that the string COMMAND is the full path of the command
 - <tt>-r</tt> or <tt>--require-parameter</tt> specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option
 - <tt>-u</tt> or <tt>--unauthorative</tt> implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors
@@ -25,13 +31,14 @@ that do not begin with a hyphen. Fish recognizes three styles of
 options, the same styles as the GNU version of the getopt
 library. These styles are:
 
-- Short options, like '-a'. Short options are a single character long, are preceeded by a single hyphen and may ge grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32').
-- Old style long options, like '-Wall'. Old style long options are more than one character long, are preceeded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null').
-- GNU style long options, like '--colors'. GNU style long options are more than one character long, are preceeded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbrevated so long as the abbrevation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h').
+- Short options, like '-a'. Short options are a single character long, are preceded by a single hyphen and may be grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32').
+- Old style long options, like '-Wall'. Old style long options can be more than one character long, are preceded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null').
+- GNU style long options, like '--colors'. GNU style long options can be more than one character long, are preceded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbreviated so long as the abbreviation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h').
 
-\c complete only allows one of old style long options and GNU style
-long options to be used on a specific command, but short options can
-always be specified.
+The options for specifying command name, command path, or command
+switches may all be used multiple times to specify multiple commands
+which have the same completion or multiple switches accepted by a
+command.
 
 When erasing completions, it is possible to either erase all
 completions for a specific command by specifying <tt>complete -e -c
@@ -61,7 +68,9 @@ are valid, like the \c nodeps switch.
 
 This can be written as:
 
-<tt>complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d 'Dont check dependencies'</tt>
+<tt>complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d
+"Don't check dependencies"</tt>
 
-where \c __fish_contains_opt is a function that checks the commandline buffer for the presense of a specified set of options. 
+where \c __fish_contains_opt is a function that checks the commandline
+buffer for the presence of a specified set of options.
 

doc_src/contains.txt

@@ -0,0 +1,24 @@
+
+\section contains contains - Test if a word is present in a list
+
+\subsection contains-synopsis Synopsis
+<code>contains [OPTIONS] KEY [VALUES...]</code>
+
+\subsection contains-description Description
+
+- \c -h or \c --help display this message
+
+Test if the set VALUES contains the string KEY. Return status is 0 if
+yes, 1 otherwise
+
+
+\subsection contains-example Example
+<pre>
+for i in ~/bin /usr/local/bin
+	if not contains \$i \$PATH
+		set PATH \$PATH i
+	end
+end
+</pre>
+
+The above code tests if ~/bin and  /usr/local/bin are in the path and if they are not, they are added.

doc_src/count.txt

@@ -6,7 +6,7 @@
 
 \subsection count-description Description
 
-<tt>count</tt> returns the number of arguments that were passed to
+<tt>count</tt> prints the number of arguments that were passed to
 it. This is usually used to find out how many elements an environment
 variable array contains, but this is not the only potential usage for
 the count command. 
@@ -16,7 +16,10 @@ the user does not have to worry about an array containing elements
 such as dashes. \c fish performs a special check when invoking the
 count program, and if the user uses a help option, this help page is
 displayed, but if a help option is contained inside of a variable or
-is the result of expantion, it will be passed on to the count program.
+is the result of expansion, it will be passed on to the count program.
+
+Count exits with a non-zero exit status if no arguments where passed
+to it, with zero otherwise.
 
 \subsection count-example Example
 

doc_src/end.txt

@@ -5,9 +5,12 @@
 if CONDITION; COMMAND_TRUE [else; COMMAND_FALSE] end
 while CONDITION; COMMANDS; end
 switch VALUE; [case [WILDCARD...]; [COMMANDS...];...] end
+begin; [COMMANDS...] end
 </pre>
 
 \subsection end-description Description
 <tt>end</tt> ends a block of commands. For more information, read the
-documentation for the block constructs, such as \c if, \c for and \
+documentation for the block constructs, such as \c if, \c for and \c
 while.
+
+The \c end command does not change the current exit status.

doc_src/exec.txt

@@ -7,8 +7,8 @@
 \subsection exec-description Description
 
 The \c exec builtin is used to replace the currently running shells
-process image with a new command. On sucessfull completion, exec never
-returns. exec can not be used inside a pipeline. 
+process image with a new command. On successful completion, exec never
+returns. exec can not be used inside a pipeline.
 
 \subsection exec-example Example
 

doc_src/exit.txt

@@ -7,8 +7,8 @@
 
 The <tt>exit</tt> builtin causes fish to exit. If <tt>STATUS</tt> is
 supplied, it will be converted to an integer and used as the exit
-code. Otherwise the exit code will be 0.
+code. Otherwise the exit code will be that of the last command executed.
 
 If exit is called while sourcing a file (using the <a
 href="#source">.</a> builtin) the rest of the file will be skipped,
-but the shell will not exit.
+but the shell itself will not exit.

doc_src/fish_pager.txt

@@ -0,0 +1,9 @@
+
+\section fish_pager fish_pager - Internal command used by fish
+
+\subsection fish_pager-description Description
+
+This command is used internally by fish to display a list of
+completions. It should not be used by other commands, as it's
+interface is liable to change in the future.
+

doc_src/fishd.txt

@@ -2,50 +2,30 @@
 \section fishd fishd - Universal variable daemon
 
 \subsection fishd-synopsis Synopsis
- <tt>fishd [SECTION]</tt>
+ <tt>fishd [(-h|--help|-v|--version)]</tt>
 
 \subsection fishd-description Description
 
 The \c fishd daemon is used to load, save and distribute universal
-variable information. fish automtically connects to fishd via a socket
+variable information. fish automatically connects to fishd via a socket
 on startup. If no instance of fishd is running, fish spawns a new
 fishd instance. fishd will create a socket in /tmp, and wait for
-incoming connections from universal variable clents, such as fish,
+incoming connections from universal variable clients, such as fish,
 When no clients are connected, fishd will automatically shut down.
 
-\subsection fishd-commands Commands
-
-Fishd works by sending and recieving sommands. Each command is ended
-with a newline. These are the commands supported by fishd:
-
-<pre>set KEY:VALUE
-set_export KEY:VALUE
-</pre>
-
-These commands update the value of a variable. The only difference
-between the two is that <tt>set_export</tt>-variables should be
-exported to children of the process using them. The variable value may
-be escaped using C-style backslash escapes. In fact, this is required
-for newline characters, which would otherwise be interpreted as end of
-command.
-
-<pre>erase KEY
-</pre>
-
-Erase the variable with the specified name.
-
-<pre>barrier
-barrier_reply
-</pre>
-
-A \c barrier command will result in a barrier_reply beeing added to
-the end of the senders queue of unsent messages. These commands are
-used to synchronize clients, since once the reply for a barrier
-message returns, the sender can know that any updates available at the
-time the original barrier request was sent have been recieved.
+- <tt>-h</tt> or <tt>--help</tt> displays this help message and then exits
+- <tt>-v</tt> or <tt>--version</tt> displays the current fish version and then exits
 
 \subsection fishd-files Files
 
-~/.fishd.HOSTNAME permenent storage location for universal variale
+~/.fishd.HOSTNAME permanent storage location for universal variable
 data. The data is stored as a set of \c set and \c set_export commands
-such as would be parsed by fishd.
+such as would be parsed by fishd. If an instance of fishd is running
+(which is generally the case), manual modifications to ~/.fishd.HOSTNAME
+will be lost. Do NOT edit this file manually!
+
+/tmp/fishd.socket.USERNAME the socket which fishd uses to communicate
+with all clients.
+
+/tmp/fishd.log.USERNAME the fishd log file
+

doc_src/function.txt

@@ -1,35 +1,35 @@
 \section function function - create a function
 
 \subsection function-synopsis Synopsis
- <tt>function [OPTIONS] NAME; BODY; end </tt>
+ <code>function [OPTIONS] NAME; BODY; end </code>
 
 \subsection function-description Description
 
-- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character. 
-- <tt>-d DESCRIPTION</tt> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
-- <tt>-j PID</tt> or <tt> --on-job-exit PID</tt> tells fish to run this function when the job with group id PID exits
-- <tt>-p PID</tt> or <tt> --on-process-exit PID</tt> tells fish to run this function when the fish child process with process id PID exits
-- <tt>-s</tt> or <tt>--on-signal SIGSPEC</tt> tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a singal number, or the signal name, such as SIGHUP (or just HUP)
-- <tt>-v</tt> or <tt>--on-variable VARIABLE_NAME</tt> tells fish to run this function when the variable VARIABLE_NAME changes value
+- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character.
+- <code>-d DESCRIPTION</code> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
+- <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)
+- <code>-v</code> or <code>--on-variable VARIABLE_NAME</code> tells fish to run this function when the variable VARIABLE_NAME changes value
 
-This builtin command is used to create a new function. A Function is a
+This builtin command is used to create a new function. A function is a
 list of commands that will be executed when the name of the function
-is entered. The function 
+is entered. The function
 
 <pre>
 function hi
 	echo hello
 end
-</pre> 
+</pre>
 
-will write <tt>hello</tt> whenever the user enters \c hi.
+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 variable <a href="index.html#variables-arrays">array</a> argv.
+are inserted into the environment <a href="index.html#variables-arrays">variable array</a> argv.
 
 \subsection function-example Example
 
-<pre>function ll 
+<pre>function ll
 	ls -l $argv
 end
 </pre>
@@ -39,18 +39,18 @@ will run the \c ls command, using the \c -l option, while passing on any additio
 <pre>
 function mkdir -d "Create a directory and set CWD"
 	mkdir $argv
-	if test $status = 0 
+	if test $status = 0
 		switch $argv[(count $argv)]
 			case '-*'
-				
+
 			case '*'
 				cd $argv[(count $argv)]
 				return
 		end
 	end
 end
-</pre> 
+</pre>
 
-will run the mkdir command, and if it is succesfull, change the
+will run the mkdir command, and if it is successful, change the
 current working directory to the one just created.
 

doc_src/functions.txt

@@ -1,17 +1,27 @@
 \section functions functions - print or erase functions
 
 \subsection function-synopsis Synopsis
-<tt>functions [-e] FUNCTIONS...</tt>
+<code>functions [-e] FUNCTIONS...</code>
 
 \subsection functions-description Description
 
 This builtin command is used to print or erase functions.
 
-- <tt>-e</tt> or <tt>--erase</tt> causes the specified functions to be erased.
-- <tt>-n</tt> or <tt>--names</tt> List only the names of all defined functions
+- <code>-a</code> or <code>--all</code> list all functions, even those whose name start with an underscore.
+- <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
+- <code>-n</code> or <code>--names</code> list only the names of all defined functions
+- <code>-q</code> or <code>--query</code> test if the specified functions exist. Does not output anything, but the builtins exit status is the number of functions specified that were not defined.
 
-If \c functions is called with no arguments, the names and definition
-of all functions are printed, otherwise, the specified function
-definitions will be printed.
+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. 
 
+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.
 
+The exit status of the functions builtin is the number functions
+specified in the argument list that do not exist.

doc_src/help.txt

@@ -1,5 +1,5 @@
 
-\section help help - Display fish documantation
+\section help help - Display fish documentation
 
 \subsection help-synopsis Synopsis
  <tt>help [SECTION]</tt>

doc_src/jobs.txt

@@ -1,13 +1,21 @@
 \section jobs jobs - print currently running jobs
 
 \subsection jobs-synopsis
-<tt>jobs</tt>
+<code>jobs [OPTIONS] [PID]</code>
 
 \subsection jobs-description Description
-The <tt>jobs</tt> builtin causes fish to print a list of the currently
-running jobs and their status. 
+The <code>jobs</code> builtin causes fish to print a list of the currently
+running jobs and their status.
 
-On systems that supports this feature, jobs will also print the CPU
-usage of each job since the last command was executed. The CPU usage
-is expressed as a percentage of full CPU activity. Note that on
+jobs accepts the following switches:
+
+- <code>-c</code> or <code>--command</code> print the command name for each process in jobs
+- <code>-g</code> or <code>--group</code> only print the group id of each job
+- <code>-h</code> or <code>--help</code> display a help message and exit
+- <code>-l</code> or <code>--last</code> only the last job to be started is printed
+- <code>-p</code> or <code>--pid</code> print the process id for each process in all jobs
+
+On systems that supports this feature, jobs will print the CPU usage
+of each job since the last command was executed. The CPU usage is
+expressed as a percentage of full CPU activity. Note that on
 multiprocessor systems, the total activity may be more than 100\%.

doc_src/mimedb.txt

@@ -14,6 +14,13 @@
 - \c -f, \c --output-description the output will be the description of each mimetype
 - \c -a, \c --output-action the output will be the default action of each mimetype
 - \c -l, \c --launch launch the default action for the specified file(s)
-- \c -h, \c --help Display a help message and exit
-- \c -v, \c --version Display version number and exit
+- \c -h, \c --help display a help message and exit
+- \c -v, \c --version display version number and exit
+
+The mimedb command is used to query the mimetype database and the
+.desktop files installed on the system in order to find information on
+a file. The information that mimedb can retrive includes the mimetype
+for a file, a description of the type and what its default action
+is. mimedb can also be used to launch the default action for this
+file.
 

doc_src/nextd.txt

@@ -1,9 +1,10 @@
 \section nextd nextd
 
 \subsection nextd-synopsis Synopsis
-<tt>nextd [-l] [pos]</tt>
+<tt>nextd [-l | --list] [pos]</tt>
 
-\subsection nextd-description Description 
-<tt>nextd</tt> moves forwards <tt>pos</tt> positions in the history of visited directories;
-if the end of the history has been hit, a warning is printed. If the <tt>-l></tt> flag is 
-specified, the current history is also displayed. 
+\subsection nextd-description Description <tt>nextd</tt> moves
+forwards <tt>pos</tt> positions in the history of visited directories;
+if the end of the history has been hit, a warning is printed. If the
+<code>-l></code> or <code>--list</code> flag is specified, the current
+history is also displayed.

doc_src/or.txt

@@ -2,22 +2,22 @@
 \section or or - Conditionally execute a command
 
 \subsection or-synopsis Synopsis
- <tt>or COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; or COMMAND2</tt>
 
 \subsection or-description Description
 
-The \c or builtin is used to execute one command, and if it returns
-non-zero status, also execute a second command. 
+The \c or builtin is used to execute a command if the current exit status (as set by the last previous command) is non-zero
+
+The or command does not change the current exit status.
 
 \subsection or-example Example
 
-The following code runs the \c make command to build a program, or if it fails, it runs <tt>make clean</tt>, which removes the files created by the build process
-<pre>
-or make; make clean
-</pre>
-
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
+The following code runs the \c make command to build a program, if the
+build succceds, the program is installed. If either step fails,
+<tt>make clean</tt> is run, which removes the files created by the
+build process
 
 <pre>
-or and make; make install; make clean
+make; and make install; or make clean
 </pre>
+

doc_src/prevd.txt

@@ -1,9 +1,10 @@
 \section prevd prevd
 
 \subsection prevd-synopsis Synopsis
-<tt>prevd [-l] [pos]</tt>
+<tt>prevd [-l | --list] [pos]</tt>
 
-\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, a warning is printed. If the <tt>-l</tt> flag 
-is specified, the current history is also displayed.
+\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, a warning
+is printed. If the <code>-l</code> or <code>--list</code> flag is
+specified, the current history is also displayed.

doc_src/read.txt

@@ -8,10 +8,13 @@
 The <tt>read</tt> builtin causes fish to read one line from standard
 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>-pPROMPT_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>.
-- <tt>-cCMD</tt> or <tt>--command=CMD</tt> specifies that the initial string in the interactive mode command buffer should be CMD.
+- <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>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes
+- <code>-U</code> or <code>--universal</code> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
+- <code>-x</code> or <code>--export</code> causes the specified environment variable to be exported to child processes
 
 Read starts by reading a single line of input from stdin, the line is
 then tokenized using the <tt>IFS</tt> environment variable. Each variable

doc_src/return.txt

@@ -2,18 +2,21 @@
 \section return return - Stop the innermost currently evaluated function
 
 \subsection return-synopsis Synopsis
- <tt>function NAME; [COMMANDS...] break [STATUS]; [COMMANDS...] end</tt>
+ <tt>function NAME; [COMMANDS...] return [STATUS]; [COMMANDS...] end</tt>
 
-\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 href="#if">if</a> statement or a
-<a href="#switch">switch</a> statement to conditionally stop the
-executing function and return to the caller.
+\subsection return-description Description 
 
-- \c STATUS is the return status of the function. If unspecified, the status is set to 0.
+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
+href="#if">if</a> statement or a <a href="#switch">switch</a>
+statement to conditionally stop the executing function and return to
+the caller, but it can also be used to specify the exit status of a
+function.
+
+- \c STATUS is the return status of the function. If unspecified, the status is unchanged.
 
 \subsection return-example Example
-The following code is an implementation of the false program as a fish builtin
+The following code is an implementation of the false command as a fish function
 <p>
 <pre>function false
 	return 1

doc_src/set.txt

@@ -1,41 +1,84 @@
 \section set set - Handle environment variables.
 
 \subsection set-synopsis Synopsis
-<tt>set [OPTIONS] VARIABLE_NAME [VALUES...]</tt>
+<pre>set [SCOPE_OPTIONS]
+set [OPTIONS] VARIABLE_NAME VALUES...
+set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
+set (-q | --query) [SCOPE_OPTIONS] VARIABLE_NAMES...
+set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME
+set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]... </pre>
 
-The <tt>set</tt> builtin causes fish to assign the variable <tt>VARIABLE_NAME</tt> the values <tt>VALUES...</tt>. 
+The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_NAME</code> the values <code>VALUES...</code>.
 
 \subsection set-description Description
-- <tt>-e</tt> or <tt>--erase</tt> causes the specified environment variable to be erased
-- <tt>-g</tt> or <tt>--global</tt> causes the specified environment variable to be made global. If this option is not supplied, the specified variable will dissapear when the current block ends
-- <tt>-l</tt> or <tt>--local</tt> forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local
-- <tt>-n</tt> or <tt>--names</tt> List only the names of all defined variables
-- <tt>-q</tt> or <tt>--query</tt> test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined.
-- <tt>-u</tt> or <tt>--unexport</tt> causes the specified environment not to be exported to child processes
-- <tt>-U</tt> or <tt>--universal</tt> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
-- <tt>-x</tt> or <tt>--export</tt> causes the specified environment variable to be exported to child processes
+- <code>-e</code> or <code>--erase</code> causes the specified environment variable to be erased
+- <code>-l</code> or <code>--local</code> forces the specified environment variable to be given a scope that is local to the current block, even if a variable with the given name exists and is non-local
+- <code>-g</code> or <code>--global</code> causes the specified environment variable to be given a global scope. Non-global variables disappear when the block they belong to ends
+- <code>-U</code> or <code>--universal</code> causes the specified environment variable to be given a universal scope. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
+- <code>-n</code> or <code>--names</code> List only the names of all defined variables
+- <code>-q</code> or <code>--query</code> test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined.
+- <code>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes
+- <code>-x</code> or <code>--export</code> causes the specified environment variable to be exported to child processes
 
 If set is called with no arguments, the names and values of all
-environment variables are printed.
-
-If set is called with only one argument, the scope of the variable
-with the given name will be changed as specified, but it's value will
-remain the same. If the variable did not previously exist, it's value
-will be an empty string.
-
-If the \c -e or \c --erase option is specified, the variable
-specified by the following arguments will be erased
+environment variables are printed. If some of the scope or export
+flags have been given, only the variables matching the specified scope
+are printed.
 
 If a variable is set to more than one value, the variable will be an
-array with the specified elements.
+array with the specified elements. If a variable is set to zero
+elements, it will become an array with zero elements.
 
-If the variable name is one or more array elements, such as <tt>PATH[1
-3 7]</tt>, only those array elements specified will be changed.
+If the variable name is one or more array elements, such as
+<code>PATH[1 3 7]</code>, only those array elements specified will be
+changed. When array indices are specified to set, multiple arguments
+may be used to specify additional indexes, e.g. <code>set PATH[1]
+PATH[4] /bin /sbin</code>. 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.
+
+The scoping rules when creating or updating a variable are:
+
+-# If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
+-# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previos variable scope is used.
+-# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing functions. If no function is executing, the variable will be global.
+
+The exporting rules when creating or updating a variable are identical
+to the scoping rules for variables:
+
+-# If a variable is explicitly set to either be exported or not exported, that setting will be honored.
+-# If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
+-# If a variable is not explicitly set to be either global or local and has never before been defined, the variable will not be exported.
+
+In query mode, the scope to be examined can be specified.
+
+In erase mode, if variable indices are specified, only the specified
+slices of the array variable will be erased. When erasing an entire
+variable (i.e. no slicing), the scope of the variable to be erased can
+be specified. That way, a global variable can be erased even if a
+local variable with the same name exists. Scope can not be specified
+when erasing a slice of an array. The innermost scope is always used.
+
+The set command requires all switch arguments to come before any
+non-switch arguments. For example, <code>set flags -l</code> will have
+the effect of setting the value of the variable <code>flags</code> to
+'-l', not making the variable local.
+
+In assignment mode, set exits with an exit status of zero it the
+variable assignments where sucessfully performed, with a non-zero exit
+status otherwise. In query mode, the exit status is the number of
+variables that where not found. In erase mode, set exits with a zero
+exit status in case of success, with a non-zero exit status if the
+commandline was invalid, if the variable was write-protected or if the
+variable did not exist.
 
 \subsection set-example Example
 
-<tt>set foo hi</tt> sets the value of the variable foo to be hi.
+<code>set -xg</code> will print all global, exported variables.
 
-<tt>set -e smurf</tt> removes the variable \c smurf.
+<code>set foo hi</code> sets the value of the variable foo to be hi.
 
-<tt>set PATH[4] ~/bin</tt> changes the fourth element of the \c PATH array to \c ~/bin
+<code>set -e smurf</code> removes the variable \c smurf.
+
+<code>set PATH[4] ~/bin</code> changes the fourth element of the \c PATH array to \c ~/bin

doc_src/set_color.txt

@@ -11,10 +11,21 @@ COLOR is one of black, red, green, brown, yellow, blue, magenta,
 purple, cyan, white and normal. 
 
 - \c -b, \c --background Set the background color
-- \c -o, \c --bold Set bold or extra bright mode
+- \c -c, \c --print-colors Prints a list of all valid color names
 - \c -h, \c --help Display help message and exit
+- \c -o, \c --bold Set bold or extra bright mode
+- \c -u, \c --underline Set underlined mode
 - \c -v, \c --version Display version and exit
 
+
 Calling <tt>set_color normal</tt> will set the terminal color to
 whatever is the default color of the terminal.
 
+Some terminals use the --bold escape sequence to switch to a brighter
+color set. On such terminals, <code>set_color white</code> will result
+in a grey font color, while <code>set_color --bold white</code> will
+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.
+

doc_src/status.txt

@@ -5,7 +5,7 @@
  <tt>status [OPTION]</tt>
 
 \subsection status-description Description
-- <tt>-c</tt> or <tt>--is-command-substitution</tt> returns 0 if fish is currently executing a command usbstitution
+- <tt>-c</tt> or <tt>--is-command-substitution</tt> returns 0 if fish is currently executing a command substitution
 - <tt>-b</tt> or <tt>--is-block</tt> returns 0 if fish is currently executing a block of code
 - <tt>-i</tt> or <tt>--is-interactive</tt> returns 0 if fish is interactive, i.e.connected to a keyboard
-- <tt>-l</tt> or <tt>--is-login</tt> returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH. 
+- <tt>-l</tt> or <tt>--is-login</tt> returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH.

doc_src/switch.txt

@@ -8,11 +8,23 @@
 
 The \c switch statement is used to perform one of several blocks of
 commands depending on whether a specified value equals one of several
-wildcarded values.
+wildcarded values. The \c case statement is used together with the \c
+switch statement in order to determine which block should be
+performed.
+
+Each \c case command is given one or more parameter. The first \c case
+command with a parameter that matches the string specified in the
+switch command will be evaluated. \c case parameters may contain
+wildcards. These need to be escaped or quoted in order to avoid
+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 stamantes of traditional shells.
 
 \subsection switch-example Example
 
-If the variable \$animal contins the name of an animal, the
+If the variable \$animal contains the name of an animal, the
 following code would attempt to classify it:
 
 <p>
@@ -22,16 +34,18 @@ switch $animal
         echo evil
     case wolf dog human moose dolphin whale
         echo mammal
-    case duck goose albatros
+    case duck goose albatross
         echo bird
     case shark trout stingray
         echo fish
+    case '*'
+        echo I have no idea what a $animal is
 end
 </pre>
 </p>
 <p>
 
-If the above code was run with \$animal set to \c whale, the output
-would be \c mammal.  
+If the above code was run with \c \$animal set to \c whale, the output
+would be \c mammal.
 
 </p>

doc_src/tokenize.txt

@@ -1,14 +0,0 @@
-
-\section tokenize tokenize - tokenize a string
-
-\subsection tokenize-synopsis Synopsis
- <tt>tokenize [STRING...]</tt>
-
-\subsection tokenize-description Description
-- STRING is the string or list of strings to tokenize. Each token will be printed on a line by itself
-- \c -e, \c --with-empty allow empty tokens
-- \c -n, \c --no-empty ignore empty tokens (Default)
-- <tt>-d DELIMITER</tt>,  <tt>--delimiter=DELIMITER</tt> is the list of characters that will be used as delimiters. If unspecified, the IFS environment variable will be used as the delimiter string,
-- \c -h, \c --help Display help message and exit
-- \c -v, \c --version Display version and exit
-

doc_src/trap.txt

@@ -0,0 +1,37 @@
+
+\section trap trap - perform an action when the shell receives a signal
+
+\subsection trap-synopsis Synopsis
+<tt>trap [OPTIONS] [[ARG] SIGSPEC ... ]</tt>
+
+\subsection trap-description Description
+
+Trap is a shellscript wrapper around the fish event delivery
+framework. IT is defined for backwards compatibility reasons. For
+other uses, it is recommended to define a <a
+href='index.html#event'>event handler</a>.
+
+- ARG is the command to be executed on signal delivery
+- SIGSPEC is the name of the signal to trap
+- \c -h or \c --help Display help and exit
+- \c -l or \c --list-signals print a list of signal names
+- \c -p or \c --print print all defined signal handlers
+
+If ARG and SIGSPEC are both specified, ARG is the command to be
+executed when the signal specified by SIGSPEC is delivered.
+
+If ARG is absent (and there is a single SIGSPEC) or -, each specified
+signal is reset to its original disposition (the value it had upon
+entrance to the shell).  If ARG is the null string the signal
+specified by each SIGSPEC is ignored by the shell and by the commands
+it invokes.
+
+If ARG is not present and -p has been supplied, then the trap commands
+associated with each SIGSPEC are displayed. If no arguments are
+supplied or if only -p is given, trap prints the list of commands
+associated with each signal.
+
+Signal names are case insensitive and the SIG prefix is optional.
+
+The return status is 1 if any SIGSPEC is invalid; otherwise trap
+returns 0.

doc_src/type.txt

@@ -6,15 +6,18 @@
 
 \subsection type-description Description
 
-With no options, indicate how each name would be interpreted if used as a command name.  
+With no options, indicate how each name would be interpreted if used as a command name.
 
 - \c -h or \c --help print this message
 - \c -a or \c --all print all of possible definitions of the specified names
-- \c -f or \c --no-functions supresses function and builtin lookup
+- \c -f or \c --no-functions suppresses function and builtin lookup
 - \c -t or \c --type print a string which is one of alias, keyword, function, builtin, or file if name is an alias, shell reserved word, function, builtin, or disk file, respectively
 - \c -p or \c --path either return the name of the disk file that would be executed if name were specified as a command name, or nothing if 'type  -t  name' would  not  return 'file'
 - \c -P or \c --force-path either return the name of the disk file that would be executed if name were specified as a command name, or nothing no file with the specified name could be found in the PATH
 
+\c type returns a zero exit status if the specified command was found,
+otherwise the exit status is one.
+
 \subsection type-example Example
 
 <tt>type fg</tt> outputs the string 'fg is a shell builtin'.

doc_src/ulimit.txt

@@ -1,5 +1,5 @@
 
-\section ulimit ulimit - Set or get the shells resurce usage limits
+\section ulimit ulimit - Set or get the shells resource usage limits
 
 \subsection ulimit-synopsis Synopsis
 <tt>ulimit [OPTIONS] [LIMIT]</tt>
@@ -38,7 +38,7 @@ except for -t, which is in seconds and -n and -u, which are unscaled
 values. The return status is 0 unless an invalid option or argument is
 supplied, or an error occurs while setting a new limit.
 
-The fish implementation of ulimit should behave identically to the implementation in bash, except for these differences: 
+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.

doc_src/umask.txt

@@ -1,5 +1,5 @@
 
-\section umask umask - Set or get the shells resurce usage limits
+\section umask umask - Set or get the shells resource usage limits
 
 \subsection umask-synopsis Synopsis
 <code>umask [OPTIONS] [MASK]</code>
@@ -10,9 +10,30 @@ With no argument, the current file-creation mask is printed, if an
 argument is specified, it is the new file creation mask. The mask may
 be specified as an octal number, in which case it is interpreted as
 the rights that should be masked away, i.e. it is the inverse of the
-file permissions any new files will have. If a synbolic mask is
-specified, the actual file permission bits, and not the inverse, are
-specified.
+file permissions any new files will have.
+
+If a symbolic mask is specified, the actual file permission bits, and
+not the inverse, should be specified. A symbolic mask is a comma
+separated list of rights. Each right consists of three parts:
+
+- The first part specifies to whom this set of right applies, and can
+be one of \c u, \c g, \c o or \c a, where \c u specifies the user who
+owns the file, \c g specifies the group owner of the file, \c o
+specific other users rights and \c a specifies all three should be
+changed.
+- The second part of a right specifies the mode, and can be one of \c
+=, \c + or \c -, where \c = specifies that the rights should be set to
+the new value, \c + specifies that the specified right should be added
+to those previously specified and \c - specifies that the specified
+rights should be removed from those previously specified.
+- The third part of a right specifies what rights should be changed
+and can be any combination of \c r, \c w and \c x, representing
+read, write and execute rights.
+
+If the first and second parts are skipped, they are assumed to be \c a
+and \c =, respectively. As an example, <code>r,u+w</code> means all
+users should have read access and the file owner should also have
+write access.
 
 - <code>-h</code> or <code>--help</code> print this message
 - <code>-S</code> or <code>--symbolic</code> prints the file-creation mask in symbolic form instead of octal form. Use <code>man chmod</code> for more information.

doc_src/vared.txt

@@ -0,0 +1,15 @@
+
+\section vared vared - Interactively edit the value of an environment variable 
+
+\subsection vared-synopsis Synopsis
+ <tt>vared VARIABLE_NAME</tt>
+
+\subsection vared-description Description
+
+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. 
+
+\subsection vared-example Example
+
+<code>vared PATH[3]</code> edits the third element of the PATH array

env.c

@@ -25,10 +25,22 @@
 #include <termio.h>
 #endif
 
+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
+#if HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+
 #include <errno.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "proc.h"
 #include "common.h"
@@ -42,11 +54,16 @@
 #include "input_common.h"
 #include "event.h"
 
+#include "complete.h"
+
 /**
    Command used to start fishd
 */
-#define FISHD_CMD L"if which fishd >/dev/null; fishd ^/tmp/fish.%s.log; end"
+#define FISHD_CMD L"if which fishd 2>/dev/null >/dev/null; fishd ^/tmp/fishd.log.%s; end"
 
+/**
+   Value denoting a null string
+*/
 #define ENV_NULL L"\x1d"
 
 /**
@@ -91,7 +108,11 @@ typedef struct env_node
 typedef struct var_entry
 {
 	int export; /**< Whether the variable should be exported */
-	wchar_t val[0]; /**< The value of the variable */
+#if __STDC_VERSION__ < 199901L
+	wchar_t val[1]; /**< The value of the variable */
+#else
+	wchar_t val[]; /**< The value of the variable */
+#endif
 }
 	var_entry_t;
 
@@ -116,6 +137,11 @@ static hash_table_t *global;
 */
 static hash_table_t env_read_only;
 
+/**
+   Table of variables whose value is dynamically calculated, such as umask, status, etc
+*/
+static hash_table_t env_electric;
+
 /**
    Exported variable array used by execv
 */
@@ -133,19 +159,6 @@ static buffer_t export_buffer;
 */
 static int has_changed = 1;
 
-/**
-   Free hash key and hash value
-*/
-static void clear_hash_entry( const void *key, const void *data )
-{
-	var_entry_t *entry = (var_entry_t *)data;	
-	if( entry->export )
-		has_changed = 1;
-	
-	free( (void *)key );
-	free( (void *)data );
-}
-
 /**
    This stringbuffer is used to store the value of dynamically
    generated variables, such as history.
@@ -163,6 +176,36 @@ static int get_names_show_exported;
 */
 static int get_names_show_unexported;
 
+/**
+   List of all locale variable names
+*/
+static const wchar_t *locale_variable[] =
+{
+	L"LANG",
+	L"LC_ALL",
+	L"LC_COLLATE",
+	L"LC_CTYPE",
+	L"LC_MESSAGES",
+	L"LC_MONETARY",
+	L"LC_NUMERIC",
+	L"LC_TIME",
+	(void *)0
+}
+	;
+
+/**
+   Free hash key and hash value
+*/
+static void clear_hash_entry( void *key, void *data )
+{
+	var_entry_t *entry = (var_entry_t *)data;	
+	if( entry->export )
+		has_changed = 1;
+	
+	free( (void *)key );
+	free( (void *)data );
+}
+
 /**
    When fishd isn't started, this function is provided to
    env_universal as a callback, it tries to start up fishd. It's
@@ -174,7 +217,7 @@ static void start_fishd()
 {
 	string_buffer_t cmd;
 	struct passwd *pw;
-		
+	
 	sb_init( &cmd );
 	pw = getpwuid(getuid());
 	
@@ -182,7 +225,7 @@ static void start_fishd()
 	
 	if( !pw )
 	{
-		debug( 0, L"Could not get user information" );
+		debug( 0, _( L"Could not get user information" ) );
 		return;
 	}
 	
@@ -194,12 +237,112 @@ static void start_fishd()
 	sb_destroy( &cmd );
 }
 
+/**
+   Return the current umask value.
+*/
+static mode_t get_umask()
+{
+	mode_t res;
+	res = umask( 0 );
+	umask( res );
+	return res;
+}
+
+/**
+   Checks if the specified variable is a locale variable
+*/
+static int is_locale( const wchar_t *key )
+{
+	int i;
+	for( i=0; locale_variable[i]; i++ )
+		if( wcscmp(locale_variable[i], key ) == 0 )
+			return 1;
+	return 0;
+}
+
+/**
+  Properly sets all locale information
+*/
+static void handle_locale()
+{
+	const wchar_t *lc_all = env_get( L"LC_ALL" );
+	const wchar_t *lang;
+	int i;
+	wchar_t *old = wcsdup(wsetlocale( LC_MESSAGES, (void *)0 ));
+
+	/*
+	  Array of locale constants corresponding to the local variable names defined in locale_variable
+	*/
+	static const int cat[] = 
+		{
+			0, 
+			LC_ALL, 
+			LC_COLLATE,
+			LC_CTYPE,
+			LC_MESSAGES,
+			LC_MONETARY,
+			LC_NUMERIC,
+			LC_TIME
+		}
+	;
+	
+	if( lc_all )
+	{
+		wsetlocale( LC_ALL, lc_all );
+	}
+	else
+	{
+		lang = env_get( L"LANG" );
+		if( lang )
+		{
+			wsetlocale( LC_ALL, lang );
+		}
+		
+		for( i=2; locale_variable[i]; i++ )
+		{
+			const wchar_t *val = env_get( locale_variable[i] );
+			if( val )
+				wsetlocale(  cat[i], val );
+		}
+	}
+	
+	if( wcscmp( wsetlocale( LC_MESSAGES, (void *)0 ), old ) != 0 )
+	{
+
+		/* 
+		   Try to make change known to gettext. Both changing
+		   _nl_msg_cat_cntr and calling dcgettext might potentially
+		   tell some gettext implementation that the translation
+		   strings should be reloaded. We do both and hope for the
+		   best.
+		*/
+		extern int _nl_msg_cat_cntr;
+		++_nl_msg_cat_cntr;
+		dcgettext( "fish", "Changing language to English", LC_MESSAGES );
+		
+		if( is_interactive )
+		{
+			debug( 0, _(L"Changing language to English") );
+		}
+	}
+	free( old );
+		
+}
+
+
+/**
+   Universal variable callback function. This function makes sure the
+   proper events are triggered when an event occurs.
+*/
 static void universal_callback( int type,
 								const wchar_t *name, 
 								const wchar_t *val )
 {
 	wchar_t *str=0;
 	
+	if( is_locale( name ) )
+		handle_locale();
+	
 	switch( type )
 	{
 		case SET:
@@ -213,7 +356,6 @@ static void universal_callback( int type,
 	
 	if( str )
 	{
-		array_list_t arg;
 		event_t ev;
 		
 		has_changed=1;
@@ -222,29 +364,108 @@ static void universal_callback( int type,
 		ev.param1.variable=name;
 		ev.function_name=0;
 		
-		al_init( &arg );
-		al_push( &arg, L"VARIABLE" );
-		al_push( &arg, str );
-		al_push( &arg, name );
-		event_fire( &ev, &arg );		
-		al_destroy( &arg );
+		al_init( &ev.arguments );
+		al_push( &ev.arguments, L"VARIABLE" );
+		al_push( &ev.arguments, str );
+		al_push( &ev.arguments, name );
+		event_fire( &ev );		
+		al_destroy( &ev.arguments );
 	}
 }
 
+/**
+   Make sure the PATH variable contains the essaential directories
+*/
+static void setup_path()
+{
+	wchar_t *path;
+	
+	int i, j;
+	array_list_t l;
+
+	const wchar_t *path_el[] = 
+		{
+			L"/bin",
+			L"/usr/bin",
+			PREFIX L"/bin",
+			0
+		}
+	;
+
+	path = env_get( L"PATH" );
+	if( !path )
+	{
+		env_set( L"PATH", 0, ENV_EXPORT | ENV_GLOBAL );
+		path=0;
+	}	
+		
+	al_init( &l );
+	
+	if( path )
+		tokenize_variable_array( path, &l );
+	
+	for( j=0; path_el[j]; j++ )
+	{
+		int has_el=0;
+		
+		for( i=0; i<al_get_count( &l); i++ )
+		{
+			wchar_t * el = (wchar_t *)al_get( &l, i );
+			size_t len = wcslen( el );
+			while( (len > 0) && (el[len-1]==L'/') )
+				len--;
+			if( (wcslen( path_el[j] ) == len) && (wcsncmp( el, path_el[j], len)==0) )
+			{
+				has_el = 1;
+			}
+		}
+		
+		if( !has_el )
+		{
+			string_buffer_t b;
+
+			debug( 3, L"directory %ls was missing", path_el[j] );
+
+			sb_init( &b );
+			if( path )
+			{
+				sb_append( &b, path );
+			}
+			
+			sb_append2( &b,
+						ARRAY_SEP_STR,
+						path_el[j],
+						(void *)0 );
+			
+			env_set( L"PATH", (wchar_t *)b.buff, ENV_GLOBAL | ENV_EXPORT );
+			
+			sb_destroy( &b );
+			
+			al_foreach( &l, &free );
+			path = env_get( L"PATH" );
+			al_truncate( &l, 0 );
+			tokenize_variable_array( path, &l );			
+		}
+	}
+	
+	al_foreach( &l, &free );
+	al_destroy( &l );
+}
+
 void env_init()
 {
 	char **p;
+	struct passwd *pw;
+	wchar_t *uname;
 
 	sb_init( &dyn_var );
-
 	b_init( &export_buffer );
 	
-	
 	/*
 	  These variables can not be altered directly by the user
 	*/
 	hash_init( &env_read_only, &hash_wcs_func, &hash_wcs_cmp );
-
+	
 	hash_put( &env_read_only, L"status", L"" );
 	hash_put( &env_read_only, L"history", L"" );
 	hash_put( &env_read_only, L"_", L"" );
@@ -253,11 +474,22 @@ void env_init()
 	hash_put( &env_read_only, L"PWD", L"" );
 	
 	/*
-	  HOME should be writeable by root, since this is often a
+	  Names of all dynamically calculated variables
+	*/
+	hash_init( &env_electric, &hash_wcs_func, &hash_wcs_cmp );
+	hash_put( &env_electric, L"history", L"" );
+	hash_put( &env_electric, L"status", L"" );
+	hash_put( &env_electric, L"umask", L"" );
+
+	/*
+	  HOME and USER should be writeable by root, since this can be a
 	  convenient way to install software.
 	*/
 	if( getuid() != 0 )
+	{
 		hash_put( &env_read_only, L"HOME", L"" );
+		hash_put( &env_read_only, L"USER", L"" );
+	}
 	
 	top = malloc( sizeof(env_node_t) );
 	top->next = 0;
@@ -267,6 +499,11 @@ void env_init()
 	global_env = top;
 	global = &top->env;	
 
+	/*
+	  Now the environemnt variable handling is set up, the next step
+	  is to insert valid data
+	*/
+	
 	/*
 	  Import environment variables
 	*/
@@ -276,12 +513,13 @@ void env_init()
 		wchar_t *pos;
 		
 		key = str2wcs(*p);
-		
+
 		if( !key )
 			continue;
 		
 		val = wcschr( key, L'=' );
 		
+
 		if( val == 0 )
 			env_set( key, L"", ENV_EXPORT );
 		else
@@ -296,13 +534,29 @@ void env_init()
 					*pos = ARRAY_SEP;
 				pos++;
 			}
-			
+
 			env_set( key, val, ENV_EXPORT | ENV_GLOBAL );
 		}		
 		free(key);
-	}		
+	}
 
-	env_universal_init( env_get( L"FISHD_SOKET_DIR"), 
+	/*
+	  Set up the PATH variable
+	*/
+	setup_path();
+
+	/*
+	  Set up the USER variable
+	*/
+	pw = getpwuid( getuid() );
+	if( pw )
+	{
+		uname = str2wcs( pw->pw_name );
+		env_set( L"USER", uname, ENV_GLOBAL | ENV_EXPORT );
+		free( uname );
+	}
+	
+	env_universal_init( env_get( L"FISHD_SOCKET_DIR"), 
 						env_get( L"USER" ),
 						&start_fishd,
 						&universal_callback );
@@ -321,6 +575,8 @@ void env_destroy()
 		env_pop();
 
 	hash_destroy( &env_read_only );
+
+	hash_destroy( &env_electric );
 	
 	hash_foreach( global, &clear_hash_entry );
 	hash_destroy( global );
@@ -357,10 +613,10 @@ static env_node_t *env_get_node( const wchar_t *key )
 	
 	return 0;
 }
-	
-void env_set( const wchar_t *key, 
-			  const wchar_t *val, 
-			  int var_mode )
+
+int env_set( const wchar_t *key, 
+			 const wchar_t *val, 
+			 int var_mode )
 {
 	int free_val = 0;
 	var_entry_t *entry;
@@ -371,42 +627,44 @@ void env_set( const wchar_t *key,
 	int done=0;
 
 	event_t ev;
-	array_list_t ev_list;
 	int is_universal = 0;	
-	
+
+	CHECK( key, ENV_INVALID );
+		
 	if( (var_mode & ENV_USER ) && 
 		hash_get( &env_read_only, key ) )
 	{
-		return;
+		return ENV_PERM;
 	}
 	
-	if( wcscmp(key, L"LANG" )==0 )
-	{
-		fish_setlocale(LC_ALL,val);
-	}
-
 	if( wcscmp( key, L"umask" ) == 0)
 	{
 		wchar_t *end;
 		int mask;
-		
+
+		/*
+		  Set the new umask
+		*/
 		if( val && wcslen(val) )
 		{				
 			errno=0;
 			mask = wcstol( val, &end, 8 );
 	
-			if( !errno && !*end )
+			if( !errno && (!*end) && (mask <= 0777) && (mask >= 0) )
 			{
 				umask( mask );
 			}
 		}
+		/*
+		  Do not actually create a umask variable, on env_get, it will be calculated dynamically
+		*/
+		return 0;
 	}
-	
 
 	/*
 	  Zero element arrays are internaly not coded as null but as this placeholder string
 	*/
-	if( !val && ( var_mode & ENV_USER ) )
+	if( !val )
 	{
 		val = ENV_NULL;
 	}
@@ -467,8 +725,11 @@ void env_set( const wchar_t *key,
 			else
 			{
 				if( !proc_had_barrier)
+				{
+					proc_had_barrier=1;
 					env_universal_barrier();
-
+				}
+				
 				if( env_universal_get( key ) )
 				{
 					int export = 0;
@@ -490,12 +751,13 @@ void env_set( const wchar_t *key,
 				else
 				{
 					/*
-					  New variable with unspecified scope. The default scope is the innermost scope that is shadowing
+					  New variable with unspecified scope. The default
+					  scope is the innermost scope that is shadowing
 					*/
 					node = top;
 					while( node->next && !node->new_scope )
 						node = node->next;
-				
+					
 				}
 			}
 		}
@@ -503,7 +765,7 @@ void env_set( const wchar_t *key,
 		if( !done )
 		{
 			void *k, *v;
-			hash_remove( &node->env, key, (const void **)&k, (const void **)&v );
+			hash_remove( &node->env, key, &k, &v );
 			free( k );
 			free( v );
 
@@ -541,33 +803,50 @@ void env_set( const wchar_t *key,
 		ev.param1.variable = key;
 		ev.function_name = 0;
 		
-		al_init( &ev_list );
-		al_push( &ev_list, L"VARIABLE" );
-		al_push( &ev_list, key );
+		al_init( &ev.arguments );
+		al_push( &ev.arguments, L"VARIABLE" );
+		al_push( &ev.arguments, L"SET" );
+		al_push( &ev.arguments, key );
 		
 //	debug( 1, L"env_set: fire events on variable %ls", key );	
-		event_fire( &ev, &ev_list );
+		event_fire( &ev );
 //	debug( 1, L"env_set: return from event firing" );	
-		al_destroy( &ev_list );	
+		al_destroy( &ev.arguments );	
 	}
-	
+
+	if( is_locale( key ) )
+	{
+		handle_locale();
+	}
+
+	return 0;
 }
 
+
 /**
    Attempt to remove/free the specified key/value pair from the
    specified hash table.
+
+   \return zero if the variable was not found, non-zero otherwise
 */
 static int try_remove( env_node_t *n,
-					   const wchar_t *key )
+					   const wchar_t *key,
+					   int var_mode )
 {
+	void *old_key_void, *old_val_void;
 	wchar_t *old_key, *old_val;
+
 	if( n == 0 )
 		return 0;
 
 	hash_remove( &n->env, 
 				 key,
-				 (const void **)&old_key, 
-				 (const void **)&old_val );
+				 &old_key_void, 
+				 &old_val_void );
+
+	old_key = (wchar_t *)old_key_void;
+	old_val = (wchar_t *)old_val_void;
+	
 	if( old_key != 0 )
 	{
 		var_entry_t * v = (var_entry_t *)old_val;
@@ -581,25 +860,72 @@ static int try_remove( env_node_t *n,
 		return 1;
 	}
 
+	if( var_mode & ENV_LOCAL )
+		return 0;
+	
 	if( n->new_scope )
-		return try_remove( global_env, key );
+		return try_remove( global_env, key, var_mode );
 	else
-		return try_remove( n->next, key );
+		return try_remove( n->next, key, var_mode );
 }
 
 
-void env_remove( const wchar_t *key, int var_mode )
+int env_remove( const wchar_t *key, int var_mode )
 {
+	env_node_t *first_node;
+	int erased = 0;
+	
+	CHECK( key, 1 );
+		
 	if( (var_mode & ENV_USER ) && 
 		hash_get( &env_read_only, key ) )
 	{
-		return;
+		return 2;
 	}
 	
-	if( !try_remove( top, key ) )
+	first_node = top;
+	
+	if( ! (var_mode & ENV_UNIVERSAL ) )
 	{
-		env_universal_remove( key );
+		
+		if( var_mode & ENV_GLOBAL )
+		{
+			first_node = global_env;
+		}
+		
+		if( try_remove( first_node, key, var_mode ) )
+		{		
+			event_t ev;
+			
+			ev.type=EVENT_VARIABLE;
+			ev.param1.variable=key;
+			ev.function_name=0;
+			
+			al_init( &ev.arguments );
+			al_push( &ev.arguments, L"VARIABLE" );
+			al_push( &ev.arguments, L"ERASE" );
+			al_push( &ev.arguments, key );
+			
+			event_fire( &ev );	
+			
+			al_destroy( &ev.arguments );
+			erased = 1;
+		}
 	}
+	
+	if( !erased && 
+		!(var_mode & ENV_GLOBAL) &&
+		!(var_mode & ENV_LOCAL) ) 
+	{
+		erased = !env_universal_remove( key );
+	}
+
+	if( is_locale( key ) )
+	{
+		handle_locale();
+	}
+	
+	return !erased;	
 }
 
 
@@ -609,6 +935,8 @@ wchar_t *env_get( const wchar_t *key )
 	env_node_t *env = top;
 	wchar_t *item;
 	
+	CHECK( key, 0 );
+		
 	if( wcscmp( key, L"history" ) == 0 )
 	{
 		wchar_t *current;
@@ -628,7 +956,10 @@ wchar_t *env_get( const wchar_t *key )
 			wchar_t *next = history_get( i-add_current );
 			if( !next )
 			{
-				debug( 1, L"No history at idx %d\n", i );
+				/*
+				  This is not an error - it simply means the user has
+				  a short history
+				*/
 				break;
 			}
 			
@@ -656,6 +987,12 @@ wchar_t *env_get( const wchar_t *key )
 		sb_printf( &dyn_var, L"%d", proc_get_last_status() );		
 		return (wchar_t *)dyn_var.buff;		
 	}
+	else if( wcscmp( key, L"umask" )==0 )
+	{
+		sb_clear( &dyn_var );			
+		sb_printf( &dyn_var, L"0%0.3o", get_umask() );		
+		return (wchar_t *)dyn_var.buff;		
+	}
 	
 	while( env != 0 )
 	{
@@ -677,7 +1014,11 @@ wchar_t *env_get( const wchar_t *key )
 			env = env->next;
 	}	
 	if( !proc_had_barrier)
+	{
+		proc_had_barrier=1;
 		env_universal_barrier();
+	}
+	
 	item = env_universal_get( key );
 	
 	if( !item || (wcscmp( item, ENV_NULL )==0))
@@ -688,38 +1029,67 @@ wchar_t *env_get( const wchar_t *key )
 		return item;
 }
 
-int env_exist( const wchar_t *key )
+int env_exist( const wchar_t *key, int mode )
 {
 	var_entry_t *res;
-	env_node_t *env = top;
-	wchar_t *item;
-	
-    if( hash_get( &env_read_only, key ) )
-    {
-        return 1;
-    }
-	
-	while( env != 0 )
+	env_node_t *env;
+	wchar_t *item=0;
+
+	CHECK( key, 0 );
+		
+	/*
+	  Read only variables all exist, and they are all global. A local
+	  version can not exist.
+	*/
+	if( ! (mode & ENV_LOCAL) && ! (mode & ENV_UNIVERSAL) )
 	{
-		res = (var_entry_t *) hash_get( &env->env, 
-										key );
-		if( res != 0 )
+		if( hash_get( &env_read_only, key ) || hash_get( &env_electric, key ) )
 		{
 			return 1;
 		}
-		
-		if( env->new_scope )
-			env = global_env;
-		else
-			env = env->next;
-	}	
-	if( !proc_had_barrier)
-		env_universal_barrier();
-	item = env_universal_get( key );
+	}
+
+	if( ! (mode & ENV_UNIVERSAL) )
+	{
+		env = (mode & ENV_GLOBAL)?global_env:top;
+					
+		while( env != 0 )
+		{
+			res = (var_entry_t *) hash_get( &env->env, 
+											key );
+			if( res != 0 )
+			{
+				return 1;
+			}
+			
+			if( mode & ENV_LOCAL )
+				break;
+			
+			if( env->new_scope )
+				env = global_env;
+			else
+				env = env->next;
+		}	
+	}
 	
+	if( ! (mode & ENV_LOCAL) && ! (mode & ENV_GLOBAL) )
+	{
+		if( !proc_had_barrier)
+		{
+			proc_had_barrier=1;
+			env_universal_barrier();
+		}
+		
+		item = env_universal_get( key );
+	
+	}
 	return item != 0;
+
 }
 
+/**
+   Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported variable.
+*/
 static int local_scope_exports( env_node_t *n )
 {
 	
@@ -755,8 +1125,20 @@ void env_pop()
 {
 	if( &top->env != global )
 	{
+		int i;
+		int locale_changed = 0;
+		
 		env_node_t *killme = top;
 
+		for( i=0; locale_variable[i]; i++ )
+		{
+			if( hash_get( &killme->env, locale_variable[i] ) )
+			{
+				locale_changed = 1;
+				break;
+			}
+		}
+
 		if( killme->new_scope )
 		{
 			has_changed |= killme->export || local_scope_exports( killme->next );
@@ -766,12 +1148,15 @@ void env_pop()
 		hash_foreach( &killme->env, &clear_hash_entry );
 		hash_destroy( &killme->env );
 		free( killme );
+
+		if( locale_changed )
+			handle_locale();
 		
 	}
 	else
 	{
 		debug( 0,
-			   L"Tried to pop empty environment stack." );
+			   _( L"Tried to pop empty environment stack." ) );
 		sanity_lose();
 	}	
 }
@@ -781,23 +1166,38 @@ void env_pop()
    Function used with hash_foreach to insert keys of one table into
    another
 */
-static void add_key_to_hash( const void *key, 
-							 const void *data,
+static void add_key_to_hash( void *key, 
+							 void *data,
 							 void *aux )
 {
 	var_entry_t *e = (var_entry_t *)data;
 	if( ( e->export && get_names_show_exported) || 
 		( !e->export && get_names_show_unexported) )
+	{
 		hash_put( (hash_table_t *)aux, key, 0 );
+	}
 }
 
-static void add_to_hash( const void *k, void *aux )
+/**
+   Add key to hashtable
+*/
+static void add_to_hash( void *k, void *aux )
 {
 	hash_put( (hash_table_t *)aux,
 			  k,
 			  0 );
 }
 
+/**
+   Add key to list
+*/
+static void add_key_to_list( void * key, 
+							 void * val, 
+							 void *aux )
+{
+	al_push( (array_list_t *)aux, key );
+}
+
 
 void env_get_names( array_list_t *l, int flags )
 {
@@ -808,6 +1208,8 @@ void env_get_names( array_list_t *l, int flags )
 	hash_table_t names;
 	env_node_t *n=top;
 
+	CHECK( l, );
+	
 	get_names_show_exported = 
 		flags & ENV_EXPORT|| (!(flags & ENV_UNEXPORT));
 	get_names_show_unexported = 
@@ -844,11 +1246,9 @@ void env_get_names( array_list_t *l, int flags )
 		hash_foreach2( &global_env->env, 
 					   add_key_to_hash,
 					   &names );
+
 		if( get_names_show_unexported )
-		{
-			al_push( l, L"history" );
-			al_push( l, L"status" );
-		}
+			hash_foreach2( &env_electric, &add_key_to_list, l );
 		
 		if( get_names_show_exported )
 		{
@@ -878,7 +1278,7 @@ void env_get_names( array_list_t *l, int flags )
 /**
    Function used by env_export_arr to iterate over hashtable of variables
 */
-static void export_func1( const void *k, const void *v, void *aux )
+static void export_func1( void *k, void *v, void *aux )
 {
 	var_entry_t *val_entry = (var_entry_t *)v;
 	if( val_entry->export )
@@ -894,7 +1294,7 @@ static void export_func1( const void *k, const void *v, void *aux )
 /**
    Function used by env_export_arr to iterate over hashtable of variables
 */
-static void export_func2( const void *k, const void *v, void *aux )
+static void export_func2( void *k, void *v, void *aux )
 {
 	wchar_t *key = (wchar_t *)k;
 	wchar_t *val = (wchar_t *)v;
@@ -908,7 +1308,7 @@ static void export_func2( const void *k, const void *v, void *aux )
 
 	if( !ks || !vs )
 	{
-		die_mem();
+		DIE_MEM();
 	}
 	
 	/*
@@ -931,11 +1331,14 @@ static void export_func2( const void *k, const void *v, void *aux )
 	free( vs );
 }
 
-char **env_export_arr( int recalc)
+char **env_export_arr( int recalc )
 {
 	if( recalc && !proc_had_barrier)
+	{
+		proc_had_barrier=1;
 		env_universal_barrier();
-
+	}
+	
 	if( has_changed )
 	{
 		array_list_t uni;

env.h

@@ -41,6 +41,16 @@
 */
 #define ENV_UNIVERSAL 32
 
+/**
+   Error code for trying to alter read-only variable
+*/
+enum{
+	ENV_PERM = 1,
+	ENV_INVALID
+}
+;
+
+
 /**
    Initialize environment variable data
 */
@@ -61,9 +71,15 @@ void env_destroy();
    \param val The value
    \param mode The type of the variable. Can be any combination of ENV_GLOBAL, ENV_LOCAL, ENV_EXPORT and ENV_USER. If mode is zero, the current variable space is searched and the current mode is used. If no current variable with the same name is found, ENV_LOCAL is assumed.
 
+   \returns 0 on suicess or an error code on failiure.
+
+   The current error codes are:
+
+   * ENV_PERM, can only be returned when setting as a user, e.g. ENV_USER is set. This means that the user tried to change a read-only variable.
+   * ENV_INVALID, the variable name or mode was invalid
 */
 
-void env_set( const wchar_t *key, 
+int env_set( const wchar_t *key, 
 			  const wchar_t *val,
 			  int mode );
 
@@ -80,16 +96,21 @@ wchar_t *env_get( const wchar_t *key );
 /**
    Returns 1 if the specified key exists. This can't be reliable done
    using env_get, since env_get returns null for 0-element arrays
+
+   \param key The name of the variable to remove
+   \param mode the scope to search in. All scopes are searched if unset
 */
-int env_exist( const wchar_t *key );
+int env_exist( const wchar_t *key, int mode );
 
 /**
    Remove environemnt variable
    
    \param key The name of the variable to remove
-   \param mode should be ENV_USER if this is a remove request from the user, 0 otherwise. If this is a user request, read-only variables can not be removed.
+   \param mode should be ENV_USER if this is a remove request from the user, 0 otherwise. If this is a user request, read-only variables can not be removed. The mode may also specify the scope of the variable that should be erased.
+
+   \return zero if the variable existed, and non-zero if the variable did not exist
 */
-void env_remove( const wchar_t *key, int mode );
+int env_remove( const wchar_t *key, int mode );
 
 /**
   Push the variable stack. Used for implementing local variables for functions and for-loops.

env_universal.c

@@ -1,5 +1,6 @@
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -11,15 +12,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <fcntl.h>
+
 #if HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
+
+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include <signal.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -112,24 +122,21 @@ static int get_socket( int fork_ok )
 	local.sun_family = AF_UNIX;
 	strcpy(local.sun_path, name );
 	free( name );
-	len = strlen(local.sun_path) + sizeof(local.sun_family);
+	len = sizeof(local);
 	
 	if( connect( s, (struct sockaddr *)&local, len) == -1 ) 
 	{
 		close( s );
-		if( fork_ok )
+		if( fork_ok && start_fishd )
 		{
 			debug( 2, L"Could not connect to socket %d, starting fishd", s );
 			
-			if( start_fishd )
-			{
-				start_fishd();
-			}
-			
+			start_fishd();
+									
 			return get_socket( 0 );
 		}
 		
-		debug( 3, L"Could not connect to socket %d, already tried forking, giving up", s );
+		debug( 2, L"Could not connect to socket %d, already tried manual restart (or no command supplied), giving up", s );
 		return -1;
 	}
 	
@@ -174,8 +181,13 @@ static void check_connection()
 	
 	if( env_universal_server.killme )
 	{
-		debug( 2, L"Lost connection to universal variable server." );
-		close( env_universal_server.fd );
+		debug( 3, L"Lost connection to universal variable server." );
+		
+		if( close( env_universal_server.fd ) )
+		{
+			wperror( L"close" );
+		}
+		
 		env_universal_server.fd = -1;
 		env_universal_server.killme=0;
 		sb_clear( &env_universal_server.input );	
@@ -193,7 +205,7 @@ static void reconnect()
 	if( get_socket_count >= RECONNECT_COUNT )
 		return;
 	
-	debug( 2, L"Get new fishd connection" );
+	debug( 3, L"Get new fishd connection" );
 	
 	init = 0;
 	env_universal_server.fd = get_socket(1);
@@ -210,7 +222,7 @@ void env_universal_init( wchar_t * p,
 						 void (*sf)(),
 						 void (*cb)( int type, const wchar_t *name, const wchar_t *val ))
 {
-	debug( 2, L"env_universal_init()" );
+	debug( 3, L"env_universal_init()" );
 	path=p;
 	user=u;
 	start_fishd=sf;	
@@ -229,7 +241,7 @@ void env_universal_init( wchar_t * p,
 	{
 		env_universal_barrier();
 	}
-	debug( 2, L"end env_universal_init()" );
+	debug( 3, L"end env_universal_init()" );
 }
 
 void env_universal_destroy()
@@ -244,8 +256,13 @@ void env_universal_destroy()
 			wperror( L"fcntl" );
 		}
 		try_send_all( &env_universal_server );	
+		
+		if( close( env_universal_server.fd ) )
+		{
+			wperror( L"close" );
+		}
 	}
-	close( env_universal_server.fd );
+	
 	env_universal_server.fd =-1;
 	q_destroy( &env_universal_server.unsent );
 	sb_destroy( &env_universal_server.input );	
@@ -262,6 +279,8 @@ int env_universal_read_all()
 	if( !init)
 		return 0;
 
+	debug( 3, L"env_universal_read_all()" );
+
 	if( env_universal_server.fd == -1 )
 	{
 		reconnect();		
@@ -286,15 +305,21 @@ wchar_t *env_universal_get( const wchar_t *name )
 {
 	if( !init)
 		return 0;
-	
-	if( !name )
-		return 0;
 
+	CHECK( name, 0 );
+	
+	debug( 3, L"env_universal_get( \"%ls\" )", name );
 	return env_universal_common_get( name );
 }
 
 int env_universal_get_export( const wchar_t *name )
 {
+	if( !init)
+		return 0;
+
+	CHECK( name, 0 );
+	
+	debug( 3, L"env_universal_get_export()" );
 	return env_universal_common_get_export( name );
 }
 
@@ -305,7 +330,7 @@ void env_universal_barrier()
 
 	if( !init || ( env_universal_server.fd == -1 ))
 		return;
-	
+
 	barrier_reply = 0;
 
 	/*
@@ -330,6 +355,7 @@ void env_universal_barrier()
 		if( env_universal_server.fd == -1 )
 		{
 			reconnect();
+			debug( 2, L"barrier interrupted, exiting" );
 			return;			
 		}
 		
@@ -347,6 +373,7 @@ void env_universal_barrier()
 		if( env_universal_server.fd == -1 )
 		{
 			reconnect();
+			debug( 2, L"barrier interrupted, exiting (2)" );
 			return;			
 		}		
 		FD_ZERO( &fds );
@@ -364,8 +391,10 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export )
 	
 	if( !init )
 		return;
-	
-	debug( 3, L"env_universal_set( %ls, %ls )", name, value );
+
+	CHECK( name, );
+		
+	debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name, value );
 	
 	msg = create_message( export?SET_EXPORT:SET, 
 						  name, 
@@ -382,26 +411,37 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export )
 	env_universal_barrier();
 }
 
-void env_universal_remove( const wchar_t *name )
+int env_universal_remove( const wchar_t *name )
 {
+	int res;
+	
 	message_t *msg;
 	if( !init )
-		return;
+		return 1;
+		
+	CHECK( name, 1 );
+
+	res = !env_universal_common_get( name );
 	
-	debug( 2,
-		   L"env_universal_remove( %ls )",
+	debug( 3,
+		   L"env_universal_remove( \"%ls\" )",
 		   name );
 
 	msg= create_message( ERASE, name, 0);
 	msg->count=1;
 	q_put( &env_universal_server.unsent, msg );
 	env_universal_barrier();
+
+	return res;
 }
 
 void env_universal_get_names( array_list_t *l,
                               int show_exported,
                               int show_unexported )
 {
+	if( !init )
+		return;
+	
 	env_universal_common_get_names( l, 
 									show_exported,
 									show_unexported );	

env_universal.h

@@ -1,4 +1,4 @@
-/** \file env_universl.h
+/** \file env_universal.h
 	Universal variable client library
 */
 
@@ -18,7 +18,7 @@ extern connection_t env_universal_server;
    Initialize the envuni library
 */
 void env_universal_init();
-/*
+/**
   Free memory used by envuni
 */
 void env_universal_destroy();
@@ -40,8 +40,10 @@ int env_universal_get_export( const wchar_t *name );
 void env_universal_set( const wchar_t *name, const wchar_t *val, int export );
 /**
    Erase a universal variable
+   
+   \return zero if the variable existed, and non-zero if the variable did not exist
 */
-void env_universal_remove( const wchar_t *name );
+int env_universal_remove( const wchar_t *name );
 
 /**
    Read all available messages from the server.

env_universal_common.c

@@ -5,6 +5,9 @@
    client library and by the daemon.
 
 */
+#include "config.h"
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -25,7 +28,9 @@
 #include <signal.h>
 #include <sys/stat.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -65,12 +70,12 @@
    should be exported. Obviously, it needs to be allocated large
    enough to fit the value string.
 */
-typedef struct var_entry
+typedef struct var_uni_entry
 {
 	int export; /**< Whether the variable should be exported */
 	wchar_t val[0]; /**< The value of the variable */
 }
-var_entry_t;
+var_uni_entry_t;
 
 
 static void parse_message( wchar_t *msg,
@@ -81,6 +86,9 @@ static void parse_message( wchar_t *msg,
 */
 hash_table_t env_universal_var;
 
+/**
+   Callback function, should be called on all events
+*/
 void (*callback)( int type, 
 				  const wchar_t *key, 
 				  const wchar_t *val );
@@ -100,13 +108,16 @@ static int get_names_show_unexported;
 
 void env_universal_common_init( void (*cb)(int type, const wchar_t *key, const wchar_t *val ) )
 {
-	debug( 2, L"Init env_universal_common" );
+	debug( 3, L"Init env_universal_common" );
 	callback = cb;
 	hash_init( &env_universal_var, &hash_wcs_func, &hash_wcs_cmp );
 }
 
-static void erase( const void *key,
-				   const void *data )
+/**
+   Free both key and data
+*/
+static void erase( void *key,
+				   void *data )
 {
 	free( (void *)key );
 	free( (void *)data );
@@ -180,23 +191,29 @@ void read_message( connection_t *src )
 			}
 			else
 			{
-				sb_printf( &src->input, L"%lc", res );
+				sb_append_char( &src->input, res );
 			}
 		}
 	}
 }
 
+/**
+   Remove variable with specified name
+*/
 static void remove_entry( wchar_t *name )
 {
 	void *k, *v;
 	hash_remove( &env_universal_var, 
 				 name,
-				 (const void **)&k,
-				 (const void **)&v );
+				 &k,
+				 &v );
 	free( k );
 	free( v );
 }
 
+/**
+   Test if the message msg contains the command cmd
+*/
 static int match( const wchar_t *msg, const wchar_t *cmd )
 {
 	size_t len = wcslen( cmd );
@@ -209,11 +226,13 @@ static int match( const wchar_t *msg, const wchar_t *cmd )
 	return 1;
 }
 
-
+/**
+   Parse message msg
+*/
 static void parse_message( wchar_t *msg, 
 						   connection_t *src )
 {
-	debug( 2, L"parse_message( %ls );", msg );
+	debug( 3, L"parse_message( %ls );", msg );
 	
 	if( msg[0] == L'#' )
 		return;
@@ -239,10 +258,10 @@ static void parse_message( wchar_t *msg,
 
 			val = unescape( val, 0 );
 			
-			var_entry_t *entry = 
-				malloc( sizeof(var_entry_t) + sizeof(wchar_t)*(wcslen(val)+1) );			
+			var_uni_entry_t *entry = 
+				malloc( sizeof(var_uni_entry_t) + sizeof(wchar_t)*(wcslen(val)+1) );			
 			if( !entry )
-				die_mem();
+				DIE_MEM();
 			entry->export=export;
 			
 			wcscpy( entry->val, val );
@@ -307,8 +326,13 @@ static void parse_message( wchar_t *msg,
 	}		
 }
 
-int try_send( message_t *msg,
-			  int fd )
+/**
+   Attempt to send the specified message to the specified file descriptor
+
+   \return 1 on sucess, 0 if the message could not be sent without blocking and -1 on error
+*/
+static int try_send( message_t *msg,
+					 int fd )
 {
 
 	debug( 3,
@@ -409,7 +433,7 @@ message_t *create_message( int type,
 			msg = malloc( sizeof( message_t ) + sz );
 			
 			if( !msg )
-				die_mem();
+				DIE_MEM();
 			
 			strcpy( msg->body, (type==SET?SET_MBS:SET_EXPORT_MBS) );
 			strcat( msg->body, " " );
@@ -429,7 +453,7 @@ message_t *create_message( int type,
             msg = malloc( sizeof( message_t ) + sz );
 
 			if( !msg )
-				die_mem();
+				DIE_MEM();
 			
             strcpy( msg->body, ERASE_MBS " " );
             strcat( msg->body, key );
@@ -442,7 +466,7 @@ message_t *create_message( int type,
 			msg = malloc( sizeof( message_t )  + 
 						  strlen( BARRIER_MBS ) +2);
 			if( !msg )
-				die_mem();
+				DIE_MEM();
 			strcpy( msg->body, BARRIER_MBS "\n" );
 			break;
 		}
@@ -452,7 +476,7 @@ message_t *create_message( int type,
 			msg = malloc( sizeof( message_t )  +
 						  strlen( BARRIER_REPLY_MBS ) +2);
 			if( !msg )
-				die_mem();
+				DIE_MEM();
 			strcpy( msg->body, BARRIER_REPLY_MBS "\n" );
 			break;
 		}
@@ -474,11 +498,11 @@ message_t *create_message( int type,
    Function used with hash_foreach to insert keys of one table into
    another
 */
-static void add_key_to_hash( const void *key, 
-							 const void *data,
+static void add_key_to_hash( void *key, 
+							 void *data,
 							 void *aux )
 {
-	var_entry_t *e = (var_entry_t *)data;
+	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 );
@@ -498,7 +522,7 @@ void env_universal_common_get_names( array_list_t *l,
 
 wchar_t *env_universal_common_get( const wchar_t *name )
 {
-	var_entry_t *e = (var_entry_t *)hash_get( &env_universal_var, name );	
+	var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name );	
 	if( e )
 		return e->val;
 	return 0;	
@@ -506,18 +530,28 @@ wchar_t *env_universal_common_get( const wchar_t *name )
 
 int env_universal_common_get_export( const wchar_t *name )
 {
-	var_entry_t *e = (var_entry_t *)hash_get( &env_universal_var, name );
+	var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name );
 	if( e )
 		return e->export;
 	return 0;
 }
 
-static void enqueue( const void *k,
-					 const void *v,
+/**
+   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_entry_t *val = (const var_entry_t *)v;
+	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 );

env_universal_common.h

@@ -88,7 +88,13 @@ typedef struct connection
 */
 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[0];
 }
 	message_t;
@@ -136,6 +142,9 @@ wchar_t *env_universal_common_get( const wchar_t *name );
 */
 int env_universal_common_get_export( const wchar_t *name );
 
+/**
+   Add messages about all existing variables to the specified connection
+*/
 void enqueue_all( connection_t *c );
 
 

etc/fish.in

@@ -0,0 +1,71 @@
+#
+# Init file for fish
+#
+# @configure_input@
+
+#
+# Set default search paths for completions and shellscript functions
+#
+
+set -g fish_function_path ~/.fish.d/functions    @sysconfdir@/fish.d/functions    @datadir@/fish/functions 
+set -g fish_complete_path ~/.fish.d/completions  @sysconfdir@/fish.d/completions  @datadir@/fish/completions 
+
+#
+# Set default field separators
+#
+
+set -g IFS \ \t\n
+
+#
+# Some things should only be done for login terminals
+#
+
+if status --is-login
+
+	#
+	# Set some value for LANG if nothing was set before, and this is a
+	# login shell.
+	#
+
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	# Check for i18n information in
+	# /etc/sysconfig/i18n
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+
+	#
+	# Put linux consoles in unicode mode.
+	#
+
+	if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null
+		if test "$TERM" = linux
+			if which unicode_start >/dev/null
+				unicode_start
+			end
+		end
+	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
+#
+
+for i in fish.d/*.fish
+	. $i
+end

etc/fish_inputrc

@@ -19,7 +19,7 @@ $if fish
 	"\M-d": if test -z (commandline); dirh; else; commandline -f kill-word; end
 	"\C-d": delete-or-exit	
 # This will make sure the output of the current command is paged using the less pager when you press Meta-p
-	"\M-p": if commandline -j|grep -v "less *$" >/dev/null; commandline -aj "|less;"; end
+	"\M-p": if commandline -j|grep -v 'less *$' >/dev/null; commandline -aj "|less;"; end
 $endif
 
 # Include user-specific inputrc file after including fish-specific

etc/fish_interactive.fish.in

@@ -1,6 +1,7 @@
 #
 # Initializations that should only be performed when in interactive mode
 #
+# @configure_input@
 
 if not status --is-interactive
 	exit
@@ -10,26 +11,15 @@ end
 # Print a greeting 
 #
 
-printf 'Welcome to fish, the friendly interactive shell\nType ' 
-set_color green 
-printf 'help ' 
-set_color normal 
-printf 'for instructions on how to use fish\n' 
+printf (_ 'Welcome to fish, the friendly interactive shell\n')
+printf (_ 'Type %shelp%s for instructions on how to use fish\n') (set_color green) (set_color normal)
 
 #
 # Set exit message
 #
 
-function fish_on_exit -d "Commands to execute when fish exits"
-	echo Good bye
-end
-
-# Set the default prompt command. Make sure that every terminal escape
-# string has a newline before and after, so that fish will know how
-# long it is.
-
-function fish_prompt -d "Write out the prompt"
-	printf '%s@%s \n%s\n%s\n%s\n> ' (whoami) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+function fish_on_exit -d (_ "Commands to execute when fish exits") --on-process %self
+	printf (_ "Good bye\n")
 end
 
 #
@@ -39,9 +29,11 @@ end
 # other than fish, which may use a different file. The new value should
 # be exported, since the fish inputrc file plays nice with other files 
 # by including them when found.
+# Give priority to the default file installed with fish in 
+# @sysconfdir@/fish_inputrc.
 #
 
-for i in ~/.fish_inputrc ~/etc/fish_inputrc /etc/fish_inputrc ~/.inputrc /etc/inputrc
+for i in ~/.fish_inputrc @sysconfdir@/fish_inputrc ~/.inputrc /etc/inputrc
 	if test -f $i
 		set -xg INPUTRC $i
 		break
@@ -50,19 +42,25 @@ end
 
 
 #
-# Set various color values
+# Set various defaults using these throwaway functions
 #
 
 function set_default -d "Set an universal variable, unless it has already been set"
-	if not set -q $argv[1] 
+	if not set -q $argv[1]
 		set -U -- $argv	
 	end
+	if not set -q $argv[1]
+		set -g -- $argv	
+	end
 end
 
 function set_exported_default -d "Set an exported universal variable, unless it has already been set"
 	if not set -q $argv[1]
 		set -Ux -- $argv	
 	end
+	if not set -q $argv[1]
+		set -gx -- $argv	
+	end
 end
 
 
@@ -70,8 +68,12 @@ end
 set_default fish_color_normal normal
 set_default fish_color_command green
 set_default fish_color_redirection normal
-set_default fish_color_comment brown
-set_default fish_color_error red
+set_default fish_color_comment red
+set_default fish_color_error red --bold
+set_default fish_color_escape cyan
+set_default fish_color_operator cyan
+set_default fish_color_quote brown
+set_default fish_color_valid_path --underline
 
 set_default fish_color_cwd green
 
@@ -87,7 +89,10 @@ set_default fish_pager_color_completion normal
 set_default fish_pager_color_description normal
 set_default fish_pager_color_progress cyan
 
+#
 # Directory history colors
+#
+
 set_default fish_color_history_current cyan
 
 
@@ -95,25 +100,11 @@ set_default fish_color_history_current cyan
 # Setup the CDPATH variable
 #
 
-set_exported_default CDPATH . ~
+set_default CDPATH . ~
 
 #
-# Match colors for grep, if supported
+# Remove temporary functions for setting default variable values
 #
 
-if grep --color=auto --help 1>/dev/null 2>/dev/null
-	set_exported_default GREP_COLOR '97;45'
-	set_exported_default GREP_OPTIONS '--color=auto'
-end
-
-#
-# Color definitions for ls, if supported
-#
-
-if command ls --color=auto --help 1>/dev/null 2>/dev/null
-	set_exported_default LS_COLORS $LS_COLORS '*.jar=01;31' '*.doc=35' '*.pdf=35' '*.ps=35' '*.xls=35' '*.swf=35' '*~=37'
-end
-
-
-functions -e set_default
 functions -e set_exported_default
+functions -e set_default

event.c

@@ -1,6 +1,6 @@
-/** \file function.c
+/** \file event.c
 
-	Functions for storing and retrieving function information.
+	Functions for handling event triggers
 
 */
 #include <stdlib.h>
@@ -12,7 +12,11 @@
 #include <string.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
+#include "wutil.h"
 #include "function.h"
 #include "proc.h"
 #include "parser.h"
@@ -20,6 +24,8 @@
 #include "event.h"
 #include "signal.h"
 
+#include "halloc_util.h"
+
 /**
    Number of signals that can be queued before an overflow occurs
 */
@@ -31,18 +37,27 @@
 */
 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[2];
+static signal_list_t sig_list[]={{0,0},{0,0}};
 
 /**
    The index of sig_list that is the list of signals currently written to
@@ -58,10 +73,20 @@ static array_list_t *events;
 */
 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;
+
+/**
+   String buffer used for formating event descriptions in event_get_desc()
+*/
+static string_buffer_t *get_desc_buff=0;
+
 /**
    Tests if one event instance matches the definition of a event
-   class. If the class defines a function name, that will also be a
-   match criterion.
+   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 )
@@ -111,11 +136,11 @@ static int event_match( event_t *class, event_t *instance )
    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 )
+static event_t *event_copy( event_t *event, int copy_arguments )
 {
 	event_t *e = malloc( sizeof( event_t ) );
 	if( !e )
-		die_mem();
+		DIE_MEM();
 	memcpy( e, event, sizeof(event_t));
 
 	if( e->function_name )
@@ -124,15 +149,119 @@ static event_t *event_copy( event_t *event )
 	if( e->type == EVENT_VARIABLE )
 		e->param1.variable = wcsdup( e->param1.variable );
 		
+	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 )
+{
+
+	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;
+		}
+		
+	}
+	
+	return (const wchar_t *)get_desc_buff->buff;
+}
+
+
 void event_add_handler( event_t *event )
 {
-	event_t *e = event_copy( event );
+	event_t *e;
+
+	CHECK( event, );
+	
+	e = event_copy( event, 0 );
 
 	if( !events )
-		events = al_new();	
+		events = al_new();
 
 	if( e->type == EVENT_SIGNAL )
 	{
@@ -148,14 +277,19 @@ void event_remove( event_t *criterion )
 	array_list_t *new_list=0;
 	event_t e;
 	
+	CHECK( criterion, );
+
 	/*
-	  Because of concurrency issues, 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.
+	  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;	
+		return;
 
 	for( i=0; i<al_get_count( events); i++ )
 	{
@@ -203,6 +337,8 @@ int event_get( event_t *criterion, array_list_t *out )
 	
 	if( !events )
 		return 0;	
+
+	CHECK( criterion, 0 );
 	
 	for( i=0; i<al_get_count( events); i++ )
 	{
@@ -255,11 +391,11 @@ static int event_is_killed( event_t *e )
 
 /**
    Perform the specified event. Since almost all event firings will
-   not match a single event handler, we make sureto optimize the 'no
-   matches' path. This means that nothing is allocated/initialized
-   unless that is needed.
+   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, array_list_t *arguments )
+static void event_fire_internal( event_t *event )
 {
 	int i, j;
 	string_buffer_t *b=0;
@@ -325,9 +461,9 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 		
 		sb_append( b, criterion->function_name );
 		
-		for( j=0; j<al_get_count(arguments); j++ )
+		for( j=0; j<al_get_count(&event->arguments); j++ )
 		{
-			wchar_t *arg_esc = escape( (wchar_t *)al_get( arguments, j), 0 );		
+			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 );				
@@ -335,13 +471,16 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 
 //		debug( 1, L"Event handler fires command '%ls'", (wchar_t *)b->buff );
 		
-		is_subshell=1;
-		is_interactive=1;
-				
+		/*
+		  Event handlers are not part of the main flow of code, so
+		  they are marked as non-interactive
+		*/
+		proc_push_interactive(0);
+		parser_push_block( EVENT );
+		current_block->param1.event = event;
 		eval( (wchar_t *)b->buff, 0, TOP );
-		is_subshell=0;
-		is_interactive=1;
-		
+		parser_pop_block();
+		proc_pop_interactive();					
 	}
 
 	if( b )
@@ -366,15 +505,47 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 /**
    Handle all pending signal events
 */
-static void event_fire_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 )
 	{
-		int i;
 		signal_list_t *lst;
 		event_t e;
-		array_list_t a;
-		al_init( &a );		
+		al_init( &e.arguments );		
 
 		/*
 		  Switch signal lists
@@ -393,7 +564,7 @@ static void event_fire_signal_events()
 		
 		if( lst->overflow )
 		{
-			debug( 0, L"Signal list overflow. Signals have been ignored" );
+			debug( 0, _( L"Signal list overflow. Signals have been ignored." ) );
 		}
 		
 		/*
@@ -402,19 +573,27 @@ static void event_fire_signal_events()
 		for( i=0; i<lst->count; i++ )
 		{
 			e.param1.signal = lst->signal[i];
-			al_set( &a, 0, sig2wcs( e.param1.signal ) );			
-			event_fire_internal( &e, &a );
+			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( &a );
+		al_destroy( &e.arguments );
 		
 	}	
 }
 
 
-void event_fire( event_t *event, array_list_t *arguments )
+void event_fire( event_t *event )
 {
-	//int is_event_old = is_event;
 	is_event++;
 	
 	if( event && (event->type == EVENT_SIGNAL) )
@@ -422,44 +601,57 @@ void event_fire( event_t *event, array_list_t *arguments )
 		/*
 		  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 illegal in a
+		  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
 	{
-		event_fire_signal_events();
 		
+		event_fire_delayed();
+			
 		if( event )
-			event_fire_internal( event, arguments );
+		{
+			if( event_is_blocked( event ) )
+			{
+				if( !blocked )
+					blocked = al_new();
+				
+				al_push( blocked, event_copy(event, 1) );
+			}
+			else
+			{
+				event_fire_internal( event );
+			}
+		}
 		
 	}	
-	is_event--;// = is_event_old;	
+	is_event--;
 }
 
 
 void event_init()
 {
-	sig_list[active_list].count=0;	
 }
 
 void event_destroy()
 {
+
 	if( events )
 	{
-		al_foreach( events, (void (*)(const void *))&event_free );
+		al_foreach( events, (void (*)(void *))&event_free );
 		al_destroy( events );
 		free( events );		
 		events=0;
 	}
+
 	if( killme )
 	{
-		al_foreach( killme, (void (*)(const void *))&event_free );
+		al_foreach( killme, (void (*)(void *))&event_free );
 		al_destroy( killme );
 		free( killme );		
 		killme=0;		
@@ -468,9 +660,17 @@ void event_destroy()
 
 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 );
 	free( e );
 }
-		
+

event.h

@@ -1,6 +1,6 @@
 /** \file event.h
 
-Event handling library
+	Functions for handling event triggers
 
 */
 #ifndef FISH_EVENT_H
@@ -17,6 +17,9 @@ Event handling library
 */
 #define EVENT_ANY_PID 0
 
+/**
+   Enumeration of event types
+*/
 enum
 {
 	EVENT_ANY, /**< Matches any event type (Not always any event, as the function name may limit the choice as well */
@@ -40,18 +43,24 @@ typedef struct
 	   Type of event
 	*/
 	int type;
+
+	/**
+	   The type-specific parameter
+	*/
 	union
 	{
 		/**
-		   Signal number for signal-type events.Use EVENT_ANY_SIGNAL to match any signal
+		   Signal number for signal-type events.Use EVENT_ANY_SIGNAL
+		   to match any signal
 		*/
 		int signal;
 		/**
-		   Variable name for variable-type events. 
+		   Variable name for variable-type events.
 		*/
 		const wchar_t *variable;
 		/**
-		   Process id for process-type events. Use EVENT_ANY_PID to match any pid.
+		   Process id for process-type events. Use EVENT_ANY_PID to
+		   match any pid.
 		*/
 		pid_t pid;
 		/**
@@ -61,7 +70,17 @@ typedef struct
 		
 	} param1;
 
+	/**
+	   The name of the event handler function
+	*/
 	const wchar_t *function_name;	
+
+	/**
+	   The argument list. Only used when sending a new event using
+	   event_fire. In all other situations, the value of this variable
+	   is ignored.
+	*/
+	array_list_t arguments;
 }
 	event_t;
 
@@ -93,9 +112,8 @@ int event_get( event_t *criterion, array_list_t *out );
    dispatched.
 
    \param event the specific event whose handlers should fire
-   \param arguments the argument string to send to the event handler function
 */
-void event_fire( event_t *event, array_list_t *arguments );
+void event_fire( event_t *event );
 
 /**
    Initialize the event-handling library
@@ -112,4 +130,10 @@ void event_destroy();
 */
 void event_free( event_t *e );
 
+/**
+   Returns a string describing the specified event. The string should
+   not be freed.
+*/
+const wchar_t *event_get_desc( event_t *e );
+
 #endif

exec.h

@@ -3,6 +3,9 @@
 */
 
 #ifndef FISH_EXEC_H
+/**
+   Header guard
+*/
 #define FISH_EXEC_H
 
 #include <wchar.h>
@@ -13,18 +16,7 @@
 /**
    pipe redirection error message
 */
-#define PIPE_ERROR L"An error occurred while setting up pipe"
-
-/**
-   Initialize the exec library
-*/
-void exec_init();
-
-/*
-  Destroy dynamically allocated data and other resources used by the
-  exec library
-*/
-void exec_destroy();
+#define PIPE_ERROR _(L"An error occurred while setting up pipe")
 
 /**
   Execute the processes specified by j. 

expand.h

@@ -1,15 +1,18 @@
 /**\file expand.h
 
-   Prototypes for string expantion functions. These functions perform
-   several kinds of parameter expantion. There are a lot of issues
+   Prototypes for string expansion functions. These functions perform
+   several kinds of parameter expansion. There are a lot of issues
    with regards to memory allocation. Overall, these functions would
    benefit from using a more clever memory allocation scheme, perhaps
    an evil combination of talloc, string buffers and reference
    counting.
-
+   
 */
 
 #ifndef FISH_EXPAND_H
+/**
+   Header guard
+*/
 #define FISH_EXPAND_H
 
 #include <wchar.h>
@@ -17,17 +20,17 @@
 #include "util.h"
 
 /**
-   Flag specifying that subshell expantion should be skipped
+   Flag specifying that subshell expansion should be skipped
 */
 #define EXPAND_SKIP_SUBSHELL 1
 
 /**
-   Flag specifying that variable expantion should be skipped
+   Flag specifying that variable expansion should be skipped
 */
 #define EXPAND_SKIP_VARIABLES 2
 
 /**
-   Flag specifying that wildcard expantion should be skipped
+   Flag specifying that wildcard expansion should be skipped
 */
 #define EXPAND_SKIP_WILDCARDS 4
 
@@ -51,7 +54,7 @@
 
 #define DIRECTORIES_ONLY 32
 
-/*
+/**
   Use unencoded private-use keycodes for internal characters
 */
 #define EXPAND_RESERVED 0xf000
@@ -61,20 +64,45 @@ enum
 	/** Character represeting a home directory */
 	HOME_DIRECTORY = EXPAND_RESERVED,
 
-	/** Character represeting process expantion */
+	/** Character represeting process expansion */
 	PROCESS_EXPAND,
 	
-	/** Character representing variable expantion */
+	/** Character representing variable expansion */
 	VARIABLE_EXPAND,
 
-	/** Character representing the start of a bracket expantion */
+	/** Character rpresenting variable expansion into a single element*/
+	VARIABLE_EXPAND_SINGLE,
+
+	/** Character representing the start of a bracket expansion */
 	BRACKET_BEGIN,
 
-	/** Character representing the end of a bracket expantion */
+	/** Character representing the end of a bracket expansion */
 	BRACKET_END,
 
 	/** Character representing separation between two bracket elements */
 	BRACKET_SEP,
+	/**
+	   Separate subtokens in a token with this character. 
+	*/
+	INTERNAL_SEPARATOR,
+
+}
+	;
+
+
+/**
+   These are the possible return values for expand_string
+*/
+enum
+{
+	/** Error */
+	EXPAND_ERROR,
+	/** Ok */
+	EXPAND_OK,
+	/** Ok, a wildcard in the string matched no files */
+	EXPAND_WILDCARD_NO_MATCH,
+	/* Ok, a wildcard in the string matched a file */
+	EXPAND_WILDCARD_MATCH
 }
 	;
 
@@ -85,104 +113,91 @@ enum
 #define ARRAY_SEP_STR L"\x1e"
 
 /**
-   Separate subtokens in a token with this character. 
+   Error issued on array out of bounds
 */
-#define INTERNAL_SEPARATOR 0xfffffff0
-
+#define ARRAY_BOUNDS_ERR _(L"Array index out of bounds")
 
 
 /**
    Perform various forms of expansion on in, such as tilde expansion
-   (~USER becomes the users home directory), variable expansion
-   ($VAR_NAME becomes the value of the environment variable VAR_NAME),
-   subshell expantion and wildcard expansion. The results are inserted
+   (\~USER becomes the users home directory), variable expansion
+   (\$VAR_NAME becomes the value of the environment variable VAR_NAME),
+   subshell expansion and wildcard expansion. The results are inserted
    into the list out.
    
    If the parameter does not need expansion, it is copied into the list
    out. If expansion is performed, the original parameter is freed and
    newly allocated strings are inserted into the list out.
-   
+
+   If \c context is non-null, all the strings contained in the
+   array_list_t \c out will be registered to be free'd when context is
+   free'd.
+ 
+   \param context the halloc context to use for automatic deallocation
    \param in The parameter to expand
-   \param flag Specifies if any expantion pass should be skipped. Legal values are any combination of EXPAND_SKIP_SUBSHELL EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+   \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_SUBSHELL EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
    \param out The list to which the result will be appended.
+   \return One of EXPAND_OK, EXPAND_ERROR, EXPAND_WILDCARD_MATCH and EXPAND_WILDCARD_NO_MATCH. EXPAND_WILDCARD_NO_MATCH and EXPAND_WILDCARD_MATCH are normal exit conditions used only on strings containing wildcards to tell if the wildcard produced any matches.
 */
-int expand_string( wchar_t *in, array_list_t *out, int flag );
+int expand_string( void *context, wchar_t *in, array_list_t *out, int flag );
 
 /**
    expand_one is identical to expand_string, except it will fail if in
    expands to more than one string. This is used for expanding command
    names.
 
+   If \c context is non-null, the returning string ill be registered
+   to be free'd when context is free'd.
+ 
+   \param context the halloc context to use for automatic deallocation   
    \param in The parameter to expand
-   \param flag Specifies if any expantion pass should be skipped. Legal values are any combination of EXPAND_SKIP_SUBSHELL EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+   \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_SUBSHELL EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
    \return The expanded parameter, or 0 on failiure
 */
-wchar_t *expand_one( wchar_t *in, int flag );
-
-/**
-   Expand backslashed escapes and substitute them with their unescaped
-   counterparts. Also optionally change the wildcards, the tilde
-   character and a few more into constants which are defined to be
-   outside of the valid character space, but still inside the valid
-   space for a wchar_t. This assumes that a wchar_t is at least 32
-   bits long AND that the characterset is UCS4 or some other 31-bit
-   character set.
-
-   The result must be free()d. The original string is not modified. If
-   an invalid sequence is specified, 0 is returned.
-
-*/
-wchar_t *expand_unescape( const wchar_t * in, int escape_special );
-
-/**
-   Replace special characters with escape sequences. Newline is
-   replaced with \n, etc. 
-
-   The result must be free()d. The original string is not modified.
-
-   \param in The string to be escaped
-   \param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters
-   \return The escaped string
-*/
-wchar_t *expand_escape( const wchar_t *in, int escape_all );
+wchar_t *expand_one( void *context, wchar_t *in, int flag );
 
 /**
    Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc. Suitable for pretty-printing.
+
+   \param in the value to escape
 */
 wchar_t *expand_escape_variable( const wchar_t *in );
 
-
 /**
-   Perform tilde expantion and nothing else on the specified string.
+   Perform tilde expansion and nothing else on the specified string.
 
-   If tilde expantion is needed, the original string is freed and a
+   If tilde expansion is needed, the original string is freed and a
    new string, allocated using malloc, is returned.
+
+   \param in the string to tilde expand
 */
 wchar_t *expand_tilde(wchar_t *in);
 
-/**
-   Locate the last subshell in the specified string.
-   
-   \param in the string to search for subshells
-   \param begin the starting paranthesis of the subshell
-   \param end the ending paranthesis of the subshell
-   \param flags set this variable to ACCEPT_INCOMPLETE if in tab_completion mode
-   \return -1 on syntax error, 0 if no subshells exist and 1 on sucess
-*/
-int expand_locate_subshell( wchar_t *in, 
-							wchar_t **begin, 
-							wchar_t **end,
-							int flags );
-
 
 /**
-   Tokenize the specified string into the specified array_list_t.
-   Each new element is allocated using malloc and must be freed by the
-   caller.
-   
-   \param val the input string. The contents of this string is not changed.
-   \param out the list in which to place the elements. 
+   Test if the specified argument is clean, i.e. it does not contain
+   any tokens which need to be expanded or otherwise altered. Clean
+   strings can be passed through expand_string and expand_one without
+   changing them. About two thirds of all strings are clean, so
+   skipping expansion on them actually does save a small amount of
+   time, since it avoids multiple memory allocations during the
+   expansion process.
+
+   \param in the string to test
 */
-void expand_variable_array( const wchar_t *val, array_list_t *out );
+int expand_is_clean( const wchar_t *in );
+
+/**
+   Perform error reporting for a syntax error related to the variable
+   expansion beginning at the specified character of the specified
+   token. This function will call the error function with an
+   explanatory string about what is wrong with the specified token.
+
+   \param token The token containing the error
+   \param token_pos The position where the expansion begins
+   \param error_pos The position on the line to report to the error function.
+*/
+void expand_variable_error( const wchar_t *token, int token_pos, int error_pos );
+
 
 #endif

fallback.h

@@ -0,0 +1,370 @@
+
+#ifndef FISH_FALLBACK_H
+#define FISH_FALLBACK_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <wctype.h>
+#include <wchar.h>
+#include <limits.h>
+#include <sys/time.h>
+
+#ifndef WCHAR_MAX
+/**
+   This _should_ be defined by wchar.h, but e.g. OpenBSD doesn't.
+*/
+#define WCHAR_MAX INT_MAX
+#endif
+
+/**
+   Make sure __func__ is defined to some string. In C99, this should
+   be the currently compiled function. If we aren't using C99 or
+   later, older versions of GCC had __FUNCTION__.
+*/
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+#  define __func__ __FUNCTION__
+# else
+#  define __func__ "<unknown>"
+# endif
+#endif
+
+/**
+   Under curses, tputs expects an int (*func)(char) as its last
+   parameter, but in ncurses, tputs expects a int (*func)(int) as its
+   last parameter. tputs_arg_t is defined to always be what tputs
+   expects. Hopefully.
+*/
+
+#ifdef NCURSES_VERSION
+typedef int tputs_arg_t;
+#else
+typedef char tputs_arg_t;
+#endif
+
+#ifdef TPUTS_KLUDGE
+
+/**
+   Linux on PPC seems to have a tputs implementation that sometimes
+   behaves strangely. This fallback seems to fix things.
+*/
+int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t));
+
+#endif
+
+#ifndef HAVE_FWPRINTF
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we implement our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int fwprintf( FILE *f, const wchar_t *format, ... );
+
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int swprintf( wchar_t *str, size_t l, const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int wprintf( const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vwprintf( const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vfwprintf( FILE *f, const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va );
+
+#endif
+
+#ifndef HAVE_FGETWC
+/**
+   Fallback implementation of fgetwc
+*/
+wint_t fgetwc(FILE *stream);
+
+/**
+   Fallback implementation of getwc
+*/
+wint_t getwc(FILE *stream);
+
+#endif
+
+#ifndef HAVE_FPUTWC
+
+/**
+   Fallback implementation of fputwc
+*/
+wint_t fputwc(wchar_t wc, FILE *stream);
+/**
+   Fallback implementation of putwc
+*/
+wint_t putwc(wchar_t wc, FILE *stream);
+
+#endif
+
+#ifndef HAVE_WCSTOK
+
+/**
+   Fallback implementation of wcstok. Uses code borrowed from glibc.
+*/
+wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr);
+
+#endif
+
+#ifndef HAVE_WCWIDTH
+
+/**
+   Return the number of columns used by a character. This is a libc
+   function, but the prototype for this function is missing in some libc
+   implementations. 
+
+   Fish has a fallback implementation in case the implementation is
+   missing altogether.  In locales without a native wcwidth, Unicode
+   is probably so broken that it isn't worth trying to implement a
+   real wcwidth. Therefore, the fallback wcwidth assumes any printing
+   character takes up one column and anything else uses 0 columns.
+*/
+int wcwidth( wchar_t c );
+
+#endif
+
+#ifndef HAVE_WCSDUP
+
+/**
+   Create a duplicate string. Wide string version of strdup. Will
+   automatically exit if out of memory.
+*/
+wchar_t *wcsdup(const wchar_t *in);
+
+#endif
+
+#ifndef HAVE_WCSLEN
+
+/**
+   Fallback for wcsen. Returns the length of the specified string.
+*/
+size_t wcslen(const wchar_t *in);
+
+#endif
+
+#ifndef HAVE_WCSCASECMP
+/**
+   Case insensitive string compare function. Wide string version of
+   strcasecmp.
+
+   This implementation of wcscasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcscasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcscasecmp( const wchar_t *a, const wchar_t *b );
+
+#endif
+
+#ifndef HAVE_WCSNCASECMP
+
+/**
+   Case insensitive string compare function. Wide string version of
+   strncasecmp.
+
+   This implementation of wcsncasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcsncasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
+
+/**
+   Returns a newly allocated wide character string wich is a copy of
+   the string in, but of length c or shorter. The returned string is
+   always null terminated, and the null is not included in the string
+   length.
+*/
+
+#endif
+
+#ifndef HAVE_WCSNDUP
+
+/**
+   Fallback for wcsndup function. Returns a copy of \c in, truncated
+   to a maximum length of \c c.
+*/
+wchar_t *wcsndup( const wchar_t *in, int c );
+
+#endif
+
+/**
+   Converts from wide char to digit in the specified base. If d is not
+   a valid digit in the specified base, return -1. This is a helper
+   function for wcstol, but it is useful itself, so it is exported.
+*/
+long convert_digit( wchar_t d, int base );
+
+#ifndef HAVE_WCSTOL
+
+/**
+   Fallback implementation. Convert a wide character string to a
+   number in the specified base. This functions is the wide character
+   string equivalent of strtol. For bases of 10 or lower, 0..9 are
+   used to represent numbers. For bases below 36, a-z and A-Z are used
+   to represent numbers higher than 9. Higher bases than 36 are not
+   supported.
+*/
+long wcstol(const wchar_t *nptr,
+			wchar_t **endptr,
+			int base);
+
+#endif
+#ifndef HAVE_WCSLCAT
+
+/**
+   Appends src to string dst of size siz (unlike wcsncat, siz is the
+   full size of dst, not space left).  At most siz-1 characters will be
+   copied.  Always NUL terminates (unless siz <= wcslen(dst)).  Returns
+   wcslen(src) + MIN(siz, wcslen(initial dst)).  If retval >= siz,
+   truncation occurred.
+
+   This is the OpenBSD strlcat function, modified for wide characters,
+   and renamed to reflect this change.
+
+*/
+size_t wcslcat( wchar_t *dst, const wchar_t *src, size_t siz );
+
+#endif
+#ifndef HAVE_WCSLCPY
+
+/**
+   Copy src to string dst of size siz.  At most siz-1 characters will
+   be copied.  Always NUL terminates (unless siz == 0).  Returns
+   wcslen(src); if retval >= siz, truncation occurred.
+
+   This is the OpenBSD strlcpy function, modified for wide characters,
+   and renamed to reflect this change. 
+*/
+size_t wcslcpy( wchar_t *dst, const wchar_t *src, size_t siz );
+
+#endif
+
+#ifdef HAVE_BROKEN_DEL_CURTERM
+
+/**
+   BSD del_curterm seems to do a double-free. We redefine it as a no-op
+*/
+int del_curterm(TERMINAL *oterm);
+#endif
+
+#ifndef HAVE_LRAND48_R
+
+/**
+   Datastructure for the lrand48_r fallback implementation.
+*/
+struct drand48_data
+{
+	/**
+	   Seed value
+	*/
+	unsigned int seed;
+}
+	;
+
+/**
+   Fallback implementation of lrand48_r. Internally uses rand_r, so it is pretty weak.
+*/
+int lrand48_r( struct drand48_data *buffer, long int *result );
+
+/**
+   Fallback implementation of srand48_r, the seed function for lrand48_r.
+*/
+int srand48_r( long int seedval, struct drand48_data *buffer );
+
+#endif
+
+#ifndef HAVE_FUTIMES
+
+int futimes( int fd, const struct timeval *times );
+
+#endif
+
+#ifndef HAVE_GETTEXT
+
+/**
+   Fallback implementation of gettext. Just returns the original string.
+*/
+char * gettext( const char * msgid );
+
+/**
+   Fallback implementation of bindtextdomain. Does nothing.
+*/
+char * bindtextdomain( const char * domainname, const char * dirname );
+
+/**
+   Fallback implementation of textdomain. Does nothing.
+*/
+char * textdomain( const char * domainname );
+
+#endif
+
+#ifndef HAVE_DCGETTEXT
+
+/**
+   Fallback implementation of dcgettext. Just returns the original string.
+*/
+char * dcgettext ( const char * domainname, 
+				   const char * msgid,
+				   int category );
+
+#endif
+
+#ifndef HAVE__NL_MSG_CAT_CNTR
+
+/**
+   Some gettext implementation use have this variable, and by
+   increasing it, one can tell the system that the translations need
+   to be reloaded.
+*/
+extern int _nl_msg_cat_cntr;
+
+#endif
+
+#endif
+

fish.spec.in

@@ -1,3 +1,5 @@
+%define xinclude %( if test -d /usr/X11R6/include; then echo /usr/X11R6/include; else echo /usr/include; fi )
+
 Summary:                A friendly interactive shell
 Name:                   @PACKAGE_NAME@
 
@@ -11,64 +13,107 @@ URL:                    http://roo.no-ip.org/fish/
 Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:          doxygen ncurses-devel xorg-x11-devel
+BuildRequires:          ncurses-devel
+BuildRequires:          %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h
+BuildRequires:          %{xinclude}/X11/Intrinsic.h, %{xinclude}/X11/Xatom.h
+
+
 
 %description 
 fish is a shell geared towards interactive use. It's features are
 focused on user friendlieness and discoverability. The language syntax
 is simple but incompatible with other shell languages.
 
+
+
+
 %prep
 %setup -q
 
-%build
 
+
+
+%build
 %configure docdir=%_datadir/doc/%{name}-%{version}
 make %{?_smp_mflags}
 
+
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+
+
 %post
 if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then
 	echo %_bindir/fish >>%_sysconfdir/shells
 fi
 
+
+
+
 %postun
 if [ "$1" = 0 ]; then
 	grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp
 	mv %_sysconfdir/fish.tmp %_sysconfdir/shells
 fi
 
+
+
+
 %files
 %defattr(-,root,root,-)
+
 %doc %_datadir/doc/%{name}-%{version}
+
 %_mandir/man1/fish.1*
 %_mandir/man1/xsel.1x*
 %_mandir/man1/mimedb.1*
 %_mandir/man1/set_color.1*
-%_mandir/man1/tokenize.1*
 %_mandir/man1/count.1*
+%_mandir/man1/fishd.1*
+%_mandir/man1/fish_pager.1*
+
 %attr(0755,root,root) %_bindir/fish
 %attr(0755,root,root) %_bindir/fishd
 %attr(0755,root,root) %_bindir/fish_pager
 %attr(0755,root,root) %_bindir/xsel
 %attr(0755,root,root) %_bindir/set_color
-%attr(0755,root,root) %_bindir/tokenize
 %attr(0755,root,root) %_bindir/mimedb
 %attr(0755,root,root) %_bindir/count
+
 %config %_sysconfdir/fish
 %config %_sysconfdir/fish_inputrc
 %dir %_sysconfdir/fish.d
 %config %_sysconfdir/fish.d/fish_*.fish
-%dir %_sysconfdir/fish.d/completions
-%config %_sysconfdir/fish.d/completions/*.fish
+
+%dir %_datadir/fish
+%_datadir/fish/fish
+
+%dir %_datadir/fish/completions
+%_datadir/fish/completions/*.fish
+
+%dir %_datadir/fish/functions
+%_datadir/fish/functions/*.fish
+
+%_datadir/locale/*/LC_MESSAGES/fish.mo
+
+
+
 
 %changelog
+* Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0
+- 1.17.0
+
 * Sat Sep 24 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.14.0-0
 - 1.14.0
 

fish_pager.c

@@ -27,16 +27,26 @@
 #include <termio.h>
 #endif
 
+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include <signal.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "complete.h"
 #include "output.h"
 #include "input_common.h"
 #include "env_universal.h"
+#include "halloc.h"
+#include "halloc_util.h"
 
 enum 
 {
@@ -69,6 +79,7 @@ static struct termios pager_modes;
 
 static int is_ca_mode = 0;
 
+static buffer_t *pager_buffer;
 
 /**
    The environment variables used to specify the color of different
@@ -86,8 +97,39 @@ static wchar_t *hightlight_var[] =
 static string_buffer_t out_buff;
 static FILE *out_file;
 
+/**
+   Data structure describing one or a group of related completions
+ */
+typedef struct 
+{
+	/**
+	   The list of all completin strings this entry applies to
+	*/
+	array_list_t *comp;
+	/**
+	   The description
+	*/
+	wchar_t *desc;
+	/**
+	   On-screen width of the completion string
+	*/
+	int comp_width;	
+	/**
+	   On-screen width of the description information
+	*/
+	int desc_width;	
+	/**
+	   Preffered total width
+	*/
+	int pref_width;
+	/**
+	   Minimum acceptable width
+	*/
+	int min_width;
+}
+	comp_t;
 
-int get_color( int highlight )
+static int get_color( int highlight )
 {
 	if( highlight < 0 )
 		return FISH_COLOR_NORMAL;
@@ -96,9 +138,6 @@ int get_color( int highlight )
 	
 	wchar_t *val = env_universal_get( hightlight_var[highlight]);
 	
-	if( val == 0 )
-		return FISH_COLOR_NORMAL;
-	
 	if( val == 0 )
 	{
 		return FISH_COLOR_NORMAL;
@@ -107,7 +146,20 @@ int get_color( int highlight )
 	return output_color_code( val );	
 }
 
-int try_sequence( char *seq )
+static void recalc_width( array_list_t *l, const wchar_t *prefix )
+{
+	int i;
+	for( i=0; i<al_get_count( l ); i++ )
+	{
+		comp_t *c = (comp_t *)al_get( l, i );
+		
+		c->min_width = mini( c->desc_width, maxi(0,termsize.ws_col/3 - 2)) +
+			mini( c->desc_width, maxi(0,termsize.ws_col/5 - 4)) +4;
+	}
+	
+}
+
+static int try_sequence( char *seq )
 {
 	int j, k;
 	wint_t c=0;
@@ -190,6 +242,110 @@ static wint_t readch()
 }
 
 
+static int pager_buffered_writer( char c)
+{
+	b_append( pager_buffer, &c, 1 );
+	return 0;
+}
+
+static void pager_flush()
+{
+	write( 1, pager_buffer->buff, pager_buffer->used );
+	pager_buffer->used = 0;
+}
+
+
+static int print_max( const wchar_t *str, int max, int has_more )
+{
+	int i;
+	int written = 0;
+	for( i=0; str[i]; i++ )
+	{
+		if( written + wcwidth(str[i]) > max )
+			break;
+		if( ( written + wcwidth(str[i]) == max) && (has_more || str[i+1]) )
+		{
+			writech( ellipsis_char );
+			written += wcwidth(ellipsis_char );
+			break;
+		}
+			
+		writech( str[i] );
+		written+= wcwidth( str[i] );
+	}
+	return written;
+}
+
+static void completion_print_item( const wchar_t *prefix, comp_t *c, int width )
+{
+	int comp_width=0, desc_width=0;
+	int i;
+	int written=0;
+	
+	if( c->pref_width <= width )
+	{
+		/*
+		  The entry fits, we give it as much space as it wants
+		*/
+		comp_width = c->comp_width;
+		desc_width = c->desc_width;
+	}
+	else
+	{
+		/*
+		  The completion and description won't fit on the
+		  allocated space. Give a maximum of 2/3 of the
+		  space to the completion, and whatever is left to
+		  the description.
+		*/
+		int desc_all = c->desc_width?c->desc_width+4:0;
+		
+		comp_width = maxi( mini( c->comp_width,
+								 2*(width-4)/3 ),
+						   width - desc_all );
+		if( c->desc_width )
+			desc_width = width-comp_width-4;
+		else
+			c->desc_width=0;
+		
+	}
+	
+	for( i=0; i<al_get_count( c->comp ); i++ )
+	{
+		const wchar_t *comp = (const wchar_t *)al_get( c->comp, i );
+		if( i != 0 )
+			written += print_max( L"  ", comp_width - written, 2 );
+		set_color( get_color(HIGHLIGHT_PAGER_PREFIX),FISH_COLOR_NORMAL );
+		written += print_max( prefix, comp_width - written, comp[0]?1:0 );
+		set_color( get_color(HIGHLIGHT_PAGER_COMPLETION),FISH_COLOR_IGNORE );
+		written += print_max( comp, comp_width - written, i!=(al_get_count(c->comp)-1) );
+	}
+
+
+	if( desc_width )
+	{
+		while( written < (width-desc_width-2))
+		{
+			written++;
+			writech( L' ');
+		}
+		written += print_max( L"(", 1, 0 );
+		set_color( get_color( HIGHLIGHT_PAGER_DESCRIPTION ),
+				   FISH_COLOR_IGNORE );
+		written += print_max( c->desc, desc_width, 0 );
+		written += print_max( L")", 1, 0 );
+	}
+	else
+	{
+		while( written < width )
+		{
+			written++;
+			writech( L' ');
+		}
+	}
+	
+}
+
 /**
    Print the specified part of the completion list, using the
    specified column offsets and quoting style.
@@ -214,271 +370,29 @@ static void completion_print( int cols,
 
 	int rows = (al_get_count( l )-1)/cols+1;
 	int i, j;
-	int prefix_width= my_wcswidth(prefix);
 
 	for( i = row_start; i<row_stop; i++ )
 	{
 		for( j = 0; j < cols; j++ )
 		{
-			wchar_t *el, *el_end;
+			comp_t *el;
 
+			int is_last = (j==(cols-1));
+			
 			if( al_get_count( l ) <= j*rows + i )
 				continue;
 
-			el = (wchar_t *)al_get( l, j*rows + i );
-			el_end= wcschr( el, COMPLETE_SEP );
-
-			set_color( get_color(HIGHLIGHT_PAGER_PREFIX),FISH_COLOR_NORMAL );
-
-			writestr( prefix );
-
-			set_color( get_color(HIGHLIGHT_PAGER_COMPLETION),FISH_COLOR_IGNORE );
-
-			if( el_end == 0 )
-			{
-				/* We do not have a description for this completion */
-				int written = 0;
-				int max_written = width[j] - prefix_width - (j==cols-1?0:2);
-
-				if( is_quoted )
-				{
-					for( i=0; i<max_written; i++ )
-					{
-						if( !el[i] )
-							break;
-						writech( el[i] );
-						written+= wcwidth( el[i] );
-					}
-				}
-				else
-				{
-					written = write_escaped_str( el, max_written );
-				}
-
-				set_color( get_color( HIGHLIGHT_PAGER_DESCRIPTION ),
-						   FISH_COLOR_IGNORE );
-
-				writespace( width[j]-
-							written-
-							prefix_width );
-			}
-			else
-			{
-				int whole_desc_width = my_wcswidth(el_end+1);
-				int whole_comp_width;
-
-				/*
-				  Temporarily drop the description so that wcswidth et
-				  al only calculate the width of the completion.
-				*/
-				*el_end = L'\0';
-
-				/*
-				  Calculate preferred completion width
-				*/
-				if( is_quoted )
-				{
-					whole_comp_width = my_wcswidth(el);
-				}
-				else
-				{
-					wchar_t *tmp = escape( el, 1 );
-					whole_comp_width = my_wcswidth( tmp );
-					free(tmp);
-				}
-
-				/*
-				  Calculate how wide this entry 'wants' to be
-				*/
-				int pref_width = whole_desc_width + 4 + prefix_width + 2 -
-					(j==cols-1?2:0) + whole_comp_width;
-
-				int comp_width, desc_width;
-
-				if( pref_width <= width[j] )
-				{
-					/*
-					  The entry fits, we give it as much space as it wants
-					*/
-					comp_width = whole_comp_width;
-					desc_width = whole_desc_width;
-				}
-				else
-				{
-					/*
-					  The completion and description won't fit on the
-					  allocated space. Give a maximum of 2/3 of the
-					  space to the completion, and whatever is left to
-					  the description.
-					*/
-					int sum = width[j] - prefix_width - 4 - 2 + (j==cols-1?2:0);
-
-					comp_width = maxi( mini( whole_comp_width,
-											 2*sum/3 ),
-									   sum - whole_desc_width );
-					desc_width = sum-comp_width;
-				}
-
-				/* First we must print the completion. */
-				if( is_quoted )
-				{
-					writestr_ellipsis( el, comp_width);
-				}
-				else
-				{
-					write_escaped_str( el, comp_width );
-				}
-
-				/* Put the description back */
-				*el_end = COMPLETE_SEP;
-
-				/* And print it */
-				set_color( get_color(HIGHLIGHT_PAGER_DESCRIPTION),
-						   FISH_COLOR_IGNORE );
-				writespace( maxi( 2,
-								  width[j]
-								  - comp_width
-								  - desc_width
-								  - 4
-								  - prefix_width
-								  + (j==cols-1?2:0) ) );
-				/* Print description */
-				writestr(L"(");
-				writestr_ellipsis( el_end+1, desc_width);
-				writestr(L")");
-
-				if( j != cols-1)
-					writestr( L"  " );
-
-			}
+			el = (comp_t *)al_get( l, j*rows + i );
+			
+			completion_print_item( prefix, el, width[j] - (is_last?0:2) );
+			
+			if( !is_last)
+				writestr( L"  " );
 		}
 		writech( L'\n' );
 	}
 }
 
-/**
-   Calculates how long the specified string would be when printed on the command line.
-
-   \param str The string to be printed.
-   \param is_quoted Whether the string would be printed quoted or unquoted
-   \param pref_width the preferred width for this item
-   \param min_width the minimum width for this item
-*/
-static void printed_length( wchar_t *str,
-							int is_quoted,
-							int *pref_width,
-							int *min_width )
-{
-	if( is_quoted )
-	{
-		wchar_t *sep = wcschr(str,COMPLETE_SEP);
-		if( sep )
-		{
-			*sep=0;
-			int cw = my_wcswidth( str );
-			int dw = my_wcswidth(sep+1);
-
-			if( termsize.ws_col > 80 )
-				dw = mini( dw, termsize.ws_col/3 );
-
-
-			*pref_width = cw+dw+4;
-
-			if( dw > termsize.ws_col/3 )
-			{
-				dw = termsize.ws_col/3;
-			}
-
-			*min_width=cw+dw+4;
-
-			*sep= COMPLETE_SEP;
-			return;
-		}
-		else
-		{
-			*pref_width=*min_width= my_wcswidth( str );
-			return;
-		}
-
-	}
-	else
-	{
-		int comp_len=0, desc_len=0;
-		int has_description = 0;
-		while( *str != 0 )
-		{
-			switch( *str )
-			{
-				case L'\n':
-				case L'\b':
-				case L'\r':
-				case L'\e':
-				case L'\t':
-				case L'\\':
-				case L'&':
-				case L'$':
-				case L' ':
-				case L'#':
-				case L'^':
-				case L'<':
-				case L'>':
-				case L'@':
-				case L'(':
-				case L')':
-				case L'{':
-				case L'}':
-				case L'?':
-				case L'*':
-				case L'|':
-				case L';':
-				case L':':
-					if( has_description )
-						desc_len++;
-					else
-						comp_len+=2;
-					break;
-
-				case COMPLETE_SEP:
-					has_description = 1;
-					break;
-
-				default:
-					if( has_description )
-						desc_len+= wcwidth(*str);
-					else
-						comp_len+= wcwidth(*str);
-					break;
-			}
-			str++;
-		}
-		if( has_description )
-		{
-			/*
-			  Mangle long descriptions to make formating look nicer
-			*/
-			debug( 3, L"Desc, width = %d %d\n", comp_len, desc_len );
-//			if( termsize.ws_col > 80 )
-//				desc_len = mini( desc_len, termsize.ws_col/3 );
-
-			*pref_width = comp_len+ desc_len+4;;
-
-			comp_len = mini( comp_len, maxi(0,termsize.ws_col/3 - 2));
-			desc_len = mini( desc_len, maxi(0,termsize.ws_col/5 - 4));
-
-			*min_width = comp_len+ desc_len+4;
-			return;
-		}
-		else
-		{
-			debug( 3, L"No desc, width = %d\n", comp_len );
-			
-			*pref_width=*min_width= comp_len;
-			return;
-		}
-
-	}
-}
-
 
 /**
    Try to print the list of completions l with the prefix prefix using
@@ -526,8 +440,6 @@ static int completion_try_print( int cols,
 	
 	int pref_tot_width=0;
 	int min_tot_width = 0;
-	int prefix_width = my_wcswidth( prefix );
-	
 	int res=0;
 	/*
 	  Skip completions on tiny terminals
@@ -535,25 +447,24 @@ static int completion_try_print( int cols,
 	
 	if( termsize.ws_col < 16 )
 		return 1;
-
+	
 	memset( pref_width, 0, sizeof(pref_width) );
 	memset( min_width, 0, sizeof(min_width) );
-
-	/* Calculated how wide the list would be */
+	
+	/* Calculate how wide the list would be */
 	for( j = 0; j < cols; j++ )
 	{
 		for( i = 0; i<rows; i++ )
 		{
 			int pref,min;
-			wchar_t *el;
+			comp_t *c;
 			if( al_get_count( l ) <= j*rows + i )
 				continue;
 
-			el = (wchar_t *)al_get( l, j*rows + i );
-			printed_length( el, is_quoted, &pref, &min );
-
-			pref += prefix_width;
-			min += prefix_width;
+			c = (comp_t *)al_get( l, j*rows + i );
+			pref = c->pref_width;
+			min = c->min_width;
+			
 			if( j != cols-1 )
 			{
 				pref += 2;
@@ -635,6 +546,7 @@ static int completion_try_print( int cols,
 			}
 			
 			completion_print( cols, width, 0, rows, prefix, is_quoted, l);
+			pager_flush();
 		}
 		else
 		{
@@ -667,6 +579,7 @@ static int completion_try_print( int cols,
 						  percent );
 				writestr(msg);
 				set_color( FISH_COLOR_NORMAL, FISH_COLOR_NORMAL );
+				pager_flush();
 				int c = readch();
 
 				switch( c )
@@ -728,7 +641,8 @@ static int completion_try_print( int cols,
 						}
 						else
 						{
-							writembs( flash_screen );
+							if( flash_screen )
+								writembs( flash_screen );
 						}
 
 						break;
@@ -752,7 +666,8 @@ static int completion_try_print( int cols,
 						}
 						else
 						{
-							writembs( flash_screen );
+							if( flash_screen )
+								writembs( flash_screen );
 						}
 						break;
 					}
@@ -780,7 +695,9 @@ static int completion_try_print( int cols,
 }
 
 /**
-   Substitute any series of tabs, newlines, etc. with a single space character in completion description
+   Substitute any series of whitespace with a single space character
+   inside completion descriptions. Remove all whitespace from
+   beginning/end of completion descriptions.
 */
 static void mangle_descriptions( array_list_t *l )
 {
@@ -789,7 +706,7 @@ static void mangle_descriptions( array_list_t *l )
 	{
 		wchar_t *next = (wchar_t *)al_get(l, i);
 		wchar_t *in, *out;
-		skip=0;
+		skip=1;
 		
 		while( *next != COMPLETE_SEP && *next )
 			next++;
@@ -818,6 +735,124 @@ static void mangle_descriptions( array_list_t *l )
 	}
 }
 
+/**
+   Merge multiple completions with the same description to the same line
+*/
+static void join_completions( array_list_t *l )
+{
+	long i;
+	int in, out;
+	hash_table_t desc_table;
+	
+	hash_init( &desc_table, &hash_wcs_func, &hash_wcs_cmp );
+
+	for( i=0; i<al_get_count(l); i++ )
+	{
+		wchar_t *item = (wchar_t *)al_get( l, i );
+		wchar_t *desc = wcschr( item, COMPLETE_SEP );
+		long prev_idx;
+		
+		if( !desc )
+			continue;
+		desc++;
+		prev_idx = ((long)hash_get( &desc_table, desc) )-1;
+		if( prev_idx == -1 )
+		{
+			hash_put( &desc_table, halloc_wcsdup( global_context, desc), (void *)(i+1));
+		}
+		else
+		{
+			string_buffer_t foo;
+			wchar_t *old = (wchar_t *)al_get( l, prev_idx );
+			wchar_t *old_end = wcschr( old, COMPLETE_SEP );
+			
+			if( old_end )
+			{
+				*old_end = 0;
+				
+				sb_init( &foo );
+				sb_append( &foo, old );
+				sb_append_char( &foo, COMPLETE_ITEM_SEP );
+				sb_append( &foo, item );
+
+				free( (void *)al_get( l, prev_idx ) );
+				al_set( l, prev_idx, foo.buff );
+
+				free( (void *)al_get( l, i ) );
+				al_set( l, i, 0 );
+			}
+			
+		}
+		
+	}	
+	hash_destroy( &desc_table );
+
+	out=0;
+	for( in=0; in < al_get_count(l); in++ )
+	{
+		const void * d =  al_get( l, in );
+		
+		if( d )
+		{
+			al_set( l, out++, d );
+		}
+	}
+	al_truncate( l, out );	
+}
+
+/**
+   Replace completion strings with a comp_t structure
+*/
+static void mangle_completions( array_list_t *l, const wchar_t *prefix )
+{
+	int i;
+	
+	for( i=0; i<al_get_count( l ); i++ )
+	{
+		wchar_t *next = (wchar_t *)al_get( l, i );
+		wchar_t *start, *end;
+		comp_t *comp = halloc( global_context, sizeof( comp_t ) );
+		comp->comp = al_halloc( global_context );
+		
+		for( start=end=next; 1; end++ )
+		{
+			wchar_t c = *end;
+			
+			if( (c == COMPLETE_ITEM_SEP) || (c==COMPLETE_SEP) || !c)
+			{
+				*end = 0;
+				wchar_t * str = escape( start, 1 );
+				comp->comp_width += my_wcswidth( str );
+				halloc_register( global_context, str );
+				al_push( comp->comp, str );
+				start = end+1;
+			}
+
+			if( c == COMPLETE_SEP )
+			{
+				comp->desc = halloc_wcsdup( global_context, start );
+				break;
+			}	
+			
+			if( !c )
+				break;
+			
+		}
+
+		comp->comp_width  += my_wcswidth(prefix)*al_get_count(comp->comp) + 2*(al_get_count(comp->comp)-1);
+		comp->desc_width = comp->desc?my_wcswidth( comp->desc ):0;
+		
+		comp->pref_width = comp->comp_width + comp->desc_width + (comp->desc_width?4:0);
+		
+		free( next );
+		al_set( l, i, comp );
+	}
+	
+	recalc_width( l, prefix );
+}
+
+
+
 /**
    Respond to a winch signal by checking the terminal size
 */
@@ -839,9 +874,12 @@ static void init()
 {
 	struct sigaction act;
 	program_name = L"fish_pager";
-	fish_setlocale( LC_ALL, L"" );
-	
-	
+	wsetlocale( LC_ALL, L"" );
+
+	/*
+	  Make fd 1 output to screen, and use some other fd for writing
+	  the resulting output back to the caller
+	*/
 	int out = dup( 1 );
 	close(1);
 	if( open( ttyname(0), O_WRONLY ) != 1 )
@@ -853,11 +891,18 @@ static void init()
 		}
 	}
 	out_file = fdopen( out, "w" );
+
+	/**
+	   Init the stringbuffer used to keep any output in
+	*/
 	sb_init( &out_buff );
 
-	output_init();
+	halloc_util_init();
 	env_universal_init( 0, 0, 0, 0);
 	input_common_init( &interrupt_handler );
+	output_set_writer( &pager_buffered_writer );
+	pager_buffer = halloc( global_context, sizeof( buffer_t ) );
+	halloc_register_function( global_context, (void (*)(void *))&b_destroy, pager_buffer );
 	
 	sigemptyset( & act.sa_mask );
 	act.sa_flags=0;
@@ -870,33 +915,6 @@ static void init()
 		exit(1);
 	}
 	
-	/* Loop until we are in the foreground.  */
-	while (tcgetpgrp( 0 ) != getpid())
-	{
-		kill (- getpid(), SIGTTIN);
-	}
-
-	/* Put ourselves in our own process group.  */
-	if( getpgrp() != getpid() )
-	{
-		if (setpgid (getpid(), getpid()) < 0)
-		{
-			debug( 1,
-				   L"Couldn't put the shell in its own process group");
-			wperror( L"setpgid" );
-			exit (1);
-		}
-	}
-
-	/* Grab control of the terminal.  */
-	if( tcsetpgrp (STDIN_FILENO, getpid()) )
-	{
-		debug( 1,
-			   L"Couldn't grab control of terminal" );
-		wperror( L"tcsetpgrp" );
-		exit(1);
-	}
-
 	handle_winch( 0 );                /* Set handler for window change events */
 	
 	tcgetattr(0,&pager_modes);        /* get the current terminal modes */
@@ -909,6 +927,9 @@ static void init()
     pager_modes.c_cc[VMIN]=1;
     pager_modes.c_cc[VTIME]=0;
 
+	/*
+	  
+	*/
     if( tcsetattr(0,TCSANOW,&pager_modes))      /* set the new modes */
     {
         wperror(L"tcsetattr");
@@ -927,45 +948,51 @@ void destroy()
 {
 	env_universal_destroy();
 	input_common_destroy();
-	output_destroy();
+	halloc_util_destroy();
 	del_curterm( cur_term );
 	sb_destroy( &out_buff );
 	fclose( out_file );
-
 }
 
 int main( int argc, char **argv )
 {
 	int i;
 	int is_quoted=0;	
-	array_list_t comp;
+	array_list_t *comp;
 	wchar_t *prefix;
-
 		
 	init();
+	
 	if( argc < 3 )
 	{
 		debug( 0, L"Insufficient arguments" );
 	}
 	else
 	{
+		comp = al_halloc( global_context );
 		prefix = str2wcs( argv[2] );
 		is_quoted = strcmp( "1", argv[1] )==0;
-	
+		is_quoted = 0;
+		
 		debug( 3, L"prefix is '%ls'", prefix );
-	
-		al_init( &comp );
-	
+		
 		for( i=3; i<argc; i++ )
 		{
-			al_push( &comp, str2wcs( argv[i] ) );
+			wchar_t *wcs = str2wcs( argv[i] );
+			if( wcs )
+			{
+				al_push( comp, wcs );
+			}
 		}
+		
+		mangle_descriptions( comp );
+		if( wcscmp( prefix, L"-" ) == 0 )
+			join_completions( comp );
+		mangle_completions( comp, prefix );
 	
-		mangle_descriptions( &comp );
-
 		for( i = 6; i>0; i-- )
 		{
-			switch( completion_try_print( i, prefix, is_quoted, &comp ) )
+			switch( completion_try_print( i, prefix, is_quoted, comp ) )
 			{
 				case 0:
 					break;
@@ -979,15 +1006,16 @@ int main( int argc, char **argv )
 		
 		}
 	
-		al_foreach( &comp, (void(*)(const void *))&free );
-		al_destroy( &comp );	
 		free(prefix );
 
 		fwprintf( out_file, L"%ls", (wchar_t *)out_buff.buff );
 		if( is_ca_mode )
+		{
 			writembs(exit_ca_mode);
+			pager_flush();
+		}
 	}
-		
+	
 	destroy();
 }
 

fish_tests.c

@@ -1,9 +1,10 @@
-/** \file main.c
+/** \file fish_tests.c
 	Various bug and feature tests. Compiled and run by make test.
 */
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -26,7 +27,9 @@
 #include <locale.h>
 #include <dirent.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "proc.h"
 #include "reader.h"
@@ -38,11 +41,29 @@
 #include "expand.h"
 #include "parser.h"
 #include "tokenizer.h"
+#include "output.h"
+#include "exec.h"
+#include "event.h"
+#include "halloc_util.h"
 
+/**
+   Number of laps to run performance testing loop
+*/
 #define LAPS 50
 
+/**
+   The result of one of the test passes
+*/
+#define NUM_ANS L"-7 99999999 1234567 deadbeef DEADBEEFDEADBEEF"
+
+/**
+   Number of encountered errors
+*/
 static int err_count=0;
 
+/**
+   Print formatted output
+*/
 static void say( wchar_t *blah, ... )
 {
 	va_list va;
@@ -52,6 +73,9 @@ static void say( wchar_t *blah, ... )
 	wprintf( L"\n" );
 }
 
+/**
+   Print formatted error string
+*/
 static void err( wchar_t *blah, ... )
 {
 	va_list va;
@@ -64,17 +88,26 @@ static void err( wchar_t *blah, ... )
 	wprintf( L"\n" );
 }
 
+/**
+   Print ok message
+*/
 static void ok()
 {
 	wprintf( L"OK\n" );
 }
 
+/**
+   Compare two pointers
+*/
 static int pq_compare( void *e1, void *e2 )
 {
 	return e1-e2;
 }
 
-static int pq_test( int elements )
+/**
+   Test priority queue functionality
+*/
+static void pq_test( int elements )
 {
 	int i;
 	int prev;
@@ -114,7 +147,9 @@ static int pq_test( int elements )
 	}
 }
 
-
+/**
+   Test stack functionality
+*/
 static int stack_test( int elements )
 {
 	int i;
@@ -160,8 +195,10 @@ static int stack_test( int elements )
 	return res;
 }
 
-
-static int hash_func( const void *data )
+/**
+   Hash function for pointers
+*/
+static int hash_func( void *data )
 {
 /*	srand( (int)data );
 	return rand();
@@ -170,12 +207,18 @@ static int hash_func( const void *data )
 	return 127*((foo^0xefc7e214)) ^(foo<<11);	
 }
 
-static int compare_func( const void *key1, const void *key2 )
+/**
+   Pointer hash comparison function
+*/
+static int compare_func( void *key1, void *key2 )
 {
 	return key1==key2;
 }
 
 
+/**
+   Hashtable test
+*/
 static int hash_test( int elements )
 {
 	int i;
@@ -249,7 +292,10 @@ static int hash_test( int elements )
 	
 }
 
-static int al_test( int sz)
+/**
+   Arraylist test
+*/
+static void al_test( int sz)
 {
 	int i;	
 	array_list_t l;
@@ -280,6 +326,9 @@ static int al_test( int sz)
 	}
 }
 
+/**
+   Stringbuffer test
+*/
 static void sb_test()
 {
 	string_buffer_t b;
@@ -287,7 +336,7 @@ static void sb_test()
 	
 	sb_init( &b );
 	
-	if( res=sb_printf( &b, L"%ls%s", L"Testing ", "string_buffer_t " ) == -1 )
+	if( (res=sb_printf( &b, L"%ls%s", L"Testing ", "string_buffer_t " )) == -1 )
 	{
 		err( L"Error %d while testing stringbuffers", res );
 	}
@@ -296,10 +345,25 @@ static void sb_test()
 	{
 		err( L"Error %d while testing stringbuffers", res );
 	}
+
 	say( (wchar_t *)b.buff );
+
+	sb_clear( &b );
+
+	sb_printf( &b, L"%d %u %o %x %llX", -7, 99999999, 01234567, 0xdeadbeef, 0xdeadbeefdeadbeefll );
+	if( wcscmp( (wchar_t *)b.buff,  NUM_ANS) != 0 )
+	{
+		err( L"numerical formating is broken, '%ls' != '%ls'", (wchar_t *)b.buff, NUM_ANS );
+	}
+	else
+		say( L"numerical formating works" );	
+
+	
 }
 
-
+/**
+   Performs all tests of the util library
+*/
 static void test_util()
 {
 	int i;
@@ -346,8 +410,9 @@ static void test_util()
 }
 
 
-
-
+/**
+   Test the tokenizer
+*/
 static void test_tok()
 {
 	tokenizer t;
@@ -412,49 +477,52 @@ static void test_tok()
 		
 }
 
+/**
+   Test the parser
+*/
 static void test_parser()
 {
 	say( L"Testing parser" );
 	
 	
 	say( L"Testing null input to parser" );
-	if( !parser_test( 0, 0 ) )
+	if( !parser_test( 0, 0, 0 ) )
 	{
 		err( L"Null input to parser_test undetected" );
 	}
 
 	say( L"Testing block nesting" );
-	if( !parser_test( L"if; end", 0 ) )
+	if( !parser_test( L"if; end", 0, 0 ) )
 	{
 		err( L"Incomplete if statement undetected" );			
 	}
-	if( !parser_test( L"if test; echo", 0 ) )
+	if( !parser_test( L"if test; echo", 0, 0 ) )
 	{
 		err( L"Missing end undetected" );			
 	}
-	if( !parser_test( L"if test; end; end", 0 ) )
+	if( !parser_test( L"if test; end; end", 0, 0 ) )
 	{
 		err( L"Unbalanced end undetected" );			
 	}
 
 	say( L"Testing detection of invalid use of builtin commands" );
-	if( !parser_test( L"case foo", 0 ) )
+	if( !parser_test( L"case foo", 0, 0 ) )
 	{
 		err( L"'case' command outside of block context undetected" );		
 	}
-	if( !parser_test( L"switch ggg; if true; case foo;end;end", 0 ) )
+	if( !parser_test( L"switch ggg; if true; case foo;end;end", 0, 0 ) )
 	{
 		err( L"'case' command outside of switch block context undetected" );		
 	}
-	if( !parser_test( L"else", 0 ) )
+	if( !parser_test( L"else", 0, 0 ) )
 	{
 		err( L"'else' command outside of conditional block context undetected" );		
 	}
-	if( !parser_test( L"break", 0 ) )
+	if( !parser_test( L"break", 0, 0 ) )
 	{
 		err( L"'break' command outside of loop block context undetected" );		
 	}
-	if( !parser_test( L"exec ls|less", 0 ) || !parser_test( L"echo|return", 0 ))
+	if( !parser_test( L"exec ls|less", 0, 0 ) || !parser_test( L"echo|return", 0, 0 ))
 	{
 		err( L"Invalid pipe command undetected" );		
 	}	
@@ -472,7 +540,7 @@ static void test_parser()
 }
 	
 /**
-   Perform parameter expantion and test if the output equals the zero-terminated parameter list supplied.
+   Perform parameter expansion and test if the output equals the zero-terminated parameter list supplied.
 
    \param in the string to expand
    \param flags the flags to send to expand_string
@@ -487,7 +555,7 @@ static int expand_test( const wchar_t *in, int flags, ... )
 	wchar_t *arg;
 	
 	al_init( &out );
-	expand_string( wcsdup(in), &out, flags);
+	expand_string( 0, wcsdup(in), &out, flags);
 	
 	va_start( va, flags );
 
@@ -509,15 +577,17 @@ static int expand_test( const wchar_t *in, int flags, ... )
 	}
 	va_end( va );
 	
-	al_foreach( &out, (void (*)(const void *))&free );
+	al_foreach( &out, &free );
 	return res;
 		
 }
 
-
+/**
+   Test globbing and other parameter expansion
+*/
 static void test_expand()
 {
-	say( L"Testing parameter expantion" );
+	say( L"Testing parameter expansion" );
 	
 	if( !expand_test( L"foo", 0, L"foo", 0 ))
 	{
@@ -526,17 +596,19 @@ static void test_expand()
 
 	if( !expand_test( L"a{b,c,d}e", 0, L"abe", L"ace", L"ade", 0 ) )
 	{
-		err( L"Bracket expantion is broken" );
+		err( L"Bracket expansion is broken" );
 	}
 
 	if( !expand_test( L"a*", EXPAND_SKIP_WILDCARDS, L"a*", 0 ) )
 	{
-		err( L"Cannot skip wildcard expantion" );
+		err( L"Cannot skip wildcard expansion" );
 	}
 	
 }
 
-
+/**
+   Test speed of completion calculations
+*/
 void perf_complete()
 {
 	wchar_t c;
@@ -570,7 +642,7 @@ void perf_complete()
 	
 		matches += al_get_count( &out );
 		
-		al_foreach( &out, (void (*)(const void *))&free );
+		al_foreach( &out, &free );
 		al_truncate( &out, 0 );
 	}
 	t2=get_time();
@@ -592,7 +664,7 @@ void perf_complete()
 	
 		matches += al_get_count( &out );
 		
-		al_foreach( &out, (void (*)(const void *))&free );
+		al_foreach( &out, &free );
 		al_truncate( &out, 0 );
 	}
 	t2=get_time();
@@ -607,7 +679,9 @@ void perf_complete()
 	
 }
 
-
+/**
+   Main test 
+*/
 int main( int argc, char **argv )
 {
 
@@ -617,13 +691,11 @@ int main( int argc, char **argv )
 	say( L"Lines beginning with '(ignore):' are not errors, they are warning messages\ngenerated by the fish parser library when given broken input, and can be\nignored. All actual errors begin with 'Error:'." );
 
 	proc_init();	
-	output_init();	
+	halloc_util_init();
 	event_init();	
-	exec_init();	
 	parser_init();
 	function_init();
 	builtin_init();
-	complete_init();
 	reader_init();
 	env_init();
 
@@ -645,11 +717,9 @@ int main( int argc, char **argv )
 	parser_destroy();
 	function_destroy();
 	builtin_destroy();
-	complete_destroy();
 	wutil_destroy();
-	exec_destroy();
 	event_destroy();
-	output_destroy();
 	proc_destroy();
+	halloc_util_destroy();
 	
 }

fishd.c

@@ -2,11 +2,46 @@
 
 The universal variable server. fishd is automatically started by fish
 if a fishd server isn't already running. fishd reads any saved
-variables from ~/.fishd, and takes care of commonication between fish
+variables from ~/.fishd, and takes care of communication between fish
 instances. When no clients are running, fishd will automatically shut
 down and save.
 
+\section fishd-commands Commands
+
+Fishd works by sending and receiving commands. Each command is ended
+with a newline. These are the commands supported by fishd:
+
+<pre>set KEY:VALUE
+set_export KEY:VALUE
+</pre>
+
+These commands update the value of a variable. The only difference
+between the two is that <tt>set_export</tt>-variables should be
+exported to children of the process using them. The variable value may
+be escaped using C-style backslash escapes. In fact, this is required
+for newline characters, which would otherwise be interpreted as end of
+command.
+
+<pre>erase KEY
+</pre>
+
+Erase the variable with the specified name.
+
+<pre>barrier
+barrier_reply
+</pre>
+
+A \c barrier command will result in a barrier_reply being added to
+the end of the senders queue of unsent messages. These commands are
+used to synchronize clients, since once the reply for a barrier
+message returns, the sender can know that any updates available at the
+time the original barrier request was sent have been received.
+
 */
+
+#include "config.h"
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
@@ -19,11 +54,17 @@ down and save.
 #include <pwd.h>
 #include <fcntl.h>
 
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 #include <errno.h>
 #include <locale.h>
 #include <signal.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -35,10 +76,24 @@ down and save.
 #define UNIX_PATH_MAX 100
 #endif
 
+/**
+   Fallback if MSG_DONTWAIT isn't defined. That's actually prerry bad,
+   and may lead to strange fishd behaviour, but at least it should
+   work most of the time.
+*/
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
 /**
    Small greeting to show that fishd is running
 */
-#define GREETING "#Fish universal variable daemon\n"
+#define GREETING "# Fish universal variable daemon\n"
+
+/**
+   Small not about not editing ~/.fishd manually. Inserted at the top of all .fishd files.
+*/
+#define SAVE_MSG "# This file is automatically generated by the fishd universal variable daemon.\n# Do NOT edit it directly, your changes will be overwritten.\n"
 
 /**
    The name of the save file. The hostname is appended to this.
@@ -60,6 +115,11 @@ down and save.
 */
 #define LOCKTIMEOUT 1
 
+/**
+   Getopt short switches for fishd
+*/
+#define GETOPT_STRING "hv"
+
 /**
    The list of connections to clients
 */
@@ -70,6 +130,16 @@ static connection_t *conn;
 */
 static int sock;
 
+/**
+   Set to one when fishd should save and exit
+*/
+static int quit=0;
+
+/**
+   Dynamically generated function, made from the documentation in doc_src.
+*/
+void print_help();
+
 /**
    Constructs the fish socket filename
 */
@@ -110,6 +180,15 @@ static char *get_socket_filename()
 	return name;
 }
 
+/**
+   Signal handler for the term signal. 
+*/
+static void handle_term( int signal )
+{
+	quit=1;
+}
+
+
 /**
    Acquire the lock for the socket
    Returns the name of the lock file if successful or 
@@ -156,12 +235,12 @@ static int get_socket()
 		debug( 0, L"Unable to obtain lock on socket, exiting" );
 		exit( EXIT_FAILURE );
 	}
-	debug( 1, L"Acquired lockfile: %s", lockfile );
+	debug( 4, L"Acquired lockfile: %s", lockfile );
 	
 	local.sun_family = AF_UNIX;
 	strcpy( local.sun_path, sock_name );
-	len = strlen( local.sun_path ) + sizeof( local.sun_family );
-
+	len = sizeof(local);
+	
 	debug(1, L"Connect to socket at %s", sock_name);
 	
 	if( ( s = socket( AF_UNIX, SOCK_STREAM, 0 ) ) == -1 )
@@ -204,7 +283,7 @@ static int get_socket()
 
 unlock:
 	(void)unlink( lockfile );
-	debug( 1, L"Released lockfile: %s", lockfile );
+	debug( 4, L"Released lockfile: %s", lockfile );
 	/*
 	   End critical section protected by lock
 	*/
@@ -268,26 +347,37 @@ static void daemonize()
 			
 		case 0:
 		{
+			/*
+			  Make fishd ignore the HUP signal.
+			*/
 			struct sigaction act;
 			sigemptyset( & act.sa_mask );
 			act.sa_flags=0;
 			act.sa_handler=SIG_IGN;
 			sigaction( SIGHUP, &act, 0);
+
+			/*
+			  Make fishd save and exit on the TERM signal.
+			*/
+			sigfillset( & act.sa_mask );
+			act.sa_flags=0;
+			act.sa_handler=&handle_term;
+			sigaction( SIGTERM, &act, 0);
 			break;
 		}
 		
 		default:
 		{			
-			debug( 0, L"Parent calling exit" );
+			debug( 0, L"Parent process exiting (This is normal)" );
 			exit(0);
 		}		
 	}
-
+	
 	/*
 	  Put ourself in out own processing group
 	*/
 	setsid();
-
+	
 	/*
 	  Close stdin and stdout. We only use stderr, anyway.
 	*/
@@ -321,7 +411,7 @@ void load_or_save( int save)
 	strcat( name, FILE );
 	strcat( name, hostname );
 	
-	debug( 1, L"Open file for %s: '%s'", 
+	debug( 4, L"Open file for %s: '%s'", 
 		   save?"saving":"loading", 
 		   name );
 	
@@ -334,14 +424,18 @@ void load_or_save( int save)
 		wperror( L"open" );
 		return;		
 	}
-	debug( 1, L"File open on fd %d", c.fd );
+	debug( 4, L"File open on fd %d", c.fd );
 
 	sb_init( &c.input );
 	memset (&c.wstate, '\0', sizeof (mbstate_t));
 	q_init( &c.unsent );
 
 	if( save )
+	{
+		
+		write( c.fd, SAVE_MSG, strlen(SAVE_MSG) );
 		enqueue_all( &c );
+	}
 	else
 		read_message( &c );
 
@@ -350,12 +444,17 @@ void load_or_save( int save)
 	close( c.fd );
 }
 
+/**
+   Load variables from disk
+*/
 static void load()
 {
 	load_or_save(0);
 }
 
-
+/**
+   Save variables to disk
+*/
 static void save()
 {
 	load_or_save(1);
@@ -366,28 +465,89 @@ static void save()
 */
 static void init()
 {
-	program_name=L"fishd";
 
 	sock = get_socket();
 	daemonize();	
-	fish_setlocale( LC_ALL, L"" );	
 	env_universal_common_init( &broadcast );
 	
 	load();	
 }
 
-
+/**
+   Main function for fishd
+*/
 int main( int argc, char ** argv )
 {
-	int child_socket, t;
+	int child_socket;
 	struct sockaddr_un remote;
+	socklen_t t;
 	int max_fd;
 	int update_count=0;
 	
 	fd_set read_fd, write_fd;
 	
-	init();
+	program_name=L"fishd";
+	wsetlocale( LC_ALL, L"" );	
+
+	/*
+	  Parse options
+	*/
+	while( 1 )
+	{
+#ifdef HAVE_GETOPT_LONG
+		static struct option
+			long_options[] =
+			{
+				{
+					"help", no_argument, 0, 'h' 
+				}
+				,
+				{
+					"version", no_argument, 0, 'v' 
+				}
+				,
+				{ 
+					0, 0, 0, 0 
+				}
+			}
+		;
+		
+		int opt_index = 0;
+		
+		int opt = getopt_long( argc,
+							   argv, 
+							   GETOPT_STRING,
+							   long_options, 
+							   &opt_index );
+		
+#else	
+		int opt = getopt( argc,
+						  argv, 
+						  GETOPT_STRING );
+#endif
+		if( opt == -1 )
+			break;
+		
+		switch( opt )
+		{
+			case 0:
+				break;				
+
+			case 'h':
+				print_help();
+				exit(0);				
+								
+			case 'v':
+				debug( 0, L"%ls, version %s\n", program_name, PACKAGE_VERSION );
+				exit( 0 );				
+				
+			case '?':
+				return 1;
+				
+		}		
+	}
 	
+	init();
 	while(1) 
 	{
 		connection_t *c;
@@ -409,15 +569,27 @@ int main( int argc, char ** argv )
 				FD_SET( c->fd, &write_fd );
 			}
 		}
-		
-		res=select( max_fd, &read_fd, &write_fd, 0, 0 );
-		
-		if( res==-1 )
+
+		while( 1 )
 		{
-			wperror( L"select" );
-			exit(1);
+			res=select( max_fd, &read_fd, &write_fd, 0, 0 );
+
+			if( quit )
+			{
+				save();
+				exit(0);
+			}
+			
+			if( res != -1 )
+				break;
+			
+			if( errno != EINTR )
+			{
+				wperror( L"select" );
+				exit(1);
+			}
 		}
-		
+				
 		if( FD_ISSET( sock, &read_fd ) )
 		{
 			if( (child_socket = 
@@ -429,7 +601,7 @@ int main( int argc, char ** argv )
 			}
 			else
 			{
-				debug( 1, L"Connected with new child on fd %d", child_socket );
+				debug( 4, L"Connected with new child on fd %d", child_socket );
 
 				if( fcntl( child_socket, F_SETFL, O_NONBLOCK ) != 0 )
 				{
@@ -486,7 +658,7 @@ int main( int argc, char ** argv )
 		{
 			if( c->killme )
 			{
-				debug( 1, L"Close connection %d", c->fd );
+				debug( 4, L"Close connection %d", c->fd );
 
 				close(c->fd );
 				sb_destroy( &c->input );

function.c

@@ -9,13 +9,21 @@
 #include <signal.h>
 
 #include "config.h"
+
+#include "wutil.h"
+#include "fallback.h"
 #include "util.h"
+
 #include "function.h"
 #include "proc.h"
 #include "parser.h"
 #include "common.h"
 #include "intern.h"
 #include "event.h"
+#include "reader.h"
+#include "parse_util.h"
+#include "env.h"
+#include "expand.h"
 
 
 /**
@@ -27,7 +35,23 @@ typedef struct
 	wchar_t *cmd;
 	/** Function description */
 	wchar_t *desc;	
+	/**
+	   File where this function was defined
+	*/
+	const wchar_t *definition_file;
+	/**
+	   Line where definition started
+	*/
+	int definition_offset;	
+	/**
+	   Flag for specifying functions which are actually key bindings
+	*/
 	int is_binding;
+	
+	/**
+	   Flag for specifying that this function was automatically loaded
+	*/
+	int is_autoload;
 }
 	function_data_t;
 
@@ -36,11 +60,90 @@ typedef struct
 */
 static hash_table_t function;
 
+/**
+   Kludgy flag set by the load function in order to tell function_add
+   that the function being defined is autoloaded. There should be a
+   better way to do this...
+*/
+static int is_autoload = 0;
+
+/**
+   Make sure that if the specified function is a dynamically loaded
+   function, it has been fully loaded.
+*/
+static int load( const wchar_t *name )
+{
+	int was_autoload = is_autoload;
+	int res;
+	function_data_t *data;
+	data = (function_data_t *)hash_get( &function, name );
+	if( data && !data->is_autoload )
+		return 0;
+	
+	is_autoload = 1;	
+	res = parse_util_load( name,
+						   L"fish_function_path",
+						   &function_remove,
+						   1 );
+	is_autoload = was_autoload;
+	return res;
+}
+
+/**
+   Insert a list of all dynamically loaded functions into the
+   specified list.
+*/
+static void autoload_names( array_list_t *out, int get_hidden )
+{
+	int i;
+	
+	array_list_t path_list;
+	const wchar_t *path_var = env_get( L"fish_function_path" );
+	
+	if( ! path_var )
+		return;
+	
+	al_init( &path_list );
+
+	tokenize_variable_array( path_var, &path_list );
+	for( i=0; i<al_get_count( &path_list ); i++ )
+	{
+		wchar_t *ndir = (wchar_t *)al_get( &path_list, i );
+		DIR *dir = wopendir( ndir );
+		if( !dir )
+			continue;
+		
+		struct wdirent *next;
+		while( (next=wreaddir(dir))!=0 )
+		{
+			wchar_t *fn = next->d_name;
+			wchar_t *suffix;
+			if( !get_hidden && fn[0] == L'_' )
+				continue;
+			
+			suffix = wcsrchr( fn, L'.' );
+			if( suffix && (wcscmp( suffix, L".fish" ) == 0 ) )
+			{
+				const wchar_t *dup;
+				*suffix = 0;
+				dup = intern( fn );
+				if( !dup )
+					DIE_MEM();
+				al_push( out, dup );
+			}
+		}				
+		closedir(dir);
+	}
+	al_foreach( &path_list, &free );
+	al_destroy( &path_list );
+}
+
+
 /**
    Free all contents of an entry to the function hash table
 */
-static void clear_function_entry( const void *key, 
-							   const void *data )
+static void clear_function_entry( void *key, 
+								  void *data )
 {
 	function_data_t *d = (function_data_t *)data;
 	free( (void *)d->cmd );
@@ -61,6 +164,7 @@ void function_destroy()
 	hash_destroy( &function );
 }
 
+
 void function_add( const wchar_t *name, 
 				   const wchar_t *val,
 				   const wchar_t *desc,
@@ -68,16 +172,31 @@ void function_add( const wchar_t *name,
 				   int is_binding )
 {
 	int i;
+	wchar_t *cmd_end;
+	function_data_t *d;
 	
-	if( function_exists( name ) )
-		function_remove( name );
+	CHECK( name, );
+	CHECK( val, );
 	
-	function_data_t *d = malloc( sizeof( function_data_t ) );
+	function_remove( name );
+	
+	d = malloc( sizeof( function_data_t ) );
+	d->definition_offset = parse_util_lineno( parser_get_buffer(), current_block->tok_pos )-1;
 	d->cmd = wcsdup( val );
+	
+	cmd_end = d->cmd + wcslen(d->cmd)-1;
+	while( (cmd_end>d->cmd) && wcschr( L"\n\r\t ", *cmd_end ) )
+	{
+		*cmd_end-- = 0;
+	}
+	
 	d->desc = desc?wcsdup( desc ):0;
 	d->is_binding = is_binding;
+	d->definition_file = intern(reader_current_filename());
+	d->is_autoload = is_autoload;
+		
 	hash_put( &function, intern(name), d );
-
+	
 	for( i=0; i<al_get_count( events ); i++ )
 	{
 		event_add_handler( (event_t *)al_get( events, i ) );
@@ -87,34 +206,60 @@ void function_add( const wchar_t *name,
 
 int function_exists( const wchar_t *cmd )
 {
+	
+	CHECK( cmd, 0 );
+	
+	if( parser_is_reserved(cmd) )
+		return 0;
+	
+	load( cmd );
 	return (hash_get(&function, cmd) != 0 );
 }
 
 void function_remove( const wchar_t *name )
 {
 	void *key;
+	void *dv;
 	function_data_t *d;
-
 	event_t ev;
+	
+	CHECK( name, );
+
+	hash_remove( &function,
+				 name,
+				 &key,
+				 &dv );
+
+	d=(function_data_t *)dv;
+	
+	if( !key )
+		return;
+
 	ev.type=EVENT_ANY;
 	ev.function_name=name;	
 	event_remove( &ev );
 
-	hash_remove( &function,
-				 name,
-				 (const void **) &key,
-				 (const void **)&d );
-
-	if( !d )
-		return;
-
 	clear_function_entry( key, d );
+
+	/*
+	  Notify the autoloader that the specified function is erased, but
+	  only if this call to fish_remove is not made by the autoloader
+	  itself.
+	*/
+	if( !is_autoload )
+	{
+		parse_util_unload( name, L"fish_function_path", 0 );
+	}
 }
 	
 const wchar_t *function_get_definition( const wchar_t *argv )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, argv );
+	function_data_t *data;
+	
+	CHECK( argv, 0 );
+	
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
 	if( data == 0 )
 		return 0;
 	return data->cmd;
@@ -122,44 +267,123 @@ const wchar_t *function_get_definition( const wchar_t *argv )
 	
 const wchar_t *function_get_desc( const wchar_t *argv )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, argv );
+	function_data_t *data;
+	
+	CHECK( argv, 0 );
+		
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
 	if( data == 0 )
 		return 0;
 	
-	return data->desc?data->desc:data->cmd;
+	return _(data->desc);
 }
 
 void function_set_desc( const wchar_t *name, const wchar_t *desc )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, name );
+	function_data_t *data;
+	
+	CHECK( name, );
+	CHECK( desc, );
+	
+	load( name );
+	data = (function_data_t *)hash_get( &function, name );
 	if( data == 0 )
 		return;
 
 	data->desc =wcsdup(desc);
 }
 
+/**
+   Search arraylist of strings for specified string
+*/
+static int al_contains_str( array_list_t *list, const wchar_t * str )
+{
+	int i;
+	for( i=0; i<al_get_count( list ); i++ )
+	{
+		if( wcscmp( al_get( list, i ), str) == 0 )
+			{
+				return 1;
+			}
+	}
+	return 0;
+}
+	
 /**
    Helper function for removing hidden functions 
 */
-static void get_names_internal( const void *key,
-								const void *val,
+static void get_names_internal( void *key,
+								void *val,
 								void *aux )
 {
 	wchar_t *name = (wchar_t *)key;
 	function_data_t *f = (function_data_t *)val;
 	
-	if( name[0] != L'_' && !f->is_binding)
+	if( name[0] != L'_' && !f->is_binding && !al_contains_str( (array_list_t *)aux, name ) )
+	{
 		al_push( (array_list_t *)aux, name );
+	}
+}
+
+/**
+   Helper function for removing hidden functions 
+*/
+static void get_names_internal_all( void *key,
+									void *val,
+									void *aux )
+{
+	wchar_t *name = (wchar_t *)key;
+	
+	if( !al_contains_str( (array_list_t *)aux, name ) )
+	{
+		al_push( (array_list_t *)aux, name );
+	}
 }
 
 void function_get_names( array_list_t *list, int get_hidden )
 {
+	CHECK( list, );
+		
+	autoload_names( list, get_hidden );
+	
 	if( get_hidden )
-		hash_get_keys( &function, list );
+	{
+		hash_foreach2( &function, &get_names_internal_all, list );
+	}
 	else
+	{
 		hash_foreach2( &function, &get_names_internal, list );
+	}
 	
 }
 
+const wchar_t *function_get_definition_file( const wchar_t *argv )
+{
+	function_data_t *data;
+
+	CHECK( argv, 0 );
+		
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
+	if( data == 0 )
+		return 0;
+	
+	return data->definition_file;
+}
+
+
+int function_get_definition_offset( const wchar_t *argv )
+{
+	function_data_t *data;
+
+	CHECK( argv, -1 );
+		
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
+	if( data == 0 )
+		return -1;
+	
+	return data->definition_offset;
+}
+

function.h

@@ -58,7 +58,7 @@ void function_set_desc( const wchar_t *name, const wchar_t *desc );
 /**
    Returns true if the function witrh the name name exists.
 */
-int function_exists( const wchar_t *name);
+int function_exists( const wchar_t *name );
 
 /**
    Insert all function names into l. These are not copies of the strings and should not be freed after use.
@@ -69,4 +69,15 @@ int function_exists( const wchar_t *name);
 void function_get_names( array_list_t *list, 
 						 int get_hidden );
 
+/**
+   Returns tha absolute path of the file where the specified function
+   was defined. Returns 0 if the file was defined on the commandline.
+*/
+const wchar_t *function_get_definition_file( const wchar_t *name );
+
+/**
+   Returns the linenumber where the definition of the specified function started
+*/
+int function_get_definition_offset( const wchar_t *name );
+
 #endif

halloc.c

@@ -0,0 +1,228 @@
+/** \file halloc.c
+
+    A hierarchical memory allocation system. Works just like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "common.h"
+#include "halloc.h"
+
+/**
+   Extra size to allocate whenever doing a halloc, in order to fill uyp smaller halloc calls
+*/
+#define HALLOC_BLOCK_SIZE 128
+
+/**
+   Maximum size of trailing halloc space to refuse to discard
+*/
+#define HALLOC_SCRAP_SIZE 16
+
+#ifdef HALLOC_DEBUG
+/**
+   Debug statistic parameter
+*/
+static int child_count=0;
+/**
+   Debug statistic parameter
+*/
+static int child_size=0;
+/**
+   Debug statistic parameter
+*/
+static int alloc_count =0;
+/**
+   Debug statistic parameter
+*/
+static int alloc_spill = 0;
+/**
+   Debug statistic parameter
+*/
+static pid_t pid=0;
+/**
+   Debug statistic parameter
+*/
+static int parent_count=0;
+#endif
+
+/**
+   The main datastructure for a main halloc context
+*/
+typedef struct halloc
+{
+	/**
+	   List of all addresses and functions to call on them
+	*/
+	array_list_t children;
+	/**
+	   Memory scratch area used to fullfil smaller memory allocations
+	*/
+	void *scratch;
+	/**
+	   Amount of free space in the scratch area
+	*/
+	size_t scratch_free;
+#if __STDC_VERSION__ < 199901L
+	/**
+	   The actual data. MAde to be of type long long to make sure memory alignment is in order.
+	*/
+	long long data[1]; // Waste one byte on non-C99 compilers... :-( 
+#else
+	long long data[];
+#endif
+}
+	halloc_t;
+
+/**
+   Get the offset of the halloc structure before a data block
+*/
+static halloc_t *halloc_from_data( void *data )
+{
+	return (halloc_t *)(((char *)data) - sizeof( halloc_t ) );
+}
+
+/**
+   A function that does nothing
+*/
+static void late_free( void *data)
+{
+}
+
+#ifdef HALLOC_DEBUG
+/**
+   Debug function, called at exit when in debug mode. Prints usage
+   statistics, like number of allocations and number of internal calls
+   to malloc.
+*/
+static void woot()
+{
+	if( getpid() == pid )
+	{
+		debug( 1, L"%d parents, %d children with average child size of %.2f bytes caused %d allocs, average spill of %.2f bytes", 
+			   parent_count, child_count, (double)child_size/child_count,
+			   parent_count+alloc_count, (double)alloc_spill/(parent_count+alloc_count) );				
+	}
+}
+#endif
+
+void *halloc( void *context, size_t size )
+{	
+	halloc_t *me, *parent;
+	if( context )
+	{
+		void *res;
+		
+#ifdef HALLOC_DEBUG
+			
+		if( !child_count )
+		{
+			pid = getpid();
+			atexit( woot );
+		}
+		
+		child_count++;
+		child_size += size;
+#endif	
+		parent = halloc_from_data( context );
+		if( size <= parent->scratch_free )
+		{
+			res = parent->scratch;
+			parent->scratch_free -= size;
+			parent->scratch = ((char *)parent->scratch)+size;
+		}
+		else
+		{
+
+#ifdef HALLOC_DEBUG
+			alloc_count++;
+#endif	
+		
+			if( parent->scratch_free < HALLOC_SCRAP_SIZE )
+			{
+#ifdef HALLOC_DEBUG
+				alloc_spill += parent->scratch_free;
+#endif
+				res = calloc( 1, size + HALLOC_BLOCK_SIZE );
+				parent->scratch = (char *)res + size;
+				parent->scratch_free = HALLOC_BLOCK_SIZE;
+			}
+			else
+			{
+				res = calloc( 1, size );
+			}
+			al_push( &parent->children, &late_free );
+			al_push( &parent->children, res );
+			
+		}
+		return res;
+	
+	}
+	else
+	{
+		me = (halloc_t *)calloc( 1, sizeof(halloc_t) + size + HALLOC_BLOCK_SIZE );
+		
+		if( !me )
+			return 0;
+#ifdef HALLOC_DEBUG
+		parent_count++;
+#endif		
+		me->scratch = ((char *)me) + sizeof(halloc_t) + size;
+		me->scratch_free = HALLOC_BLOCK_SIZE;
+		
+		al_init( &me->children );
+		return &me->data;
+	}
+}
+
+void halloc_register_function( void *context, void (*func)(void *), void *data )
+{
+	halloc_t *me;
+	if( !context )
+		return;
+	
+	me = halloc_from_data( context );
+	al_push( &me->children, func );
+	al_push( &me->children, data );
+}
+
+void halloc_free( void *context )
+{
+	halloc_t *me;
+	int i;
+	
+	if( !context )
+		return;
+
+	
+	me = halloc_from_data( context );
+
+#ifdef HALLOC_DEBUG
+	alloc_spill += me->scratch_free;
+#endif
+	for( i=0; i<al_get_count(&me->children); i+=2 )
+	{
+		void (*func)(void *) = (void (*)(void *))al_get( &me->children, i );
+		void * data = (void *)al_get( &me->children, i+1 );
+		if( func != &late_free )
+			func( data );
+	}
+	for( i=0; i<al_get_count(&me->children); i+=2 )
+	{
+		void (*func)(void *) = (void (*)(void *))al_get( &me->children, i );
+		void * data = (void *)al_get( &me->children, i+1 );
+		if( func == &late_free )
+			free( data );
+	}
+	al_destroy( &me->children );
+	free(me);
+}

halloc.h

@@ -0,0 +1,48 @@
+/** \file halloc.h 
+
+    A hierarchical memory allocation system. Works mostly like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#ifndef FISH_HALLOC_H
+#define FISH_HALLOC_H
+
+/**
+   Allocate new memory using specified parent memory context. Context
+   _must_ be either 0 or the result of a previous call to halloc.
+
+   If \c context is null, the resulting block is a root block, and
+   must be freed with a call to halloc_free().
+
+   If \c context is not null, context must be a halloc root block. the
+   resulting memory block is a child context, and must never be
+   explicitly freed, it will be automatically freed whenever the
+   parent context is freed. Child blocks can also never be used as the
+   context in calls to halloc_register_function, halloc_free, etc.
+*/
+void *halloc( void *context, size_t size );
+
+/**
+   Make the specified function run whenever context is free'd, using data as argument.
+
+   \c context a halloc root block
+*/
+void halloc_register_function( void *context, void (*func)(void *), void *data );
+
+/**
+   Free memory context and all children contexts. Only root contexts
+   may be freed explicitly.
+
+   All functions registered with halloc_register_function are run in
+   the order they where added. Afterwards, all memory allocated using
+   halloc itself is free'd.
+
+   \c context a halloc root block
+*/
+void halloc_free( void *context );
+
+
+#endif
+

halloc_util.c

@@ -0,0 +1,100 @@
+/** \file halloc_util.c
+
+    A hierarchical memory allocation system. Works just like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "common.h"
+#include "halloc.h"
+
+void *global_context=0;
+
+void halloc_util_init()
+{
+	global_context = halloc( 0, 0 );
+}
+
+void halloc_util_destroy()
+{
+	halloc_free( global_context );
+}
+
+array_list_t *al_halloc( void *context )
+{
+	array_list_t *res = halloc( context, sizeof( array_list_t ) );
+	if( !res )
+		DIE_MEM();
+	al_init( res );
+	halloc_register_function( context, (void (*)(void *)) &al_destroy, res );
+	return res;
+}
+
+string_buffer_t *sb_halloc( void *context )
+{
+	string_buffer_t *res = halloc( context, sizeof( string_buffer_t ) );
+	if( !res )
+		DIE_MEM();
+	sb_init( res );
+	halloc_register_function( context, (void (*)(void *)) &sb_destroy, res );
+	return res;
+}
+
+/**
+   A function that takes a single parameter, which is a function pointer, and calls it.
+*/
+static void halloc_passthrough( void *f )
+{
+	void (*func)() = (void (*)() )f;
+	func();
+}
+
+void halloc_register_function_void( void *context, void (*func)() )
+{
+	halloc_register_function( context, &halloc_passthrough, (void *)func );
+}
+
+void *halloc_register( void *context, void *data )
+{
+	if( !data )
+		return 0;
+	
+	halloc_register_function( context, &free, data );
+	return data;
+}
+
+wchar_t *halloc_wcsdup( void *context, const wchar_t *in )
+{
+	size_t len=wcslen(in);
+	wchar_t *out = halloc( context, sizeof( wchar_t)*(len+1));
+	
+	if( out == 0 )
+	{
+		DIE_MEM();
+	}
+	memcpy( out, in, sizeof( wchar_t)*(len+1));
+	return out;
+}
+
+wchar_t *halloc_wcsndup( void * context, const wchar_t *in, int c )
+{
+	wchar_t *res = halloc( context, sizeof(wchar_t)*(c+1) );
+	if( res == 0 )
+	{
+		DIE_MEM();
+	}
+	wcslcpy( res, in, c+1 );
+	res[c] = L'\0';	
+	return res;	
+}

halloc_util.h

@@ -0,0 +1,66 @@
+/**
+   \file halloc_util.h
+
+   Various halloc-related utility functions.
+*/
+
+#ifndef FISH_HALLOC_UTIL_H
+#define FISH_HALLOC_UTIL_H
+
+/**
+   This pointer is a valid halloc context that will be freed right
+   before program shutdown. It may be used to allocate memory that
+   should be freed when the program shuts down.
+*/
+extern void *global_context;
+
+/**
+   Create the global_context halloc object
+*/
+void halloc_util_init();
+
+/**
+   Free the global_context halloc object
+*/
+void halloc_util_destroy();
+
+/**
+   Allocate a array_list_t that will be automatically disposed of when
+   the specified context is free'd
+*/
+array_list_t *al_halloc( void *context );
+
+/**
+   Allocate a string_buffer_t that will be automatically disposed of
+   when the specified context is free'd
+*/
+string_buffer_t *sb_halloc( void *context );
+
+/**
+   Register the specified function to run when the specified context
+   is free'd. This function is related to halloc_register_function,
+   but the specified function dowes not take an argument.
+*/
+void halloc_register_function_void( void *context, void (*func)() );
+
+/**
+   Free the memory pointed to by \c data when the memory pointed to by
+   \c context is free:d. Note that this will _not_ turn the specified
+   memory area into a valid halloc context. Only memory areas created
+   using a call to halloc( 0, size ) can be used as a context.
+*/
+void *halloc_register( void *context, void *data );
+
+/**
+   Make a copy of the specified string using memory allocated using
+   halloc and the specified context
+*/
+wchar_t *halloc_wcsdup( void *context, const wchar_t *str );
+
+/**
+   Make a copy of the specified substring using memory allocated using
+   halloc and the specified context
+*/
+wchar_t *halloc_wcsndup( void * context, const wchar_t *in, int c );
+
+#endif

highlight.c

@@ -12,12 +12,16 @@
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "highlight.h"
 #include "tokenizer.h"
 #include "proc.h"
 #include "parser.h"
+#include "parse_util.h"
 #include "builtin.h"
 #include "function.h"
 #include "env.h"
@@ -26,6 +30,14 @@
 #include "common.h"
 #include "complete.h"
 #include "output.h"
+#include "halloc.h"
+#include "halloc_util.h"
+#include "wildcard.h"
+
+/**
+   Number of elements in the highlight_var array
+*/
+#define VAR_COUNT ( sizeof(highlight_var)/sizeof(wchar_t *) )
 
 static void highlight_universal_internal( wchar_t * buff, 
 										  int *color, 
@@ -36,43 +48,477 @@ static void highlight_universal_internal( wchar_t * buff,
 /**
    The environment variables used to specify the color of different tokens.
 */
-static wchar_t *hightlight_var[] = 
+static wchar_t *highlight_var[] = 
 {
 	L"fish_color_normal",
-	L"fish_color_command",
-	L"fish_color_subshell",
-	L"fish_color_redirection",
-	L"fish_color_end",
 	L"fish_color_error",
+	L"fish_color_command",
+	L"fish_color_end",
 	L"fish_color_param",
 	L"fish_color_comment",
 	L"fish_color_match",
 	L"fish_color_search_match",
-	L"fish_color_pager_prefix",
-	L"fish_color_pager_completion",
-	L"fish_color_pager_description",
-	L"fish_color_pager_progress"
+	L"fish_color_operator",
+	L"fish_color_escape",
+	L"fish_color_quote",
+	L"fish_color_redirection",
+	L"fish_color_valid_path"
 }
 	;
 
+/**
+   Tests if the specified string is the prefix of any valid path in the system. 
+
+   \return zero it this is not a valid prefix, non-zero otherwise
+*/
+static int is_potential_path( const wchar_t *path )
+{
+	wchar_t *tilde, *unescaped;
+	wchar_t *in, *out;
+	int has_magic = 0;
+	int res = 0;
+
+	void *context = halloc( 0, 0 );
+
+	tilde = expand_tilde( wcsdup(path) );
+	if( tilde )
+	{
+		halloc_register( context, tilde );
+	
+		unescaped = unescape( tilde, 1 );
+		if( unescaped )
+		{
+			
+//	debug( 1, L"%ls -> %ls ->%ls", path, tilde, unescaped );
+			
+			halloc_register( context, unescaped );
+			
+			for( in = out = unescaped; *in; in++ )
+			{
+				switch( *in )
+				{
+					case PROCESS_EXPAND:
+					case VARIABLE_EXPAND:
+					case VARIABLE_EXPAND_SINGLE:
+					case BRACKET_BEGIN:
+					case BRACKET_END:
+					case BRACKET_SEP:
+					case ANY_CHAR:
+					case ANY_STRING:
+					case ANY_STRING_RECURSIVE:
+					{
+						has_magic = 1;
+						break;		
+					}
+				
+					case INTERNAL_SEPARATOR:
+					{
+						break;
+					}
+				
+					default:
+					{
+						*(out++) = *in;
+						break;
+					}
+				
+				}
+			
+			}
+			*out = 0;
+		
+			if( !has_magic && wcslen( unescaped ) )
+			{
+				int must_be_dir = 0;
+				DIR *dir;
+				must_be_dir = unescaped[wcslen(unescaped)-1] == L'/';
+				if( must_be_dir )
+				{
+					dir = wopendir( unescaped );
+					res = !!dir;
+					closedir( dir );
+				}
+				else
+				{
+					wchar_t *dir_name, *base;
+					struct wdirent *ent;
+				
+					dir_name = wdirname( halloc_wcsdup(context, unescaped) );
+					base = wbasename( halloc_wcsdup(context, unescaped) );			
+			
+					if( (wcscmp( dir_name, L"/" ) == 0 ) &&
+						(wcscmp( base, L"/" ) == 0 ) )
+					{
+						res = 1;
+					}
+					else if( (dir = wopendir( dir_name )) )
+					{
+					
+						while( (ent = wreaddir( dir )) )
+						{
+							if( wcsncmp( ent->d_name, base, wcslen(base) ) == 0 )
+							{
+								res = 1;
+								break;
+							}
+						}
+					
+						closedir( dir );
+					}
+				}
+			
+			}
+		}
+	}
+	
+	halloc_free( context );
+		
+	return res;
+	
+}
+
+
 
 int highlight_get_color( int highlight )
 {
+	int i;
+	int idx=0;
+	int result = 0;
+	
 	if( highlight < 0 )
 		return FISH_COLOR_NORMAL;
-	if( highlight >= (12) )
+	if( highlight >= (1<<VAR_COUNT) )
 		return FISH_COLOR_NORMAL;
-	
-	wchar_t *val = env_get( hightlight_var[highlight]);
-	if( val == 0 )
-		val = env_get( hightlight_var[HIGHLIGHT_NORMAL]);
-	
-	if( val == 0 )
+
+	for( i=0; i<(VAR_COUNT-1); i++ )
 	{
-		return FISH_COLOR_NORMAL;
+		if( highlight & (1<<i ))
+		{
+			idx = i;
+			break;
+		}
 	}
+		
+	wchar_t *val = env_get( highlight_var[idx]);
+
+//	debug( 1, L"%d -> %d -> %ls", highlight, idx, val );	
 	
-	return output_color_code( val );
+	if( val == 0 )
+		val = env_get( highlight_var[0]);
+	
+	if( val )
+		result = output_color_code( val );
+	
+	if( highlight & HIGHLIGHT_VALID_PATH )
+	{
+		wchar_t *val2 = env_get( L"fish_color_valid_path" );
+		int result2 = output_color_code( val2 );
+		if( result == FISH_COLOR_NORMAL )
+			result = result2;
+		else 
+		{
+			if( result2 & FISH_COLOR_BOLD )
+				result |= FISH_COLOR_BOLD;
+			if( result2 & FISH_COLOR_UNDERLINE )
+				result |= FISH_COLOR_UNDERLINE;
+		}
+		
+	}
+	return result;
+	
+}
+
+/**
+   Highligt operators (such as $, ~, %, as well as escaped characters.
+*/
+static void highlight_param( const wchar_t * buff,
+							 int *color,
+							 int pos,
+							 array_list_t *error )
+{
+	
+	
+	int mode = 0; 
+	int in_pos, len = wcslen( buff );
+	int bracket_count=0;
+	wchar_t c;
+	int normal_status = *color;
+	
+	for( in_pos=0;
+		 in_pos<len; 
+		 in_pos++ )
+	{
+		c = buff[in_pos];
+		switch( mode )
+		{
+
+			/*
+			  Mode 0 means unquoted string
+			*/
+			case 0:
+			{
+				if( c == L'\\' )
+				{
+					int start_pos = in_pos;
+					in_pos++;
+					
+					if( wcschr( L"~%", buff[in_pos] ) )
+					{
+						if( in_pos == 1 )
+						{
+							color[start_pos] = HIGHLIGHT_ESCAPE;
+							color[in_pos+1] = normal_status;
+						}
+					}
+					else if( buff[in_pos]==L',' )
+					{
+						if( bracket_count )
+						{
+							color[start_pos] = HIGHLIGHT_ESCAPE;
+							color[in_pos+1] = normal_status;
+						}
+					}
+					else if( wcschr( L"nrtbe*?$(){}'\"<>^ \\#;|&", buff[in_pos] ) )
+					{
+						color[start_pos]=HIGHLIGHT_ESCAPE;
+						color[in_pos+1]=normal_status;
+					}
+					else if( wcschr( L"uUxX01234567", buff[in_pos] ) )
+					{
+						int i;
+						long long res=0;
+						int chars=2;
+						int base=16;
+						
+						int byte = 0;
+						wchar_t max_val = ASCII_MAX;
+						
+						switch( buff[in_pos] )
+						{
+							case L'u':
+							{
+								chars=4;
+								max_val = UCS2_MAX;
+								break;
+							}
+							
+							case L'U':
+							{
+								chars=8;
+								max_val = WCHAR_MAX;
+								break;
+							}
+							
+							case L'x':
+							{
+								break;
+							}
+							
+							case L'X':
+							{
+								byte=1;
+								max_val = BYTE_MAX;
+								break;
+							}
+							
+							default:
+							{
+								base=8;
+								chars=3;
+								in_pos--;
+								break;
+							}								
+						}
+						
+						for( i=0; i<chars; i++ )
+						{
+							int d = convert_digit( buff[++in_pos],base);
+							
+							if( d < 0 )
+							{
+								in_pos--;
+								break;
+							}
+							
+							res=(res*base)|d;
+						}
+
+						if( (res <= max_val) )
+						{
+							color[start_pos] = HIGHLIGHT_ESCAPE;
+							color[in_pos+1] = normal_status;								
+						}
+						else
+						{	
+							color[start_pos] = HIGHLIGHT_ERROR;
+							color[in_pos+1] = normal_status;								
+						}
+					}
+
+				}
+				else 
+				{
+					switch( buff[in_pos]){
+						case L'~':
+						case L'%':
+						{
+							if( in_pos == 0 )
+							{
+								color[in_pos] = HIGHLIGHT_OPERATOR;
+								color[in_pos+1] = normal_status;
+							}
+							break;
+						}
+
+						case L'$':
+						{
+							wchar_t n = buff[in_pos+1];							
+							color[in_pos] = (n==L'$'||wcsvarchr(n))? HIGHLIGHT_OPERATOR:HIGHLIGHT_ERROR;
+							color[in_pos+1] = normal_status;								
+							break;
+						}
+
+
+						case L'*':
+						case L'?':
+						case L'(':
+						case L')':
+						{
+							color[in_pos] = HIGHLIGHT_OPERATOR;
+							color[in_pos+1] = normal_status;
+							break;
+						}
+						
+						case L'{':
+						{
+							color[in_pos] = HIGHLIGHT_OPERATOR;
+							color[in_pos+1] = normal_status;
+							bracket_count++;
+							break;					
+						}
+						
+						case L'}':
+						{
+							color[in_pos] = HIGHLIGHT_OPERATOR;
+							color[in_pos+1] = normal_status;
+							bracket_count--;
+							break;						
+						}
+
+						case L',':
+						{
+							if( bracket_count )
+							{
+								color[in_pos] = HIGHLIGHT_OPERATOR;
+								color[in_pos+1] = normal_status;
+							}
+
+							break;					
+						}
+						
+						case L'\'':
+						{
+							color[in_pos] = HIGHLIGHT_QUOTE;
+							mode = 1;
+							break;					
+						}
+				
+						case L'\"':
+						{
+							color[in_pos] = HIGHLIGHT_QUOTE;
+							mode = 2;
+							break;
+						}
+
+					}
+				}		
+				break;
+			}
+
+			/*
+			  Mode 1 means single quoted string, i.e 'foo'
+			*/
+			case 1:
+			{
+				if( c == L'\\' )
+				{
+					int start_pos = in_pos;
+					switch( buff[++in_pos] )
+					{
+						case '\\':
+						case L'\'':
+						{
+							color[start_pos] = HIGHLIGHT_ESCAPE;
+							color[in_pos+1] = HIGHLIGHT_QUOTE;
+							break;
+						}
+						
+						case 0:
+						{
+							return;
+						}
+						
+					}
+					
+				}
+				if( c == L'\'' )
+				{
+					mode = 0;
+					color[in_pos+1] = normal_status;
+				}
+				
+				break;
+			}
+
+			/*
+			  Mode 2 means double quoted string, i.e. "foo"
+			*/
+			case 2:
+			{
+				switch( c )
+				{
+					case '"':
+					{
+						mode = 0;
+						color[in_pos+1] = normal_status;
+						break;
+					}
+				
+					case '\\':
+					{
+						int start_pos = in_pos;
+						switch( buff[++in_pos] )
+						{
+							case L'\0':
+							{
+								return;
+							}
+							
+							case '\\':
+							case L'$':
+							case '"':
+							{
+								color[start_pos] = HIGHLIGHT_ESCAPE;
+								color[in_pos+1] = HIGHLIGHT_QUOTE;
+								break;
+							}
+						}
+						break;
+					}
+					
+					case '$':
+					{
+						wchar_t n = buff[in_pos+1];
+						color[in_pos] = (n==L'$'||wcsvarchr(n))? HIGHLIGHT_OPERATOR:HIGHLIGHT_ERROR;
+						color[in_pos+1] = HIGHLIGHT_QUOTE;								
+						break;
+					}
+				
+				}						
+				break;
+			}
+		}
+	}
 }
 
 
@@ -86,11 +532,21 @@ void highlight_shell( wchar_t * buff,
 	int i;
 	int last_val;
 	wchar_t *last_cmd=0;
-	int len = wcslen(buff);
+	int len;
+
+	void *context;
+	wchar_t *cmd=0;
+	
+	CHECK( buff, );
+	CHECK( color, );
+	
+	len = wcslen(buff);
 	
 	if( !len )
 		return;
 	
+	context = halloc( 0, 0 );
+	
 	for( i=0; buff[i] != 0; i++ )
 		color[i] = -1;
 	
@@ -101,6 +557,7 @@ void highlight_shell( wchar_t * buff,
 		int last_type = tok_last_type( &tok );
 		int prev_argc=0;
 		
+				
 		switch( last_type )
 		{
 			case TOK_STRING:
@@ -121,6 +578,27 @@ void highlight_shell( wchar_t * buff,
 					{
 						color[ tok_get_pos( &tok ) ] = HIGHLIGHT_PARAM;
 					}					
+
+					if( cmd && (wcscmp( cmd, L"cd" ) == 0) )
+					{
+						wchar_t *dir = expand_one( context, 
+												   wcsdup(tok_last( &tok )),
+												   EXPAND_SKIP_SUBSHELL );
+						if( dir )
+						{
+							if( !parser_cdpath_get( context, dir ) )
+							{
+								color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR;							
+							}
+						}
+					}
+					
+					highlight_param( param,
+									 &color[tok_get_pos( &tok )],
+									 pos-tok_get_pos( &tok ), 
+									 error );
+					
+
 				}
 				else
 				{ 
@@ -129,28 +607,27 @@ void highlight_shell( wchar_t * buff,
 					/*
 					  Command. First check that the command actually exists.
 					*/
-					wchar_t *cmd = 
-						(last_type == TOK_STRING) ? 
-						expand_one(wcsdup(tok_last( &tok )),EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_VARIABLES) : 
-						wcsdup(tok_last( &tok ));
+					cmd = expand_one( context, 
+									  wcsdup(tok_last( &tok )),
+									  EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_VARIABLES);
+					
 					if( cmd == 0 )
 					{
 						color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR;
 					}
 					else
 					{
-						wchar_t *tmp;
 						int is_cmd = 0;
 						int is_subcommand = 0;
 						int mark = tok_get_pos( &tok );
 						color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND;
-
 						
 						if( parser_is_subcommand( cmd ) )
 						{
 							tok_next( &tok );
-							if(( wcscmp( L"-h", tok_last( &tok ) ) == 0 ) ||
-							   ( wcscmp( L"--help", tok_last( &tok ) ) == 0 ) )							
+							if( ( ! parser_is_block( cmd ) ) &&
+								( ( wcscmp( L"-h", tok_last( &tok ) ) == 0 ) ||
+								  ( wcsncmp( L"--help", tok_last( &tok ), wcslen( tok_last( &tok ) ) ) == 0 && wcslen( tok_last( &tok ) ) >= 3 ) ) )							
 							{
 								/* 
 								   The builtin and command builtins
@@ -169,31 +646,37 @@ void highlight_shell( wchar_t * buff,
 
 						if( !is_subcommand )
 						{
+							wchar_t *tmp;
 							/*
 							  OK, this is a command, it has been
 							  successfully expanded and everything
 							  looks ok. Lets check if the command
 							  exists.
 							*/
+
+							/*
+							  First check if it is a builtin or
+							  function, since we don't have to stat
+							  any files for that
+							*/
 							is_cmd |= builtin_exists( cmd );
 							is_cmd |= function_exists( cmd );
-							is_cmd |= (tmp=get_filename( cmd )) != 0;
+
+							/*
+							  Moving on to expensive tests
+							*/
+
+							/*
+							  Check if this is a regular command
+							*/
+							is_cmd |= !!(tmp=parser_get_filename( context, cmd ));
 							
 							/* 
-							   Could not find the command. Maybe it is a path for a implicit cd command.
-							   Lets check!
+							   Could not find the command. Maybe it is
+							   a path for a implicit cd command.
 							*/
-							if( !is_cmd )
-							{
-								wchar_t *pp = parser_cdpath_get( cmd );
-								if( pp )
-								{
-									free( pp );
-									is_cmd = 1;
-								}		
-							}
-							
-							free(tmp);
+							is_cmd |= !!(tmp=parser_cdpath_get( context, cmd ));
+														
 							if( is_cmd )
 							{								
 								color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND;
@@ -206,15 +689,11 @@ void highlight_shell( wchar_t * buff,
 							}
 							had_cmd = 1;
 						}
-						free(cmd);
 
 						if( had_cmd )
 						{
-							if( last_cmd )
-								free( last_cmd );
-							last_cmd = wcsdup( tok_last( &tok ) );						
-						}					
-
+							last_cmd = halloc_wcsdup( context, tok_last( &tok ) );						
+						}
 					}
 
 				}
@@ -247,7 +726,7 @@ void highlight_shell( wchar_t * buff,
 				{
 					case TOK_STRING:
 					{
-						target = expand_one( wcsdup( tok_last( &tok ) ), EXPAND_SKIP_SUBSHELL);
+						target = expand_one( context, wcsdup( tok_last( &tok ) ), EXPAND_SKIP_SUBSHELL);
 						/*
 						  Redirect filename may contain a subshell. 
 						  If so, it will be ignored/not flagged.
@@ -265,7 +744,7 @@ void highlight_shell( wchar_t * buff,
 
 				if( target != 0 )
 				{
-					wchar_t *dir = wcsdup( target );
+					wchar_t *dir = halloc_wcsdup( context, target );
 					wchar_t *dir_end = wcsrchr( dir, L'/' );
 					struct stat buff;
 					/* 
@@ -281,9 +760,8 @@ void highlight_shell( wchar_t * buff,
 							if( error )
 								al_push( error, wcsdupcat2( L"Directory \'", dir, L"\' does not exist", 0 ) );
 							
-						}						
+						}
 					}
-					free( dir );
 					
 					/*
 					  If the file is read from or appended to, check
@@ -299,7 +777,6 @@ void highlight_shell( wchar_t * buff,
 								al_push( error, wcsdupcat2( L"File \'", target, L"\' does not exist", 0 ) );
 						}
 					}
-					free( target );					
 				}
 				break;
 			}
@@ -349,27 +826,24 @@ void highlight_shell( wchar_t * buff,
 		}
 	}
 
-	if( last_cmd )
-		free( last_cmd );
-	
 	tok_destroy( &tok );	
 			 
 	/*
 	  Locate and syntax highlight subshells recursively
 	*/
-	
-	wchar_t *buffcpy = wcsdup( buff );
+
+	wchar_t *buffcpy = halloc_wcsdup( context, buff );
 	wchar_t *subpos=buffcpy;
 	int done=0;
 	
 	while( 1 )
 	{
 		wchar_t *begin, *end;
-		
-		if( expand_locate_subshell( subpos, 
-									&begin, 
-									&end,
-									1) <= 0)
+	
+		if( parse_util_locate_cmdsubst( subpos, 
+										&begin, 
+										&end,
+										1) <= 0)
 		{
 			break;
 		}
@@ -380,16 +854,19 @@ void highlight_shell( wchar_t * buff,
 			*end=0;
 		
 		highlight_shell( begin+1, color +(begin-buffcpy)+1, -1, error );
-		color[end-buffcpy]=HIGHLIGHT_PARAM;
+		color[end-buffcpy]=HIGHLIGHT_OPERATOR;
 		
 		if( done )
 			break;
 		
 		subpos = end+1;		
+		
 	}
-	free( buffcpy );
-	
 
+	/*
+	  The highlighting code only changes the first element when the
+	  color changes. This fills in the rest.
+	*/
 	last_val=0;
 	for( i=0; buff[i] != 0; i++ )
 	{
@@ -399,6 +876,32 @@ void highlight_shell( wchar_t * buff,
 			color[i] = last_val;
 	}
 
+	/*
+	  Color potentially valid paths in a special path color if they
+	  are the current token.
+	*/
+
+	if( pos >= 0 && pos <= len )
+	{
+		
+		wchar_t *tok_begin, *tok_end;
+		wchar_t *token;
+		
+		parse_util_token_extent( buff, pos, &tok_begin, &tok_end, 0, 0 );
+		if( tok_begin && tok_end )
+		{
+			token = halloc_wcsndup( context, tok_begin, tok_end-tok_begin );
+			
+			if( is_potential_path( token ) )
+			{
+				for( i=tok_begin-buff; i < (tok_end-buff); i++ )
+				{
+					color[i] |= HIGHLIGHT_VALID_PATH;
+				}
+			}
+		}
+	}
+	
 
 	highlight_universal_internal( buff, color, pos, error );
 
@@ -412,6 +915,9 @@ void highlight_shell( wchar_t * buff,
 			color[i]=0;
 		}
 	}
+
+	halloc_free( context );
+	
 }
 
 /**
@@ -461,15 +967,15 @@ static void highlight_universal_internal( wchar_t * buff,
 						{
 							if( prev_q == *str )
 							{
-								int pos1, pos2;
+								long pos1, pos2;
 							
 								level--;
-								pos1 = (int)al_pop( &l );
+								pos1 = (long)al_pop( &l );
 								pos2 = str-buff;
 								if( pos1==pos || pos2==pos )
 								{
-									color[pos1]|=HIGHLIGHT_MATCH<<8;
-									color[pos2]|=HIGHLIGHT_MATCH<<8;
+									color[pos1]|=HIGHLIGHT_MATCH<<16;
+									color[pos2]|=HIGHLIGHT_MATCH<<16;
 									match_found = 1;
 									
 								}
@@ -494,7 +1000,7 @@ static void highlight_universal_internal( wchar_t * buff,
 			al_destroy( &l );
 		
 			if( !match_found )
-				color[pos] = HIGHLIGHT_ERROR<<8;
+				color[pos] = HIGHLIGHT_ERROR<<16;
 		}
 
 		/*
@@ -507,8 +1013,7 @@ static void highlight_universal_internal( wchar_t * buff,
 			wchar_t inc_char = buff[pos];
 			int level = 0;
 			wchar_t *str = &buff[pos];
-			int match_found=0;
-			
+			int match_found=0;			
 
 			while( (str >= buff) && *str)
 			{
@@ -519,8 +1024,8 @@ static void highlight_universal_internal( wchar_t * buff,
 				if( level == 0 )
 				{
 					int pos2 = str-buff;
-					color[pos]|=HIGHLIGHT_MATCH<<8;
-					color[pos2]|=HIGHLIGHT_MATCH<<8;
+					color[pos]|=HIGHLIGHT_MATCH<<16;
+					color[pos2]|=HIGHLIGHT_MATCH<<16;
 					match_found=1;
 					break;
 				}
@@ -528,7 +1033,7 @@ static void highlight_universal_internal( wchar_t * buff,
 			}
 			
 			if( !match_found )
-				color[pos] = HIGHLIGHT_ERROR<<8;
+				color[pos] = HIGHLIGHT_ERROR<<16;
 		}
 	}
 }
@@ -540,7 +1045,7 @@ void highlight_universal( wchar_t * buff,
 {
 	int i;
 	
-	for( i=0; buff[i] != 0; i++ )
+	for( i=0; buff[i]; i++ )
 		color[i] = 0;
 	
 	highlight_universal_internal( buff, color, pos, error );

highlight.h

@@ -9,6 +9,59 @@
 
 #include "util.h"
 
+/**
+   Internal value representing highlighting of normal text
+*/
+#define HIGHLIGHT_NORMAL 0x1
+/**
+   Internal value representing highlighting of an error
+*/
+#define HIGHLIGHT_ERROR 0x2
+/**
+   Internal value representing highlighting of a command
+*/
+#define HIGHLIGHT_COMMAND 0x4
+/**
+   Internal value representing highlighting of a process separator
+*/
+#define HIGHLIGHT_END 0x8
+/**
+   Internal value representing highlighting of a regular command parameter
+*/
+#define HIGHLIGHT_PARAM 0x10
+/**
+   Internal value representing highlighting of a comment
+*/
+#define HIGHLIGHT_COMMENT 0x20
+/**
+   Internal value representing highlighting of a matching parenteses, etc.
+*/
+#define HIGHLIGHT_MATCH 0x40
+/**
+   Internal value representing highlighting of a search match
+*/
+#define HIGHLIGHT_SEARCH_MATCH 0x80
+/**
+   Internal value representing highlighting of an operator
+*/
+#define HIGHLIGHT_OPERATOR 0x100
+/**
+   Internal value representing highlighting of an escape sequence
+*/
+#define HIGHLIGHT_ESCAPE 0x200
+/**
+   Internal value representing highlighting of a quoted string
+*/
+#define HIGHLIGHT_QUOTE 0x400
+/**
+   Internal value representing highlighting of an IO redirection
+*/
+#define HIGHLIGHT_REDIRECTION 0x800 
+/**
+   Internal value representing highlighting a potentially valid path
+*/
+#define HIGHLIGHT_VALID_PATH 0x1000
+
 /**
    Perform syntax highlighting for the shell commands in buff. The result is
    stored in the color array as a color_code from the HIGHLIGHT_ enum

history.c

@@ -12,13 +12,17 @@
 
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "history.h"
 #include "common.h"
 #include "reader.h"
 #include "env.h"
 #include "sanity.h"
+#include "signal.h"
 
 /*
   The history is implemented using a linked list. Searches are done
@@ -37,14 +41,21 @@ typedef struct
 	   Number of entries
 	*/
 	int count;
+
 	/**
 	   Last history item
 	*/
 	ll_node_t *last;
+
 	/**
 	   The last item loaded from file
 	*/
 	ll_node_t *last_loaded;
+
+	/**
+	   Set to one if the file containing the saved history has been loaded
+	*/
+	int is_loaded;
 }
 	history_data;
 
@@ -73,7 +84,9 @@ static int past_end =1;
 static int history_count=0;
 
 /**
-   The name of the current history list. The name is used to switch between history lists for different commands as sell as for deciding the name of the file to save the history in.
+   The name of the current history list. The name is used to switch
+   between history lists for different commands as sell as for
+   deciding the name of the file to save the history in.
 */
 static wchar_t *mode_name;
 
@@ -82,25 +95,37 @@ static wchar_t *mode_name;
 */
 static hash_table_t history_table;
 
+/**
+   Flag, set to 1 once the history file has been loaded
+*/
+static int is_loaded=0;
 
 /**
-   Load history from ~/.fish_history
+   Load history from file
 */
-static void history_load( wchar_t *name )
+static int history_load()
 {
 	wchar_t *fn;
 	wchar_t *buff=0;
 	int buff_len=0;
 	FILE *in_stream;
 	hash_table_t used;
+	int res = 0;
 	
-	block();
+	if( !mode_name )
+	{
+		return -1;
+	}	
+
+	is_loaded = 1;
+		
+	signal_block();
 	hash_init2( &used, 
 				&hash_wcs_func,
 				&hash_wcs_cmp,
 				4096 );
 
-	fn = wcsdupcat2( env_get(L"HOME"), L"/.", name, L"_history", 0 );
+	fn = wcsdupcat2( env_get(L"HOME"), L"/.", mode_name, L"_history", 0 );
 	
 	in_stream = wfopen( fn, "r" );
 	
@@ -111,13 +136,13 @@ static void history_load( wchar_t *name )
 			int buff_read = fgetws2( &buff, &buff_len, in_stream );
 			if( buff_read == -1 )
 			{
-				debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name );
+				debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
 				wperror( L"fgetws2" );
 				fclose( in_stream );
 				free( fn );
 				free( buff );
-				unblock();				
-				return;
+				signal_unblock();				
+				return -1;
 			}
 
 			/*
@@ -127,15 +152,15 @@ static void history_load( wchar_t *name )
 
 			  Use a hashtable to check for duplicates instead.
 			*/
-			if( !hash_get( &used,
-						   buff ) )
+			if( wcslen(buff) && !hash_get( &used,
+										   buff ) )
 			{
 				history_count++;		
 				
 				history_current = malloc( sizeof( ll_node_t ) );
 				if( !history_current )
 				{
-					die_mem();
+					DIE_MEM();
 					
 				}
 				
@@ -161,8 +186,10 @@ static void history_load( wchar_t *name )
 	{
 		if( errno != ENOENT )
 		{
-			debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name );
+			debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
 			wperror( L"fopen" );
+			res = -1;
+			
 		}
 		
 	}	
@@ -173,7 +200,9 @@ static void history_load( wchar_t *name )
 	free( buff );
 	free( fn );
 	last_loaded = history_last;
-	unblock();
+	signal_unblock();
+	return res;
+	
 }
 
 void history_init()
@@ -190,6 +219,10 @@ static void history_to_hash()
 {
 	history_data *d;
 	
+	if( !mode_name )
+		return;
+	
+
 	d = (history_data *)hash_get( &history_table, 
 								  mode_name );
 	
@@ -198,6 +231,7 @@ static void history_to_hash()
 	d->last=history_last;
 	d->last_loaded=last_loaded;
 	d->count=history_count;
+	d->is_loaded = is_loaded;
 	
 	hash_put( &history_table, 
 			  mode_name,
@@ -212,24 +246,38 @@ void history_set_mode( wchar_t *name )
 	
 	if( mode_name )
 	{		
+		/*
+		  Move the current history to the hashtable
+		*/
 		history_to_hash();		
 	}
+	
+	/*
+	  See if the new history already exists
+	*/
 	curr = (history_data *)hash_get( &history_table,
 									 name );
 	if( curr )
 	{
+		/*
+		  Yes. Restore it.
+		*/
 		mode_name = (wchar_t *)hash_get_key( &history_table,
 											 name );
 		history_current = history_last = curr->last;
 		last_loaded = curr->last_loaded;
 		history_count = curr->count;
+		is_loaded = curr->is_loaded;
 	}
 	else
 	{
+		/*
+		  Nope. Create a new history list.
+		*/
 		history_count=0;
 		history_last = history_current = last_loaded=0;
 		mode_name = wcsdup( name );
-		history_load( name );
+		is_loaded = 0;
 	}
 	
 	past_end=1;
@@ -259,6 +307,9 @@ static void history_save()
 	/* First we save this sessions history in local variables */
 	ll_node_t *real_pos = history_last, *real_first = last_loaded;
 
+	if( !is_loaded )
+		return;
+	
 	if( !real_first )
 	{
 		real_first = history_current;
@@ -274,7 +325,9 @@ static void history_save()
 	history_count=0;
 	past_end=1;
 
-	history_load( mode_name );
+	if( !history_load() )
+	{
+		
 	if( real_pos != 0 )
 	{
 		/* 
@@ -332,6 +385,8 @@ static void history_save()
 		}
 		free( fn );	
 	}
+	}
+	
 	
 }
 
@@ -339,7 +394,7 @@ static void history_save()
    Save the specified mode to file
 */
 
-static void history_destroy_mode( const void *name, const void *link )
+static void history_destroy_mode( void *name, void *link )
 {
 	mode_name = (wchar_t *)name;
 	history_data *d = (history_data *)link;
@@ -349,7 +404,7 @@ static void history_destroy_mode( const void *name, const void *link )
 	past_end=1;
 
 //	fwprintf( stderr, L"Destroy history mode \'%ls\'\n", mode_name );
-		
+
 	if( history_last )
 	{
 		history_save();	
@@ -368,11 +423,12 @@ static void history_destroy_mode( const void *name, const void *link )
 
 void history_destroy()
 {
+	
 	/**
 	   Make sure current mode is in table
 	*/
 	history_to_hash();		
-
+		
 	/**
 	   Save all modes in table
 	*/
@@ -390,6 +446,15 @@ void history_destroy()
 */
 static ll_node_t *history_find( ll_node_t *n, const wchar_t *s )
 {
+	if( !is_loaded )
+	{
+		if( history_load() )
+		{
+			return 0;
+		}
+	}
+	
+
 	if( n == 0 )
 		return 0;
 	
@@ -406,6 +471,15 @@ void history_add( const wchar_t *str )
 {
 	ll_node_t *old_node;
 
+	if( !is_loaded )
+	{
+		if( history_load() )
+		{
+			return;
+		}
+	}
+	
+
 	if( wcslen( str ) == 0 )
 		return;
 	
@@ -455,20 +529,26 @@ static int history_test( const wchar_t *needle, const wchar_t *haystack )
 /*
 	return wcsncmp( haystack, needle, wcslen(needle) )==0;
 */
-	return (int)wcsstr( haystack, needle );
+	return !!wcsstr( haystack, needle );
 }
 
 const wchar_t *history_prev_match( const wchar_t *str )
 {
+	if( !is_loaded )
+	{
+		if( history_load() )
+		{
+			return 0;
+		}
+	}
+	
+
 	if( history_current == 0 )
 		return str;
 	
 	if( history_current->prev == 0 )
 	{
-		if( history_test( str, history_current->data ) )
-			return (wchar_t *)history_current->data;
-		else
-			return str;
+		return str;
 	}
 	if( past_end )
 		past_end = 0;
@@ -484,6 +564,15 @@ const wchar_t *history_prev_match( const wchar_t *str )
 
 const wchar_t *history_next_match( const wchar_t *str)
 {
+	if( !is_loaded )
+	{
+		if( history_load() )
+		{
+			return 0;
+		}
+	}
+	
+
 	if( history_current == 0 )
 		return str;
 
@@ -510,15 +599,27 @@ void history_reset()
 */
 void history_first()
 {
-	while( history_current->prev )
-		history_current = history_current->prev;
+	if( is_loaded )
+		while( history_current->prev )
+			history_current = history_current->prev;
 	
 }
 
 wchar_t *history_get( int idx )
 {
-	ll_node_t *n=history_last;
+	ll_node_t *n;
 	int i;
+	
+	if( !is_loaded )
+	{
+		if( history_load() )
+		{
+			return 0;
+		}
+	}
+	
+	n = history_last;
+	
 	if( idx<0)
 	{
 		debug( 1, L"Tried to access negative history index %d", idx );

history.h

@@ -8,7 +8,8 @@
 #include <wchar.h>
 
 /**
-   Load history from file.
+   Init history library. The history file won't actually be loaded
+   until the first time a history search is performed.
 */
 void history_init();
 

init/completions/apm.fish

@@ -1,8 +0,0 @@
-#apm
-complete -f -c apm -s V -l version -d "print version"
-complete -f -c apm -s v -l verbose -d "print APM info"
-complete -f -c apm -s m -l minutes -d "print time remaining"
-complete -f -c apm -s M -l monitor -d "monitor status info"
-complete -f -c apm -s S -l standby -d "request APM standby mode"
-complete -f -c apm -s s -l suspend -d "request APM suspend mode"
-complete -f -c apm -s d -l debug -d "APM status debuggin info"

init/completions/apropos.fish

@@ -1,20 +0,0 @@
-function __fish_complete_apropos
-	if test (commandline -ct)
-		set str (commandline -ct)
-		apropos $str|sed -e 's/^\(.*'$str'\([^ ]*\).*\)$/'$str'\2\t\1/'
-	end
-end
-
-complete -xc apropos -a "(__fish_complete_apropos)" -d "Whatis entry"
-
-complete -c apropos -s h -l help -d "apropos command help"
-complete -f -c apropos -s d -l debug -d "print debugging info"
-complete -f -c apropos -s v -l verbose -d "print verbose warning"
-complete -f -c apropos -s r -l regex -d "keyword as regex"
-complete -f -c apropos -s w -l wildcard -d "keyword as wildwards"
-complete -f -c apropos -s e -l exact -d "keyword as exactly match"
-complete -x -c apropos -s m -l system -d "search for other system"
-complete -x -c apropos -s M -l manpath -a "(echo $MANPATH)" -d "specify man path"
-complete -x -c apropos -s C -l config-file -d "specify a conf file"
-complete -f -c apropos -s V -l version -d "Display version"
-

init/completions/apt-build.fish

@@ -1,29 +0,0 @@
-
-#apt-build
-complete -c apt-build -l help -d "apt-build command help"
-complete -f -c apt-build -a update -d "update list of packages"
-complete -f -c apt-build -a upgrade -d "upgrade packages"
-complete -f -c apt-bulid -a world -d "rebuild your system"
-complete -x -c apt-build -a install -d "build and install a new pkg"
-complete -x -c apt-build -a source -d "download and extract a src"
-complete -x -c apt-build -a info -d "info on a pkg"
-complete -x -c apt-build -a remove -d "remove packages"
-complete -x -c apt-build -a clean-build -d "erase built pkgs"
-complete -x -c apt-build -a build-source -d "build src without install"
-complete -x -c apt-build -a clean-sources -d "clean src dirs"
-complete -x -c apt-build -a update-source -d "update src and rebuild them"
-complete -x -c apt-build -a update-repository -d "update the repository"
-complete -f -c apt-build -l nowrapper -d "do not use gcc wrapper"
-complete -f -c apt-build -l remove-builddep -d "remove build-dep"
-complete -f -c apt-build -l no-source -d "do not download source"
-complete -f -c apt-build -l build-dir -d "specify build-dir"
-complete -f -c apt-build -l rebuild -d "rebuild a package"
-complete -f -c apt-build -l reinstall -d "rebuild and install an installed pkg"
-complete -r -f -c apt-build -l build-command -d "use <command> to build"
-complete -r -c apt-build -l patch -d "apply <file> patch"
-complete -c apt-build -s p -l patch-strip -d "prefix to strip on patch"
-complete -c apt-build -s y -l yes -d "assume yes"
-complete -c apt-build -l purge -d "use purge instead of remove"
-complete -c apt-build -l noupdate -d "do not run update"
-complete -r -c apt-build -l source-list -d "specify sources.list file"
-complete -f -c apt-build -s v -l version -d "show version"

init/completions/apt-cache.fish

@@ -1,33 +0,0 @@
-#apt-cache
-complete -c apt-cache -s h -l help -d "apt-cache command help"
-complete -c apt-cache -a add -d "add index files Debug only"
-complete -f -c apt-cache -a gencaches -d "build apt cache"
-complete -x -c apt-cache -a showpkg -d "show package info"
-complete -f -c apt-cache -a stats -d "show cache statistics"
-complete -x -c apt-cache -a showsrc -d "show source package"
-complete -f -c apt-cache -a dump -d "show packages in cache"
-complete -f -c apt-cache -a dumpavail -d "print available list"
-complete -f -c apt-cache -a unmet -d "list unmet dep in cache"
-complete -x -c apt-cache -a show -d "display package record"
-complete -x -c apt-cache -a search -d "search pkgname by REGEX"
-complete -c apt-cache -l full -a search -d "search full package name"
-complete -x -c apt-cache -l names-only -a search -d "search pkgname only"
-complete -x -c apt-cache -a depends -d "list dep for the package"
-complete -x -c apt-cache -a rdepends -d "list reverse dep for the package"
-complete -x -c apt-cache -a pkgnames -d "print package name by prefix"
-complete -x -c apt-cache -a dotty -d "generate dotty output for packages"
-complete -x -c apt-cache -a policy -d "debug preferences file"
-complete -x -c apt-cache -a madison -d "mimic madison"
-complete -r -c apt-cache -s p -l pkg-cache -d "select file to store pkg cache"
-complete -r -c apt-cache -s s -l src-cache -d "select file to store src cache"
-complete -f -c apt-cache -s q -l quiet -d "quiet output"
-complete -f -c apt-cache -s i -l important -d "print important deps"
-complete -f -c apt-cache -s a -l all-versions -d "print full records"
-complete -f -c apt-cache -s g -l generate -d "auto-gen package cache"
-complete -f -c apt-cache -l all-names -d "print all names"
-complete -f -c apt-cache -l recurse -d "dep and rdep recursive"
-complete -f -c apt-cache -l installed -d "limit to installed"
-complete -f -c apt-cache -s v -l version -d "show version"
-complete -r -c apt-cache -s c -l config-file -d "specify config file"
-complete -x -c apt-cache -s o -l option -d "specify options"
-

init/completions/apt-cdrom.fish

@@ -1,13 +0,0 @@
-#apt-cdrom
-complete -c apt-cdrom -s h -l help -d "apt-cdrom command help"
-complete -r -c apt-cdrom -a add -d "add new disc to source list"
-complete -x -c apt-cdrom -a ident -d "report identity of disc"
-complete -r -c apt-cdrom -s d -l cdrom -d "mount point"
-complete -f -c apt-cdrom -s r -l rename -d "rename a disc"
-complete -f -c apt-cdrom -s m -l no-mount -d "no mounting"
-complete -f -c apt-cdrom -s f -l fast -d "fast copy"
-complete -f -c apt-cdrom -s a -l thorough -d "thorough pkg scan"
-complete -f -c apt-cdrom -s n -l no-act -d "no changes"
-complete -f -c apt-cdrom -s v -l version -d "show version"
-complete -r -c apt-cdrom -s c -l config-file -d "specify config file"
-complete -x -c apt-cdrom -s o -l option -d "specify options"

init/completions/apt-config.fish

@@ -1,7 +0,0 @@
-#apt-config
-complete -c apt-config -s h -l help -d "apt-config command help"
-complete -c apt-config -a shell -d "access config file from shell"
-complete -f -c apt-config -a dump -d "dump contents of config file"
-complete -f -c apt-config -s v -l version -d "show version"
-complete -r -c apt-config -s c -l config-file -d "specify config file"
-complete -x -c apt-config -s o -l option -d "specify options"

init/completions/apt-extracttemplates.fish

@@ -1,7 +0,0 @@
-
-#apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d "apt-extracttemplates command help"
-complete -r -c apt-extracttemplates -s t -d "set temp dir"
-complete -r -c apt-extracttemplates -s c -d "specifiy config file"
-complete -r -c apt-extracttemplates -s o -d "specify options"
-

init/completions/apt-file.fish

@@ -1,17 +0,0 @@
-#apt-file
-complete -c apt-file -s h -l help -d "apt-file command help"
-complete -x -c apt-file -a update -d "resync pkg contents from source"
-complete -r -c apt-file -a search -d "search pkg containing pattern"
-complete -r -c apt-file -a list -d "list contents of a pkg matching pattern"
-complete -x -c apt-file -a purge -d "remove all gz files from cache"
-complete -r -c apt-file -s c -l cache -d "set cache dir"
-complete -f -c apt-file -s v -l verbose -d "run in verbose"
-complete -c apt-file -s d -l cdrom-mount -d "use cdrom-mount-point"
-complete -f -c apt-file -s i -l ignore-case -d "do not expand pattern"
-complete -f -c apt-file -s x -l regexp -d "pattern is regexp"
-complete -f -c apt-file -s V -l version -d "show version"
-complete -f -c apt-file -s a -l architecture -d "set arch"
-complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d "set sources.list file"
-complete -f -c apt-file -s l -l package-only -d "only display pkg name"
-complete -f -c apt-file -s F -l fixed-string -d "do not expand pattern"
-complete -f -c apt-file -s y -l dummy -d "run in dummy mode"

init/completions/apt-ftparchive.fish

@@ -1,17 +0,0 @@
-#apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d "apt-ftparchive command help"
-complete -f -c apt-ftparchive -a packages -d "generate pkg from source"
-complete -f -c apt-ftparchive -a sources -d "generate source index file"
-complete -f -c apt-ftparchive -a contents -d "generate contents file"
-complete -f -c apt-ftparchive -a release -d "generate release file"
-complete -f -c apt-ftparchive -a clean -d "remove records"
-complete -f -c apt-ftparchive -l md5 -d "generate MD5 sums"
-complete -f -c apt-ftparchive -s d -l db -d "use a binary db"
-complete -f -c apt-ftparchive -s q -l quiet -d "quiet mode"
-complete -f -c apt-ftparchive -l delink -d "perform delinking"
-complete -f -c apt-ftparchive -l contents -d "perform contents generation"
-complete -c apt-ftparchive -s s -l source-override -d "use source override"
-complete -f -c apt-ftparchive -l readonly -d "make caching db readonly"
-complete -f -c apt-ftparchive -s v -l version -d "show version"
-complete -r -c apt-ftparchive -s c -l config-file -d "use config file"
-complete -r -c apt-ftparchive -s o -l option -d "set config options"

init/completions/apt-get.fish

@@ -1,64 +0,0 @@
-#completion for apt-get
-
-function __fish_apt_no_subcommand -d "test if apt has yet to be given the subcommand"
-	for i in (commandline -opc)
-		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove source build-dep check clean autoclean
-			return 1
-		end
-	end
-	return 0
-end
-
-function __fish_apt_use_package -d "Test if apt command should have packages as potential completion"
-	for i in (commandline -opc)
-		if contains -- $i contains install remove build-dep
-			return 0
-		end
-	end
-	return 1
-end
-
-complete -c apt-get -n "__fish_apt_use_package" -a "(__fish_print_packages)" -d "Package"
-
-complete -c apt-get -s h -l help -d "apt-get command help"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "update" -d "update sources"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "upgrade" -d "upgrade or install newest packages"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "dselect-upgrade" -d "use with dselect front-end"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "dist-upgrade" -d "distro upgrade"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "install" -d "install one or more packages"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "remove" -d "remove one or more packages"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "source" -d "fetch source packages"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "build-dep" -d "install/remove packages for dependencies"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "check" -d "update cache and check dep"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "clean" -d "clean local caches and packages"
-complete -f -n "__fish_apt_no_subcommand" -c apt-get -a "autoclean" -d "clean packages no longer be downloaded"
-complete -c apt-get -s d -l download-only -d "Download Only"
-complete -c apt-get -s f -l fix-broken -d "correct broken deps"
-complete -c apt-get -s m -l fix-missing -d "ignore missing packages"
-complete -c apt-get -l no-download -d "Disable downloading packages"
-complete -c apt-get -s q -l quiet -d "quiet output"
-complete -c apt-get -s s -l simulate -d "perform a siulation"
-complete -c apt-get -s y -l assume-yes -d "automatic yes to prompts"
-complete -c apt-get -s u -l show-upgraded -d "show upgraded packages"
-complete -c apt-get -s V -l verbose-versions -d "show full versions for packages"
-complete -c apt-get -s b -l compile -d "compile source packages"
-complete -c apt-get -s b -l build -d "compile source packages"
-complete -c apt-get -l ignore-hold -d "ignore package Holds"
-complete -c apt-get -l no-upgrade -d "Do not upgrade packages"
-complete -c apt-get -l force-yes -d "Force yes"
-complete -c apt-get -l print-uris -d "print the URIs"
-complete -c apt-get -l purge -d "use purge instead of remove"
-complete -c apt-get -l reinstall -d "reinstall packages"
-complete -c apt-get -l list-cleanup -d "erase obsolete files"
-complete -c apt-get -s t -l target-release -d "control default input to the policy engine"
-complete -c apt-get -l trivial-only -d "only perform operations that are trivial"
-complete -c apt-get -l no-remove -d "abort if any packages are to be removed"
-complete -c apt-get -l only-source -d "only accept source packages"
-complete -c apt-get -l diff-only -d "download only diff file"
-complete -c apt-get -l tar-only -d "download only tar file"
-complete -c apt-get -l arch-only -d "only process arch-dep build-deps"
-complete -c apt-get -l allow-unauthenticated -d "ignore non-authenticated packages"
-complete -c apt-get -s v -l version -d "show program version"
-complete -r -c apt-get -s c -l config-file -d "specify a config file"
-complete -r -c apt-get -s o -l option -d "set a config option"
-

init/completions/apt-key.fish

@@ -1,5 +0,0 @@
-#apt-key
-complete -r -c apt-key -a add -d "add a new key"
-complete -f -c apt-key -a del -d "remove a key"
-complete -f -c apt-key -a list -d "list trusted keys"
-

init/completions/apt-listbugs.fish

@@ -1,25 +0,0 @@
-#apt-listbugs
-complete -c apt-listbugs -s h -l help -d "apt-listbugs command help"
-complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d "set severity"
-complete -f -c apt-listbugs -s T -l tag -d "Targs you want to see"
-complete -f -c apt-listbugs -s S -l stats -d "outstanding 'pending upload' resolved done open" -d "status you want to see"
-complete -f -c apt-listbugs -s l -l showless -d "ignore bugs in your system"
-complete -f -c apt-listbugs -s g -l showgreater -d "ignore newer bugs than upgrade pkgs"
-complete -f -c apt-listbugs -s D -l show-downgrade -d "bugs for downgrade pkgs"
-complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d "Bug Tracking system"
-complete -f -c apt-listbugs -s p -l port -d "specify port for web interface"
-complete -f -c apt-listbugs -s R -l release-critical -d "use daily bug report"
-complete -f -c apt-listbugs -s I -l index -d "use the raw index.db"
-complete -f -c apt-listbugs -s X -l indexdir -d "specify index dir"
-complete -f -c apt-listbugs -s P -l pin-priority -d "specify Pin-Priority value"
-complete -f -c apt-listbugs -l title -d "specify the title of rss"
-complete -f -c apt-listbugs -s f -l force-download -d "retrieve fresh bugs"
-complete -f -c apt-listbugs -s q -l quiet -d "do not display progress bar"
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d "specify local cache dir"
-complete -f -c apt-listbugs -s t -l timer -d "specify the expire cache timer"
-complete -c apt-listbugs -s C -l aptconf -d "specify apt config file"
-complete -f -c apt-listbugs -s y -l force-yes -d "assume all yes"
-complete -f -c apt-listbugs -s n -l force-no -d "assume all no"
-complete -c apt-listbugs -a list -d "list bugs from pkgs"
-complete -c apt-listbugs -a rss -d "list bugs in rss format"
-