Further tweak the language about setting PATH in the tutorial

Also fix a few broken anchors

.gitattributes

@@ -0,0 +1,21 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+/build_tools/make_svn_completions.fish export-ignore
+/build_tools/description-pak export-ignore
+/build_tools/make_hg_completions.fish export-ignore
+/build_tools/make_vcs_completions.fish export-ignore
+/build_tools/make_vcs_completions_generic.fish export-ignore
+/build_tools/osx_package_resources export-ignore
+/build_tools/osx_package_resources/terminal_logo.png export-ignore
+/build_tools/osx_package_resources/welcome.rtf export-ignore
+/build_tools/make_csv_completions.fish export-ignore
+/build_tools/osx_distribution.xml export-ignore
+/build_tools/make_tarball.sh export-ignore
+/build_tools/make_deb.sh export-ignore
+/build_tools/osx_package_scripts export-ignore
+/build_tools/osx_package_scripts/add-shell export-ignore
+/build_tools/osx_package_scripts/postinstall export-ignore
+/build_tools/make_pkg.sh export-ignore
+/build_tools/make_darcs_completions.fish export-ignore
+

.gitignore

@@ -0,0 +1,43 @@
+*.o
+*~
+*.exe
+*.xccheckout
+
+.DS_Store
+Makefile
+autom4te.cache/
+build/
+command_list.txt
+command_list_toc.txt
+confdefs.h
+config.h
+config.h.in
+config.log
+config.status
+configure
+doc/
+doc.h
+doc_src/commands.hdr
+doc_src/index.hdr
+po/*.gmo
+fish
+fish_indent
+fish_tests
+fish.pc
+mimedb
+seq
+set_color
+share/config.fish
+share/man/
+toc.txt
+user_doc/
+xcuserdata
+tests/*tmp.*
+tests/foo.txt
+FISH-BUILD-VERSION-FILE
+version
+messages.pot
+lexicon.txt
+lexicon_filter
+lexicon.log
+

.travis.yml

@@ -0,0 +1,27 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+before_install:
+  - sudo apt-get update
+install:
+  - sudo apt-get install --no-install-recommends bc doxygen expect gettext libncurses5-dev
+script:
+  - autoreconf
+  - ./configure
+  - make -j2
+  - sudo make install
+  - make test SHOW_INTERACTIVE_LOG=1
+notifications:
+  irc:
+    channels:
+      - "irc.oftc.net#fish"
+    template:
+      - "%{repository}#%{build_number} (%{commit} on %{branch} by %{author}): %{message} Details at %{build_url}"
+    use_notice: true
+    skip_join: true
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/61821cec3015bf0f8bb1
+matrix:
+  fast_finish: true

CONTRIBUTING.md

@@ -0,0 +1,105 @@
+# Style guide
+
+This is style guide for fish contributors. You should use it for any new code
+that you would add to this project and try to format existing code to use this
+style.
+
+## Formatting
+
+1. fish uses the Allman/BSD style of indentation.
+2. Indent with spaces, not tabs.
+3. Use 4 spaces per indent (unless needed like `Makefile`).
+4. Opening curly bracket is on the following line:
+
+        // ✔:
+        struct name
+        {
+          // code
+        };
+
+        void func()
+        {
+          // code
+        }
+
+        if (...)
+        {
+          // code
+        }
+
+        // ✗:
+        void func() {
+          // code
+        }
+
+5. Put space after `if`, `while` and `for` before conditions.
+
+        // ✔:
+        if () {}
+
+        // ✗:
+        if() {}
+
+6. Put spaces before and after operators excluding increment and decrement;
+
+        // ✔:
+        int a = 1 + 2 * 3;
+        a++;
+
+        // ✗:
+        int a=1+2*3;
+        a ++;
+
+7. Never put spaces between function name and parameters list.
+
+        // ✔:
+        func(args);
+
+        // ✗:
+        func (args);
+
+8. Never put spaces after `(` and before `)`.
+9. Always put space after comma and semicolon.
+
+        // ✔:
+        func(arg1, arg2);
+
+        for (int i = 0; i < LENGTH; i++) {}
+
+        // ✗:
+        func(arg1,arg2);
+
+        for (int i = 0;i<LENGTH;i++) {}
+
+## Documentation
+
+Document your code using [Doxygen][dox].
+
+1. Documentation comment should use double star notation or tripple slash:
+
+        // ✔:
+        /// Some var
+        int var;
+
+        /**
+         * Some func
+         */
+        void func();
+
+2. Use slash as tag mark:
+
+        // ✔:
+
+        /**
+         * \param a an integer argument.
+         * \param s a constant character pointer.
+         * \return The results
+         */
+        int foo(int a, const char *s);
+
+## Naming
+
+All names in code should be `small_snake_case`. No Hungarian notation is used.
+Classes and structs names should be followed by `_t`.
+
+[dox]: http://www.stack.nl/~dimitri/doxygen/ "Doxygen homepage"

COPYING

@@ -0,0 +1,19 @@
+Fish is a smart and user-friendly command line shell.
+
+Copyright (C) 2005-2009 Axel Liljencrantz
+
+fish is free software.
+
+Most of fish is licensed under the GNU General Public License version 2, and
+you can redistribute it and/or modify it under the terms of the GNU GPL as
+published by the Free Software Foundation.
+
+fish also includes software licensed under the GNU Lesser General Public
+License version 2, the OpenBSD license and the ISC license.
+
+Full licensing information is contained in doc_src/license.hdr.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.

Dockerfile

@@ -0,0 +1,19 @@
+FROM centos:latest
+
+# Build dependency
+RUN yum update -y &&\
+  yum install -y autoconf automake bc clang gcc-c++ make ncurses-devel &&\
+  yum clean all
+
+# Test dependency
+RUN yum install -y expect vim-common
+
+ADD . /src
+WORKDIR /src
+
+# Build fish
+RUN autoreconf &&\
+  ./configure &&\
+  make &&\
+  make install
+

INSTALL

@@ -1,62 +0,0 @@
-
-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.
-
-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.
-
-
-Prerequisites
-=============
-
-Fish requires the following packages to build:
-
- - Doxygen
- - Curses or Ncurses
-
-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.
-
-
-Simple install procedure
-========================
-
- % ./configure
- % 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:
-
- % chsh -s /usr/local/bin/fish			 
-
-chsh will prompt you for your password, and change your default shell.
-
-
-Local install procedure
-=======================
-
-To install fish in your own home directory (typically as non-root),
-type:
-
- % ./configure --prefix=$HOME
- % make					# Compile fish
- % 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.
-

README

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

README.md

@@ -0,0 +1,89 @@
+[fish](http://fishshell.com/) - the friendly interactive shell [![Build Status](https://travis-ci.org/fish-shell/fish-shell.svg?branch=master)](https://travis-ci.org/fish-shell/fish-shell)
+================================================
+
+fish is a smart and user-friendly command line shell for OS X, Linux, and the rest of the family. fish includes features like syntax highlighting, autosuggest-as-you-type, and fancy tab completions that just work, with no configuration required.
+
+For more on fish's design philosophy, see the [design document](http://fishshell.com/docs/current/design.html).
+
+## Quick Start
+
+fish generally works like other shells, like bash or zsh. A few important differences can be found at <http://fishshell.com/docs/current/tutorial.html> by searching for the magic phrase 'unlike other shells'.
+
+Detailed user documentation is available by running `help` within fish, and also at <http://fishshell.com/docs/current/index.html>
+
+## Building
+
+fish is written in a sane subset of C++98, with a few components from C++TR1. It builds successfully with g++ 4.2 or later, and with clang. It also will build as C++11.
+
+fish can be built using autotools or Xcode. autoconf 2.60 or later is required.
+
+fish depends on a curses implementation, such as ncurses. The headers and libraries are required for building.
+
+fish requires gettext for translation support.
+
+Building the documentation requires Doxygen 1.8.7 or newer.
+
+### Autotools Build
+
+    autoconf
+    ./configure
+    make [gmake on BSD]
+    sudo make install
+
+### Xcode Development Build
+
+* Build the `base` target in Xcode
+* Run the fish executable, for example, in `DerivedData/fish/Build/Products/Debug/base/bin/fish`
+
+### Xcode Build and Install
+
+    xcodebuild install
+    sudo ditto /tmp/fish.dst /
+
+## Help, it didn't build!
+
+If fish reports that it could not find curses, try installing a curses development package and build again.
+
+On Debian or Ubuntu you want:
+
+    sudo apt-get install build-essential ncurses-dev libncurses5-dev gettext
+
+On RedHat, CentOS, or Amazon EC2:
+
+    sudo yum install ncurses-devel
+
+## Runtime Dependencies
+
+fish requires a curses implementation, such as ncurses, to run.
+
+fish requires a number of utilities to operate, which should be present on any Unix, GNU/Linux or OS X system. These include (but are not limited to) hostname, grep, awk, sed, which, and getopt. fish also requires the bc program.
+
+Translation support requires the gettext program.
+
+Some optional features of fish, such as the manual page completion parser and the web configuration tool, require Python.
+
+In order to generate completions from man pages compressed with either lzma or xz, you may need to install an extra Python package. Python versions prior to 2.6 are not supported.  For Python versions 2.6 to 3.2 you need to install the module `backports.lzma`.  How to install it depends on your system and how you installed Python.  Most Linux distributions should include it as a package named `backports-lzma` (or similar).  From version 3.3 onwards, Python already includes the required module.
+
+## Packages for Linux
+
+Instructions on how to find builds for several Linux distros are at <https://github.com/fish-shell/fish-shell/wiki/Nightly-builds>
+
+## Switching to fish
+
+If you wish to use fish as your default shell, use the following command:
+
+	chsh -s /usr/local/bin/fish
+
+chsh will prompt you for your password, and change your default shell.
+
+To switch your default shell back, you can run:
+
+	chsh -s /bin/bash
+
+Substitute /bin/bash with /bin/tcsh or /bin/zsh as appropriate.
+
+## Contact Us
+
+Questions, comments, rants and raves can be posted to the official fish mailing list at <https://lists.sourceforge.net/lists/listinfo/fish-users> or join us on our IRC channel [#fish at irc.oftc.net](https://webchat.oftc.net/?channels=fish).
+
+Found a bug? Have an awesome idea? Please open an issue on this github page.

autoload.cpp

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

autoload.h

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

build_tools/build_documentation.sh

@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# This script is run as part of the build process
+
+if test $# -eq 0
+then
+	# Use fish's defaults
+	DOXYFILE=Doxyfile.help
+	INPUTDIR=doc_src
+	OUTPUTDIR=share
+	echo "Using defaults: $0 ${DOXYFILE} ${INPUTDIR} ${OUTPUTDIR}"
+elif test $# -eq 3
+then
+	DOXYFILE="$1"
+	INPUTDIR="$2"
+	OUTPUTDIR="$3"
+else
+	echo "Usage: $0 doxygen_file input_directory output_directory"
+	exit 1
+fi
+
+# Determine which man pages we don't want to generate.
+# on OS X, don't make a man page for open, since we defeat fish's open function on OS X.
+CONDEMNED_PAGES=
+if test `uname` = 'Darwin'; then
+	CONDEMNED_PAGES="$CONDEMNED_PAGES open.1"
+fi
+
+# Helper function to turn a relative path into an absolute path
+resolve_path()
+{
+	D=`command dirname "$1"`
+	B=`command basename "$1"`
+	echo "`cd \"$D\" 2>/dev/null && pwd || echo \"$D\"`/$B"
+}
+
+# Expand relative paths
+DOXYFILE=`resolve_path "$DOXYFILE"`
+INPUTDIR=`resolve_path "$INPUTDIR"`
+INPUTFILTER=`resolve_path "$INPUT_FILTER"`
+OUTPUTDIR=`resolve_path "$OUTPUTDIR"`
+
+echo "      doxygen file: $DOXYFILE"
+echo "   input directory: $INPUTDIR"
+echo "      input filter: $INPUTFILTER"
+echo "  output directory: $OUTPUTDIR"
+echo "          skipping: $CONDEMNED_PAGES"
+
+# Make sure INPUTDIR is found
+if test ! -d "$INPUTDIR"; then
+	echo >&2 "Could not find input directory '${INPUTDIR}'"
+	exit 1
+fi
+
+# Make sure doxygen is found
+DOXYGENPATH=`command -v doxygen`
+if test -z "$DOXYGENPATH" ; then
+    for i in /usr/local/bin/doxygen /opt/bin/doxygen /Applications/Doxygen.app/Contents/Resources/doxygen ~/Applications/Doxygen.app/Contents/Resources/doxygen ; do
+    	if test -f "$i"; then
+    	    DOXYGENPATH="$i"
+    	    break
+    	fi
+    done
+fi
+
+if test -z "$DOXYGENPATH"; then
+    echo >&2 "doxygen is not installed, so documentation will not be built."
+    exit 0
+fi
+
+# Check we have the lexicon filter
+if test -z "$INPUT_FILTER"; then
+    echo >&2 "Lexicon filter is not available. Continuing without."
+    INPUTFILTER=''
+fi
+
+# Determine where our output should go
+if ! mkdir -p "${OUTPUTDIR}" ; then
+    echo "Could not create output directory '${OUTPUTDIR}'"
+fi
+
+# Make a temporary directory
+TMPLOC=`mktemp -d -t fish_doc_build_XXXXXX` || { echo >&2 "Could not build documentation because mktemp failed"; exit 1; }
+
+# Copy stuff to the temp directory
+for i in "$INPUTDIR"/*.txt; do
+	INPUTFILE=$TMPLOC/`basename $i .txt`.doxygen
+	echo  "/** \page" `basename $i .txt` > $INPUTFILE
+	cat $i >>$INPUTFILE
+	echo "*/" >>$INPUTFILE
+done
+
+# Make some extra stuff to pass to doxygen
+# Input is kept as . because we cd to the input directory beforehand
+# This prevents doxygen from generating "documentation" for intermediate directories
+DOXYPARAMS=$(cat <<EOF
+PROJECT_NUMBER=$PROJECT_NUMBER
+INPUT_FILTER=$INPUTFILTER
+INPUT=.
+OUTPUT_DIRECTORY=$OUTPUTDIR
+QUIET=YES
+EOF
+);
+
+# echo "$DOXYPARAMS"
+
+# Clear out the output directory first
+find "${OUTPUTDIR}" -name "*.1" -delete
+
+# Run doxygen
+cd "$TMPLOC"
+(cat "${DOXYFILE}" ; echo "$DOXYPARAMS";) | "$DOXYGENPATH" -
+
+# Remember errors
+RESULT=$?
+
+cd "${OUTPUTDIR}/man/man1/"
+if test "$RESULT" = 0 ; then
+
+	# Postprocess the files
+	for i in "$INPUTDIR"/*.txt; do
+		# It would be nice to use -i here for edit in place, but that is not portable
+		CMD_NAME=`basename "$i" .txt`;
+		sed < ${CMD_NAME}.1 > ${CMD_NAME}.1.tmp \
+            -e "/.SH \"$CMD_NAME/d" \
+            -e "s/^$CMD_NAME * \\\- \([^ ]*\) /\\\fB\1\\\fP -/"
+		mv "${CMD_NAME}.1.tmp" "${CMD_NAME}.1"
+	done
+
+	# Erase condemned pages
+	rm -f $CONDEMNED_PAGES
+fi
+
+# Destroy TMPLOC
+echo "Cleaning up '$TMPLOC'"
+rm -Rf "$TMPLOC"
+
+if test "$RESULT" = 0; then
+    # Tell the user what we did
+    echo "Output man pages into '${OUTPUTDIR}'"
+else
+    echo "Doxygen failed. See the output log for details."
+fi
+exit $RESULT

build_tools/description-pak

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

build_tools/git_version_gen.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+# Originally from the git sources (GIT-VERSION-GEN)
+# Presumably (C) Junio C Hamano <junkio@cox.net>
+# Reused under GPL v2.0
+# Modified for fish by David Adam <zanchey@ucc.gu.uwa.edu.au>
+
+FBVF=FISH-BUILD-VERSION-FILE
+DEF_VER=unknown
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f version
+then
+	VN=$(cat version) || VN="$DEF_VER"
+elif ! VN=$(git describe --always --dirty 2>/dev/null); then
+	VN="$DEF_VER"
+fi
+
+if test -r $FBVF
+then
+	VC=$(sed -e 's/^FISH_BUILD_VERSION = //' <$FBVF)
+else
+	VC=unset
+fi
+test "$VN" = "$VC" || {
+	echo >&2 "FISH_BUILD_VERSION = $VN"
+	echo "FISH_BUILD_VERSION = $VN" >$FBVF
+}

build_tools/make_csv_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for csv. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions csv >share/completions/csv.fish

build_tools/make_darcs_completions.fish

@@ -0,0 +1,12 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for darcs. Meant to be 
+# executed from the root directory (so the completions get put in the right 
+# place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+set darcs_comp 'complete -c darcs -n "not __fish_use_subcommand" -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" --description "Darcs repo"'
+set darcs_comp $darcs_comp 'complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref (commandline -poc)" --description "Set the specified option" -x'
+
+write_completions darcs $darcs_comp >share/completions/darcs.fish

build_tools/make_deb.sh

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

build_tools/make_hg_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for hg. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions hg >share/completions/hg.fish

build_tools/make_pkg.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+VERSION=`sed -E -n 's/^.*PACKAGE_VERSION "([0-9.]+)"/\1/p' osx/config.h`
+if test -z "$VERSION" ; then
+  echo "Could not get version from osx/config.h"
+  exit 1
+fi
+
+echo "Version is $VERSION"
+
+set -x
+
+make distclean
+rm -Rf /tmp/fish_pkg
+
+#Exit on error
+set -e
+
+mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
+xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
+pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION"  /tmp/fish_pkg/intermediates/fish.pkg
+
+productbuild  --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg
+
+
+# Make the app
+xcodebuild -scheme fish.app -configuration Release DSTROOT=/tmp/fish_app/
+rm -f ~/fish_built/fish.app.zip
+cd DerivedData/fish/Build/Products/Release/
+zip -r ~/fish_built/fish.app.zip fish.app

build_tools/make_svn_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for svn. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions svn >share/completions/svn.fish

build_tools/make_tarball.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Script to generate a tarball
+# We use git to output a tree. But we also want to build the user documentation
+# and put that in the tarball, so that nobody needs to have doxygen installed
+# to build it.
+
+# Exit on error
+set -e
+
+# We wil generate a tarball with a prefix "fish"
+# git can do that automatically for us via git-archive
+# but to get the documentation in, we need to make a symlink called "fish"
+# and tar from that, so that the documentation gets the right prefix
+
+# Get the current directory, which we'll use for symlinks
+wd="$PWD"
+
+# The name of the prefix, which is the directory that you get when you untar
+prefix="fish"
+
+# Get the version from git-describe
+VERSION=`git describe --dirty 2>/dev/null`
+prefix="$prefix-$VERSION"
+
+# The path where we will output the tar file
+path=~/fish_built/$prefix.tar
+
+# Clean up stuff we've written before
+rm -f "$path" "$path".gz
+
+# git starts the archive
+git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
+
+# tarball out the documentation, generate a configure script and version file
+# Don't use autoreconf since it invokes commands that may not be installed, like aclocal
+# Don't run autoheader since configure.ac runs it. autoconf is enough.
+autoconf
+./configure --with-doxygen
+make user_doc share/man
+echo $VERSION > version
+cd /tmp
+rm -f "$prefix"
+ln -s "$wd" "$prefix"
+TAR_APPEND="gnutar --append --file=$path --mtime=now --owner=0 --group=0 --mode=g+w,a+rX"
+$TAR_APPEND --no-recursion "$prefix"/user_doc
+$TAR_APPEND "$prefix"/user_doc/html "$prefix"/share/man
+$TAR_APPEND "$prefix"/version
+$TAR_APPEND "$prefix"/configure "$prefix"/config.h.in
+rm -f "$prefix"/version
+rm -f "$prefix"
+
+# gzip it
+gzip "$path"
+
+# Output what we did, and the sha1 hash
+echo "Tarball written to $path".gz
+openssl sha1 "$path".gz

build_tools/make_vcs_completions.fish

@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for hg, darcs and a
+# few other vcs systems.
+
+build_tools/make_darcs_completions.fish
+build_tools/make_hg_completions.fish
+build_tools/make_svn_completions.fish
+build_tools/make_csv_completions.fish

build_tools/make_vcs_completions_generic.fish

@@ -0,0 +1,229 @@
+#!/usr/bin/env fish
+#
+# This file provides generic functions for generating specific completions for 
+# hg, darcs and a few other vcs systems. It uses the fact that all these 
+# systems have a somewhat uniform command line help mechanism.
+#
+
+function cap
+	set res (echo $argv |cut -c 1|tr a-z A-Z)(echo $argv |cut -c 2-)
+	echo $res
+end
+
+#
+# Escapes the single quote (') character and removes trailing whitespace from $argv
+#
+
+function esc
+	echo $argv | sed -e "s/\(['\\\]\)/\\\\\1/g" | sed -e 's/ *$//' | sed -e 's/     .*//'
+end
+
+
+#
+# This function formats a list of completion information into a set of fish completions
+#
+# The first argument is the condition string, which will be copied to
+# the resulting commandline verbatim
+#
+# Remaining arguments are tab separated lists of completion
+# information. Each list contains four elements, the short switch, the
+# long switch, the argument and the description.
+#
+
+function complete_from_list
+
+	set condition $argv[1]
+	set -e argv[1]
+
+	for j in $argv
+		set exploded (echo $j|tr \t \n)
+		set short $exploded[1]
+		set long $exploded[2]
+		set arg $exploded[3]
+		set desc (cap (esc $exploded[4]))
+
+		set str
+
+		switch $short
+			case '-?'
+				set str $str -s (printf "%s\n" $short|cut -c 2)
+		end
+
+		switch $long
+			case '--?*'
+				set str $str -l (printf "%s\n" $long|cut -c 3-)
+		end
+
+		switch $arg
+			case '=DIRECTORY' ' dir'
+				set str $str -x -a "'(__fish_complete_directories (commandline -ct))'"
+
+			case '=COMMAND'
+				set str $str -x -a "'(__fish_complete_command)'"
+
+			case '=USERNAME' ' <user>'
+				set str $str -x -a "'(__fish_complete_users)'"
+
+			case '=FILENAME' '=FILE' ' <file>'
+				set str $str -r
+
+			case ' arg'
+				set str $str -x
+
+			case ' (*):'
+				 set str $str -x -a \'(echo $arg| sed -e "s/ (\(.*\)):/\1/" |tr '/' ' ')\'
+
+			case '?*'
+				set str $str -x
+				if not set -q unknown
+					set -g unknown
+				end
+				if not contains $arg $unknown
+					echo "Don't know how to handle arguments of type '$arg'" >&2
+					set unknown $unknown $arg
+				end
+		end
+
+		switch $desc
+			case '?*'
+				set str $str --description \'$desc\'
+		end
+
+		echo complete -c $cmd $condition $str
+
+	end
+
+end
+
+
+function write_completions
+
+	set -g cmd $argv[1]; or return 1
+
+	echo "Making completions for $cmd" >&2
+
+
+	echo '
+#
+# Completions for the '$cmd' command
+# This file was autogenerated by the file make_vcs_completions.fish
+# which is shipped with the fish source code.
+#
+
+#
+# Completions from commandline
+#
+'
+	set -e argv[1]
+
+	while count $argv >/dev/null
+		echo $argv[1]
+		set -e argv[1]
+	end
+
+
+	eval "function cmd; $cmd \$argv; end"
+
+	set -l cmd_str
+
+	switch $cmd
+		case svn
+
+		function list_subcommand
+			set cmd1 '\([^ ]*\)'
+			set cmd2 '\([^,)]*\)'
+			set cmdn '\(, \([^,)]*\)\|\)'
+			set svn_re '^    *'$cmd1'\( ('$cmd2$cmdn$cmdn')\|\).*$'
+			cmd help|sed -ne 's/'$svn_re'/\1\n\3\n\5\n\7/p'| grep .
+		end
+
+		function list_subcommand_help
+			set short_exp '\(-.\|\)'
+			set long_exp '\(--[^ =,]*\)'
+			set arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*[^.]\)'
+			set re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\(\|\\.\)\$"
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\2\t\3\t\5/p'
+		end
+
+		for i in (list_subcommand)
+
+			set desc (cmd help $i|head -n 3| sed -e 's/usage:.*//'| tr \n \ | sed -e 's/[^:]*: *\(.*[^.]\)\(\|\\.\)$/\1/')
+			set desc (esc $desc)
+			set cmd_str $cmd_str "-a $i --description '$desc'"
+		end
+
+		case cvs
+
+		function list_subcommand
+			cmd --help-commands 2>| sed -n -e 's/^   *\([^ ][^ ]*\) .*$/\1/p'
+		end
+
+		set short_exp '\(-.\)'
+		set arg_exp '\(\| [^ \t][^ \t]*\)'
+		set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
+		set -g re '^[ \t]*'$short_exp$arg_exp'[ \t]*'$desc_exp'$'
+
+		function list_subcommand_help
+#'s/^[ \t]*\(-.\)[ \t]\([^- \t][^ \t]*\)*[ \t]*\([^-].*\)$/\1\t\2\t\3/p'
+
+			cmd -H $argv 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p'
+		end
+
+		echo '
+#
+# Global switches
+#
+'
+
+		complete_from_list "-n '__fish_use_subcommand'" (cmd --help-options 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p')
+
+		set cmd_str_internal (cmd --help-commands 2>| sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*\)$/\1\t\2/p')
+		for i in $cmd_str_internal
+			set exploded (echo $i|tr \t \n)
+			set cmd_str $cmd_str "-a $exploded[1] --description '"(esc $exploded[2])"'"
+		end
+
+		case '*'
+
+		function list_subcommand
+			cmd help | sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
+		end
+
+		function list_subcommand_help
+			set -l short_exp '\(-.\|\)\( [^ -][^ ]*\|\)'
+			set -l long_exp '\(--[^ =,]*\)'
+			set -l arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set -l desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*[^.]\)'
+			set -l re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\(\|\\.\)\$"
+
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\3\t\4\t\6/p'
+		end
+
+		set cmd_str (cmd help | sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*[^.]\)\(\|\\.\)$/-a \1 --description \'\2\'/p')
+
+	end
+
+	echo '
+#
+# subcommands
+#
+'
+
+	printf "complete -c $cmd -n '__fish_use_subcommand' -x %s\n" $cmd_str
+
+	for i in (list_subcommand)
+
+		echo '
+
+#
+# Completions for the \''$i'\' subcommand
+#
+'
+
+		complete_from_list "-n 'contains \\'$i\\' (commandline -poc)'" (list_subcommand_help $i)
+	end
+
+	echo \n\n
+
+end

build_tools/osx_distribution.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <title>fish shell</title>
+    <welcome file="welcome.rtf"/>
+    <background file="terminal_logo.png" scaling="proportional" alignment="bottomleft"/>
+    <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="com.ridiculousfish.fish-shell-pkg"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="com.ridiculousfish.fish-shell-pkg" visible="false">
+        <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
+    </choice>
+    <pkg-ref id="com.ridiculousfish.fish-shell-pkg" version="0" onConclusion="none">fish.pkg</pkg-ref>
+</installer-gui-script>

build_tools/osx_package_resources/welcome.rtf

@@ -0,0 +1,25 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
+{\colortbl;\red255\green255\blue255;}
+{\info
+{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs30 \cf0 The fish shell is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "http://fishshell.com"}}{\fldrslt http://fishshell.com}}.\
+\
+fish will be installed into
+\f1\fs26 /usr/local/
+\f0\fs30 , and fish will be added to
+\f1\fs26 /etc/shells
+\f0\fs30  if necessary.\
+\
+Your default shell will 
+\i not
+\i0  be changed. To make fish your default, run:\
+\
+
+\f1 chsh -s /usr/local/bin/fish
+\f0 \
+\
+Enjoy!\
+}

build_tools/osx_package_scripts/add-shell

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

build_tools/osx_package_scripts/postinstall

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

builtin.h

@@ -1,5 +1,5 @@
 /** \file builtin.h
-	Prototypes for functions for executing builtin functions.
+  Prototypes for functions for executing builtin functions.
 */
 
 #ifndef FISH_BUILTIN_H
@@ -8,49 +8,98 @@
 #include <wchar.h>
 
 #include "util.h"
+#include "io.h"
+#include "common.h"
+
+class parser_t;
 
 enum
 {
-	COMMAND_NOT_BUILTIN,
-	BUILTIN_REGULAR,
-	BUILTIN_FUNCTION
+    COMMAND_NOT_BUILTIN,
+    BUILTIN_REGULAR,
+    BUILTIN_FUNCTION
 }
 ;
 
 /**
    Error message on missing argument
 */
-#define BUILTIN_ERR_MISSING L": Expected argument"
+#define BUILTIN_ERR_MISSING _( L"%ls: Expected argument\n" )
 
 /**
    Error message on invalid combination of options
 */
-#define BUILTIN_ERR_COMBO L": 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": Variable can only be one of universal, global and local"
+#define BUILTIN_ERR_GLOCAL _( L"%ls: Variable scope can only be one of universal, global and local\n" )
 
 /**
    Error message for specifying both export and unexport to set/read
 */
-#define BUILTIN_ERR_EXPUNEXP L": Variable can't be both exported and unexported"
+#define BUILTIN_ERR_EXPUNEXP _( L"%ls: Variable can't be both exported and unexported\n" )
 
 /**
    Error message for unknown switch
 */
-#define BUILTIN_ERR_UNKNOWN	L": Unknown option"
+#define BUILTIN_ERR_UNKNOWN  _( L"%ls: Unknown option '%ls'\n" )
 
 /**
-   Stringbuffer used to represent standard output
+   Error message for invalid character in variable name
 */
-extern string_buffer_t *sb_out;
+#define BUILTIN_ERR_VARCHAR _( L"%ls: Invalid character '%lc' in variable name. Only alphanumerical characters and underscores are valid in a variable name.\n" )
 
 /**
-   Stringbuffer used to represent standard error
+   Error message for invalid (empty) variable name
 */
-extern string_buffer_t *sb_err;
+#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 for insufficient number of arguments
+*/
+#define BUILTIN_FOR_ERR_COUNT _( L"%ls: Expected at least two arguments, got %d\n")
+
+#define BUILTIN_FOR_ERR_NAME _( L"%ls: '%ls' is not a valid variable name\n" )
+
+/** Error messages for 'else if' */
+#define BUILTIN_ELSEIF_ERR_COUNT _( L"%ls: can only take 'if' and then another command as an argument\n")
+#define BUILTIN_ELSEIF_ERR_ARGUMENT _( L"%ls: any second argument must be 'if'\n")
+
+/**
+   Error message when too many arguments are supplied to a builtin
+*/
+#define BUILTIN_ERR_TOO_MANY_ARGUMENTS _( L"%ls: Too many arguments\n" )
+
+/**
+   Error message when block types mismatch in the end builtin, e.g. 'begin; end for'
+*/
+#define BUILTIN_END_BLOCK_MISMATCH _( L"%ls: Block mismatch: '%ls' vs. '%ls'\n" )
+
+/**
+   Error message for unknown block type in the end builtin, e.g. 'begin; end beggin'
+*/
+#define BUILTIN_END_BLOCK_UNKNOWN _( L"%ls: Unknown block type '%ls'\n" )
+
+#define BUILTIN_ERR_NOT_NUMBER _( L"%ls: Argument '%ls' is not a number\n" )
+
+/** Get the string used to represent stdout and stderr */
+const wcstring &get_stdout_buffer();
+const wcstring &get_stderr_buffer();
+
+/** Output an error */
+void builtin_show_error(const wcstring &err);
 
 /**
    Kludge. Tells builtins if output is to screen
@@ -64,7 +113,7 @@ extern int builtin_err_redirect;
 
 
 /**
-   Initialize builtin data. 
+   Initialize builtin data.
 */
 void builtin_init();
 
@@ -76,72 +125,74 @@ void builtin_destroy();
 /**
   Is there a builtin command with the given name?
 */
-int builtin_exists( wchar_t *cmd );
+int builtin_exists(const wcstring &cmd);
 
 /**
-  Execute a builtin command 
+  Execute a builtin command
 
-  \param argv Array containing the command and parameters 
+  \param parser The parser being used
+  \param argv Array containing the command and parameters
   of the builtin.  The list is terminated by a
-  null pointer. This syntax resembles the syntax 
+  null pointer. This syntax resembles the syntax
   for exec.
+  \param io the io redirections to perform on this builtin.
 
   \return the exit status of the builtin command
 */
-int builtin_run( wchar_t **argv );
+int builtin_run(parser_t &parser, const wchar_t * const *argv, const io_chain_t &io);
+
+/** Returns a list of all builtin names */
+wcstring_list_t builtin_get_names(void);
+
+/** Insert all builtin names into list. */
+void builtin_get_names(std::vector<completion_t> &list);
 
 /**
-  Insert all builtin names into l. These are not copies of the strings and should not be freed after use.
+   Pushes a new set of input/output to the stack. The new stdin is supplied, a new set of output strings is created.
 */
-void builtin_get_names( array_list_t *list );
+void builtin_push_io(parser_t &parser, int stdin_fd);
 
 /**
-   Pushes a new set of input/output to the stack. The new stdin is supplied, a new set of output string_buffer_ts is created.
+   Pops a set of input/output from the stack. The output strings are destroued, but the input file is not closed.
 */
-void builtin_push_io( int stdin_fd );
-
-/**
-   Pops a set of input/output from the stack. The output string_buffer_ts are destroued, but the input file is not closed.
-*/
-void builtin_pop_io();
+void builtin_pop_io(parser_t &parser);
 
 
 /**
-   Return a one-line description of the specified builtin
+   Return a one-line description of the specified builtin.
 */
-const wchar_t *builtin_get_desc( const wchar_t *b );
+wcstring builtin_get_desc(const wcstring &b);
 
-/**
-   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
+
+/** Support for setting and removing transient command lines.
+    This is used by 'complete -C' in order to make
+    the commandline builtin operate on the string to complete instead
+    of operating on whatever is to be completed. It's also used by
+    completion wrappers, to allow a command to appear as the command
+    being wrapped for the purposes of completion.
+    
+    Instantiating an instance of builtin_commandline_scoped_transient_t
+    pushes the command as the new transient commandline. The destructor removes it.
+    It will assert if construction/destruction does not happen in a stack-like (LIFO) order.
 */
-void builtin_print_help( wchar_t *cmd, string_buffer_t *b );
+class builtin_commandline_scoped_transient_t
+{
+    size_t token;
+    public:
+    builtin_commandline_scoped_transient_t(const wcstring &cmd);
+    ~builtin_commandline_scoped_transient_t();
+};
 
 
 /**
-   The set builtin, used for setting variables. Defined in builtin_set.c.
+   Run the __fish_print_help function to obtain the help information
+   for the specified command.
 */
-int builtin_set(wchar_t **argv);
+wcstring builtin_help_get(parser_t &parser, const wchar_t *cmd);
 
-/**
-   The commandline builtin, used for setting and getting the contents of the commandline. Defined in builtin_commandline.c.
-*/
-int builtin_commandline(wchar_t **argv);
+/** Defines a function, like builtin_function. Returns 0 on success. args should NOT contain 'function' as the first argument. */
+int define_function(parser_t &parser, const wcstring_list_t &args, const wcstring &contents, int definition_line_offset, wcstring *out_err);
 
-/**
-   The ulimit builtin, used for setting resource limits. Defined in builtin_ulimit.c.
-*/
-int builtin_ulimit(wchar_t **argv);
-
-/** 
-	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.
-*/
-void builtin_wperror( const wchar_t *s);
 
 #endif

builtin_commandline.c

@@ -1,477 +0,0 @@
-/** \file builtin_commandline.c Functions defining the commandline builtin
-
-Functions used for implementing the commandline 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 "util.h"
-#include "builtin.h"
-#include "common.h"
-#include "wgetopt.h"
-#include "reader.h"
-#include "proc.h"
-#include "parser.h"
-#include "tokenizer.h"
-#include "input_common.h"
-#include "input.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
-}
-	;
-
-/**
-   For text insertion, how should it be done
-*/
-enum
-{
-	REPLACE_MODE=1, // Replace current text
-	INSERT_MODE, // Insert at cursor position
-	APPEND_MODE // Insert at end of current token/command/buffer
-}
-	;
-
-
-/**
-   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( wchar_t *begin,
-						  wchar_t *end,
-						  wchar_t *insert,
-						  int append_mode )
-{
-	wchar_t *buff = reader_get_buffer();
-	string_buffer_t out;
-	int out_pos=reader_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)
-	{
-		case REPLACE_MODE:
-		{
-							
-			sb_append( &out, insert );
-			out_pos = wcslen( insert ) + (begin-buff);							
-			break;
-							
-		}
-		case APPEND_MODE:
-		{
-			sb_append_substring( &out, begin, end-begin );
-			sb_append( &out, insert );
-			break;
-		}
-		case INSERT_MODE:
-		{
-			int cursor = reader_get_cursor_pos() -(begin-buff);
-			sb_append_substring( &out, begin, cursor );
-			sb_append( &out, insert );
-			sb_append_substring( &out, begin+cursor, end-begin-cursor );
-			out_pos +=  wcslen( insert );							
-			break;
-		}
-	}
-	sb_append( &out, end );
-	reader_set_buffer( (wchar_t *)out.buff, out_pos );
-	sb_destroy( &out );
-}
-	
-/**
-   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( wchar_t *begin, 
-						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());
-
-	if( tokenize )
-	{
-					
-		buff = wcsndup( begin, end-begin );
-//		fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end );
-		sb_init( &out );
-					
-		for( tok_init( &tok, buff, TOK_ACCEPT_UNFINISHED );
-			 tok_has_next( &tok );
-			 tok_next( &tok ) )
-		{
-			if( (cut_at_cursor) &&
-				(tok_get_pos( &tok)+wcslen(tok_last( &tok)) >= pos) )
-				break;
-		
-//			fwprintf( stderr, L"Next token %ls\n", tok_last( &tok ) );
-
-			switch( tok_last_type( &tok ) )
-			{
-				case TOK_STRING:
-					sb_append2( &out, tok_last( &tok), L"\n", (void *)0 );
-					break;
-								
-			}						
-		}
-					
-		if( out.buff )
-			sb_append( sb_out,
-					   (wchar_t *)out.buff );
-					
-		free( buff );
-		tok_destroy( &tok );
-		sb_destroy( &out );
-	}
-	else
-	{
-		if( cut_at_cursor )
-		{
-			end = begin+pos;			
-		}
-		sb_append_substring( sb_out, begin, end-begin );		
-		sb_append( sb_out, L"\n" );		
-	}
-}
-
-
-/**
-   The commandline builtin. It is used for specifying a new value for
-   the commandline.
-*/
-int builtin_commandline( wchar_t **argv )
-{
-
-	int buffer_part=0;
-	int cut_at_cursor=0;
-	
-	int argc = builtin_count_args( argv );
-	int append_mode=0;
-
-	int function_mode = 0;
-	
-	int tokenize = 0;	
-
-	if( !reader_get_buffer() )
-	{
-		sb_append2( sb_err,
-					argv[0],
-					L": Can not set commandline in non-interactive mode\n",
-					(void *)0 );
-		builtin_print_help( argv[0], sb_err );
-		return 1;		
-	}	
-
-	woptind=0;
-
-	while( 1 )
-	{
-		const static struct woption
-			long_options[] =
-			{
-				{
-					L"append", no_argument, 0, 'a'
-				}
-				,
-				{
-					L"insert", no_argument, 0, 'i'
-				}
-				,
-				{
-					L"replace", no_argument, 0, 'r'
-				}
-				,
-				{
-					L"current-job", no_argument, 0, 'j'
-				}
-				,
-				{
-					L"current-process", no_argument, 0, 'p'
-				}
-				,
-				{
-					L"current-token", no_argument, 0, 't'
-				}
-				,		
-				{
-					L"current-buffer", no_argument, 0, 'b'
-				}
-				,		
-				{
-					L"cut-at-cursor", no_argument, 0, 'c'
-				}
-				,
-				{
-					L"function", no_argument, 0, 'f'
-				}
-				,
-				{
-					L"tokenize", no_argument, 0, 'o'
-				}
-				,
-				{
-					0, 0, 0, 0 
-				}
-			}
-		;		
-		
-		int opt_index = 0;
-		
-		int opt = wgetopt_long( argc,
-								argv, 
-								L"aijpctwfo", 
-								long_options, 
-								&opt_index );
-		if( opt == -1 )
-			break;
-			
-		switch( opt )
-		{
-			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 );
-				builtin_print_help( argv[0], sb_err );
-
-				return 1;
-				
-			case L'a':
-				append_mode = APPEND_MODE;
-				break;
-				
-			case L'i':
-				append_mode = INSERT_MODE;
-				break;
-				
-			case 'c':
-				cut_at_cursor=1;
-				break;
-				
-			case 't':
-				buffer_part = TOKEN_MODE;
-				break;
-
-			case 'j':
-				buffer_part = JOB_MODE;
-				break;
-
-			case 'p':
-				buffer_part = PROCESS_MODE;
-				break;
-
-			case 'f':
-				function_mode=1;
-				break;
-
-			case 'o':
-				tokenize=1;
-				break;
-
-			case L'?':
-				builtin_print_help( argv[0], sb_err );				
-				return 1;	
-		}
-	}		
-
-	if( function_mode )
-	{
-		int i;
-		
-		/*
-		  Check for invalid switch combinations
-		*/
-		if( buffer_part || cut_at_cursor || append_mode || tokenize )
-		{
-			sb_append2(sb_err,
-					   argv[0],
-					   BUILTIN_ERR_COMBO,
-					   L"\n",
-					   parser_current_line(),
-					   L"\n",
-					   (void *)0);
-			return 1;
-		}
-		
-
-		if( argc == woptind )
-		{
-			sb_append2( sb_err,
-						argv[0],
-						BUILTIN_ERR_MISSING,
-						L"\n",
-						parser_current_line(),
-						L"\n",
-						(void *)0 );
-			builtin_print_help( argv[0], sb_err );
-			return 1;
- 		}
-		for( i=woptind; i<argc; i++ )
-		{
-			wint_t c = input_get_code( argv[i] );
-			if( c != -1 )
-			{
-//				fwprintf( stderr, L"Add function %ls (%d)\n", argv[i], c );
-				/*
-				  input_unreadch inserts the specified keypress or
-				  readline function at the top of the stack of unused
-				  keypresses
-				*/
-				input_unreadch(c);
-			}
-			else
-			{
-//				fwprintf( stderr, L"BLUR %ls %d\n", argv[i], c );
-				sb_append2( sb_err,
-							argv[0],
-							L": Unknown readline function '",
-							argv[i],
-							L"'\n",
-							parser_current_line(),
-							L"\n",
-							(void *)0 );
-				builtin_print_help( argv[0], sb_err );
-				return 1;
-			}
-		}
-		
-		return 0;		
-	}
-	
-	/*
-	  Check for invalid switch combinations
-	*/
-	if( argc-woptind > 1 )
-	{
-		
-		sb_append2( sb_err,
-					argv[0],
-					L": Too many arguments\n",
-					(void *)0 );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	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 );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	if( append_mode && !(argc-woptind) )
-	{
-		sb_append2( sb_err,
-                    argv[0],
-                    BUILTIN_ERR_COMBO,
-                    L",\n insertion mode switches can not be used when not in insertion mode",
-                    (void *)0 );
-        builtin_print_help( argv[0], sb_err );		
-        return 1;
-	}
-
-	/*
-	  Set default modes
-	*/
-	if( !append_mode )
-	{
-		append_mode = REPLACE_MODE;
-	}
-	
-	if( !buffer_part )
-	{
-		buffer_part = STRING_MODE;
-	}
-		
-	wchar_t *begin, *end;
-	
-	switch( buffer_part )
-	{
-		case STRING_MODE:
-		{			
-			begin = reader_get_buffer();
-			end = begin+wcslen(begin);
-			break;			
-		}
-
-		case PROCESS_MODE:
-		{
-			reader_current_process_extent( &begin, &end );
-			break;
-		}
-		
-		case JOB_MODE:
-		{
-			reader_current_job_extent( &begin, &end );					
-			break;			
-		}
-		
-		case TOKEN_MODE:
-		{
-			reader_current_token_extent( &begin, &end, 0, 0 );
-			break;			
-		}
-				
-	}
-
-	switch(argc-woptind)
-	{
-		case 0:
-		{					
-			write_part( begin, end, cut_at_cursor, tokenize );
-			break;
-		}
-		
-		case 1:
-		{
-			replace_part( begin, end, argv[woptind], append_mode );
-			break;					
-		}		
-	}
-	
-	return 0;
-}

builtin_commandline.cpp

@@ -0,0 +1,674 @@
+/** \file builtin_commandline.c Functions defining the commandline builtin
+
+Functions used for implementing the commandline builtin.
+
+*/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <signal.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "common.h"
+#include "wgetopt.h"
+#include "reader.h"
+#include "proc.h"
+#include "parser.h"
+#include "tokenizer.h"
+#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 */
+}
+;
+
+/**
+   For text insertion, how should it be done
+*/
+enum
+{
+    REPLACE_MODE=1, /**< Replace current text */
+    INSERT_MODE, /**< Insert at cursor position */
+    APPEND_MODE /**< Insert at end of current token/command/buffer */
+}
+;
+
+/**
+   Pointer to what the commandline builtin considers to be the current
+   contents of the command line buffer.
+ */
+static const wchar_t *current_buffer=0;
+/**
+   What the commandline builtin considers to be the current cursor
+   position.
+ */
+static size_t current_cursor_pos = (size_t)(-1);
+
+/**
+   Returns the current commandline buffer.
+*/
+static const wchar_t *get_buffer()
+{
+    return current_buffer;
+}
+
+/**
+   Returns the position of the cursor
+*/
+static size_t get_cursor_pos()
+{
+    return current_cursor_pos;
+}
+
+static pthread_mutex_t transient_commandline_lock = PTHREAD_MUTEX_INITIALIZER;
+static wcstring_list_t *get_transient_stack()
+{
+    ASSERT_IS_MAIN_THREAD();
+    ASSERT_IS_LOCKED(transient_commandline_lock);
+    // A pointer is a little more efficient than an object as a static because we can elide the thread-safe initialization
+    static wcstring_list_t *result = NULL;
+    if (! result)
+    {
+        result = new wcstring_list_t();
+    }
+    return result;
+}
+
+static bool get_top_transient(wcstring *out_result)
+{
+    ASSERT_IS_MAIN_THREAD();
+    bool result = false;
+    scoped_lock locker(transient_commandline_lock);
+    const wcstring_list_t *stack = get_transient_stack();
+    if (! stack->empty())
+    {
+        out_result->assign(stack->back());
+        result = true;
+    }
+    return result;
+}
+
+builtin_commandline_scoped_transient_t::builtin_commandline_scoped_transient_t(const wcstring &cmd)
+{
+    ASSERT_IS_MAIN_THREAD();
+    scoped_lock locker(transient_commandline_lock);
+    wcstring_list_t *stack = get_transient_stack();
+    stack->push_back(cmd);
+    this->token = stack->size();
+}
+
+builtin_commandline_scoped_transient_t::~builtin_commandline_scoped_transient_t()
+{
+    ASSERT_IS_MAIN_THREAD();
+    scoped_lock locker(transient_commandline_lock);
+    wcstring_list_t *stack = get_transient_stack();
+    assert(this->token == stack->size());
+    stack->pop_back();
+}
+
+/**
+   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,
+                         const wchar_t *insert,
+                         int append_mode)
+{
+    const wchar_t *buff = get_buffer();
+    size_t out_pos = get_cursor_pos();
+
+    wcstring out;
+
+    out.append(buff, begin - buff);
+
+    switch (append_mode)
+    {
+        case REPLACE_MODE:
+        {
+
+            out.append(insert);
+            out_pos = wcslen(insert) + (begin-buff);
+            break;
+
+        }
+        case APPEND_MODE:
+        {
+            out.append(begin, end-begin);
+            out.append(insert);
+            break;
+        }
+        case INSERT_MODE:
+        {
+            long cursor = get_cursor_pos() -(begin-buff);
+            out.append(begin, cursor);
+            out.append(insert);
+            out.append(begin+cursor, end-begin-cursor);
+            out_pos +=  wcslen(insert);
+            break;
+        }
+    }
+    out.append(end);
+    reader_set_buffer(out, out_pos);
+}
+
+/**
+   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)
+{
+    size_t pos = get_cursor_pos()-(begin-get_buffer());
+
+    if (tokenize)
+    {
+        wchar_t *buff = wcsndup(begin, end-begin);
+//    fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end );
+        wcstring out;
+        tokenizer_t tok(buff, TOK_ACCEPT_UNFINISHED);
+        for (; tok_has_next(&tok); tok_next(&tok))
+        {
+            if ((cut_at_cursor) &&
+                    (tok_get_pos(&tok)+wcslen(tok_last(&tok)) >= pos))
+                break;
+
+            switch (tok_last_type(&tok))
+            {
+                case TOK_STRING:
+                {
+                    wcstring tmp = tok_last(&tok);
+                    unescape_string_in_place(&tmp, UNESCAPE_INCOMPLETE);
+                    out.append(tmp);
+                    out.push_back(L'\n');
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
+
+        stdout_buffer.append(out);
+
+        free(buff);
+    }
+    else
+    {
+        if (cut_at_cursor)
+        {
+            end = begin+pos;
+        }
+
+//    debug( 0, L"woot2 %ls -> %ls", buff, esc );
+        wcstring tmp = wcstring(begin, end - begin);
+        unescape_string_in_place(&tmp, UNESCAPE_INCOMPLETE);
+        stdout_buffer.append(tmp);
+        stdout_buffer.append(L"\n");
+
+    }
+}
+
+
+/**
+   The commandline builtin. It is used for specifying a new value for
+   the commandline.
+*/
+static int builtin_commandline(parser_t &parser, wchar_t **argv)
+{
+
+    int buffer_part=0;
+    int cut_at_cursor=0;
+
+    int argc = builtin_count_args(argv);
+    int append_mode=0;
+
+    int function_mode = 0;
+    int selection_mode = 0;
+
+    int tokenize = 0;
+
+    int cursor_mode = 0;
+    int line_mode = 0;
+    int search_mode = 0;
+    int paging_mode = 0;
+    const wchar_t *begin = NULL, *end = NULL;
+    
+    scoped_push<const wchar_t *> saved_current_buffer(&current_buffer);
+    scoped_push<size_t> saved_current_cursor_pos(&current_cursor_pos);
+    
+    wcstring transient_commandline;
+    if (get_top_transient(&transient_commandline))
+    {
+        current_buffer = transient_commandline.c_str();
+        current_cursor_pos = transient_commandline.size();
+    }
+    else
+    {
+        current_buffer = reader_get_buffer();
+        current_cursor_pos = reader_get_cursor_pos();
+    }
+
+    if (!get_buffer())
+    {
+        if (is_interactive_session)
+        {
+            /*
+              Prompt change requested while we don't have
+              a prompt, most probably while reading the
+              init files. Just ignore it.
+            */
+            return 1;
+        }
+
+        stderr_buffer.append(argv[0]);
+        stderr_buffer.append(L": Can not set commandline in non-interactive mode\n");
+        builtin_print_help(parser, argv[0], stderr_buffer);
+        return 1;
+    }
+
+    woptind=0;
+
+    while (1)
+    {
+        static const struct woption
+                long_options[] =
+        {
+            { L"append", no_argument, 0, 'a' },
+            { L"insert", no_argument, 0, 'i' },
+            { L"replace", no_argument, 0, 'r' },
+            { L"current-job", no_argument, 0, 'j' },
+            { L"current-process", no_argument, 0, 'p' },
+            { L"current-token", no_argument, 0, 't' },
+            { L"current-buffer", no_argument, 0, 'b' },
+            { L"cut-at-cursor", no_argument, 0, 'c' },
+            { L"function", no_argument, 0, 'f' },
+            { L"tokenize", no_argument, 0, 'o' },
+            { L"help", no_argument, 0, 'h' },
+            { L"input", required_argument, 0, 'I' },
+            { L"cursor", no_argument, 0, 'C' },
+            { L"line", no_argument, 0, 'L' },
+            { L"search-mode", no_argument, 0, 'S' },
+            { L"selection", no_argument, 0, 's' },
+            { L"paging-mode", no_argument, 0, 'P' },
+            { 0, 0, 0, 0 }
+        };
+
+        int opt_index = 0;
+
+        int opt = wgetopt_long(argc,
+                               argv,
+                               L"abijpctwforhI:CLSsP",
+                               long_options,
+                               &opt_index);
+        if (opt == -1)
+            break;
+
+        switch (opt)
+        {
+            case 0:
+                if (long_options[opt_index].flag != 0)
+                    break;
+                append_format(stderr_buffer,
+                              BUILTIN_ERR_UNKNOWN,
+                              argv[0],
+                              long_options[opt_index].name);
+                builtin_print_help(parser, argv[0], stderr_buffer);
+
+                return 1;
+
+            case L'a':
+                append_mode = APPEND_MODE;
+                break;
+
+            case L'b':
+                buffer_part = STRING_MODE;
+                break;
+
+
+            case L'i':
+                append_mode = INSERT_MODE;
+                break;
+
+            case L'r':
+                append_mode = REPLACE_MODE;
+                break;
+
+            case 'c':
+                cut_at_cursor=1;
+                break;
+
+            case 't':
+                buffer_part = TOKEN_MODE;
+                break;
+
+            case 'j':
+                buffer_part = JOB_MODE;
+                break;
+
+            case 'p':
+                buffer_part = PROCESS_MODE;
+                break;
+
+            case 'f':
+                function_mode=1;
+                break;
+
+            case 'o':
+                tokenize=1;
+                break;
+
+            case 'I':
+                current_buffer = woptarg;
+                current_cursor_pos = wcslen(woptarg);
+                break;
+
+            case 'C':
+                cursor_mode = 1;
+                break;
+
+            case 'L':
+                line_mode = 1;
+                break;
+
+            case 'S':
+                search_mode = 1;
+                break;
+
+            case 's':
+                selection_mode = 1;
+                break;
+
+            case 'P':
+                paging_mode = 1;
+                break;
+
+            case 'h':
+                builtin_print_help(parser, argv[0], stdout_buffer);
+                return 0;
+
+            case L'?':
+                builtin_unknown_option(parser, argv[0], argv[woptind-1]);
+                return 1;
+        }
+    }
+
+    if (function_mode)
+    {
+        int i;
+
+        /*
+          Check for invalid switch combinations
+        */
+        if (buffer_part || cut_at_cursor || append_mode || tokenize || cursor_mode || line_mode || search_mode || paging_mode)
+        {
+            append_format(stderr_buffer,
+                          BUILTIN_ERR_COMBO,
+                          argv[0]);
+
+            builtin_print_help(parser, argv[0], stderr_buffer);
+            return 1;
+        }
+
+
+        if (argc == woptind)
+        {
+            append_format(stderr_buffer,
+                          BUILTIN_ERR_MISSING,
+                          argv[0]);
+
+            builtin_print_help(parser, argv[0], stderr_buffer);
+            return 1;
+        }
+        for (i=woptind; i<argc; i++)
+        {
+            wchar_t c = input_function_get_code(argv[i]);
+            if (c != (wchar_t)(-1))
+            {
+                /*
+                  input_unreadch inserts the specified keypress or
+                  readline function at the back of the queue of unused
+                  keypresses
+                */
+                input_queue_ch(c);
+            }
+            else
+            {
+                append_format(stderr_buffer,
+                              _(L"%ls: Unknown input function '%ls'\n"),
+                              argv[0],
+                              argv[i]);
+                builtin_print_help(parser, argv[0], stderr_buffer);
+                return 1;
+            }
+        }
+
+        return 0;
+    }
+
+    if (selection_mode)
+    {
+        size_t start, len;
+        const wchar_t *buffer = reader_get_buffer();
+        if (reader_get_selection(&start, &len))
+        {
+            stdout_buffer.append(buffer + start, len);
+        }
+        return 0;
+    }
+
+    /*
+      Check for invalid switch combinations
+    */
+    if ((search_mode || line_mode || cursor_mode || paging_mode) && (argc-woptind > 1))
+    {
+
+        append_format(stderr_buffer,
+                      argv[0],
+                      L": Too many arguments\n",
+                      NULL);
+        builtin_print_help(parser, argv[0], stderr_buffer);
+        return 1;
+    }
+
+    if ((buffer_part || tokenize || cut_at_cursor) && (cursor_mode || line_mode || search_mode || paging_mode))
+    {
+        append_format(stderr_buffer,
+                      BUILTIN_ERR_COMBO,
+                      argv[0]);
+
+        builtin_print_help(parser, argv[0], stderr_buffer);
+        return 1;
+    }
+
+
+    if ((tokenize || cut_at_cursor) && (argc-woptind))
+    {
+        append_format(stderr_buffer,
+                      BUILTIN_ERR_COMBO2,
+                      argv[0],
+                      L"--cut-at-cursor and --tokenize can not be used when setting the commandline");
+
+
+        builtin_print_help(parser, argv[0], stderr_buffer);
+        return 1;
+    }
+
+    if (append_mode && !(argc-woptind))
+    {
+        append_format(stderr_buffer,
+                      BUILTIN_ERR_COMBO2,
+                      argv[0],
+                      L"insertion mode switches can not be used when not in insertion mode");
+
+        builtin_print_help(parser, argv[0], stderr_buffer);
+        return 1;
+    }
+
+    /*
+      Set default modes
+    */
+    if (!append_mode)
+    {
+        append_mode = REPLACE_MODE;
+    }
+
+    if (!buffer_part)
+    {
+        buffer_part = STRING_MODE;
+    }
+
+    if (cursor_mode)
+    {
+        if (argc-woptind)
+        {
+            wchar_t *endptr;
+            long new_pos;
+            errno = 0;
+
+            new_pos = wcstol(argv[woptind], &endptr, 10);
+            if (*endptr || errno)
+            {
+                append_format(stderr_buffer,
+                              BUILTIN_ERR_NOT_NUMBER,
+                              argv[0],
+                              argv[woptind]);
+                builtin_print_help(parser, argv[0], stderr_buffer);
+            }
+
+            current_buffer = reader_get_buffer();
+            new_pos = maxi(0L, mini(new_pos, (long)wcslen(current_buffer)));
+            reader_set_buffer(current_buffer, (size_t)new_pos);
+            return 0;
+        }
+        else
+        {
+            append_format(stdout_buffer, L"%lu\n", (unsigned long)reader_get_cursor_pos());
+            return 0;
+        }
+
+    }
+
+    if (line_mode)
+    {
+        size_t pos = reader_get_cursor_pos();
+        const wchar_t *buff = reader_get_buffer();
+        append_format(stdout_buffer, L"%lu\n", (unsigned long)parse_util_lineno(buff, pos));
+        return 0;
+
+    }
+
+    if (search_mode)
+    {
+        return ! reader_search_mode();
+    }
+
+    if (paging_mode)
+    {
+        return ! reader_has_pager_contents();
+    }
+
+
+    switch (buffer_part)
+    {
+        case STRING_MODE:
+        {
+            begin = get_buffer();
+            end = begin+wcslen(begin);
+            break;
+        }
+
+        case PROCESS_MODE:
+        {
+            parse_util_process_extent(get_buffer(),
+                                      get_cursor_pos(),
+                                      &begin,
+                                      &end);
+            break;
+        }
+
+        case JOB_MODE:
+        {
+            parse_util_job_extent(get_buffer(),
+                                  get_cursor_pos(),
+                                  &begin,
+                                  &end);
+            break;
+        }
+
+        case TOKEN_MODE:
+        {
+            parse_util_token_extent(get_buffer(),
+                                    get_cursor_pos(),
+                                    &begin,
+                                    &end,
+                                    0, 0);
+            break;
+        }
+
+    }
+
+    switch (argc-woptind)
+    {
+        case 0:
+        {
+            write_part(begin, end, cut_at_cursor, tokenize);
+            break;
+        }
+
+        case 1:
+        {
+            replace_part(begin, end, argv[woptind], append_mode);
+            break;
+        }
+
+        default:
+        {
+            wcstring sb = argv[woptind];
+            int i;
+
+            for (i=woptind+1; i<argc; i++)
+            {
+                sb.push_back(L'\n');
+                sb.append(argv[i]);
+            }
+
+            replace_part(begin, end, sb.c_str(), append_mode);
+
+            break;
+        }
+    }
+
+    return 0;
+}

builtin_complete.cpp

@@ -0,0 +1,606 @@
+/** \file builtin_complete.c Functions defining the complete builtin
+
+Functions used for implementing the complete builtin.
+
+*/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <signal.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "common.h"
+#include "complete.h"
+#include "wgetopt.h"
+#include "parser.h"
+#include "reader.h"
+
+/*
+  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,
+                                   const wcstring_list_t &gnu_opt,
+                                   const wcstring_list_t &old_opt,
+                                   int result_mode,
+                                   const wchar_t *condition,
+                                   const wchar_t *comp,
+                                   const wchar_t *desc,
+                                   int flags)
+{
+    size_t i;
+    const wchar_t *s;
+
+    for (s=short_opt; *s; s++)
+    {
+        complete_add(cmd,
+                     cmd_type,
+                     *s,
+                     0,
+                     0,
+                     result_mode,
+                     condition,
+                     comp,
+                     desc,
+                     flags);
+    }
+
+    for (i=0; i<gnu_opt.size(); i++)
+    {
+        complete_add(cmd,
+                     cmd_type,
+                     0,
+                     gnu_opt.at(i).c_str(),
+                     0,
+                     result_mode,
+                     condition,
+                     comp,
+                     desc,
+                     flags);
+    }
+
+    for (i=0; i<old_opt.size(); i++)
+    {
+        complete_add(cmd,
+                     cmd_type,
+                     0,
+                     old_opt.at(i).c_str(),
+                     1,
+                     result_mode,
+                     condition,
+                     comp,
+                     desc,
+                     flags);
+    }
+
+    if (old_opt.empty() && gnu_opt.empty() && wcslen(short_opt) == 0)
+    {
+        complete_add(cmd,
+                     cmd_type,
+                     0,
+                     0,
+                     0,
+                     result_mode,
+                     condition,
+                     comp,
+                     desc,
+                     flags);
+    }
+}
+
+/**
+   Silly function
+*/
+static void  builtin_complete_add(const wcstring_list_t &cmd,
+                                  const wcstring_list_t &path,
+                                  const wchar_t *short_opt,
+                                  wcstring_list_t &gnu_opt,
+                                  wcstring_list_t &old_opt,
+                                  int result_mode,
+                                  int authoritative,
+                                  const wchar_t *condition,
+                                  const wchar_t *comp,
+                                  const wchar_t *desc,
+                                  int flags)
+{
+    for (size_t i=0; i<cmd.size(); i++)
+    {
+        builtin_complete_add2(cmd.at(i).c_str(),
+                              COMMAND,
+                              short_opt,
+                              gnu_opt,
+                              old_opt,
+                              result_mode,
+                              condition,
+                              comp,
+                              desc,
+                              flags);
+
+        if (authoritative != -1)
+        {
+            complete_set_authoritative(cmd.at(i).c_str(),
+                                       COMMAND,
+                                       authoritative);
+        }
+
+    }
+
+    for (size_t i=0; i<path.size(); i++)
+    {
+        builtin_complete_add2(path.at(i).c_str(),
+                              PATH,
+                              short_opt,
+                              gnu_opt,
+                              old_opt,
+                              result_mode,
+                              condition,
+                              comp,
+                              desc,
+                              flags);
+
+        if (authoritative != -1)
+        {
+            complete_set_authoritative(path.at(i).c_str(),
+                                       PATH,
+                                       authoritative);
+        }
+
+    }
+}
+
+/**
+   Silly function
+*/
+static void builtin_complete_remove3(const wchar_t *cmd,
+                                     int cmd_type,
+                                     wchar_t short_opt,
+                                     const wcstring_list_t &long_opt,
+                                     int long_mode)
+{
+    for (size_t i=0; i<long_opt.size(); i++)
+    {
+        complete_remove(cmd,
+                        cmd_type,
+                        short_opt,
+                        long_opt.at(i).c_str(),
+                        long_mode);
+    }
+}
+
+/**
+   Silly function
+*/
+static void  builtin_complete_remove2(const wchar_t *cmd,
+                                      int cmd_type,
+                                      const wchar_t *short_opt,
+                                      const wcstring_list_t &gnu_opt,
+                                      const wcstring_list_t &old_opt)
+{
+    const wchar_t *s = (wchar_t *)short_opt;
+    if (*s)
+    {
+        for (; *s; s++)
+        {
+            if (old_opt.empty() && gnu_opt.empty())
+            {
+                complete_remove(cmd,
+                                cmd_type,
+                                *s,
+                                0,
+                                0);
+
+            }
+            else
+            {
+                builtin_complete_remove3(cmd,
+                                         cmd_type,
+                                         *s,
+                                         gnu_opt,
+                                         0);
+                builtin_complete_remove3(cmd,
+                                         cmd_type,
+                                         *s,
+                                         old_opt,
+                                         1);
+            }
+        }
+    }
+    else if (gnu_opt.empty() && old_opt.empty())
+    {
+        complete_remove(cmd,
+                        cmd_type,
+                        0,
+                        0,
+                        0);
+    }
+    else
+    {
+        builtin_complete_remove3(cmd,
+                                 cmd_type,
+                                 0,
+                                 gnu_opt,
+                                 0);
+        builtin_complete_remove3(cmd,
+                                 cmd_type,
+                                 0,
+                                 old_opt,
+                                 1);
+
+    }
+
+
+}
+
+/**
+   Silly function
+*/
+static void  builtin_complete_remove(const wcstring_list_t &cmd,
+                                     const wcstring_list_t &path,
+                                     const wchar_t *short_opt,
+                                     const wcstring_list_t &gnu_opt,
+                                     const wcstring_list_t &old_opt)
+{
+    for (size_t i=0; i<cmd.size(); i++)
+    {
+        builtin_complete_remove2(cmd.at(i).c_str(),
+                                 COMMAND,
+                                 short_opt,
+                                 gnu_opt,
+                                 old_opt);
+    }
+
+    for (size_t i=0; i<path.size(); i++)
+    {
+        builtin_complete_remove2(path.at(i).c_str(),
+                                 PATH,
+                                 short_opt,
+                                 gnu_opt,
+                                 old_opt);
+    }
+
+}
+
+/**
+   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(parser_t &parser, wchar_t **argv)
+{
+    ASSERT_IS_MAIN_THREAD();
+    bool res=false;
+    int argc=0;
+    int result_mode=SHARED;
+    int remove = 0;
+    int authoritative = -1;
+
+    wcstring short_opt;
+    wcstring_list_t gnu_opt, old_opt;
+    const wchar_t *comp=L"", *desc=L"", *condition=L"";
+
+    bool do_complete = false;
+    wcstring do_complete_param;
+
+    wcstring_list_t cmd;
+    wcstring_list_t path;
+    wcstring_list_t wrap_targets;
+
+    static int recursion_level=0;
+
+    argc = builtin_count_args(argv);
+
+    woptind=0;
+
+    while (! res)
+    {
+        static const 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"unauthoritative", no_argument, 0, 'u' },
+            { L"authoritative", no_argument, 0, 'A' },
+            { L"condition", required_argument, 0, 'n' },
+            { L"wraps", required_argument, 0, 'w' },
+            { L"do-complete", optional_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:frxeuAn:C::w:h",
+                               long_options,
+                               &opt_index);
+        if (opt == -1)
+            break;
+
+        switch (opt)
+        {
+            case 0:
+                if (long_options[opt_index].flag != 0)
+                    break;
+                append_format(stderr_buffer,
+                              BUILTIN_ERR_UNKNOWN,
+                              argv[0],
+                              long_options[opt_index].name);
+                builtin_print_help(parser, argv[0], stderr_buffer);
+
+
+                res = true;
+                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':
+            {
+                wcstring tmp;
+                if (unescape_string(woptarg, &tmp, UNESCAPE_SPECIAL))
+                {
+                    if (opt=='p')
+                        path.push_back(tmp);
+                    else
+                        cmd.push_back(tmp);
+                }
+                else
+                {
+                    append_format(stderr_buffer, L"%ls: Invalid token '%ls'\n", argv[0], woptarg);
+                    res = true;
+                }
+                break;
+            }
+
+            case 'd':
+                desc = woptarg;
+                break;
+
+            case 'u':
+                authoritative=0;
+                break;
+
+            case 'A':
+                authoritative=1;
+                break;
+
+            case 's':
+                short_opt.append(woptarg);
+                break;
+
+            case 'l':
+                gnu_opt.push_back(woptarg);
+                break;
+
+            case 'o':
+                old_opt.push_back(woptarg);
+                break;
+
+            case 'a':
+                comp = woptarg;
+                break;
+
+            case 'e':
+                remove = 1;
+                break;
+
+            case 'n':
+                condition = woptarg;
+                break;
+                
+            case 'w':
+                wrap_targets.push_back(woptarg);
+                break;
+
+            case 'C':
+                do_complete = true;
+                do_complete_param = woptarg ? woptarg : reader_get_buffer();
+                break;
+
+            case 'h':
+                builtin_print_help(parser, argv[0], stdout_buffer);
+                return 0;
+
+            case '?':
+                builtin_unknown_option(parser, argv[0], argv[woptind-1]);
+                res = true;
+                break;
+
+        }
+
+    }
+
+    if (!res)
+    {
+        if (condition && wcslen(condition))
+        {
+            const wcstring condition_string = condition;
+            parse_error_list_t errors;
+            if (parse_util_detect_errors(condition_string, &errors, false /* do not accept incomplete */))
+            {
+                append_format(stderr_buffer,
+                              L"%ls: Condition '%ls' contained a syntax error",
+                              argv[0],
+                              condition);
+                for (size_t i=0; i < errors.size(); i++)
+                {
+                    append_format(stderr_buffer, L"\n%s: ", argv[0]);
+                    stderr_buffer.append(errors.at(i).describe(condition_string));
+                }
+                res = true;
+            }
+        }
+    }
+
+    if (!res)
+    {
+        if (comp && wcslen(comp))
+        {
+            wcstring prefix;
+            if (argv[0])
+            {
+                prefix.append(argv[0]);
+                prefix.append(L": ");
+            }
+
+            wcstring err_text;
+            if (parser.detect_errors_in_argument_list(comp, &err_text, prefix.c_str()))
+            {
+                append_format(stderr_buffer,
+                              L"%ls: Completion '%ls' contained a syntax error\n",
+                              argv[0],
+                              comp);
+                stderr_buffer.append(err_text);
+                stderr_buffer.push_back(L'\n');
+                res = true;
+            }
+        }
+    }
+
+    if (!res)
+    {
+        if (do_complete)
+        {
+            const wchar_t *token;
+
+            parse_util_token_extent(do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0, 0);
+            
+            /* Create a scoped transient command line, so that bulitin_commandline will see our argument, not the reader buffer */
+            builtin_commandline_scoped_transient_t temp_buffer(do_complete_param);
+
+            if (recursion_level < 1)
+            {
+                recursion_level++;
+
+                std::vector<completion_t> comp;
+                complete(do_complete_param, comp, COMPLETION_REQUEST_DEFAULT);
+
+                for (size_t i=0; i< comp.size() ; i++)
+                {
+                    const completion_t &next =  comp.at(i);
+
+                    /* Make a fake commandline, and then apply the completion to it.  */
+                    const wcstring faux_cmdline = token;
+                    size_t tmp_cursor = faux_cmdline.size();
+                    wcstring faux_cmdline_with_completion = completion_apply_to_command_line(next.completion, next.flags, faux_cmdline, &tmp_cursor, false);
+
+                    /* completion_apply_to_command_line will append a space unless COMPLETE_NO_SPACE is set. We don't want to set COMPLETE_NO_SPACE because that won't close quotes. What we want is to close the quote, but not append the space. So we just look for the space and clear it. */
+                    if (!(next.flags & COMPLETE_NO_SPACE) && string_suffixes_string(L" ", faux_cmdline_with_completion))
+                    {
+                        faux_cmdline_with_completion.resize(faux_cmdline_with_completion.size() - 1);
+                    }
+
+                    /* The input data is meant to be something like you would have on the command line, e.g. includes backslashes. The output should be raw, i.e. unescaped. So we need to unescape the command line. See #1127 */
+                    unescape_string_in_place(&faux_cmdline_with_completion, UNESCAPE_DEFAULT);
+                    stdout_buffer.append(faux_cmdline_with_completion);
+
+                    /* Append any description */
+                    if (! next.description.empty())
+                    {
+                        stdout_buffer.push_back(L'\t');
+                        stdout_buffer.append(next.description);
+                    }
+                    stdout_buffer.push_back(L'\n');
+                }
+
+                recursion_level--;
+            }
+        }
+        else if (woptind != argc)
+        {
+            append_format(stderr_buffer,
+                          _(L"%ls: Too many arguments\n"),
+                          argv[0]);
+            builtin_print_help(parser, argv[0], stderr_buffer);
+
+            res = true;
+        }
+        else if (cmd.empty() && path.empty())
+        {
+            /* No arguments specified, meaning we print the definitions of
+             * all specified completions to stdout.*/
+            complete_print(stdout_buffer);
+        }
+        else
+        {
+            int flags = COMPLETE_AUTO_SPACE;
+        
+            if (remove)
+            {
+                builtin_complete_remove(cmd,
+                                        path,
+                                        short_opt.c_str(),
+                                        gnu_opt,
+                                        old_opt);
+                
+            }
+            else
+            {
+                builtin_complete_add(cmd,
+                                     path,
+                                     short_opt.c_str(),
+                                     gnu_opt,
+                                     old_opt,
+                                     result_mode,
+                                     authoritative,
+                                     condition,
+                                     comp,
+                                     desc,
+                                     flags);
+            }
+            
+            // Handle wrap targets (probably empty)
+            // We only wrap commands, not paths
+            for (size_t w=0; w < wrap_targets.size(); w++)
+            {
+                const wcstring &wrap_target = wrap_targets.at(w);
+                for (size_t i=0; i < cmd.size(); i++)
+                {
+                    
+                    (remove ? complete_remove_wrapper : complete_add_wrapper)(cmd.at(i), wrap_target);
+                }
+            }
+        }
+    }
+
+    return res ? 1 : 0;
+}

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

@@ -1,36 +0,0 @@
-/** \file builtin_help.c
-
-    Functions for printing usage information of builtin commands. This
-	file is automatically generated from the file builtin_help.hdr and
-	various help files in the doc_src directory.
-*/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <strings.h>
-#include <wchar.h>
-
-#include "config.h"
-#include "util.h"
-#include "common.h"
-#include "builtin_help.h"
-
-/**
-	Hashtable storing the help text
-*/
-static hash_table_t tbl;
-
-char *builtin_help_get( wchar_t *cmd )
-{
-	return (char *)hash_get( &tbl, (void *)cmd );
-}
-
-void builtin_help_destroy()
-{
-	hash_destroy( &tbl );
-}
-
-
-void builtin_help_init()
-{
-	hash_init( &tbl, &hash_wcs_func, &hash_wcs_cmp );

builtin_jobs.cpp

@@ -0,0 +1,351 @@
+/** \file builtin_jobs.c
+  Functions for executing the jobs builtin.
+*/
+#include "config.h"
+
+#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 "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(const 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(const job_t *j, int mode, int header)
+{
+    process_t *p;
+    switch (mode)
+    {
+        case JOBS_DEFAULT:
+        {
+
+            if (header)
+            {
+                /*
+                  Print table header before first job
+                */
+                stdout_buffer.append(_(L"Job\tGroup\t"));
+#ifdef HAVE__PROC_SELF_STAT
+                stdout_buffer.append(_(L"CPU\t"));
+#endif
+                stdout_buffer.append(_(L"State\tCommand\n"));
+            }
+
+            append_format(stdout_buffer, L"%d\t%d\t", j->job_id, j->pgid);
+
+#ifdef HAVE__PROC_SELF_STAT
+            append_format(stdout_buffer, L"%d%%\t", cpu_use(j));
+#endif
+            stdout_buffer.append(job_is_stopped(j)?_(L"stopped"):_(L"running"));
+            stdout_buffer.append(L"\t");
+            stdout_buffer.append(j->command_wcstr());
+            stdout_buffer.append(L"\n");
+            break;
+        }
+
+        case JOBS_PRINT_GROUP:
+        {
+            if (header)
+            {
+                /*
+                  Print table header before first job
+                */
+                stdout_buffer.append(_(L"Group\n"));
+            }
+            append_format(stdout_buffer, L"%d\n", j->pgid);
+            break;
+        }
+
+        case JOBS_PRINT_PID:
+        {
+            if (header)
+            {
+                /*
+                  Print table header before first job
+                */
+                stdout_buffer.append(_(L"Process\n"));
+            }
+
+            for (p=j->first_process; p; p=p->next)
+            {
+                append_format(stdout_buffer, L"%d\n", p->pid);
+            }
+            break;
+        }
+
+        case JOBS_PRINT_COMMAND:
+        {
+            if (header)
+            {
+                /*
+                  Print table header before first job
+                */
+                stdout_buffer.append(_(L"Command\n"));
+            }
+
+            for (p=j->first_process; p; p=p->next)
+            {
+                append_format(stdout_buffer, L"%ls\n", p->argv0());
+            }
+            break;
+        }
+    }
+
+}
+
+
+
+/**
+   The jobs builtin. Used fopr printing running jobs. Defined in builtin_jobs.c.
+*/
+static int builtin_jobs(parser_t &parser, wchar_t **argv)
+{
+    int argc=0;
+    int found=0;
+    int mode=JOBS_DEFAULT;
+    int print_last = 0;
+
+    argc = builtin_count_args(argv);
+    woptind=0;
+
+    while (1)
+    {
+        static const 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;
+                append_format(stderr_buffer,
+                              BUILTIN_ERR_UNKNOWN,
+                              argv[0],
+                              long_options[opt_index].name);
+
+                builtin_print_help(parser, argv[0], stderr_buffer);
+
+
+                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(parser, argv[0], stdout_buffer);
+                return 0;
+
+            case '?':
+                builtin_unknown_option(parser, argv[0], argv[woptind-1]);
+                return 1;
+
+        }
+    }
+
+
+    /*
+      Do not babble if not interactive
+    */
+    if (builtin_out_redirect)
+    {
+        found=1;
+    }
+
+    if (print_last)
+    {
+        /*
+          Ignore unconstructed jobs, i.e. ourself.
+        */
+        job_iterator_t jobs;
+        const job_t *j;
+        while ((j = jobs.next()))
+        {
+
+            if ((j->flags & JOB_CONSTRUCTED) && !job_is_completed(j))
+            {
+                builtin_jobs_print(j, mode, !found);
+                return 0;
+            }
+        }
+
+    }
+    else
+    {
+        if (woptind < argc)
+        {
+            int i;
+
+            found = 1;
+
+            for (i=woptind; i<argc; i++)
+            {
+                int pid;
+                wchar_t *end;
+                errno=0;
+                pid=fish_wcstoi(argv[i], &end, 10);
+                if (errno || *end)
+                {
+                    append_format(stderr_buffer,
+                                  _(L"%ls: '%ls' is not a job\n"),
+                                  argv[0],
+                                  argv[i]);
+                    return 1;
+                }
+
+                const job_t *j = job_get_from_pid(pid);
+
+                if (j && !job_is_completed(j))
+                {
+                    builtin_jobs_print(j, mode, !found);
+                }
+                else
+                {
+                    append_format(stderr_buffer,
+                                  _(L"%ls: No suitable job: %d\n"),
+                                  argv[0],
+                                  pid);
+                    return 1;
+                }
+            }
+        }
+        else
+        {
+            job_iterator_t jobs;
+            const job_t *j;
+            while ((j = jobs.next()))
+            {
+                /*
+                  Ignore unconstructed jobs, i.e. ourself.
+                */
+                if ((j->flags & JOB_CONSTRUCTED) && !job_is_completed(j))
+                {
+                    builtin_jobs_print(j, mode, !found);
+                    found = 1;
+                }
+            }
+        }
+    }
+
+    if (!found)
+    {
+        append_format(stdout_buffer,
+                      _(L"%ls: There are no jobs\n"),
+                      argv[0]);
+        return 1;
+    }
+
+    return 0;
+}
+

builtin_printf.cpp

@@ -0,0 +1,787 @@
+/* printf - format and print data
+   Copyright (C) 1990-2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Usage: printf format [argument...]
+
+   A front end to the printf function that lets it be used from the shell.
+
+   Backslash escapes:
+
+   \" = double quote
+   \\ = backslash
+   \a = alert (bell)
+   \b = backspace
+   \c = produce no further output
+   \e = escape
+   \f = form feed
+   \n = new line
+   \r = carriage return
+   \t = horizontal tab
+   \v = vertical tab
+   \ooo = octal number (ooo is 1 to 3 digits)
+   \xhh = hexadecimal number (hhh is 1 to 2 digits)
+   \uhhhh = 16-bit Unicode character (hhhh is 4 digits)
+   \Uhhhhhhhh = 32-bit Unicode character (hhhhhhhh is 8 digits)
+
+   Additional directive:
+
+   %b = print an argument string, interpreting backslash escapes,
+     except that octal escapes are of the form \0 or \0ooo.
+
+   The `format' argument is re-used as many times as necessary
+   to convert all of the given arguments.
+
+   David MacKenzie <djm@gnu.ai.mit.edu> */
+
+/* This file has been imported from source code of printf command in GNU Coreutils version 6.9 */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <inttypes.h>
+
+#include "common.h"
+
+struct builtin_printf_state_t
+{
+    /* The status of the operation */
+    int exit_code;
+
+    /* Whether we should stop outputting. This gets set in the case of an error, and also with the \c escape. */
+    bool early_exit;
+
+    builtin_printf_state_t() : exit_code(0), early_exit(false)
+    {
+    }
+
+    void verify_numeric(const wchar_t *s, const wchar_t *end, int errcode);
+
+    void print_direc(const wchar_t *start, size_t length, wchar_t conversion,
+                     bool have_field_width, int field_width,
+                     bool have_precision, int precision,
+                     wchar_t const *argument);
+
+    int print_formatted(const wchar_t *format, int argc, wchar_t **argv);
+
+    void fatal_error(const wchar_t *format, ...);
+
+    long print_esc(const wchar_t *escstart, bool octal_0);
+    void print_esc_string(const wchar_t *str);
+    void print_esc_char(wchar_t c);
+
+    void append_output(wchar_t c);
+    void append_output(const wchar_t *c);
+    void append_format_output(const wchar_t *fmt, ...);
+};
+
+static bool is_octal_digit(wchar_t c)
+{
+    return c != L'\0' && wcschr(L"01234567", c) != NULL;
+}
+
+static bool is_hex_digit(wchar_t c)
+{
+    return c != L'\0' && wcschr(L"0123456789ABCDEFabcdef", c) != NULL;
+}
+
+static int hex_to_bin(const wchar_t &c)
+{
+    switch (c)
+    {
+        case L'0':
+            return 0;
+        case L'1':
+            return 1;
+        case L'2':
+            return 2;
+        case L'3':
+            return 3;
+        case L'4':
+            return 4;
+        case L'5':
+            return 5;
+        case L'6':
+            return 6;
+        case L'7':
+            return 7;
+        case L'8':
+            return 8;
+        case L'9':
+            return 9;
+        case L'a':
+        case L'A':
+            return 10;
+        case L'b':
+        case L'B':
+            return 11;
+        case L'c':
+        case L'C':
+            return 12;
+        case L'd':
+        case L'D':
+            return 13;
+        case L'e':
+        case L'E':
+            return 14;
+        case L'f':
+        case L'F':
+            return 15;
+        default:
+            return -1;
+    }
+}
+
+static int octal_to_bin(wchar_t c)
+{
+    switch (c)
+    {
+        case L'0':
+            return 0;
+        case L'1':
+            return 1;
+        case L'2':
+            return 2;
+        case L'3':
+            return 3;
+        case L'4':
+            return 4;
+        case L'5':
+            return 5;
+        case L'6':
+            return 6;
+        case L'7':
+            return 7;
+        default:
+            return -1;
+    }
+}
+
+/* This message appears in N_() here rather than just in _() below because
+   the sole use would have been in a #define.  */
+static wchar_t const *const cfcc_msg =
+    N_(L"warning: %ls: character(s) following character constant have been ignored");
+
+double C_STRTOD(wchar_t const *nptr, wchar_t **endptr)
+{
+    double r;
+
+    const wcstring saved_locale = wsetlocale(LC_NUMERIC, NULL);
+
+    if (!saved_locale.empty())
+    {
+        wsetlocale(LC_NUMERIC, L"C");
+    }
+
+    r = wcstod(nptr, endptr);
+
+    if (!saved_locale.empty())
+    {
+        wsetlocale(LC_NUMERIC, saved_locale.c_str());
+    }
+
+    return r;
+}
+
+void builtin_printf_state_t::fatal_error(const wchar_t *fmt, ...)
+{
+    // Don't error twice
+    if (early_exit)
+        return;
+
+    va_list va;
+    va_start(va, fmt);
+    wcstring errstr = vformat_string(fmt, va);
+    va_end(va);
+    stderr_buffer.append(errstr);
+    if (! string_suffixes_string(L"\n", errstr))
+        stderr_buffer.push_back(L'\n');
+
+    this->exit_code = STATUS_BUILTIN_ERROR;
+    this->early_exit = true;
+}
+
+void builtin_printf_state_t::append_output(wchar_t c)
+{
+    // Don't output if we're done
+    if (early_exit)
+        return;
+
+    stdout_buffer.push_back(c);
+}
+
+void builtin_printf_state_t::append_output(const wchar_t *c)
+{
+    // Don't output if we're done
+    if (early_exit)
+        return;
+
+    stdout_buffer.append(c);
+}
+
+void builtin_printf_state_t::append_format_output(const wchar_t *fmt, ...)
+{
+    // Don't output if we're done
+    if (early_exit)
+        return;
+
+    va_list va;
+    va_start(va, fmt);
+    append_formatv(stdout_buffer, fmt, va);
+    va_end(va);
+}
+
+
+void builtin_printf_state_t::verify_numeric(const wchar_t *s, const wchar_t *end, int errcode)
+{
+    if (errcode != 0)
+    {
+        this->fatal_error(L"%ls: %s", s, strerror(errcode));
+    }
+    else if (*end)
+    {
+        if (s == end)
+            this->fatal_error(_(L"%ls: expected a numeric value"), s);
+        else
+            this->fatal_error(_(L"%ls: value not completely converted"), s);
+    }
+}
+
+template<typename T>
+static T raw_string_to_scalar_type(const wchar_t *s, wchar_t ** end);
+
+// we use wcstoll instead of wcstoimax because FreeBSD 8 has busted wcstoumax and wcstoimax - see #626
+template<>
+intmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t ** end)
+{
+    return wcstoll(s, end, 0);
+}
+
+template<>
+uintmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t ** end)
+{
+    return wcstoull(s, end, 0);
+}
+
+template<>
+long double raw_string_to_scalar_type(const wchar_t *s, wchar_t ** end)
+{
+    return C_STRTOD(s, end);
+}
+
+template<typename T>
+static T string_to_scalar_type(const wchar_t *s, builtin_printf_state_t *state)
+{
+    T val;
+    if (*s == L'\"' || *s == L'\'')
+    {
+        wchar_t ch = *++s;
+        val = ch;
+    }
+    else
+    {
+        wchar_t *end = NULL;
+        errno = 0;
+        val = raw_string_to_scalar_type<T>(s, &end);
+        state->verify_numeric(s, end, errno);
+    }
+    return val;
+}
+
+/* Output a single-character \ escape.  */
+
+void builtin_printf_state_t::print_esc_char(wchar_t c)
+{
+    switch (c)
+    {
+        case L'a':			/* Alert. */
+            this->append_output(L'\a');
+            break;
+        case L'b':			/* Backspace. */
+            this->append_output(L'\b');
+            break;
+        case L'c':			/* Cancel the rest of the output. */
+            this->early_exit = true;
+            break;
+        case L'e':			/* Escape */
+            this->append_output(L'\x1B');
+            break;
+        case L'f':			/* Form feed. */
+            this->append_output(L'\f');
+            break;
+        case L'n':			/* New line. */
+            this->append_output(L'\n');
+            break;
+        case L'r':			/* Carriage return. */
+            this->append_output(L'\r');
+            break;
+        case L't':			/* Horizontal tab. */
+            this->append_output(L'\t');
+            break;
+        case L'v':			/* Vertical tab. */
+            this->append_output(L'\v');
+            break;
+        default:
+            this->append_output(c);
+            break;
+    }
+}
+
+/* Print a \ escape sequence starting at ESCSTART.
+   Return the number of characters in the escape sequence
+   besides the backslash.
+   If OCTAL_0 is nonzero, octal escapes are of the form \0ooo, where o
+   is an octal digit; otherwise they are of the form \ooo.  */
+long builtin_printf_state_t::print_esc(const wchar_t *escstart, bool octal_0)
+{
+    const wchar_t *p = escstart + 1;
+    int esc_value = 0;		/* Value of \nnn escape. */
+    int esc_length;		/* Length of \nnn escape. */
+
+    if (*p == L'x')
+    {
+        /* A hexadecimal \xhh escape sequence must have 1 or 2 hex. digits.  */
+        for (esc_length = 0, ++p; esc_length < 2 && is_hex_digit(*p); ++esc_length, ++p)
+            esc_value = esc_value * 16 + hex_to_bin(*p);
+        if (esc_length == 0)
+            this->fatal_error(_(L"missing hexadecimal number in escape"));
+        this->append_output(ENCODE_DIRECT_BASE + esc_value % 256);
+    }
+    else if (is_octal_digit(*p))
+    {
+        /* Parse \0ooo (if octal_0 && *p == L'0') or \ooo (otherwise).
+        Allow \ooo if octal_0 && *p != L'0'; this is an undocumented
+        extension to POSIX that is compatible with Bash 2.05b.  */
+        /* Wrap mod 256, which matches historic behavior */
+        for (esc_length = 0, p += octal_0 && *p == L'0'; esc_length < 3 && is_octal_digit(*p); ++esc_length, ++p)
+            esc_value = esc_value * 8 + octal_to_bin(*p);
+        this->append_output(ENCODE_DIRECT_BASE + esc_value % 256);
+    }
+    else if (*p && wcschr(L"\"\\abcefnrtv", *p))
+    {
+        print_esc_char(*p++);
+    }
+    else if (*p == L'u' || *p == L'U')
+    {
+        wchar_t esc_char = *p;
+        p++;
+        uint32_t uni_value = 0;
+        for (size_t esc_length = 0; esc_length < (esc_char == L'u' ? 4 : 8); esc_length++)
+        {
+            if (! is_hex_digit(*p))
+            {
+                /* Escape sequence must be done. Complain if we didn't get anything */
+                if (esc_length == 0)
+                {
+                    this->fatal_error(_(L"Missing hexadecimal number in Unicode escape"));
+                }
+                break;
+            }
+            uni_value = uni_value * 16 + hex_to_bin(*p);
+            p++;
+        }
+
+        /* PCA GNU printf respects the limitations described in ISO N717, about which universal characters "shall not" be specified. I believe this limitation is for the benefit of compilers; I see no reason to impose it in builtin_printf.
+
+          If __STDC_ISO_10646__ is defined, then it means wchar_t can and does hold Unicode code points, so just use that. If not defined, use the %lc printf conversion; this probably won't do anything good if your wide character set is not Unicode, but such platforms are exceedingly rare.
+        */
+        if (uni_value > 0x10FFFF)
+        {
+            this->fatal_error(_(L"Unicode character out of range: \\%c%0*x"), esc_char, (esc_char == L'u' ? 4 : 8), uni_value);
+        }
+        else
+        {
+#if defined(__STDC_ISO_10646__)
+            this->append_output(uni_value);
+#else
+            this->append_format_output(L"%lc", uni_value);
+#endif
+        }
+    }
+    else
+    {
+        this->append_output(L'\\');
+        if (*p)
+        {
+            this->append_output(*p);
+            p++;
+        }
+    }
+    return p - escstart - 1;
+}
+
+/* Print string STR, evaluating \ escapes. */
+
+void builtin_printf_state_t::print_esc_string(const wchar_t *str)
+{
+    for (; *str; str++)
+        if (*str == L'\\')
+            str += print_esc(str, true);
+        else
+            this->append_output(*str);
+}
+
+/* Evaluate a printf conversion specification.  START is the start of
+   the directive, LENGTH is its length, and CONVERSION specifies the
+   type of conversion.  LENGTH does not include any length modifier or
+   the conversion specifier itself.  FIELD_WIDTH and PRECISION are the
+   field width and precision for '*' values, if HAVE_FIELD_WIDTH and
+   HAVE_PRECISION are true, respectively.  ARGUMENT is the argument to
+   be formatted.  */
+
+void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wchar_t conversion,
+        bool have_field_width, int field_width,
+        bool have_precision, int precision,
+        wchar_t const *argument)
+{
+    // Start with everything except the conversion specifier
+    wcstring fmt(start, length);
+
+    /*  Create a copy of the % directive, with an intmax_t-wide width modifier substituted for any existing integer length modifier. */
+    switch (conversion)
+    {
+        case L'd':
+        case L'i':
+        case L'u':
+            fmt.append(L"ll");
+            break;
+        case L'a':
+        case L'e':
+        case L'f':
+        case L'g':
+        case L'A':
+        case L'E':
+        case L'F':
+        case L'G':
+            fmt.append(L"L");
+            break;
+        case L's':
+        case L'c':
+            fmt.append(L"l");
+            break;
+        default:
+            break;
+    }
+
+    // Append the conversion itself
+    fmt.push_back(conversion);
+
+    switch (conversion)
+    {
+        case L'd':
+        case L'i':
+        {
+            intmax_t arg = string_to_scalar_type<intmax_t>(argument, this);
+            if (! have_field_width)
+            {
+                if (! have_precision)
+                    this->append_format_output(fmt.c_str(), arg);
+                else
+                    this->append_format_output(fmt.c_str(), precision, arg);
+            }
+            else
+            {
+                if (! have_precision)
+                    this->append_format_output(fmt.c_str(), field_width, arg);
+                else
+                    this->append_format_output(fmt.c_str(), field_width, precision, arg);
+            }
+        }
+        break;
+
+        case L'o':
+        case L'u':
+        case L'x':
+        case L'X':
+        {
+            uintmax_t arg = string_to_scalar_type<uintmax_t>(argument, this);
+            if (!have_field_width)
+            {
+                if (!have_precision)
+                    this->append_format_output(fmt.c_str(), arg);
+                else
+                    this->append_format_output(fmt.c_str(), precision, arg);
+            }
+            else
+            {
+                if (!have_precision)
+                    this->append_format_output(fmt.c_str(), field_width, arg);
+                else
+                    this->append_format_output(fmt.c_str(), field_width, precision, arg);
+            }
+        }
+        break;
+
+        case L'a':
+        case L'A':
+        case L'e':
+        case L'E':
+        case L'f':
+        case L'F':
+        case L'g':
+        case L'G':
+        {
+            long double arg = string_to_scalar_type<long double>(argument, this);
+            if (!have_field_width)
+            {
+                if (!have_precision)
+                    this->append_format_output(fmt.c_str(), arg);
+                else
+                    this->append_format_output(fmt.c_str(), precision, arg);
+            }
+            else
+            {
+                if (!have_precision)
+                    this->append_format_output(fmt.c_str(), field_width, arg);
+                else
+                    this->append_format_output(fmt.c_str(), field_width, precision, arg);
+            }
+        }
+        break;
+
+        case L'c':
+            if (!have_field_width)
+                this->append_format_output(fmt.c_str(), *argument);
+            else
+                this->append_format_output(fmt.c_str(), field_width, *argument);
+            break;
+        case L's':
+            if (!have_field_width)
+            {
+                if (!have_precision)
+                {
+                    this->append_format_output(fmt.c_str(), argument);
+                }
+                else
+                    this->append_format_output(fmt.c_str(), precision, argument);
+            }
+            else
+            {
+                if (!have_precision)
+                    this->append_format_output(fmt.c_str(), field_width, argument);
+                else
+                    this->append_format_output(fmt.c_str(), field_width, precision, argument);
+            }
+            break;
+    }
+}
+
+/* For each character in str, set the corresponding boolean in the array to the given flag */
+static inline void modify_allowed_format_specifiers(bool ok[UCHAR_MAX + 1], const char *str, bool flag)
+{
+    for (const char *c  = str; *c != '\0'; c++)
+    {
+        unsigned char idx = static_cast<unsigned char>(*c);
+        ok[idx] = flag;
+    }
+}
+
+/* Print the text in FORMAT, using ARGV (with ARGC elements) for
+   arguments to any `%' directives.
+   Return the number of elements of ARGV used.  */
+
+int builtin_printf_state_t::print_formatted(const wchar_t *format, int argc, wchar_t **argv)
+{
+    int save_argc = argc;		/* Preserve original value.  */
+    const wchar_t *f;		/* Pointer into `format'.  */
+    const wchar_t *direc_start;	/* Start of % directive.  */
+    size_t direc_length;		/* Length of % directive.  */
+    bool have_field_width;	/* True if FIELD_WIDTH is valid.  */
+    int field_width = 0;		/* Arg to first '*'.  */
+    bool have_precision;		/* True if PRECISION is valid.  */
+    int precision = 0;		/* Arg to second '*'.  */
+    bool ok[UCHAR_MAX + 1] = { };	/* ok['x'] is true if %x is allowed.  */
+
+    for (f = format; *f != L'\0'; ++f)
+    {
+        switch (*f)
+        {
+            case L'%':
+                direc_start = f++;
+                direc_length = 1;
+                have_field_width = have_precision = false;
+                if (*f == L'%')
+                {
+                    this->append_output(L'%');
+                    break;
+                }
+                if (*f == L'b')
+                {
+                    /* FIXME: Field width and precision are not supported
+                    for %b, even though POSIX requires it.  */
+                    if (argc > 0)
+                    {
+                        print_esc_string(*argv);
+                        ++argv;
+                        --argc;
+                    }
+                    break;
+                }
+
+                modify_allowed_format_specifiers(ok, "aAcdeEfFgGiosuxX", true);
+
+                for (;; f++, direc_length++)
+                {
+                    switch (*f)
+                    {
+                        case L'I':
+                        case L'\'':
+                            modify_allowed_format_specifiers(ok, "aAceEosxX", false);
+                            break;
+                        case '-':
+                        case '+':
+                        case ' ':
+                            break;
+                        case L'#':
+                            modify_allowed_format_specifiers(ok, "cdisu", false);
+                            break;
+                        case '0':
+                            modify_allowed_format_specifiers(ok, "cs", false);
+                            break;
+                        default:
+                            goto no_more_flag_characters;
+                    }
+                }
+no_more_flag_characters:
+                ;
+
+                if (*f == L'*')
+                {
+                    ++f;
+                    ++direc_length;
+                    if (argc > 0)
+                    {
+                        intmax_t width = string_to_scalar_type<intmax_t>(*argv, this);
+                        if (INT_MIN <= width && width <= INT_MAX)
+                            field_width = static_cast<int>(width);
+                        else
+                            this->fatal_error(_(L"invalid field width: %ls"), *argv);
+                        ++argv;
+                        --argc;
+                    }
+                    else
+                    {
+                        field_width = 0;
+                    }
+                    have_field_width = true;
+                }
+                else
+                {
+                    while (iswdigit(*f))
+                    {
+                        ++f;
+                        ++direc_length;
+                    }
+                }
+                if (*f == L'.')
+                {
+                    ++f;
+                    ++direc_length;
+                    modify_allowed_format_specifiers(ok, "c", false);
+                    if (*f == L'*')
+                    {
+                        ++f;
+                        ++direc_length;
+                        if (argc > 0)
+                        {
+                            intmax_t prec = string_to_scalar_type<intmax_t>(*argv, this);
+                            if (prec < 0)
+                            {
+                                /* A negative precision is taken as if the
+                                precision were omitted, so -1 is safe
+                                here even if prec < INT_MIN.  */
+                                precision = -1;
+                            }
+                            else if (INT_MAX < prec)
+                                this->fatal_error(_(L"invalid precision: %ls"), *argv);
+                            else
+                            {
+                                precision = static_cast<int>(prec);
+                            }
+                            ++argv;
+                            --argc;
+                        }
+                        else
+                        {
+                            precision = 0;
+                        }
+                        have_precision = true;
+                    }
+                    else
+                    {
+                        while (iswdigit(*f))
+                        {
+                            ++f;
+                            ++direc_length;
+                        }
+                    }
+                }
+
+                while (*f == L'l' || *f == L'L' || *f == L'h' || *f == L'j' || *f == L't' || *f == L'z')
+                    ++f;
+
+                {
+                    wchar_t conversion = *f;
+                    if (conversion > 0xFF || ! ok[conversion])
+                    {
+                        this->fatal_error(_(L"%.*ls: invalid conversion specification"), (int)(f + 1 - direc_start), direc_start);
+                        return 0;
+                    }
+                }
+
+                print_direc(direc_start, direc_length, *f,
+                            have_field_width, field_width,
+                            have_precision, precision,
+                            (argc <= 0 ? L"" : (argc--, *argv++)));
+                break;
+
+            case L'\\':
+                f += print_esc(f, false);
+                break;
+
+            default:
+                this->append_output(*f);
+        }
+    }
+    return save_argc - argc;
+}
+
+static int builtin_printf(parser_t &parser, wchar_t **argv)
+{
+    builtin_printf_state_t state;
+
+    wchar_t *format;
+    int args_used;
+    int argc = builtin_count_args(argv);
+
+    if (argc <= 1)
+    {
+        state.fatal_error(_(L"printf: not enough arguments"));
+        return STATUS_BUILTIN_ERROR;
+    }
+
+    format = argv[1];
+    argc -= 2;
+    argv += 2;
+
+    do
+    {
+        args_used = state.print_formatted(format, argc, argv);
+        argc -= args_used;
+        argv += args_used;
+    }
+    while (args_used > 0 && argc > 0 && ! state.early_exit);
+    return state.exit_code;
+}

builtin_set.c

@@ -1,616 +0,0 @@
-/** \file builtin_set.c Functions defining the set builtin
-
-Functions used for implementing the set 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 "util.h"
-#include "builtin.h"
-#include "env.h"
-#include "expand.h"
-#include "common.h"
-#include "wgetopt.h"
-#include "proc.h"
-#include "parser.h"
-
-/** 
-	Extract the name from a destination argument of the form name[index1 index2...]
-*/
-static int parse_fill_name( string_buffer_t *name, 
-							const wchar_t *src) 
-{
-
-	if (src == 0) 
-	{
-		return 0;
-	}
-	
-	while (iswalnum(*src) || *src == L'_')
-	{
-		sb_append_char(name, *src++);
-	}
-	
-	if (*src != L'[' && *src != L'\0') 
-	{
-	
-		sb_append(sb_err, L"set: Invalid character in variable name: ");
-		sb_append_char(sb_err, *src);
-		sb_append2(sb_err, L"\n", 				  parser_current_line(), L"\n", (void *)0 );
-//		builtin_print_help( L"set", sb_err );
-
-		return -1;
-	}
-	else 
-	{
-		return 0;
-	}
-}
-
-
-/** 
-	Extract indexes from a destination argument of the form name[index1 index2...]
-*/
-static int parse_fill_indexes( array_list_t *indexes,
-							   const wchar_t *src)
-{
-	int count = 0;
-
-	if (src == 0)
-	{
-		return 0;
-	}
-	
-	while (*src != L'\0' && (iswalnum(*src) || *src == L'_'))
-	{
-		src++;
-	}
-	
-	if (*src == L'\0') 
-	{
-		return 0;
-	}
-	
-	if (*src++ != L'[')
-	{
-		return -1;
-	}
-	
-	while (iswblank(*src)) 
-	{
-		src++;
-	}
-	
-	while (*src != L']') 
-	{
-		wchar_t *end;
-		long l_ind = wcstol(src, &end, 10);
-		if (end == src) 
-		{
-			wchar_t sbuf[256];
-			swprintf(sbuf, 255, L"Invalid index starting at %ls\n", src);
-			sb_append(sb_err, sbuf);
-			return -1;
-		}
-
-		int *ind = (int *) calloc(1, sizeof(int));
-		*ind = (int) l_ind;
-		al_push(indexes, ind);
-		src = end;
-		count++;
-		while (iswblank(*src)) src++;
-	}
-
-	return count;
-}
-
-
-/**
-   Update a list by writing the specified values at the specified indexes
-*/
-static int update_values( array_list_t *list, 
-						  array_list_t *indexes,
-						  array_list_t *values ) 
-{
-	int i;
-
-	//fwprintf(stderr, L"Scan complete\n");
-	/* Replace values where needed */
-	for( i = 0; i < al_get_count(indexes); i++ ) 
-	{
-		int ind = *(int *) al_get(indexes, i) - 1;
-		void *new = (void *) al_get(values, i);
-		if (al_get(list, ind) != 0) 
-		{
-			free((void *) al_get(list, ind));
-		}
-		al_set(list, ind, new != 0 ? wcsdup(new) : wcsdup(L""));
-	}
-  
-	return al_get_count(list);
-}
-
-
-/**
-   Return 1 if an array list of int* pointers contains the specified
-   value, 0 otherwise
-*/
-static int al_contains_int( array_list_t *list,
-							int val)
-{
-	int i;
-
-	for (i = 0; i < al_get_count(list); i++) 
-	{
-		int *current = (int *) al_get(list, i);
-		if (current != 0 && *current == val) 
-		{
-			return 1;
-		}
-	}
-	
-	return 0;
-}
-
-
-/**
-   Erase from a list values at specified indexes 
-*/
-static int erase_values(array_list_t *list, array_list_t *indexes) 
-{
-	int i;
-	array_list_t result;
-
-	//fwprintf(stderr, L"Starting with %d\n", al_get_count(list));
-
-	al_init(&result);
-
-	for (i = 0; i < al_get_count(list); i++) 
-	{
-		if (!al_contains_int(indexes, i + 1)) 
-		{
-			al_push(&result, al_get(list, i));
-		}
-		else 
-		{
-			free((void *) al_get(list, i));
-		}
-	}
-	
-	al_truncate(list,0);	
-	al_push_all( list, &result );
-	al_destroy(&result);
-
-	//fwprintf(stderr, L"Remaining: %d\n", al_get_count(&result));
-
-	return al_get_count(list);    
-}
-
-
-/**
-   Fill a string buffer with values from a list, using ARRAY_SEP_STR to separate them 
-*/
-static int fill_buffer_from_list(string_buffer_t *sb, array_list_t *list) 
-{
-	int i;
-
-	for (i = 0; i < al_get_count(list); i++) 
-	{
-		wchar_t *v = (wchar_t *) al_get(list, i);
-		if (v != 0) 
-		{
-			// fwprintf(stderr, L".\n");
-			// fwprintf(stderr, L"Collecting %ls from %d\n", v, i);
-			sb_append(sb, v);
-		}    
-		if (i < al_get_count(list) - 1)
-			sb_append(sb, ARRAY_SEP_STR);
-	}
-	return al_get_count(list);
-}
-
-
-/**
-   Print the names of all environment variables in the scope, with or without values,
-   with or without escaping
-*/
-static void print_variables(int include_values, int esc, int scope) 
-{
-	array_list_t names;
-	int i;
-	
-	al_init( &names );
-	env_get_names( &names, scope );
-	
-	sort_list( &names );
-	
-	for( i = 0; i < al_get_count(&names); i++ )
-	{
-		wchar_t *key = (wchar_t *)al_get( &names, i );
-		wchar_t *e_key = esc ? escape(key, 1) : wcsdup(key);
-
-		sb_append(sb_out, e_key);
-		
-		if( include_values ) 
-		{
-			wchar_t *value = env_get(key);
-			wchar_t *e_value;
-			e_value = esc ? expand_escape_variable(value) : wcsdup(value);
-			sb_append2(sb_out, L" ", e_value, (void *)0);
-			free(e_value);
-		}
-		
-		sb_append(sb_out, L"\n");
-		free(e_key);
-	}
-  	al_destroy(&names);
-}
-
-/**
-   The set builtin. Creates, updates and erases environment variables and environemnt variable arrays. 
-*/
-
-int builtin_set( wchar_t **argv ) 
-{
-	const static struct woption
-		long_options[] = 
-		{
-			{ 
-				L"export", no_argument, 0, 'x' 
-			},
-			{ 
-				L"global", no_argument, 0, 'g' 
-			},
-			{ 
-				L"local", no_argument, 0, 'l'  
-			},
-			{ 
-				L"erase", no_argument, 0, 'e'  
-			},
-			{ 
-				L"names", no_argument, 0, 'n' 
-			} ,
-			{ 
-				L"unexport", no_argument, 0, 'u' 
-			} ,
-			{ 
-				L"universal", no_argument, 0, 'U' 
-			} ,
-			{ 
-				L"query", no_argument, 0, 'q' 
-			} ,
-			{ 
-				0, 0, 0, 0 
-			}
-		}
-	;
-	
-	wchar_t short_options[] = L"xglenuUq";
-
-	int argc = builtin_count_args(argv);
-
-	/*
-	  Flags to set the work mode
-	*/
-	int local = 0, global = 0, export = 0;
-	int erase = 0, list = 0, unexport=0;
-	int universal = 0, query=0;
-	
-
-	/*
-	  Variables used for performing the actual work
-	*/
-	wchar_t *dest = 0;
-	array_list_t values;
-	string_buffer_t name_sb;
-	int retcode=0;
-	wchar_t *name;
-	array_list_t indexes;
-	int retval;
-
-
-	/* Parse options to obtain the requested operation and the modifiers */
-	woptind = 0;
-	while (1) 
-	{
-		int c = wgetopt_long(argc, argv, short_options, long_options, 0);
-
-		if (c == -1) 
-		{
-			break;
-		}
-    
-		switch(c) 
-		{
-			case 0:
-				break;
-			case 'e':
-				erase = 1;
-				break;
-			case 'n':
-				list = 1;
-				break;
-			case 'x':
-				export = 1;
-				break;
-			case 'l':
-				local = 1;
-				break;
-			case 'g':
-				global = 1;
-				break;
-			case 'u':
-				unexport = 1;
-				break;
-			case 'U':
-				universal = 1;
-				break;
-			case 'q':
-				query = 1;
-				break;
-			case '?':
-				return 1;
-			default:
-				break;
-		}
-	}
-
-	if( query && (erase || list || global || local || universal || export || unexport ) )
-	{
-		sb_append2(sb_err,
-				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-	
-
-	/* Check operation and modifiers sanity */
-	if( erase && list ) 
-	{
-		sb_append2(sb_err,
-				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	if( local + global + universal > 1 ) 
-	{
-		sb_printf( sb_err,
-				   L"%ls%ls\n%ls\n",
-				   argv[0],
-				   BUILTIN_ERR_GLOCAL,
-				   parser_current_line() );
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	if( export && unexport ) 
-	{
-		sb_append2(sb_err,
-				   argv[0],
-				   BUILTIN_ERR_EXPUNEXP,
-				   L"\n",
-				   parser_current_line(),
-				   L"\n", 
-				   (void *)0);
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-
-	if( query )
-	{
-		/*
-		  Query mode. Return number of specified variables that do not exist.
-		*/
-		int i;
-		for( i=woptind; i<argc; i++ )
-		{
-			if( !env_exist( argv[i] ) )
-				retcode++;
-			
-		}
-		return retcode;
-	}
-	
-
-	/* Parse destination */
-	if( woptind < argc ) 
-	{
-		dest = wcsdup(argv[woptind++]);
-		//fwprintf(stderr, L"Dest: %ls\n", dest);
-	}
-
-	/* Parse values */
-	// wchar_t **values = woptind < argc ? (wchar_t **) calloc(argc - woptind, sizeof(wchar_t *)) : 0;
-
-	al_init(&values);
-	while( woptind < argc ) 
-	{
-		al_push(&values, argv[woptind++]);
-		//    fwprintf(stderr, L"Val: %ls\n", argv[woptind - 1]);
-	}
-
-	/* Extract variable name and indexes */
-
-	sb_init(&name_sb);
-	retval = parse_fill_name(&name_sb, dest);
-
-	
-	if( retval < 0 ) 
-		retcode=1;
-
-	if( !retcode )
-	{
-		name = (wchar_t *) name_sb.buff;
-		//fwprintf(stderr, L"Name is %ls\n", name);
-
-		al_init(&indexes);
-		retval = parse_fill_indexes(&indexes, dest);
-		if (retval < 0) 
-			retcode = 1;
-	}
-	
-	if( !retcode )
-	{
-		
-		int i;
-		int finished=0;
-		
-		/* Do the actual work */
-		int scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (export ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; 
-		if( list ) 
-		{
-			/* Maybe we should issue an error if there are any other arguments */
-			print_variables(0, 0, scope);
-			finished=1;			
-		} 
-		
-		if( (!finished ) && 
-			 (name == 0 || wcslen(name) == 0))
-		{
-			/* No arguments -- display name & value for all variables in scope */
-			if( erase ) 
-			{
-				sb_append2( sb_err,
-							argv[0],
-							L": Erase needs a variable name\n", 
-							parser_current_line(), 
-							L"\n",
-							(void *)0 );
-				builtin_print_help( argv[0], sb_err );
-				retcode = 1;
-			}
-			else 
-			{
-				print_variables( 1, 1, scope );
-			}
-
-			finished=1;			
-		} 
-
-
-		if( !finished )
-		{
-			if( al_get_count( &values ) == 0 && 
-				al_get_count( &indexes ) == 0 &&
-				!erase &&
-				!list )
-			{
-				/*
-				  Only update the variable scope
-				*/
-				env_set( name, 0, scope );
-				finished = 1;
-			}
-		}
-		
-		if( !finished )
-		{
-			/* There are some arguments, we have at least a variable name */
-			if( erase && al_get_count(&values) != 0 ) 
-			{
-				sb_append2( sb_err, 
-							argv[0],
-							L": Values cannot be specfied with erase\n",
-							parser_current_line(),
-							L"\n",
-							(void *)0 );
-				builtin_print_help( argv[0], sb_err );
-				retcode = 1;
-			} 
-			else
-			{    
-				/* All ok, we can alter the specified variable */
-				array_list_t val_l;
-				al_init(&val_l);
-
-				void *old=0;
-				
-				if (al_get_count(&indexes) == 0) 
-				{
-					/* We will act upon the entire variable */
-	
- 					al_push( &val_l, wcsdup(L"") );
-					old = val_l.arr;
-					
-					/* Build indexes for all variable or all new values */
-					int end_index = erase ? al_get_count(&val_l) : al_get_count(&values);
-					for (i = 0; i < end_index; i++) 
-					{
-						int *ind = (int *) calloc(1, sizeof(int));
-						*ind = i + 1;
-						al_push(&indexes, ind);
-					}
-				}
-				else 
-				{
-					/* We will act upon some specific indexes */
-					expand_variable_array( env_get(name), &val_l );
-				}
-				
-				string_buffer_t result_sb;
-				sb_init(&result_sb);
-				if (erase) 
-				{
-					int rem = erase_values(&val_l, &indexes);
-					if (rem == 0) 
-					{
-						env_remove(name, ENV_USER);
-					}
-					else 
-					{
-						fill_buffer_from_list(&result_sb, &val_l);
-						env_set(name, (wchar_t *) result_sb.buff, scope);
-					}     
-				}
-				else
-				{
-					
-					update_values( &val_l, 
-								   &indexes,
-								   &values );
-
-					fill_buffer_from_list( &result_sb,
-										   &val_l );
-
-					env_set(name,
-							(wchar_t *) result_sb.buff,
-							scope);
-				}
-				
-				al_foreach( &val_l, (void (*)(const void *))&free );
-				al_destroy(&val_l);
-				sb_destroy(&result_sb); 
-			}
-		}
-
-		al_foreach( &indexes, (void (*)(const void *))&free );
-		al_destroy(&indexes);
-	}
-	
-/* Common cleanup */
-//fwprintf(stderr, L"Cleanup\n");
-	free(dest);		
-	sb_destroy(&name_sb);
-	al_destroy( &values );
-	
-	return retcode;
-}
-

builtin_set.cpp

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

builtin_set_color.cpp

@@ -0,0 +1,243 @@
+/** \file builtin_set_color.cpp Functions defining the set_color builtin
+
+Functions used for implementing the set_color builtin.
+
+*/
+#include "config.h"
+
+#include "builtin.h"
+#include "color.h"
+#include "output.h"
+
+#if HAVE_NCURSES_H
+#include <ncurses.h>
+#elif HAVE_NCURSES_CURSES_H
+#include <ncurses/curses.h>
+#else
+#include <curses.h>
+#endif
+
+#if HAVE_TERM_H
+#include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
+
+/* We know about these buffers */
+extern wcstring stdout_buffer, stderr_buffer;
+
+/**
+   Error message for invalid path operations
+*/
+#define BUILTIN_SET_PATH_ERROR L"%ls: Warning: path component %ls may not be valid in %ls.\n"
+
+/**
+   Hint for invalid path operation with a colon
+*/
+#define BUILTIN_SET_PATH_HINT L"%ls: Did you mean 'set %ls $%ls %ls'?\n"
+
+/**
+   Error for mismatch between index count and elements
+*/
+#define BUILTIN_SET_ARG_COUNT L"%ls: The number of variable indexes does not match the number of values\n"
+
+static void print_colors(void)
+{
+    const wcstring_list_t result = rgb_color_t::named_color_names();
+    size_t i;
+    for (i=0; i < result.size(); i++)
+    {
+        stdout_buffer.append(result.at(i));
+        stdout_buffer.push_back(L'\n');
+    }
+}
+
+/* function we set as the output writer */
+static std::string builtin_set_color_output;
+static int set_color_builtin_outputter(char c)
+{
+    ASSERT_IS_MAIN_THREAD();
+    builtin_set_color_output.push_back(c);
+    return 0;
+}
+
+/**
+   set_color builtin
+*/
+static int builtin_set_color(parser_t &parser, wchar_t **argv)
+{
+    /** Variables used for parsing the argument list */
+    const struct woption long_options[] =
+    {
+        { L"background", required_argument, 0, 'b'},
+        { L"help", no_argument, 0, 'h' },
+        { L"bold", no_argument, 0, 'o' },
+        { L"underline", no_argument, 0, 'u' },
+        { L"version", no_argument, 0, 'v' },
+        { L"print-colors", no_argument, 0, 'c' },
+        { 0, 0, 0, 0 }
+    };
+
+    const wchar_t *short_options = L"b:hvocu";
+
+    int argc = builtin_count_args(argv);
+
+    /* Some code passes variables to set_color that don't exist, like $fish_user_whatever. As a hack, quietly return failure. */
+    if (argc <= 1)
+    {
+        return EXIT_FAILURE;
+    }
+
+    const wchar_t *bgcolor = NULL;
+    bool bold = false, underline=false;
+    int errret;
+
+    /* Parse options to obtain the requested operation and the modifiers */
+    woptind = 0;
+    while (1)
+    {
+        int c = wgetopt_long(argc, argv, short_options, long_options, 0);
+
+        if (c == -1)
+        {
+            break;
+        }
+
+        switch (c)
+        {
+            case 0:
+                break;
+
+            case 'b':
+                bgcolor = woptarg;
+                break;
+
+            case 'h':
+                builtin_print_help(parser, argv[0], stdout_buffer);
+                return STATUS_BUILTIN_OK;
+
+            case 'o':
+                bold = true;
+                break;
+
+            case 'u':
+                underline = true;
+                break;
+
+            case 'c':
+                print_colors();
+                return STATUS_BUILTIN_OK;
+
+            case '?':
+                return STATUS_BUILTIN_ERROR;
+        }
+    }
+
+    /* Remaining arguments are foreground color */
+    std::vector<rgb_color_t> fgcolors;
+    for (; woptind < argc; woptind++)
+    {
+        rgb_color_t fg = rgb_color_t(argv[woptind]);
+        if (fg.is_none() || fg.is_ignore())
+        {
+            append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], argv[woptind]);
+            return STATUS_BUILTIN_ERROR;
+        }
+        fgcolors.push_back(fg);
+    }
+
+    if (fgcolors.empty() && bgcolor == NULL && !bold && !underline)
+    {
+        append_format(stderr_buffer,
+                      _(L"%ls: Expected an argument\n"),
+                      argv[0]);
+        return STATUS_BUILTIN_ERROR;
+    }
+    
+    // #1323: We may have multiple foreground colors. Choose the best one.
+    // If we had no foreground coor, we'll get none(); if we have at least one we expect not-none
+    const rgb_color_t fg = best_color(fgcolors, output_get_color_support());
+    assert(fgcolors.empty() || !(fg.is_none() || fg.is_ignore()));
+
+    const rgb_color_t bg = rgb_color_t(bgcolor ? bgcolor : L"");
+    if (bgcolor && (bg.is_none() || bg.is_ignore()))
+    {
+        append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], bgcolor);
+        return STATUS_BUILTIN_ERROR;
+    }
+
+    /* Make sure that the term exists */
+    if (cur_term == NULL && setupterm(0, STDOUT_FILENO, &errret) == ERR)
+    {
+        append_format(stderr_buffer, _(L"%ls: Could not set up terminal\n"), argv[0]);
+        return STATUS_BUILTIN_ERROR;
+    }
+
+    /*
+       Test if we have at least basic support for setting fonts, colors
+       and related bits - otherwise just give up...
+    */
+    if (! exit_attribute_mode)
+    {
+        return STATUS_BUILTIN_ERROR;
+    }
+
+    /* Save old output function so we can restore it */
+    int (* const saved_writer_func)(char) = output_get_writer();
+
+    /* Set our output function, which writes to a std::string */
+    builtin_set_color_output.clear();
+    output_set_writer(set_color_builtin_outputter);
+
+    if (bold)
+    {
+        if (enter_bold_mode)
+            writembs(tparm(enter_bold_mode));
+    }
+
+    if (underline)
+    {
+        if (enter_underline_mode)
+            writembs(enter_underline_mode);
+    }
+
+    if (bgcolor != NULL)
+    {
+        if (bg.is_normal())
+        {
+            write_color(rgb_color_t::black(), false /* not is_fg */);
+            writembs(tparm(exit_attribute_mode));
+        }
+    }
+
+    if (! fg.is_none())
+    {
+        if (fg.is_normal() || fg.is_reset())
+        {
+            write_color(rgb_color_t::black(), true /* is_fg */);
+            writembs(tparm(exit_attribute_mode));
+        }
+        else
+        {
+            write_color(fg, true /* is_fg */);
+        }
+    }
+
+    if (bgcolor != NULL)
+    {
+        if (! bg.is_normal() && ! bg.is_reset())
+        {
+            write_color(bg, false /* not is_fg */);
+        }
+    }
+
+    /* Restore saved writer function */
+    output_set_writer(saved_writer_func);
+
+    /* Output the collected string */
+    stdout_buffer.append(str2wcstring(builtin_set_color_output));
+    builtin_set_color_output.clear();
+
+    return STATUS_BUILTIN_OK;
+}

builtin_test.cpp

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

builtin_ulimit.c

@@ -1,490 +0,0 @@
-/** \file builtin_ulimit.c Functions defining the ulimit builtin
-
-Functions used for implementing the ulimit builtin. 
-
-*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "config.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;	
-}
-	;
-
-/**
-   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_DATA, L"Maximum size of a process’s data segment", L'd'
-	}
-	,
-	{
-		RLIMIT_FSIZE, L"Maximum size of files created by the shell", L'f'
-	}
-	,
-	{
-		RLIMIT_MEMLOCK, L"Maximum size that may be locked into memory", L'l'
-	}
-	,
-	{
-		RLIMIT_RSS, L"Maximum resident set size", L'm'
-	}
-	,
-	{
-		RLIMIT_NOFILE, L"Maximum number of open file descriptors", L'n'
-	}
-	,
-	{
-		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'
-	}	
-	,
-#endif
-	{
-		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 ) )
-	{
-		return 1;
-	}
-	return 1024;
-}
-
-/**
-   Return the value for the specified resource limit
-*/
-static rlim_t get( int resource, int hard )
-{
-	struct rlimit ls;
-	
-	getrlimit( resource, &ls );
-	
-	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 );
-
-	if( l == RLIM_INFINITY )
-		sb_append( sb_out, L"unlimited\n" );
-	else
-		sb_printf( sb_out, L"%d\n", l );
-	
-}
-
-/**
-   Print values of all resource limits
-*/
-static void print_all( int hard )
-{
-	int i;
-	int w=0;
-	
-	for( i=0; resource_arr[i].desc; i++ )
-	{
-		w=maxi( w, my_wcswidth(resource_arr[i].desc));
-	}
-	
-	for( i=0; resource_arr[i].desc; i++ )
-	{
-		struct rlimit ls;
-		rlim_t l;
-		getrlimit( resource_arr[i].resource, &ls );
-		l = hard ? ls.rlim_max:ls.rlim_cur;
-
-		wchar_t *unit = ((resource_arr[i].resource==RLIMIT_CPU)?L"(seconds, ":(get_multiplier(resource_arr[i].resource)==1?L"(":L"(kB, "));
-		
-		sb_printf( sb_out,
-				   L"%-*ls %10ls-%lc) ", 
-				   w, 
-				   resource_arr[i].desc, 
-				   unit,
-				   resource_arr[i].switch_char);
-		
-		if( l == RLIM_INFINITY )
-			sb_append( sb_out, L"unlimited\n" );
-		else
-			sb_printf( sb_out, L"%d\n", l );
-	}
-}
-
-/**
-   Returns the description for the specified resource limit
-*/
-static const wchar_t *get_desc( int what )
-{
-	int i;
-	
-	for( i=0; resource_arr[i].desc; i++ )
-	{
-		if( resource_arr[i].resource == what )
-		{
-			return resource_arr[i].desc;
-		}
-	}
-	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;
-	getrlimit( resource, &ls );
-	if( value != RLIM_INFINITY )
-		value *= get_multiplier( resource );
-	
-	if( hard )
-	{
-		ls.rlim_max = value;
-	}
-	
-	if( soft )
-	{
-		ls.rlim_cur = value;
-		
-		/*
-		  Do not attempt to set the soft limit higher than the hard limit
-		*/
-		if( ( value == RLIM_INFINITY && ls.rlim_max != RLIM_INFINITY ) || 
-			( value != RLIM_INFINITY && ls.rlim_max != RLIM_INFINITY && value > ls.rlim_max))
-		{
-			ls.rlim_cur = ls.rlim_max;
-		}		
-	}
-	
-	if( setrlimit( resource, &ls ) )
-	{
-		if( errno == EPERM )
-			sb_printf( sb_err, L"ulimit: Permission denied when changing resource of type '%ls'\n", get_desc( resource ) );
-		else
-			builtin_wperror( L"ulimit" );
-		return 1;
-	}	
-	return 0;	
-}
-
-/**
-   Set all resource limits
-*/
-static int set_all( int hard, int soft, rlim_t value )
-{
-	int i;
-	int res=0;
-	
-	for( i=0; resource_arr[i].desc; i++ )
-	{
-		if( set( resource_arr[i].resource, hard, soft, value ) )
-			res = 1;
-	}
-	return res;
-}
-
-int builtin_ulimit( wchar_t ** argv )
-{
-	int hard=0;
-	int soft=0;
-	
-	int what = RLIMIT_FSIZE;
-	int report_all = 0;
-
-	int argc = builtin_count_args( argv );
-	
-	woptind=0;
-	
-	while( 1 )
-	{
-		const static struct woption
-			long_options[] =
-			{
-				{
-					L"all", no_argument, 0, 'a'
-				}
-				,
-				{
-					L"hard", no_argument, 0, 'H'
-				}
-				,
-				{
-					L"soft", no_argument, 0, 'S'
-				}
-				,
-				{
-					L"core-size", no_argument, 0, 'c'
-				}
-				,
-				{
-					L"data-size", no_argument, 0, 'd'
-				}
-				,
-				{
-					L"file-size", no_argument, 0, 'f'
-				}
-				,
-				{
-					L"lock-size", no_argument, 0, 'l'
-				}
-				,
-				{
-					L"resident-set-size", no_argument, 0, 'm'
-				}
-				,
-				{
-					L"file-descriptor-count", no_argument, 0, 'n'
-				}
-				,
-				{
-					L"pipe-size", no_argument, 0, 'p'
-				}
-				,
-				{
-					L"cpu-time", no_argument, 0, 't'
-				}
-				,
-				{
-					L"process-count", no_argument, 0, 'u'
-				}
-				,
-				{
-					L"virtual-memory-size", no_argument, 0, 'v'
-				}
-				,
-				{
-					0, 0, 0, 0 
-				}
-			}
-		;		
-		
-
-		int opt_index = 0;
-		
-		int opt = wgetopt_long( argc,
-								argv, 
-								L"aHScdflmnptuv", 
-								long_options, 
-								&opt_index );
-		if( opt == -1 )
-			break;
-			
-		switch( opt )
-		{
-			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 );
-				builtin_print_help( argv[0], sb_err );
-
-				return 1;
-				
-			case L'a':
-				report_all=1;
-				break;
-
-			case L'H':
-				hard=1;
-				break;
-
-			case L'S':
-				soft=1;				
-				break;
-
-			case L'c':
-				what=RLIMIT_CORE;
-				break;
-				
-			case L'd':
-				what=RLIMIT_DATA;
-				break;
-				
-			case L'f':
-				what=RLIMIT_FSIZE;
-				break;
-				
-			case L'l':
-				what=RLIMIT_MEMLOCK;
-				break;
-				
-			case L'm':
-				what=RLIMIT_RSS;
-				break;
-				
-			case L'n':
-				what=RLIMIT_NOFILE;
-				break;
-				
-			case L's':
-				what=RLIMIT_STACK;
-				break;
-				
-			case L't':
-				what=RLIMIT_CPU;
-				break;
-				
-			case L'u':
-				what=RLIMIT_NPROC;
-				break;
-				
-#if HAVE_RLIMIT_AS				
-			case L'v':
-				what=RLIMIT_AS;
-				break;
-#endif
-				
-			case L'?':
-				builtin_print_help( argv[0], sb_err );				
-				return 1;	
-		}
-	}		
-
-	switch( argc - woptind )
-	{
-		case 0:
-			/*
-			  Show current limit value
-			*/
-			if( report_all )
-			{
-				print_all( hard );
-			}
-			else
-			{
-				print( what, hard );
-			}
-			
-			break;
-			
-		case 1:
-		{
-			/*
-			  Change current limit value
-			*/
-			rlim_t new_limit;
-			wchar_t *end;
-			
-			/*
-			  Set both hard and soft limits if nothing else was specified
-			*/
-			if( !(hard+soft) )
-			{
-				hard=soft=1;
-			}
-			
-
-			if( wcscasecmp( argv[woptind], L"unlimited" )==0)
-			{
-				new_limit = RLIM_INFINITY;
-			}
-			else if( wcscasecmp( argv[woptind], L"hard" )==0)
-			{
-				new_limit = get( what, 1 );
-			}
-			else if( wcscasecmp( argv[woptind], L"soft" )==0)
-			{
-				new_limit = get( what, soft );
-			}
-			else
-			{
-				errno=0;				
-				new_limit = wcstol( argv[woptind], &end, 10 );
-				if( errno || *end )
-				{
-					sb_printf( sb_err, 
-							   L"%ls: Invalid limit '%ls'\n", 
-							   argv[0], 
-							   argv[woptind] );
-					builtin_print_help( argv[0], sb_err );
-					return 1;
-				}
-			}
-			
-			if( report_all )
-			{
-				return set_all( hard, soft, new_limit );
-			}
-			else 
-			{
-				return set( what, hard, soft, new_limit );
-			}
-			
-			
-			break;
-		}
-		
-		default:
-			sb_append2( sb_err,
-						argv[0],
-						L": Too many arguments\n",
-						(void *)0 );
-			builtin_print_help( argv[0], sb_err );
-			return 1;
-			
-			break;
-	}
-	return 0;	
-}

builtin_ulimit.cpp

@@ -0,0 +1,512 @@
+/** \file builtin_ulimit.c Functions defining the ulimit builtin
+
+Functions used for implementing the ulimit builtin.
+
+*/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
+#include <errno.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.
+*/
+static const struct resource_t resource_arr[] =
+{
+    {
+        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', 1024
+    }
+    ,
+    {
+        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_STACK, L"Maximum stack size", L's', 1024
+    }
+    ,
+    {
+        RLIMIT_CPU, L"Maximum amount of cpu time in seconds", L't', 1
+    }
+    ,
+#ifdef RLIMIT_NPROC
+    {
+        RLIMIT_NPROC, L"Maximum number of processes available to a single user", L'u', 1
+    }
+    ,
+#endif
+#ifdef RLIMIT_AS
+    {
+        RLIMIT_AS, L"Maximum amount of virtual memory available to the shell", L'v', 1024
+    }
+    ,
+#endif
+    {
+        0, 0, 0, 0
+    }
+}
+;
+
+/**
+   Get the implicit multiplication factor for the specified resource limit
+*/
+static int get_multiplier(int what)
+{
+    int i;
+
+    for (i=0; resource_arr[i].desc; i++)
+    {
+        if (resource_arr[i].resource == what)
+        {
+            return resource_arr[i].multiplier;
+        }
+    }
+    return -1;
+}
+
+/**
+   Return the value for the specified resource limit. This function
+   does _not_ multiply the limit value by the multiplier constant used
+   by the commandline ulimit.
+*/
+static rlim_t get(int resource, int hard)
+{
+    struct rlimit ls;
+
+    getrlimit(resource, &ls);
+
+    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);
+
+    if (l == RLIM_INFINITY)
+        stdout_buffer.append(L"unlimited\n");
+    else
+        append_format(stdout_buffer, L"%d\n", l / get_multiplier(resource));
+
+}
+
+/**
+   Print values of all resource limits
+*/
+static void print_all(int hard)
+{
+    int i;
+    int w=0;
+
+    for (i=0; resource_arr[i].desc; i++)
+    {
+        w=maxi(w, fish_wcswidth(resource_arr[i].desc));
+    }
+
+    for (i=0; resource_arr[i].desc; i++)
+    {
+        struct rlimit ls;
+        rlim_t l;
+        getrlimit(resource_arr[i].resource, &ls);
+        l = hard ? ls.rlim_max:ls.rlim_cur;
+
+        const wchar_t *unit = ((resource_arr[i].resource==RLIMIT_CPU)?L"(seconds, ":(get_multiplier(resource_arr[i].resource)==1?L"(":L"(kB, "));
+
+        append_format(stdout_buffer,
+                      L"%-*ls %10ls-%lc) ",
+                      w,
+                      resource_arr[i].desc,
+                      unit,
+                      resource_arr[i].switch_char);
+
+        if (l == RLIM_INFINITY)
+        {
+            stdout_buffer.append(L"unlimited\n");
+        }
+        else
+        {
+            append_format(stdout_buffer, L"%d\n", l/get_multiplier(resource_arr[i].resource));
+        }
+    }
+
+}
+
+/**
+   Returns the description for the specified resource limit
+*/
+static const wchar_t *get_desc(int what)
+{
+    int i;
+
+    for (i=0; resource_arr[i].desc; i++)
+    {
+        if (resource_arr[i].resource == what)
+        {
+            return resource_arr[i].desc;
+        }
+    }
+    return L"Not a resource";
+}
+
+/**
+   Set the new value of the specified resource limit. This function
+   does _not_ multiply the limit value by the multiplier constant used
+   by the commandline ulimit.
+*/
+static int set(int resource, int hard, int soft, rlim_t value)
+{
+    struct rlimit ls;
+    getrlimit(resource, &ls);
+
+    if (hard)
+    {
+        ls.rlim_max = value;
+    }
+
+    if (soft)
+    {
+        ls.rlim_cur = value;
+
+        /*
+          Do not attempt to set the soft limit higher than the hard limit
+        */
+        if ((value == RLIM_INFINITY && ls.rlim_max != RLIM_INFINITY) ||
+                (value != RLIM_INFINITY && ls.rlim_max != RLIM_INFINITY && value > ls.rlim_max))
+        {
+            ls.rlim_cur = ls.rlim_max;
+        }
+    }
+
+    if (setrlimit(resource, &ls))
+    {
+        if (errno == EPERM)
+            append_format(stderr_buffer, L"ulimit: Permission denied when changing resource of type '%ls'\n", get_desc(resource));
+        else
+            builtin_wperror(L"ulimit");
+        return 1;
+    }
+    return 0;
+}
+
+/**
+   The ulimit builtin, used for setting resource limits. Defined in
+   builtin_ulimit.c.
+*/
+static int builtin_ulimit(parser_t &parser, wchar_t ** argv)
+{
+    int hard=0;
+    int soft=0;
+
+    int what = RLIMIT_FSIZE;
+    int report_all = 0;
+
+    int argc = builtin_count_args(argv);
+
+    woptind=0;
+
+    while (1)
+    {
+        static const struct woption
+                long_options[] =
+        {
+            {
+                L"all", no_argument, 0, 'a'
+            }
+            ,
+            {
+                L"hard", no_argument, 0, 'H'
+            }
+            ,
+            {
+                L"soft", no_argument, 0, 'S'
+            }
+            ,
+            {
+                L"core-size", no_argument, 0, 'c'
+            }
+            ,
+            {
+                L"data-size", no_argument, 0, 'd'
+            }
+            ,
+            {
+                L"file-size", no_argument, 0, 'f'
+            }
+            ,
+            {
+                L"lock-size", no_argument, 0, 'l'
+            }
+            ,
+            {
+                L"resident-set-size", no_argument, 0, 'm'
+            }
+            ,
+            {
+                L"file-descriptor-count", no_argument, 0, 'n'
+            }
+            ,
+            {
+                L"stack-size", no_argument, 0, 's'
+            }
+            ,
+            {
+                L"cpu-time", no_argument, 0, 't'
+            }
+            ,
+            {
+                L"process-count", no_argument, 0, 'u'
+            }
+            ,
+            {
+                L"virtual-memory-size", no_argument, 0, 'v'
+            }
+            ,
+            {
+                L"help", no_argument, 0, 'h'
+            }
+            ,
+            {
+                0, 0, 0, 0
+            }
+        }
+        ;
+
+
+        int opt_index = 0;
+
+        int opt = wgetopt_long(argc,
+                               argv,
+                               L"aHScdflmnstuvh",
+                               long_options,
+                               &opt_index);
+        if (opt == -1)
+            break;
+
+        switch (opt)
+        {
+            case 0:
+                if (long_options[opt_index].flag != 0)
+                    break;
+                append_format(stderr_buffer,
+                              BUILTIN_ERR_UNKNOWN,
+                              argv[0],
+                              long_options[opt_index].name);
+                builtin_print_help(parser, argv[0], stderr_buffer);
+
+                return 1;
+
+            case L'a':
+                report_all=1;
+                break;
+
+            case L'H':
+                hard=1;
+                break;
+
+            case L'S':
+                soft=1;
+                break;
+
+            case L'c':
+                what=RLIMIT_CORE;
+                break;
+
+            case L'd':
+                what=RLIMIT_DATA;
+                break;
+
+            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;
+                break;
+
+            case L's':
+                what=RLIMIT_STACK;
+                break;
+
+            case L't':
+                what=RLIMIT_CPU;
+                break;
+
+#ifdef RLIMIT_NPROC
+            case L'u':
+                what=RLIMIT_NPROC;
+                break;
+#endif
+
+#ifdef RLIMIT_AS
+            case L'v':
+                what=RLIMIT_AS;
+                break;
+#endif
+
+            case L'h':
+                builtin_print_help(parser, argv[0], stdout_buffer);
+                return 0;
+
+            case L'?':
+                builtin_unknown_option(parser, argv[0], argv[woptind-1]);
+                return 1;
+        }
+    }
+
+    if (report_all)
+    {
+        if (argc - woptind == 0)
+        {
+            print_all(hard);
+        }
+        else
+        {
+            stderr_buffer.append(argv[0]);
+            stderr_buffer.append(L": Too many arguments\n");
+            builtin_print_help(parser, argv[0], stderr_buffer);
+            return 1;
+        }
+
+        return 0;
+    }
+
+    switch (argc - woptind)
+    {
+        case 0:
+        {
+            /*
+              Show current limit value
+            */
+            print(what, hard);
+            break;
+        }
+
+        case 1:
+        {
+            /*
+              Change current limit value
+            */
+            rlim_t new_limit;
+            wchar_t *end;
+
+            /*
+              Set both hard and soft limits if nothing else was specified
+            */
+            if (!(hard+soft))
+            {
+                hard=soft=1;
+            }
+
+            if (wcscasecmp(argv[woptind], L"unlimited")==0)
+            {
+                new_limit = RLIM_INFINITY;
+            }
+            else if (wcscasecmp(argv[woptind], L"hard")==0)
+            {
+                new_limit = get(what, 1);
+            }
+            else if (wcscasecmp(argv[woptind], L"soft")==0)
+            {
+                new_limit = get(what, soft);
+            }
+            else
+            {
+                errno=0;
+                new_limit = wcstol(argv[woptind], &end, 10);
+                if (errno || *end)
+                {
+                    append_format(stderr_buffer,
+                                  L"%ls: Invalid limit '%ls'\n",
+                                  argv[0],
+                                  argv[woptind]);
+                    builtin_print_help(parser, argv[0], stderr_buffer);
+                    return 1;
+                }
+                new_limit *= get_multiplier(what);
+            }
+
+            return set(what, hard, soft, new_limit);
+        }
+
+        default:
+        {
+            stderr_buffer.append(argv[0]);
+            stderr_buffer.append(L": Too many arguments\n");
+            builtin_print_help(parser, argv[0], stderr_buffer);
+            return 1;
+        }
+
+    }
+    return 0;
+}

color.cpp

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

color.h

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

complete.h

@@ -1,65 +1,156 @@
 /** \file complete.h
-	Prototypes for functions related to tab-completion.
+  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 <stdint.h>
 
 #include "util.h"
-
-/** Use all completions */
+#include "common.h"
+/**
+ * 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
-*/
+ * 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();
+enum
+{
+    /**
+       Do not insert space afterwards if this is the only completion. (The
+       default is to try insert a space)
+    */
+    COMPLETE_NO_SPACE = 1 << 0,
 
-/**
-   Destroys various structures used for tab-completion and free()s the memory used by them.
-*/
-void complete_destroy();
+    /** This is not the suffix of a token, but replaces it entirely */
+    COMPLETE_REPLACES_TOKEN = 1 << 2,
+
+    /** This completion may or may not want a space at the end - guess by
+       checking the last character of the completion. */
+    COMPLETE_AUTO_SPACE = 1 << 3,
+
+    /** This completion should be inserted as-is, without escaping. */
+    COMPLETE_DONT_ESCAPE = 1 << 4,
+
+    /** If you do escape, don't escape tildes */
+    COMPLETE_DONT_ESCAPE_TILDES = 1 << 5
+};
+typedef int complete_flags_t;
+
+
+class completion_t
+{
+
+private:
+    /* No public default constructor */
+    completion_t();
+public:
+
+    /* Destructor. Not inlining it saves code size. */
+    ~completion_t();
+
+    /** The completion string */
+    wcstring completion;
+
+    /** The description for this completion */
+    wcstring description;
+
+    /** The type of fuzzy match */
+    string_fuzzy_match_t match;
+
+    /**
+       Flags determining the completion behaviour.
+
+       Determines whether a space should be inserted after this
+       completion if it is the only possible completion using the
+       COMPLETE_NO_SPACE flag.
+
+       The COMPLETE_NO_CASE can be used to signal that this completion
+       is case insensitive.
+    */
+    complete_flags_t flags;
+
+    /* Construction. Note: defining these so that they are not inlined reduces the executable size. */
+    completion_t(const wcstring &comp, const wcstring &desc = wcstring(), string_fuzzy_match_t match = string_fuzzy_match_t(fuzzy_match_exact), complete_flags_t flags_val = 0);
+    completion_t(const completion_t &);
+    completion_t &operator=(const completion_t &);
+
+    /* Compare two completions. No operating overlaoding to make this always explicit (there's potentially multiple ways to compare completions). */
+    
+    /* "Naturally less than" means in a natural ordering, where digits are treated as numbers. For example, foo10 is naturally greater than foo2 (but alphabetically less than it) */
+    static bool is_naturally_less_than(const completion_t &a, const completion_t &b);
+    static bool is_alphabetically_equal_to(const completion_t &a, const completion_t &b);
+};
+
+enum
+{
+    COMPLETION_REQUEST_DEFAULT = 0,
+    COMPLETION_REQUEST_AUTOSUGGESTION = 1 << 0, // indicates the completion is for an autosuggestion
+    COMPLETION_REQUEST_DESCRIPTIONS = 1 << 1, // indicates that we want descriptions
+    COMPLETION_REQUEST_FUZZY_MATCH = 1 << 2 // indicates that we don't require a prefix match
+};
+typedef uint32_t completion_request_flags_t;
 
 /**
 
-  Add a completion. 
+  Add a completion.
 
-  Values are copied and should be freed by the caller.
+  All supplied values are copied, they should be freed by or otherwise
+  disposed by the caller.
+
+  Examples:
 
-  Examples: 
-  
   The command 'gcc -o' requires that a file follows it, so the
   NO_COMMON option is suitable. This can be done using the following
   line:
-  
+
   complete -c gcc -s o -r
 
   The command 'grep -d' required that one of the strings 'read',
@@ -72,85 +163,81 @@ void complete_destroy();
 
   \param cmd Command to complete.
   \param cmd_type If cmd_type is PATH, cmd will be interpreted as the absolute
-  path of the program (optionally containing wildcards), otherwise it
-  will be interpreted as the command name.
-  \param short_opt The single character name of an option. (-a is a short option, --all and  -funroll are long options)
-  \param long_opt The multi character name of an option. (-a is a short option, --all and  -funroll are long options)
-  \param long_mode Whether to use old style, single dash long options. 
+      path of the program (optionally containing wildcards), otherwise it
+      will be interpreted as the command name.
+  \param short_opt The single character name of an option. (-a is a short option,
+      --all and  -funroll are long options)
+  \param long_opt The multi character name of an option. (-a is a short option,
+      --all and  -funroll are long options)
+  \param long_mode Whether to use old style, single dash long options.
   \param result_mode Whether to search further completions when this
-  completion has been succesfully matched. If result_mode is SHARED,
-  any other completions may also be used. If result_mode is NO_FILES,
-  file completion should not be used, but other completions may be
-  used. If result_mode is NO_COMMON, on option may follow it - only a
-  parameter. If result_mode is EXCLUSIVE, no option may follow it, and
-  file completion is not performed.
+      completion has been succesfully matched. If result_mode is SHARED,
+      any other completions may also be used. If result_mode is NO_FILES,
+      file completion should not be used, but other completions may be
+      used. If result_mode is NO_COMMON, on option may follow it - only a
+      parameter. If result_mode is EXCLUSIVE, no option may follow it, and
+      file completion is not performed.
   \param comp A space separated list of completions which may contain subshells.
   \param desc A description of the completion.
-  \param authorative Whether there list of completions for this command is complete. If true, any options not matching one of the provided options will be flagged as an error by syntax highlighting.
-  \param condition a command to be run to check it this completion should be used. If \c condition is empty, the completion is always used.
-
+  \param condition a command to be run to check it this completion should be used.
+      If \c condition is empty, the completion is always used.
+  \param flags A set of completion flags
 */
-void complete_add( const wchar_t *cmd, 
-				   int cmd_type, 
-				   wchar_t short_opt,
-				   const wchar_t *long_opt,
-				   int long_mode, 
-				   int result_mode, 
-				   int authorative,
-				   const wchar_t *condition,
-				   const wchar_t *comp,
-				   const wchar_t *desc ); 
+void complete_add(const wchar_t *cmd,
+                  bool cmd_is_path,
+                  wchar_t short_opt,
+                  const wchar_t *long_opt,
+                  int long_mode,
+                  int result_mode,
+                  const wchar_t *condition,
+                  const wchar_t *comp,
+                  const wchar_t *desc,
+                  int flags);
+/**
+  Sets whether the completion list for this command is complete. If
+  true, any options not matching one of the provided options will be
+  flagged as an error by syntax highlighting.
+*/
+void complete_set_authoritative(const wchar_t *cmd, bool cmd_type, bool authoritative);
 
 /**
   Remove a previously defined completion
 */
-void complete_remove( const wchar_t *cmd, 
-					  int cmd_type, 
-					  wchar_t short_opt,
-					  const wchar_t *long_opt );
+void complete_remove(const wchar_t *cmd,
+                     bool cmd_is_path,
+                     wchar_t short_opt,
+                     const wchar_t *long_opt,
+                     int long_mode);
+
+
+/** Find all completions of the command cmd, insert them into out.
+ */
+void complete(const wcstring &cmd,
+              std::vector<completion_t> &comp,
+              completion_request_flags_t flags);
 
 /**
-  Find all completions of the command cmd, insert them into out. The
-  caller must free the variables returned in out.  The results are
-  returned in the array_list_t 'out', in the format of wide character
-  strings, with each element consisting of a suggested completion and
-  a description of what kind of object this completion represents,
-  separated by a separator of type COMPLETE_SEP.
+   Print a list of all current completions into the string.
 
-  Values returned by this function should be freed by the caller.
+   \param out The string to write completions to
 */
-void complete( const wchar_t *cmd, array_list_t *out );
-
-/**
-   Print a list of all current completions into the string_buffer_t. 
-
-   \param out The string_buffer_t to write completions to
-*/
-void complete_print( string_buffer_t *out );
-
-/**
-   Obtain a description string for the file specified by the filename.
-
-   The returned value is a string constant and should not be freed.
-
-   \param filename The file for which to find a description string
-*/
-const wchar_t *complete_get_desc( const wchar_t *filename );
+void complete_print(wcstring &out);
 
 /**
    Tests if the specified option is defined for the specified command
 */
-int complete_is_valid_option( const wchar_t *str, 
-							  const wchar_t *opt, 
-							  array_list_t *errors );
+int complete_is_valid_option(const wcstring &str,
+                             const wcstring &opt,
+                             wcstring_list_t *inErrorsOrNull,
+                             bool allow_autoload);
 
 /**
    Tests if the specified argument is valid for the specified option
    and command
 */
-int complete_is_valid_argument( const wchar_t *str, 
-								const wchar_t *opt, 
-								const wchar_t *arg );
+bool complete_is_valid_argument(const wcstring &str,
+                                const wcstring &opt,
+                                const wcstring &arg);
 
 
 /**
@@ -160,8 +247,32 @@ int complete_is_valid_argument( const wchar_t *str,
    with internal dependencies.
 
    \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)
+   \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 wcstring &cmd, bool reload);
+
+/**
+   Create a new completion entry
+
+   \param completions The array of completions to append to
+   \param comp The completion string
+   \param desc The description of the completion
+   \param flags completion flags
+
+*/
+void append_completion(std::vector<completion_t> &completions, const wcstring &comp, const wcstring &desc = wcstring(), int flags = 0, string_fuzzy_match_t match = string_fuzzy_match_t(fuzzy_match_exact));
+
+/* Function used for testing */
+void complete_set_variable_names(const wcstring_list_t *names);
+
+/* Support for "wrap targets." A wrap target is a command that completes liek another command. The target chain is the sequence of wraps (A wraps B wraps C...). Any loops in the chain are silently ignored. */
+bool complete_add_wrapper(const wcstring &command, const wcstring &wrap_target);
+bool complete_remove_wrapper(const wcstring &command, const wcstring &wrap_target);
+wcstring_list_t complete_get_wrap_chain(const wcstring &command);
+
+/* Wonky interface: returns all wraps. Even-values are the commands, odd values are the targets. */
+wcstring_list_t complete_get_wrap_pairs();
 
 #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, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2003-06-18'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -20,23 +21,25 @@ timestamp='2003-06-18'
 # GNU General Public License for more details.
 #
 # 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.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
 # 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.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -70,7 +73,8 @@ 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, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +87,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 +103,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,10 +122,18 @@ 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-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -144,10 +156,13 @@ 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 | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -162,13 +177,17 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-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 +204,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/'`
@@ -202,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -226,56 +255,103 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| epiphany \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| open8 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -291,59 +367,80 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| 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-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -361,6 +458,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 +478,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
@@ -401,6 +504,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -409,10 +516,35 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -437,12 +569,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-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 +612,14 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -576,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -615,6 +769,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -626,10 +788,17 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -643,10 +812,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,10 +824,21 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -727,9 +903,11 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
@@ -738,9 +916,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
@@ -758,6 +939,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -767,6 +956,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
 		;;
@@ -796,9 +991,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -823,6 +1019,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 +1033,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
@@ -843,6 +1049,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -854,6 +1064,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -875,6 +1088,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -931,17 +1147,9 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -956,6 +1164,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,9 +1211,16 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1010,6 +1229,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1029,6 +1252,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1045,13 +1271,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[24]aeb | 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)
@@ -1095,9 +1318,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1118,25 +1344,31 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -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* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -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* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1154,12 +1386,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 +1407,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+	-os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1193,6 +1431,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1215,6 +1456,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+	-tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1251,6 +1495,14 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1273,6 +1525,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1285,6 +1543,18 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1303,13 +1573,13 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
+	mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1328,9 +1598,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1433,7 +1709,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -1463,9 +1739,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 +1772,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,94 +1,831 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.16.2,axel@liljencrantz.se)
+#
+# This file is the main build configuration file for fish. It is used
+# to determine your systems capabilities, and tries to adapt fish to
+# take maximum advantage of the services your system offers.
+#
+# Process this file using the 'autoconf' command to produce a working
+# configure script, which should in turn be executed in order to
+# configure the build process.
+#
+
+m4_syscmd([build_tools/git_version_gen.sh 2>/dev/null])
+
+AC_PREREQ([2.60])
+AC_INIT(fish,
+        m4_esyscmd([cut -f 3 -d ' ' FISH-BUILD-VERSION-FILE | tr -d '\n']),
+        fish-users@lists.sf.net)
+
+conf_arg=$@
+
+#
+# List of output variables produced by this configure script
+#
+
+AC_SUBST(HAVE_GETTEXT)
+AC_SUBST(HAVE_DOXYGEN)
+AC_SUBST(LDFLAGS_FISH)
+
+
+#
+# If needed, run autoconf to regenerate the configure file
+#
+# This makes sure that after running autoconf once to create the first
+# version of configure, we never again need to worry about manually
+# running autoconf to handle an updates configure.ac.
+#
+
+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 "$@"
+      exit
+    fi
+    exit 1
+  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
+
+
+#
+# If needed, run autoheader to regenerate config.h.in
+#
+# This makes sure we never ever have to run autoheader manually. It
+# will be run whenever needed automatically.
+#
+
+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 || exit 1
+  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
+
+#
+# Set up various programs needed for install
+# Note AC_PROG_CXX sets CXXFLAGS if not set, which we want
+# So ensure this happens before we modify CXXFLAGS below
+#
+
+AC_PROG_CXX([g++ c++])
+AC_PROG_INSTALL
+AC_PROG_SED
+AC_LANG(C++)
+
+echo "CXXFLAGS: $CXXFLAGS"
+
+#
+# Tell autoconf to create config.h header
+#
+AC_CONFIG_HEADERS(config.h)
+
+
+#
+# This adds markup to the code that results in a few extra compile
+# time checks on recent GCC versions. It helps stop a few common bugs.
+#
+
+AH_BOTTOM([#if __GNUC__ >= 3
+#define __warn_unused __attribute__ ((warn_unused_result))
+#define __sentinel __attribute__ ((sentinel))
+#define __packed __attribute__ ((packed))
+#else
+#define __warn_unused
+#define __sentinel
+#define __packed
+#endif])
+
+
+#
+# Optionally drop gettext support
+#
+
+AC_ARG_WITH(
+  gettext,
+  AS_HELP_STRING(
+    [--without-gettext],
+    [do not translate messages, even if gettext is available]
+  ),
+  [local_gettext=$withval],
+  [local_gettext=check]
+)
+
+AS_IF([test x$local_gettext != xno],
+  [ AC_CHECK_PROGS( [found_msgfmt], [msgfmt], [no] )
+    if test x$found_msgfmt != xno; then
+      AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext])
+    elif test "x$local_gettext" != "xcheck" ; then
+      AC_MSG_FAILURE([--with-gettext was given, but the msgfmt program could not be found])
+    else
+      local_gettext=no
+    fi
+   ],
+)
+
+#
+# Build/clean the documentation only if Doxygen is available
+#
+
+doxygen_minimum=1.8.7
+
+AC_ARG_WITH(
+  doxygen,
+  AS_HELP_STRING(
+    [--with-doxygen],
+    [use Doxygen to regenerate documentation]
+  ),
+  [use_doxygen=$withval],
+  [use_doxygen=auto]
+)
+
+AS_IF([test "$use_doxygen" != "no"],
+  [
+    AC_CHECK_PROGS([found_doxygen], [doxygen], [no])
+    if test "$found_doxygen" != no; then
+      # test version
+      AC_MSG_CHECKING([the doxygen version])
+      doxygen_version=`doxygen --version 2>/dev/null`
+      AC_MSG_RESULT([$doxygen_version])
+      dnl This requires autoconf 2.60 or newer
+      AS_VERSION_COMPARE([$doxygen_version], [$doxygen_minimum],
+        [ if test "$use_doxygen" = auto; then
+            AC_MSG_WARN([doxygen version $doxygen_version found, but $doxygen_minimum required])
+            HAVE_DOXYGEN=0
+          else
+            AC_MSG_FAILURE([doxygen version $doxygen_version found, but $doxygen_minimum required])
+          fi
+        ],
+        [HAVE_DOXYGEN=1], [HAVE_DOXYGEN=1])
+    elif test "$use_doxygen" != auto; then
+      AC_MSG_FAILURE([--with-doxygen was given, but the doxygen program could not be found])
+    else
+      HAVE_DOXYGEN=0
+    fi
+  ],
+)
+
+#
+# Try to enable large file support. This will make sure that on systems
+# where off_t can be either 32 or 64 bit, the latter size is used. On
+# other systems, this should do nothing. (Hopefully)
+#
+
+CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+
+
+# fish does not use exceptions
+# Disabling exceptions saves about 20% (!) of the compiled code size
+CXXFLAGS="$CXXFLAGS -fno-exceptions"
+
+
+#
+# -Wall is there to keep me on my toes
+# But signed comparison warnings are way too aggressive
+#
+
+CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
+
+#
+# This is needed in order to get the really cool backtraces on Linux
+#
+
+if test `uname` != "Darwin"; then
+   LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
+fi
+
+#
+# On Cygwin, we need to add some flags for ncurses.
+#
+case `uname` in
+    CYGWIN*)
+        echo "adding flags for ncurses on Cygwin"
+        CXXFLAGS="$CXXFLAGS -I/usr/include -I/usr/include/ncursesw"
+        LDFLAGS_FISH="$LDFLAGS_FISH -L/usr/lib/ncursesw"
+    ;;
+esac
+
+#
+# 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.
+  #
+
+  CXXFLAGS="$CXXFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
+else
+  AC_MSG_RESULT(no)
+fi
+
+
+#
+# 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])
+  AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
 fi
 
-AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
 
-AC_CONFIG_HEADERS(config.h)
+#
+# Solaris-specific flags go here
+#
 
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-#AC_ISC_POSIX
-#AC_PROG_MAKE_SET
+AC_MSG_CHECKING([if we are under Solaris])
+case $target_os in
+  solaris*)
+    AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris])
+    AC_MSG_RESULT(yes)
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+esac
 
-# Optionally drop xsel
-AC_ARG_WITH( xsel, 
-			 AC_HELP_STRING([--without-xsel],
-             [do not build the xsel program needed for X clipboard integration]),
-			 [xsel=$withval],
-			 [xsel=with_xsel] )
+#
+# BSD-specific flags go here
+#
 
-if [[ "$xsel" = "with_xsel" ]]; then
-    AC_SUBST( XSEL,[xsel-0.9.6/xsel])
-    AC_SUBST( XSEL_MAN,[xsel.1x])
-    AC_SUBST( XSEL_MAN_PATH,[xsel-0.9.6/xsel.1x])
-else
-    AC_SUBST( XSEL,[ ])
-    AC_SUBST( XSEL_MAN,[ ])
-    AC_SUBST( XSEL_MAN_PATH,[ ])
-fi
+AC_MSG_CHECKING([if we are under BSD])
+case $target_os in
+  *bsd*)
+    AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD])
+    AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD])
+    AC_MSG_RESULT(yes)
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+esac
 
-if [[ "$prefix" = NONE ]]; then
-	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
-	AC_SUBST( PREFIX, /usr/local)
-	export prefix=/usr/local
-else
-	AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory])
-	AC_SUBST( PREFIX, [$prefix])
-fi
 
-AC_SUBST(fishdir,[/fish.d])
-AC_SUBST(fishfile,[/fish])
-AC_SUBST(fishinputfile,[/fish_inputrc])
+#
+# See if Linux procfs is present. This is used to get extra
+# information about running processes.
+#
 
-AC_ARG_VAR( [docdir], [Documentation direcotry] )
-
-if test -z $docdir; then
-   AC_SUBST(docdir,[$datadir/doc/fish])
-fi
-
-AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] )
-AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
-
-# See if Linux procfs is present
 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])])
 
-AC_CHECK_FUNCS( [wprintf futimes wcwidth wcswidth] ) 
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
+#
+# This is ued to tell the wgetopt library to translate strings. This
+# way wgetopt can be dropped into any project without requiring i18n.
+#
 
-# 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>.])
-else
-    AC_MSG_RESULT(no)
+AC_DEFINE(
+  [HAVE_TRANSLATE_H],
+  [1],
+  [Define to 1 if the wgettext function should be used for translating strings.]
+)
+
+# Disable curses macros that conflict with the STL
+AC_DEFINE([NCURSES_NOMACROS], [1], [Define to 1 to disable ncurses macros that conflict with the STL])
+AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict with the STL])
+
+#
+# Check presense of various libraries. This is done on a per-binary
+# level, since including various extra libraries in all binaries only
+# because thay are used by some of them can cause extra bloat and
+# slower compiles when developing fish.
+#
+
+# Check for os dependant libraries for all binaries.
+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( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
+AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
+AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
+
+if test x$local_gettext != xno; then
+  AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
-AC_CHECK_LIB(socket, connect)
-AC_CHECK_LIB(rt, nanosleep)
+#
+# Check presense of various header files
+#
 
-# 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_CHECK_HEADERS([getopt.h termios.h sys/resource.h term.h ncurses/term.h ncurses.h ncurses/curses.h curses.h stropts.h siginfo.h sys/select.h sys/ioctl.h execinfo.h spawn.h sys/sysctl.h])
 
-#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)])
+if test x$local_gettext != xno; then
+  AC_CHECK_HEADERS([libintl.h])
+fi
 
-AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish])
+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])]
+)
+
+#
+# On some platforms (Solaris 10) adding -std=c99 in turn requires that
+# _POSIX_C_SOURCE be defined to 200112L otherwise several
+# POSIX-specific, non-ISO-C99 types/prototypes are made unavailable
+# e.g. siginfo_t. Defining _XOPEN_SOURCE to 600 is compatible with
+# the _POSIX_C_SOURCE value and provides a little assurance that
+# extension functions' prototypes are available, e.g. killpg().
+#
+# Some other platforms (OS X), will remove types/prototypes/macros
+# e.g. SIGWINCH if either _POSIX_C_SOURCE or _XOPEN_SOURCE is defined.
+#
+# This test adds these macros only if they enable a program that uses
+# both Posix and non-standard features to compile, and that program
+# does not compile without these macros.
+#
+# We try to make everyone happy.
+#
+# The ordering of the various autoconf tests is very critical as well:
+#
+# * This test needs to be run _after_ header detection tests, so that
+# the proper headers are included.
+#
+# * This test needs to be run _before_ testing for the presense of any
+# prototypes or other language functinality.
+#
+# * This test should be (but does not need to be) run after the
+# conditional definition of __EXTENSIONS__, to avoid redundant tests.
+#
+
+XCXXFLAGS="$CXXFLAGS"
+
+echo checking how to use -D_XOPEN_SOURCE=600 and -D_POSIX_C_SOURCE=200112L...
+local_found_posix_switch=no
+
+for i in "" "-D_POSIX_C_SOURCE=200112L" "-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112L"; do
+
+  AC_MSG_CHECKING( if switches \"$i\" works)
+  CXXFLAGS="$XCXXFLAGS $i"
+
+  #
+  # Try to run this program, which should test various extensions
+  # and Posix functionality. If this program works, then everything
+  # should work. Hopefully.
+  #
+
+  AC_TRY_LINK(
+    [
+      #include <stdlib.h>
+      #include <stdio.h>
+      #include <sys/types.h>
+
+      /* POSIX, C89 and C99: POSIX extends this header.
+       * For: kill(), killpg(), siginfo_t, sigset_t,
+       * struct sigaction, sigemptyset(), sigaction(),
+       * SIGIO and SIGWINCH.  */
+      #include <signal.h>
+
+      #ifdef HAVE_SIGINFO_H
+      /* Neither POSIX, C89 nor C99: Solaris-specific (others?).
+       * For: siginfo_t (also defined by signal.h when in
+       * POSIX/extensions mode). */
+      #include <siginfo.h>
+      #endif
+
+      #ifdef HAVE_SYS_IOCTL_H
+      /* As above (under at least Linux and FreeBSD). */
+      #include <sys/ioctl.h>
+      #endif
+
+      #ifdef HAVE_TERMIOS_H
+      #include <termios.h>
+      #endif
+    ],
+    [
+      /* Avert high-level optimisation, by making the program's
+       * return value depend on all tested identifiers. */
+      long ret = 0;
+      /* POSIX only: might be unhidden by _POSIX_C_SOURCE. */
+      struct sigaction sa;
+      sigset_t ss;
+      siginfo_t info;
+      ret += (long)(void *)&info + kill( 0, 0 ) +
+        sigaction( 0, &sa, 0 ) + sigemptyset( &ss );
+      /* Extended-POSIX: might be unhidden by _XOPEN_SOURCE. */
+      ret += killpg( 0, 0 );
+      /* Non-standard: might be hidden by the macros. */
+      {
+        struct winsize termsize;
+        ret += (long)(void *)&termsize;
+        ret += SIGWINCH + TIOCGWINSZ + SIGIO;
+      }
+      return ret;
+
+    ],
+    local_cv_use__posix_c_source=yes,
+    local_cv_use__posix_c_source=no,
+  )
+
+  if test x$local_cv_use__posix_c_source = xyes; then
+    AC_MSG_RESULT( yes )
+    local_found_posix_switch=yes
+    break;
+  else
+    AC_MSG_RESULT( no )
+  fi
+
+done
+
+#
+# We didn't find any combination of switches that worked - revert to
+# no switches and hope that the fallbacks work.  A warning will be
+# printed at the end of the configure script.
+#
+
+if test ! x$local_found_posix_switch = xyes; then
+  CXXFLAGS="$XCXXFLAGS"
+fi
+
+#
+# Detect nanoseconds fields in struct stat
+#
+AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec])
+AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec])
+
+#
+# Check for D_TYPE in dirent, only on BSD and Linux
+#
+AC_STRUCT_DIRENT_D_TYPE
+
+#
+# Check for presense of various functions used by fish
+#
+
+AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
+AC_CHECK_FUNCS( futimes wcwidth wcswidth wcstok fputwc fgetwc )
+AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg mkostemp )
+AC_CHECK_FUNCS( backtrace backtrace_symbols sysconf getifaddrs )
+
+if test x$local_gettext != xno; then
+  AC_CHECK_FUNCS( gettext dcgettext )
+
+#
+# The Makefile also needs to know if we have gettext, so it knows if
+# the translations should be installed.
+#
+  AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 )
+fi
+
+#
+# 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
+
+
+#
+# Check if struct winsize and TIOCGWINSZ exist
+#
+
+AC_MSG_CHECKING([if struct winsize and TIOCGWINSZ exist])
+AC_LINK_IFELSE(
+  [
+    AC_LANG_PROGRAM(
+      [
+        #ifdef HAVE_TERMIOS_H
+        #include <termios.h>
+        #endif
+
+        #ifdef HAVE_SYS_IOCTL_H
+        #include <sys/ioctl.h>
+        #endif
+      ],
+      [
+        struct winsize termsize = {0};
+        TIOCGWINSZ;
+      ]
+    )
+  ],
+  [
+    AC_MSG_RESULT(yes);
+    AC_DEFINE([HAVE_WINSIZE], [1], [Define to 1 if the winsize struct and TIOCGWINSZ macro exist])
+  ],
+  [
+    AC_MSG_RESULT(no)
+  ]
+)
+
+
+#
+# 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
+
+# Check for __environ symbol
+AC_MSG_CHECKING([for __environ symbol])
+AC_TRY_LINK(
+  [
+    #include <unistd.h>
+  ],
+  [
+    extern char **__environ;
+    char **tmp = __environ;
+    exit(tmp!=0);
+  ],
+  have___environ=yes,
+  have___environ=no
+)
+if test "$have___environ" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(
+    [HAVE___ENVIRON],
+    [1],
+    [Define to 1 if the __environ symbol is exported.]
+  )
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Check for sys_errlist
+AC_MSG_CHECKING([for sys_errlist array])
+AC_TRY_LINK(
+  [
+   #include <stdio.h>
+  ],
+  [
+    const char *p;
+    p = sys_errlist[sys_nerr];
+  ],
+  have_sys_errlist=yes,
+  have_sys_errlist=no
+)
+if test "$have_sys_errlist" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(
+    [HAVE_SYS_ERRLIST],
+    [1],
+    [Define to 1 if the sys_errlist array is available.]
+  )
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Check for _sys_errs
+AC_MSG_CHECKING([for _sys_errs array])
+AC_TRY_LINK(
+  [
+   #include <string>
+  ],
+  [
+    std::string p;
+    extern const char _sys_errs[];
+    extern const int _sys_index[];
+    p = _sys_errs[_sys_index[0]];
+  ],
+  have__sys__errs=yes,
+  have__sys__errs=no
+)
+if test "$have__sys__errs" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(
+    [HAVE__SYS__ERRS],
+    [1],
+    [Define to 1 if the _sys_errs array is available.]
+  )
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Check if getopt_long exists and works
+AC_MSG_CHECKING([if getopt_long exists and works])
+AC_TRY_LINK(
+  [
+    #if HAVE_GETOPT_H
+    #include <getopt.h>
+    #endif
+  ],
+  [
+    static struct option
+      long_options[] =
+      {
+        0, 0, 0, 0
+      }
+    ;
+    int opt = getopt_long( 0,
+                 0,
+                 0,
+                 long_options,
+                 0 );
+
+  ],
+  have_working_getopt_long=yes,
+  have_working_getopt_long=no
+)
+if test "$have_working_getopt_long" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(
+    [HAVE_WORKING_GETOPT_LONG],
+    [1],
+    [Define to 1 if getopt_long exists and works.]
+  )
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Check for Solaris curses tputs having fixed length parameter list.
+AC_MSG_CHECKING([if we are using non varargs tparm.])
+AC_COMPILE_IFELSE(
+  [
+    AC_LANG_PROGRAM(
+      [
+	#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
+      ],
+      [
+        tparm( "" );
+      ]
+    )
+  ],
+  [tparm_solaris_kludge=no],
+  [tparm_solaris_kludge=yes]
+)
+if test "x$tparm_solaris_kludge" = "xyes"; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(
+    [TPARM_SOLARIS_KLUDGE],
+    [1],
+    [Define to 1 if tparm accepts a fixed amount of paramters.]
+  )
+else
+  AC_MSG_RESULT(no)
+fi
+
+# Tell the world what we know
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
+
+if test ! x$local_found_posix_switch = xyes; then
+  echo "Can't find a combination of switches to enable common extensions like detecting window size."
+  echo "Some fish features may be disabled."
+fi
+
+echo "fish is now configured."
+echo "Use 'make' and 'make install' to build and install fish."
+

count.c

@@ -1,22 +0,0 @@
-/** \file count.c
-   The length command, used for determining the number of items in an
-   environment variable array.
-*/
-#include <stdlib.h>
-#include <stdio.h>
-
-/**
-   The main function. Does nothing but return the number of arguments.
-
-   This command, unlike all other fish commands, does not feature a -h
-   or --help option. This is because we want to avoid errors on arrays
-   that have -h or --help as entries, which is very common when
-   parsing options, etc. For this reason, the main fish binary does a
-   check and prints help usage if -h or --help is explicitly given to
-   the command, but not if it is the contents of a variable.
-*/
-int main( int argc, char **argv )
-{
-	printf( "%d\n", argc-1 );
-	return argc==1;
-}

create_wajig_completions.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+# -*- python -*-
+
+# Program to generate fish completion function for wajig.
+# It runs 'wajig command' and analyzes the output to build a
+# completion file which it writes to stdout.
+# To use the result, direct stdout to
+# ~/.fish.d/completions/wajig.fish.
+
+# Author Reuben Thomas, from Don Rozenberg's bash_completion.py and
+# fish's apt-get.fish.
+
+import os
+import re
+import pprint
+pp = pprint.PrettyPrinter()
+
+def escape_quotes(s):
+  return re.sub('\'', '\\\'', s)
+
+# Run wajig command
+f = os.popen('wajig commands', 'r')
+
+lines = f.readlines()
+
+option_patt = r'^-([a-z]*)\|--([a-z]*) +([^ ].*)'
+option_patt_r = re.compile(option_patt)
+
+command_patt = r'^([a-z-]*) +([^ ].*)'
+command_patt_r = re.compile(command_patt)
+
+os_str = []
+os_str.append('')
+ol_str = []
+ol_str.append('')
+oh_str = []
+oh_str.append('')
+o_i = 0
+
+c_str = []
+c_str.append('')
+ch_str = []
+ch_str.append('')
+c_i = 0
+
+for l in lines:
+    l = l.strip() 
+    if l == '' or l.find(':') > -1 or l.find('Run') == 0:
+        continue
+    if l.find('-') == 0:
+        mo = option_patt_r.search(l)
+        if mo == None:
+            continue
+        os_str[o_i] = mo.group(1)
+        os_str.append('')
+        ol_str[o_i] = mo.group(2)
+        ol_str.append('')
+        oh_str[o_i] = escape_quotes(mo.group(3))
+        oh_str.append('')
+        o_i += 1
+    else:
+        mo = command_patt_r.search(l)
+        if mo == None:
+            continue
+        c_str[c_i] = mo.group(1)
+        c_str.append('')
+        ch_str[c_i] = escape_quotes(mo.group(2))
+        ch_str.append('')
+        c_i += 1
+
+# For debugging, print the commands and options.
+#print
+#pp.pprint(c_str)
+
+#print
+#pp.pprint(os_str)
+#print
+#pp.pprint(ol_str)
+
+part1 = '''function __fish_wajig_no_subcommand -d (N_ 'Test if wajig has yet to be given the subcommand')
+	for i in (commandline -opc)
+		if contains -- $i'''
+
+part2 = '''
+			return 1
+		end
+	end
+	return 0
+end
+
+function __fish_wajig_use_package -d (N_ 'Test if wajig command should have packages as potential completion')
+	for i in (commandline -opc)
+		if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
+			return 0
+		end
+	end
+	return 1
+end
+
+complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' -d (N_ 'Package')'''
+
+wajig = part1
+
+#add the commands.
+for i in range(0, len(c_str) - 1):
+    wajig = "%s %s" % (wajig, c_str[i])
+
+#add part2
+wajig = "%s%s" % (wajig, part2)
+
+#add the options.
+wajig = "%s%s" % (wajig, os_str[0].lstrip())
+for i in range(1, len(os_str) - 1):
+    wajig = "%s\ncomplete -c apt-get -s %s -l %s -d (N_ '%s')" % (wajig, os_str[i], ol_str[i], oh_str[i])
+
+#add the commands.
+for i in range(0, len(c_str) - 1):
+    wajig = "%s\ncomplete -f -n '__fish_wajig_no_subcommand' -c wajig -a '%s' -d(N_ '%s')" % (wajig, c_str[i], ch_str[i])
+
+#print it all
+print wajig

doc_src/FORMATTING.md

@@ -0,0 +1,262 @@
+# Formatting guide for fish docs
+
+The fish documentation has been updated to support Doxygen 1.8.7+, and while the main benefit of this change is extensive Markdown support, the addition of a fish lexicon and syntax filter, combined with semantic markup rules allows for automatic formatting enhancements across the HTML user_docs, the developer docs and the man pages.
+
+Initially my motivation was to fix a problem with long options ([Issue #1557](https://github.com/fish-shell/fish-shell/issues/1557) on GitHub), but as I worked on fixing the issue I realised there was an opportunity to simplify, reinforce and clarify the current documentation, hopefully making further contribution easier and cleaner, while allowing the documentation examples to presented more clearly with less author effort.
+
+While the documentation is pretty robust to variations in the documentation source, adherence to the following style guide will help keep the already excellent documention in good shape moving forward.
+
+## Line breaks and wrapping
+
+Contrary to the rest of the fish source code, the documentation greatly benefits from the use of long lines and soft wrapping. It allows paragraphs to be treated as complete blocks by Doxygen, means that the semantic filter can see complete lines when deciding on how to apply syntax highlighting, and means that man pages will consistently wrap to the width of the users console in advanced pagers, such as 'most'. 
+
+## Doxygen special commands and aliases
+
+While Markdown syntax forms the basis of the documentation content, there are some exceptions that require the use of Doxygen special commands. On the whole, Doxygen commands should be avoided, especially inline word formatting such as \\c as this would allow Doxygen to make unhelpful assumptions, such as converting double dashes (\--) to n-dashes (–).
+
+### Structure: \\page, \\section and \\subsection
+
+Use of Doxygen sections markers are important, as these determine what will be eventually output as a web page, man page or included in the developer docs. 
+
+Currently the make process for the documentation is quite convoluted, but basically the HTML docs are produced from a single, compiled file, doc.h. This contains a number of \\page markers that produce the various pages used in the documentation. The format of a \\page mark is:
+
+    \page universally_unique_page_id Page title
+
+The source files that contain the page markers are currently:
+
+- __index.hdr.in__: Core documentation
+- __commands.hdr.in__: Individual commands
+- __tutorial.hdr__: Tutorial
+- __design.hdr__: Design document
+- __faq.hdr__: Frequently Asked Questions
+- __license.hdr__: Fish and 3rd party licences
+
+Unless there is a _VERY_ good reason and developer consensus, new pages should never be added.
+
+The rest of the documentation is structured using \\section and \\subsection markers. Most of the source files (listed above) contain their full content, the exception being commands, which are separated out into source text files in the doc_src directory. These files are concatenated into one file, so each one starts with a \\section declaration. The synopsis, description and examples (if present) are declared as \\subsections. The format of these marks is practically identical to the page mark.
+
+    \section universally_unique_section_id Section title
+    \subsection universally_unique_subsection_id Subsection title
+
+Each page, section and subsection id _must_ be unique across the whole of the documentation, otherwise Doxygen will issue a warning.
+
+### Semantic markup: the \\fish .. \\endfish block
+
+While Doxygen has support for \\code..\\endcode blocks with enhanced markup and syntax colouring, it only understands the core Doxygen languages: C, C++, Objective C, Java, PHP, Python, Tcl and Fortran. To enhance Fish's syntax presentation, use the special \\fish..\\endfish blocks instead.
+
+Text placed in this block will be parsed by Doxygen using the included lexicon filter (see lexicon_filter.in) as a Doxygen input filter. The filter is built during make so that it can pick up information on builtins, functions and shell commands mentioned in completions and apply markup to keywords found inside the \\fish block.
+
+Basically, preformatted plain text inside the \\fish block is fed through the filter and is returned marked up so that Doxygen aliases can convert it back to a presentable form, according to the output document type.
+
+For instance:
+
+`echo hello world`
+
+is transformed into:
+
+`@cmnd{echo} @args{hello} @args{world}`
+
+which is then transformed by Doxygen into an HTML version (`make user_doc`):
+
+`<span class="command">echo</span> <span class="argument">hello</span> <span class="argument">world</span>`
+
+A man page version (`make share/man`):
+
+__echo__ hello world
+
+And a simple HTML version for the developer docs (`make doc`) and the LATEX/PDF manual  (`make doc/refman.pdf`):
+
+`echo hello world`
+
+### Fonts
+
+In older browsers, it was easy to set the fonts used for the three basic type styles (serif, sans-serif and monospace). Modern browsers have removed these options in their respective quests for simplification, assuming the content author will provide suitable styles for the content in the site's CSS, or the end user will provide overriding styles manually. Doxygen's default styling is very simple and most users will just accept this default.
+
+I've tried to use a sensible set of fonts in the documentation's CSS based on 'good' terminal fonts and as a result the firt preference font used throughout the documentation is '[DejaVu](http://dejavu-fonts.org)'. The rationale behaind this is that while DejaVu is getting a little long in the tooth, it still provides the most complete support across serif, sans-serif and monospace styles (giving a well balanced feel and consistent [x-height](http://en.wikipedia.org/wiki/X-height)), has the widest support for extended Unicode characters and has a free, permissive licenses (though it's still incompatible with GPLv2, though arguably less so than the SIL Open Font license, though this is a moot point when using it solely in the docs).
+
+#### Fonts inside \\fish blocks and \`backticks\`
+
+As the point of these contructs is to make fish's syntax clearer to the user, it makes sense to mimic what the user will see in the console, therefore any content is formatted using the monospaced style, specifically monospaced fonts are chosen in the following order:
+
+1. __DejaVu Sans Mono__: Explained above. [[&darr;](http://dejavu-fonts.org)]
+2. __Source Code Pro__: Monospaced code font, part of Adobe's free Edge Web Fonts. [[&darr;](https://edgewebfonts.adobe.com)]
+3. __Menlo__: Apple supplied variant of DejaVu.
+4. __Ubuntu Mono__: Ubuntu Linux's default monospaced font. [[&darr;](http://font.ubuntu.com)]
+5. __Consolas__: Modern Microsoft supplied console font.
+6. __Monaco__: Apple supplied console font since 1984!
+7. __Lucida Console__: Generic mono terminal font, standard in many OS's and distros.
+8. __monospace__: Catchall style. Chooses default monospaced font, often Courier.
+9. __fixed__: As above, more often used on mobile devices.
+
+#### General Fonts
+
+1. __DejaVu Sans__: As above.[[&darr;](http://dejavu-fonts.org)]
+2. __Roboto__: Elegant Google free font and is Doxygen's default [[&darr;](http://www.google.com/fonts/specimen/Roboto)]
+3. __Lucida Grande__: Default Apple OS X content font.
+4. __Calibri__: Default Microsoft Office font (since 2007).
+5. __Verdana__: Good general font found in a lot of OSs.
+6. __Helvetica Neue__: Better spaced and balanced Helvetica/Arial variant.
+7. __Helvetica__: Standard humanist typeface found almost everywhere.
+8. __Arial__: Microsoft's Helvetica.
+9. __sans-serif__: Catchall style. Chooses default sans-serif typeface, often Helvetica.
+
+The ordering of the fonts is important as it's designed to allow the documentation to settle into a number of different identities according to the fonts available. If you have the complete DejaVu family installed, then the docs are presented using that, and if your Console is set up to use the same fonts, presentation will be completely consistent.
+
+On OS X, with nothing extra installed, the docs will default to Menlo and Lucida Grande giving a Mac feel. Under Windows, it will default to using Consolas and Calibri on recent versions, giving a modern Windows style.
+
+#### Other sources:
+
+- [Font Squirrel](http://www.fontsquirrel.com): Good source of open source font packages.
+
+### Choosing a CLI style: using a \\fish{style} block
+
+By default, when output as HTML, a \\fish block uses syntax colouring suited to the style of the documentation rather than trying to mimic the terminal. The block has a light, bordered background and a colour scheme that 'suggests' what the user would see in a console.
+
+Additional stying can be applied adding a style declaration:
+
+    \fish{additional_style [another_style...]}
+        ...
+    \endfish
+
+This will translate to classes applied to the `<div>` tag, like so:
+
+    <div class="fish additional_style another_style">
+        ...
+    </div>
+
+The various classes are defined in `doc_src/user_doc.css` and new style can be simply added
+
+The documentation currently defines a couple of additional styles:
+
+- __cli-dark__: Used in the _tutorial_ and _FAQ_ to simulate a dark background terminal, with fish's default colours (slightly tweaked for legibility in the browser).
+
+- __synopsis__: A simple colour theme helpful for displaying the logical 'summary' of a command's syntax, options and structure.
+
+## Markdown
+
+Apart from the exceptions discussed above, the rest of the documentation now supports the use of Markdown. As such the use of Doxygen special commands for HTML tags is unnecessary.
+
+There are a few exceptions and extensions to the Markdown [standard](http://daringfireball.net/projects/markdown/) that are documented in the Doxygen [documentation](http://www.stack.nl/~dimitri/doxygen/manual/markdown.html).
+
+### \`Backticks\`
+
+As is standard in Markdown and 'Github Flavoured Markdown' (GFM), backticks can be used to denote inline technical terms in the documentation, `like so`. In the documentation this will set the font to the monospaced 'console' typeface and will cause the enclosed term to stand out.
+
+However, fenced code blocks using 4 spaces or 3 backticks (\`\`\`) should be avoided as Doxygen will interpret these as \\code blocks and try to apply standard syntax colouring, which doesn't work so well for fish examples. Use `\fish..\endfish` blocks instead.
+
+### Lists
+
+Standard Markdown list rules apply, but as Doxygen will collapse white space on output, combined with the use of long lines, it's a good idea to include an extra new line between long list items to assist future editing.
+
+## Special cases
+
+The following can be used in \\fish blocks to render some fish scenarios. These are mostly used in the tutorial when an interactive situation needs to be displayed.
+
+### Custom formatting tags
+
+- `<s>`: auto\<s\>suggestion\</s\>.
+- `<m>`: \<m\>Matched\</m\> items, such as tab completions.
+- `<sm>`: Matched items \<sm\>searched\<sm\> for, like grep results.
+- `<error>`: \<error\>This would be shown as an error.\</error\>
+- `<asis>`: \<asis\>This test will not be parsed for fish markup.\</asis\>
+- `<outp>`: \<outp\>This would be rendered as command/script output.\</outp\>
+
+### Prompts and cursors
+
+- `>_`: Display a basic prompt.
+- `~>_`: Display a prompt with a the home directory as the current working directory.
+- `___` (3 underscores): Display a cursor.
+
+
+### Keyboard shortcuts: @key{} and @cursor_key{}
+
+Graphical keyboard shortcuts can be defined using the following special commands. These allow for the different text requirements across the html and man pages. The HTML uses CSS to create a keyboard style, whereas the man page would display the key as text.
+
+- `@key{lable}`
+  Displays a key with a purely textual lable, such as: 'Tab', 'Page Up', 'Page Down', 'Home', 'End', 'F1', 'F19' and so on. 
+
+- `@key{modifier,lable}`
+  Displays a keystroke requiring the use of a 'modifier' key, such as 'Control-A', 'Shift-X', 'Alt-Tab' etc.
+
+- `@key{modifier,entity,lable}`
+  Displays a keystroke using a graphical entity, such as an arrow symbol for cursor key based shortcuts.
+
+- `@cursor_key{entity,lable}`
+  A special case for cursor keys, when no modifier is needed. i.e. `@cursor_key{&uarr;,up}` for the up arrow key.
+
+Some useful Unicode/HTML5 entities:
+
+- Up arrow: `&uarr;`
+- Down arrow: `&darr;`
+- Left arrow: `&larr;`
+- Right arrow `&rarr;`
+- Shift: `&#8679;`
+- Tab: `&rarrb;`
+- Mac option: `&#8997;`
+- Mac command: `&#8984;`
+
+## Notes
+
+### Doxygen
+
+Tested on:
+- Ubuntu 14.04 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git).
+- CentOS 6.5 with Doxygen 1.8.8, built from [GitHub source](https://github.com/doxygen/doxygen.git).
+- Mac OS X 10.9 with Homebrew install Doxygen 1.8.7 and 1.8.8. 
+
+Graphviz was also installed in all the above testing.
+
+Doxygen 1.8.6 and lower do not have the \\htmlonly[block] directive which fixes a multitude of problems in the rendering of the docs. In Doxygen 1.8.7 the list of understood HTML entities was greatly increased. I tested earlier versions and many little issues returned.
+
+As fish ships with pre-built documentation, I don't see this as an issue.
+
+### Updated Configure/Makefile
+
+- Tested on Ubuntu 14.04, CentOS 6.5 and Mac OS X 10.9.
+- Makefile has GNU/BSD sed/grep detection.
+
+### HTML output
+
+- The output HTML is HTML5 compliant, but should quickly and elegantly degrade on older browsers without losing basic structure.
+- The CSS avoids the use or browser specific extenstions (i.e. -webkit, -moz etc), using the W3C HTML5 standard instead.
+- It's been tested in Chrome 37.0 and Firefox 32.0 on Mac OS X 10.9 (+Safari 7), Windows 8.1 (+Internet Explorer 11) and Ubuntu Desktop 14.04.
+- My assumption is basically that if someone cares enough to want to install fish, they'll be keeping a browser current.
+
+### Man page output
+
+- Tested on Ubuntu 14.04, CentOS 6.5 and Mac OS X 10.9.
+- Output is substantially cleaner.
+- Tested in cat, less, more and most pagers using the following fish script:
+
+```
+function manTest --description 'Test manpage' --argument page
+    set -l pager
+    for i in $argv
+        switch $i
+            case "-l"
+                set pager -P '/usr/bin/less -is'
+            case "-m"
+                set pager -P '/usr/bin/more -s'
+            case "-c"
+                set pager -P '/bin/cat'
+        end
+    end
+    man $pager ~/Projects/OpenSource/fish-shell/share/man/man1/$page.1
+end
+
+# Assumes 'most' is the default system pager.
+# NOT PORTABLE! Paths would be need to be updated on other systems.
+```
+
+### Developer docs and LATEX/PDF output
+
+- HTML developer docs tested on Ubuntu 14.04, CentOS 6.5 and Mac OS X 10.9.
+- LATEX/PDF reference manual tested on Mac OS X 10.9 using MacTEX. PDF production returns an error (due to Doxygen's use of an outdated 'float' package), but manual PDF output is ok.
+
+### Future changes
+
+1. The documentation creation process would be better if it could be modularised further and moved out of the makefile into a number of supporting scripts. This would allow both the automake and Xcode build processes to use the documentation scripts directly. 
+2. Remove the Doxygen dependency entirely for the user documentation. This would be very acheivable now that the bulk of the documentation is in Markdown.
+3. It would be useful to gauge what parts of the documentation are actually used by users. Judging by the amount of 'missing comment' errors during the developer docs build phase, this aspect of the docs has been rather neglected. If it is not longer used or useful, then this could change the future direction of the documentation and significantly streamline the process.
+
+#### Author: Mark Griffiths [@GitHub](https://github.com/MarkGriffiths)

doc_src/abbr.txt

@@ -0,0 +1,44 @@
+\section abbr abbr - manage fish abbreviations
+
+\subsection abbr-synopsis Synopsis
+\fish{synopsis}
+abbr -a word="phrase"
+abbr -s
+abbr -l
+abbr -e word
+\endfish
+
+\subsection abbr-description Description
+
+`abbr` manipulates the list of abbreviations that fish will expand.
+
+Abbreviations are user-defined character sequences or words that are replaced with longer phrases after they are entered. For example, a frequently-run command such as `git checkout` can be abbreviated to `gco`. After entering `gco` and pressing @key{Space} or @key{Enter}, the full text `git checkout` will appear in the command line.
+
+Abbreviations are stored, by default, in a universal variable.
+
+The following parameters are available:
+
+- `-a WORD PHRASE` or `--add WORD PHRASE` Adds a new abbreviation, where WORD will be expanded to PHRASE.
+
+- `-s` or `--show` Show all abbreviated words and their expanded phrases in a manner suitable for export and import.
+
+- `-l` or `--list` Lists all abbreviated words.
+
+- `-e WORD` or `--erase WORD` Erase the abbreviation WORD.
+
+\subsection abbr-example Examples
+
+\fish
+abbr -a gco git checkout
+\endfish
+Add a new abbreviation where `gco` will be replaced with `git checkout`.
+
+\fish
+abbr -e gco
+\endfish
+Erase the `gco` abbreviation.
+
+\fish
+ssh another_host abbr -s | source
+\endfish
+Import the abbreviations defined on another_host over SSH.

doc_src/alias.txt

@@ -0,0 +1,34 @@
+\section alias alias - create a function
+
+\subsection alias-synopsis Synopsis
+\fish{synopsis}
+alias NAME DEFINITION
+alias NAME=DEFINITION
+\endfish
+
+\subsection alias-description Description
+
+`alias` is a simple wrapper for the `function` builtin. It exists for backwards compatibility with Posix shells. For other uses, it is recommended to define a <a href='#function'>function</a>.
+
+`fish` does not keep track of which functions have been defined using `alias`. They must be erased using `functions -e`.
+
+- `NAME` is the name of the alias
+
+- `DEFINITION` is the actual command to execute. The string `$argv` will be appended.
+
+You cannot create an alias to a function with the same name.
+
+
+\subsection alias-example Example
+
+The following code will create `rmi`, which runs `rm` with additional arguments on every invocation.
+
+\fish
+alias rmi "rm -i"
+
+# This is equivalent to entering the following function:
+
+function rmi
+    rm -i $argv
+end
+\endfish

doc_src/and.txt

@@ -1,23 +1,24 @@
-
-\section and and - Conditionally execute a command
+\section and and - conditionally execute a command
 
 \subsection and-synopsis Synopsis
- <tt>and COMMAND1; COMMAND2</tt>
+\fish{synopsis}
+COMMAND1; and COMMAND2
+\endfish
 
 \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. 
+`and` is used to execute a command if the current exit status (as set by the last previous command) is 0.
+
+`and` does not change the current exit status.
+
+The exit status of the last foreground command to exit can always be accessed using the <a href="index.html#variables-status">$status</a> variable.
+
 
 \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>
+The following code runs the `make` command to build a program. If the build succeeds, `make`'s exit status is 0, and the program is installed. If either step fails, the exit status is 1, and `make clean` is run, which removes the files created by the build process.
 
-\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
+\fish
+make; and make install; or make clean
+\endfish
 
-<pre>
-or and make; make install; make clean
-</pre>

doc_src/begin.txt

@@ -1,30 +1,45 @@
-
-\section begin begin - Start a new block of code
+\section begin begin - start a new block of code
 
 \subsection begin-synopsis Synopsis
- <tt>begin; [COMMAND;...] end </tt>
+\fish{synopsis}
+begin; [COMMANDS...;] end
+\endfish
 
 \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.
+`begin` is used to create a new block of code.
+
+The block is unconditionally executed. `begin; ...; end` is equivalent to `if true; ...; end`.
+
+`begin` is used to group a number of commands into a block. This allows the introduction of a new variable scope, redirection of the input or output of a set of commands as a group, or to specify precedence when using the conditional commands like `and`.
+
+`begin` does not change the current exit status.
+
 
 \subsection begin-example Example
 
-The following code sets a number of variables inside of a block
-scope. Since the variables are set inside the block and have local
-scope, they will be automatically deleted when the block ends.
+The following code sets a number of variables inside of a block scope. Since the variables are set inside the block and have local scope, they will be automatically deleted when the block ends.
 
-<pre>
+\fish
 begin
-	set -x PIRATE Yarrr
-	...
+    set -l PIRATE Yarrr
+    ...
 end
-# This will not output anything, since PIRATE went out of scope at the end of
-# the block and was killed
+
 echo $PIRATE
-</pre>
+# This will not output anything, since the PIRATE variable
+# went out of scope at the end of the block
+\endfish
+
+In the following code, all output is redirected to the file out.html.
+
+\fish
+begin
+    echo $xml_header
+    echo $html_header
+    if test -e $file
+        ...
+    end
+    ...
+end > out.html
+\endfish

doc_src/bg.txt

@@ -1,16 +1,17 @@
-\section bg bg - send to background
+\section bg bg - send jobs to background
 
 \subsection bg-synopsis Synopsis
-<tt>bg [PID...]</tt>
+\fish{synopsis}
+bg [PID...]
+\endfish
 
 \subsection bg-description Description
-Sends the specified jobs to the background. A background job is
-executed simultaneously with fish, and does not have access to the
-keyboard. If no job is specified, the last job to be used is put in the background. If PID is specified, the jobs with the specified group ids are put in the background.
 
-The PID of the desired process is usually found by using process globbing.
+`bg` sends <a href="index.html#syntax-job-control">jobs</a> to the background, resuming them if they are stopped. A background job is executed simultaneously with fish, and does not have access to the keyboard. If no job is specified, the last job to be used is put in the background. If PID is specified, the jobs with the specified process group IDs are put in the background.
+
+The PID of the desired process is usually found by using <a href="index.html#expand-process">process expansion</a>.
+
 
 \subsection bg-example Example
 
-<tt>bg \%0</tt> will put the job with job id 0 in the background.
-
+`bg %1` will put the job with job ID 1 in the background.

doc_src/bind.txt

@@ -1,16 +1,125 @@
-\section bind bind - Handle key bindings.
+\section bind bind - handle fish key bindings
 
 \subsection bind-synopsis Synopsis
-<tt>bind [OPTIONS] [BINDINGS...] </tt>
-
-The <tt>bind</tt> builtin causes fish to add the readline style bindings specified by <tt>BINDINGS</tt> to the list of key bindings. For more information on specifying keyboard bindings, use <tt>man readline</tt> to access the readline documentation.
+\fish{synopsis}
+bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE]
+     [(-k | --key)] SEQUENCE COMMAND [COMMAND...]
+bind [(-M | --mode) MODE] [(-k | --key)] SEQUENCE
+bind (-K | --key-names) [(-a | --all)]
+bind (-f | --function-names)
+bind (-e | --erase) [(-M | --mode) MODE]
+     (-a | --all | [(-k | --key)] SEQUENCE [SEQUENCE...])
+\endfish
 
 \subsection bind-description Description
-- <tt>-M MODE</tt> or <tt>--set-mode=MODE</tt> sets the current input mode to MODE. 
+
+`bind` adds a binding for the specified key sequence to the specified command.
+
+SEQUENCE is the character sequence to bind to. These should be written as <a href="index.html#escapes">fish escape sequences</a>. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the `\e` escape. For example, @key{Alt,w} can be written as `\ew`. The control character can be written in much the same way using the `\c` escape, for example @key{Control,X} (^X) can be written as `\cx`. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not `fish`.
+
+The default key binding can be set by specifying a `SEQUENCE` of the empty string (that is, ```''``` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the `self-insert` function (i.e. ```bind '' self-insert```) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
+
+If the `-k` switch is used, the name of the key (such as 'down', 'up' or 'backspace') is used instead of a sequence. The names used are the same as the corresponding curses variables, but without the 'key_' prefix. (See `terminfo(5)` for more information, or use `bind --key-names` for a list of all available named keys.)
+
+`COMMAND` can be any fish command, but it can also be one of a set of special input functions. These include functions for moving the cursor, operating on the kill-ring, performing tab completion, etc. Use `bind --function-names` for a complete list of these input functions.
+
+When `COMMAND` is a shellscript command, it is a good practice to put the actual code into a <a href="#function">function</a> and simply bind to the function name. This way it becomes significantly easier to test the function while editing, and the result is usually more readable as well.
+
+If such a script produces output, the script needs to finish by calling `commandline -f repaint` in order to tell fish that a repaint is in order.
+
+When multiple `COMMAND`s are provided, they are all run in the specified order when the key is pressed.
+
+If no `SEQUENCE` is provided, all bindings (or just the bindings in the specified `MODE`) are printed. If `SEQUENCE` is provided without `COMMAND`, just the binding matching that sequence is printed.
+
+Key bindings are not saved between sessions by default. To save custom keybindings, edit the `fish_user_key_bindings` function and insert the appropriate `bind` statements.
+
+Key bindings may use "modes", which mimics Vi's modal input behavior. The default mode is "default", and every bind applies to a single mode. The mode can be viewed/changed with the `$fish_bind_mode` variable.
+
+The following parameters are available:
+
+- `-k` or `--key` Specify a key name, such as 'left' or 'backspace' instead of a character sequence
+
+- `-K` or `--key-names` Display a list of available key names. Specifying `-a` or `--all` includes keys that don't have a known mapping
+
+- `-f` or `--function-names` Display a list of available input functions
+
+- `-M MODE` or `--mode MODE` Specify a bind mode that the bind is used in. Defaults to "default"
+
+- `-m NEW_MODE` or `--sets-mode NEW_MODE` Change the current mode to `NEW_MODE` after this binding is executed
+
+- `-e` or `--erase` Erase the binding with the given sequence and mode instead of defining a new one. Multiple sequences can be specified with this flag. Specifying `-a` or `--all` with `-M` or `--mode` erases all binds in the given mode regardless of sequence. Specifying `-a` or `--all` without `-M` or `--mode` erases all binds in all modes regardless of sequence.
+
+- `-a` or `--all` See `--erase` and `--key-names`
+
+The following special input functions are available:
+
+- `backward-char`, moves one character to the left
+
+- `backward-delete-char`, deletes one character of input to the left of the cursor
+
+- `backward-kill-line`, move everything from the beginning of the line to the cursor to the killring
+
+- `backward-kill-word`, move the word to the left of the cursor to the killring
+
+- `backward-word`, move one word to the left
+
+- `beginning-of-history`, move to the beginning of the history
+
+- `beginning-of-line`, move to the beginning of the line
+
+- `capitalize-word`, make the current word begin with a capital letter
+
+- `complete`, guess the remainder of the current token
+
+- `delete-char`, delete one character to the right of the cursor
+
+- `delete-line`, delete the entire line
+
+- `downcase-word`, make the current word lowercase
+
+- `dump-functions`, print a list of all key-bindings
+
+- `end-of-history`, move to the end of the history
+
+- `end-of-line`, move to the end of the line
+
+- `explain`, print a description of possible problems with the current command
+
+- `forward-char`, move one character to the right
+
+- `forward-word`, move one word to the right
+
+- `history-search-backward`, search the history for the previous match
+
+- `history-search-forward`, search the history for the next match
+
+- `kill-line`, move everything from the cursor to the end of the line to the killring
+
+- `kill-whole-line`, move the line to the killring
+
+- `kill-word`, move the next word to the killring
+
+- `upcase-word`, make the current word uppercase
+
+- `yank`, insert the latest entry of the killring into the buffer
+
+- `yank-pop`, rotate to the previous entry of the killring
 
 
-\subsection bind-example Example
+\subsection bind-example Examples
 
-<tt>bind -M vi</tt> changes to the vi input mode
+\fish
+bind \cd 'exit'
+\endfish
+Causes `fish` to exit when @key{Control,D} is pressed.
 
-<tt>bind '"\\M-j": jobs'</tt> Binds the jobs command to the Alt-j keyboard shortcut
+\fish
+bind -k ppage history-search-backward
+\endfish
+Performs a history search when the @key{Page Up} key is pressed.
+
+\fish
+set -g fish_key_bindings fish_vi_key_bindings
+bind -M insert \cc kill-whole-line force-repaint
+\endfish
+Turns on Vi key bindings and rebinds @key{Control,C} to clear the input line.

doc_src/block.txt

@@ -0,0 +1,41 @@
+\section block block - temporarily block delivery of events
+
+\subsection block-synopsis Synopsis
+\fish{synopsis}
+block [OPTIONS...]
+\endfish
+
+\subsection block-description Description
+
+`block` prevents events triggered by `fish` or the <a href="commands.html#emit">`emit`</a> command from being delivered and acted upon while the block is in place.
+
+In functions, `block` can be useful while performing work that should not be interrupted by the shell.
+
+The block can be removed. Any events which triggered while the block was in place will then be delivered.
+
+Event blocks should not be confused with code blocks, which are created with `begin`, `if`, `while` or `for`
+
+The following parameters are available:
+
+- `-l` or `--local` Release the block automatically at the end of the current innermost code block scope
+
+- `-g` or `--global` Never automatically release the lock
+
+- `-e` or `--erase` Release global block
+
+
+\subsection block-example Example
+
+\fish
+# Create a function that listens for events
+function --on-event foo foo; echo 'foo fired'; end
+
+# Block the delivery of events
+block -g
+
+emit foo
+# No output will be produced
+
+block -e
+# 'foo fired' will now be printed
+\endfish

doc_src/break.txt

@@ -1,21 +1,25 @@
-
-\section break break - stop the innermost currently evaluated loop
+\section break break - stop the current inner loop
 
 \subsection break-synopsis Synopsis
- <tt>LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end</tt>
+\fish{synopsis}
+LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
+\endfish
 
 \subsection break-description Description
-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.
+
+`break` halts 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.
+
+There are no parameters for `break`.
+
 
 \subsection break-example Example
-The following code searches all .c files for smurfs, and halts at the first occurance.
-<p>
-<tt>for i in *.c;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;if grep smurf $i;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo Smurfs are present in $i;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;break;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;end;
-<br>end;
-</tt>
-</p>
+The following code searches all .c files for "smurf", and halts at the first occurrence.
 
+\fish
+for i in *.c
+    if grep smurf $i
+        echo Smurfs are present in $i
+        break
+    end
+end
+\endfish

doc_src/breakpoint.txt

@@ -0,0 +1,14 @@
+\section breakpoint breakpoint - Launch debug mode
+
+\subsection breakpoint-synopsis Synopsis
+\fish{synopsis}
+breakpoint
+\endfish
+
+\subsection breakpoint-description Description
+
+`breakpoint` is used to halt a running script and launch an interactive debugging prompt.
+
+For more details, see <a href="index.html#debugging">Debugging fish scripts</a> in the `fish` manual.
+
+There are no parameters for `breakpoint`.

doc_src/builtin.txt

@@ -1,17 +1,22 @@
-
 \section builtin builtin - run a builtin command
 
 \subsection builtin-synopsis Synopsis
- <tt>builtin BUILTINNAME [OPTIONS...]</tt>
+\fish{synopsis}
+builtin BUILTINNAME [OPTIONS...]
+\endfish
 
 \subsection builtin-description Description
 
-- <tt>-n</tt> or <tt>--names</tt> List the names of all defined builtins
+`builtin` forces the shell to use a builtin command, rather than a function or program.
+
+The following parameters are available:
+
+- `-n` or `--names` List the names of all defined builtins
 
-Prefixing a command with the word 'builtin' forces fish to ignore any aliases with the same name.
 
 \subsection builtin-example Example
 
-<tt>builtin jobs</tt>
-
-causes fish to execute the jobs builtin, even if a function named jobs exists.
+\fish
+builtin jobs
+# executes the jobs builtin, even if a function named jobs exists
+\endfish

doc_src/case.txt

@@ -1,35 +1,42 @@
 \section case case - conditionally execute a block of commands
 
 \subsection case-synopsis Synopsis
-<tt>switch VALUE; [case [WILDCARD...]; [COMMANDS...];...] end</tt>
+\fish{synopsis}
+switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
+\endfish
 
 \subsection case-description Description
 
-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. The \c case statement is used together with the \c
-switch statement in order to determine which block should be
-performed.
+`switch` performs one of several blocks of commands, depending on whether a specified value equals one of several wildcarded values. `case` is used together with the `switch` statement in order to determine which block should be executed.
+
+Each `case` command is given one or more parameters. The first `case` command with a parameter that matches the string specified in the switch command will be evaluated. `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. Only the first matching case is executed.
+
+Note that command substitutions in a case statement will be evaluated even if its body is not taken. All substitutions, including command substitutions, must be performed before the value can be compared against the parameter.
+
 
 \subsection case-example Example
 
 If the variable \$animal contains the name of an animal, the following
 code would attempt to classify it:
 
-<p>
-<pre>
+\fish
 switch $animal
     case cat
         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
+    # Note that the next case has a wildcard which is quoted
+    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.
-</p>
+\endfish
+
+If the above code was run with `$animal` set to `whale`, the output
+would be `mammal`.
+

doc_src/cd.txt

@@ -1,12 +1,26 @@
 \section cd cd - change directory
 
 \subsection cd-synopsis Synopsis
-<tt>cd [DIRECTORY]</tt>
+\fish{synopsis}
+cd [DIRECTORY]
+\endfish
 
 \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.
+`cd` changes the current working directory.
+
+If `DIRECTORY` is supplied, it will become the new directory. If no parameter is given, the contents of the `HOME` environment variable will be used.
+
+If `DIRECTORY` is a relative path, the paths found in the `CDPATH` environment variable array will be tried as prefixes for the specified path.
+
+Note that the shell will attempt to change directory without requiring `cd` if the name of a directory is provided (starting with `.`, `/` or `~`, or ending with `/`).
+
+
+\subsection cd-example Examples
+
+\fish
+cd
+# changes the working directory to your home directory.
+
+cd /usr/src/fish-shell
+# changes the working directory to /usr/src/fish-shell
+\endfish

doc_src/command.txt

@@ -1,14 +1,24 @@
 \section command command - run a program
 
 \subsection command-synopsis Synopsis
-<tt>command COMMANDNAME [OPTIONS...]</tt>
+\fish{synopsis}
+command [OPTIONS] COMMANDNAME [ARGS...]
+\endfish
 
 \subsection command-description Description
-prefixing a command with the word 'command' forces fish to ignore any aliases or builtins with the same name.
 
-\subsection command-example Example
+`command` forces the shell to execute the program `COMMANDNAME` and ignore any functions or builtins with the same name.
 
+The following options are available:
 
-<tt>command ls</tt>
+- `-s` or `--search` returns the name of the disk file that would be executed, or nothing if no file with the specified name could be found in the `$PATH`.
 
-causes fish to execute the ls program, even if there exists a 'ls' alias.
+With the `-s` option, `command` treats every argument as a separate command to look up and sets the exit status to 0 if any of the specified commands were found, or 1 if no commands could be found.
+
+For basic compatibility with POSIX `command`, the `-v` flag is recognized as an alias for `-s`.
+
+\subsection command-example Examples
+
+`command ls` causes fish to execute the `ls` program, even if an `ls` function exists.
+
+`command -s ls` returns the path to the `ls` program.

doc_src/commandline.txt

@@ -1,51 +1,59 @@
-\section commandline commandline - Set or get the current commandline buffer
+\section commandline commandline - set or get the current command line buffer
 
 \subsection commandline-synopsis Synopsis
-<tt>commandline [OPTIONS] [CMD]</tt>
+\fish{synopsis}
+commandline [OPTIONS] [CMD]
+\endfish
 
 \subsection commandline-description Description
 
+`commandline` can be used to set or get the current contents of the command line buffer.
 
-- \c CMD is the new value of the commandline. If unspecified, the
-  current value of the commandline is written to standard output.
+With no parameters, `commandline` returns the current value of the command line.
 
-The following switches change the way \c commandline updates the
-commandline
+With `CMD` specified, the command line buffer is erased and replaced with the contents of `CMD`.
 
-- \c -a or \c --append do not remove the current commandline, append
-  the specified string at the end of it
-- \c -i or \c --insert do not remove the current commandline, insert
-  the specified string at the current cursor position
-- \c -r or \c --replace remove the current commandline and replace it
-  with the specified string (default)
+The following options are available:
 
-The following switches change what part of the commandline is printed
-or updated
+- `-C` or `--cursor` set or get the current cursor position, not the contents of the buffer. If no argument is given, the current cursor position is printed, otherwise the argument is interpreted as the new cursor position.
 
-- \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. 
+- `-f` or `--function` inject readline functions into the reader. This option cannot be combined with any other option. It will cause any additional arguments to be interpreted as readline functions, and these functions will be injected into the reader, so that they will be returned to the reader before any additional actual key presses are read.
 
-The following switch changes the way \c commandline prints the current
-commandline
+The following options change the way `commandline` updates the command line buffer:
 
-- \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
+- `-a` or `--append` do not remove the current commandline, append the specified string at the end of it
 
-Other switches
+- `-i` or `--insert` do not remove the current commandline, insert the specified string at the current cursor position
+
+- `-r` or `--replace` remove the current commandline and replace it with the specified string (default)
+
+The following options change what part of the commandline is printed or updated:
+
+- `-b` or `--current-buffer` select the entire buffer (default)
+
+- `-j` or `--current-job` select the current job
+
+- `-p` or `--current-process` select the current process
+
+- `-t` or `--current-token` select the current token.
+
+The following options change the way `commandline` prints the current commandline buffer:
+
+- `-c` or `--cut-at-cursor` only print selection up until the current cursor position
+
+- `-o` or `--tokenize` tokenize the selection and print one string-type token per line
+
+If `commandline` is called during a call to complete a given string using `complete -C STRING`, `commandline` will consider the specified string to be the current contents of the command line.
+
+The following options output metadata about the commandline state:
+
+- `-L` or `--line` print the line that the cursor is on, with the topmost line starting at 1
+
+- `-S` or `--search-mode` evaluates to true if the commandline is performing a history search
+
+- `-P` or `--paging-mode` evaluates to true if the commandline is showing pager contents, such as tab completions
 
-- \c -f or \c --function inject readline functions into the
-  reader. This option can not be combined with any other option. It
-  will cause any additional arguments to be interpreted as readline
-  functions, and these functions will be injected into the reader, so
-  that they will be returned to the reader before any additional
-  actual keypresses are read.
 
 \subsection commandline-example Example
 
-<tt>commandline -j $history[3]</tt>
-
-replaces the job under the cursor with the third item from the
-commandline history.
+`commandline -j $history[3]` replaces the job under the cursor with the third item from the command line history.

doc_src/commands.hdr.in

@@ -0,0 +1,38 @@
+/**
+\page commands Commands
+\htmlonly[block]
+<div class="fish_left_bar">
+<div class="logo"></div>
+<div class="menu commands_menu">
+\endhtmlonly
+@command_list_toc@
+
+\htmlonly[block]
+</div>
+</div>
+<div class="commands fish_right_bar">
+<h1 class="interior_title">Command reference</h1>
+\endhtmlonly
+`fish` ships with a large number of builtin commands, shellscript functions and external commands. These are all described below.
+
+Almost all fish commands respond to the `-h` or `--help` options to display their relevant help, also accessible using the `help` and `man` commands, like so:
+
+\fish
+echo -h
+echo --help
+# Prints help to the terminal window
+
+man echo
+# Displays the man page in the system pager
+# (normally 'less', 'more' or 'most').
+
+help echo
+# Open a web browser to show the relevant documentation
+\endfish
+
+@command_list@
+
+\htmlonly[block]
+</div>
+\endhtmlonly
+*/

doc_src/complete.txt

@@ -1,67 +1,103 @@
-\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>
+\fish{synopsis}
+complete ( -c | --command | -p | --path ) COMMAND
+        [( -s | --short-option ) SHORT_OPTION]
+        [( -l | --long-option | -o | --old-option ) LONG_OPTION]
+        [( -a | --arguments ) OPTION_ARGUMENTS]
+        [( -w | --wraps ) WRAPPED_COMMAND]
+        [( -d | --description ) DESCRIPTION]
+\endfish
 
 \subsection complete-description Description
-- <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>-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>-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
-- <tt>-x</tt> or <tt>--exclusive</tt> implies both <tt>-r</tt> and <tt>-f</tt>
 
-Command specific tab-completions in \c fish are based on the notion
-of options and arguments. An option is a parameter which begins with a
-hyphen, such as '-h', '-help' or '--help'. Arguments are parameters
-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:
+For an introduction to specifying completions, see <a
+href='index.html#completion-own'>Writing your own completions</a> in
+the fish manual.
 
-- 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').
+- `COMMAND` is the name of the command for which to add a completion.
 
-\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.
+- `SHORT_OPTION` is a one character option for the command.
+
+- `LONG_OPTION` is a multi character option for the command.
+
+- `OPTION_ARGUMENTS` is parameter containing a space-separated list of possible option-arguments, which may contain subshells.
+
+- `DESCRIPTION` is a description of what the option and/or option arguments do.
+
+- `-C STRING` or `--do-complete=STRING` makes complete try to find all possible completions for the specified string.
+
+- `-w WRAPPED_COMMAND` or `--wraps=WRAPPED_COMMAND` causes the specified command to inherit completions from the wrapped command.
+
+- `-e` or `--erase` implies that the specified completion should be deleted.
+
+- `-f` or `--no-files` specifies that the option specified by this completion may not be followed by a filename.
+
+- `-n` or `--condition` 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.
+
+- `-o` or `--old-option` implies that the command uses old long style options with only one dash.
+
+- `-p` or `--path` implies that the string `COMMAND` is the full path of the command.
+
+- `-r` or `--require-parameter` specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option.
+
+- `-u` or `--unauthoritative` implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors.
+
+- `-A` or `--authoritative` implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors.
+
+- `-x` or `--exclusive` implies both `-r` and `-f`.
+
+Command specific tab-completions in `fish` are based on the notion of options and arguments. An option is a parameter which begins with a hyphen, such as '`-h`', '`-help`' or '`--help`'. Arguments are parameters 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 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`') 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').
+
+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.
+
+The `-w` or `--wraps` options causes the specified command to inherit completions from another command. The inheriting command is said to "wrap" the inherited command. The wrapping command may have its own completions in addition to inherited ones. A command may wrap multiple commands, and wrapping is transitive: if A wraps B, and B wraps C, then A automatically inherits all of C's completions. Wrapping can be removed using the `-e` or `--erase` options.
+
+When erasing completions, it is possible to either erase all completions for a specific command by specifying `complete -e -c COMMAND`, or by specifying a specific completion option to delete by specifying either a long, short or old style option.
 
-When erasing completions, it is possible to either erase all
-completions for a specific command by specifying <tt>complete -e -c
-COMMAND</tt>, or by specifying a specific completion option to delete
-by specifying either a long, short or old style option.
 
 \subsection complete-example Example
 
-The short style option <tt>-o</tt> for the \c gcc command requires
-that a file follows it.  This can be done using writing <tt>complete
--c gcc -s o -r</tt>.
+The short style option `-o` for the `gcc` command requires that a file follows it.  This can be done using writing:
 
-The short style option <tt>-d</tt> for the \c grep command requires
-that one of the strings 'read', 'skip' or 'recurse' is used.  This can
-be specified writing <tt>complete -c grep -s d -x -a "read skip
-recurse"</tt>.
+\fish
+complete -c gcc -s o -r
+\endfish
 
-The \c su command takes any username as an argument. Usernames are
-given as the first colon-separated field in the file /etc/passwd. This
-can be specified as: <tt>complete -x -c su -d "Username" -a "(cat
-/etc/passwd|cut -d : -f 1)" </tt>.
+The short style option `-d` for the `grep` command requires that one of the strings '`read`', '`skip`' or '`recurse`' is used.  This can be specified writing:
 
-The \c rpm command has several different modes. If the \c -e or \c
---erase flag has been specified, \c rpm should delete one or more
-packages, in which case several switches related to deleting packages
-are valid, like the \c nodeps switch.
+\fish
+complete -c grep -s d -x -a "read skip recurse"
+\endfish
+
+The `su` command takes any username as an argument. Usernames are given as the first colon-separated field in the file /etc/passwd. This can be specified as:
+
+\fish
+complete -x -c su -d "Username" -a "(cat /etc/passwd | cut -d : -f 1)"
+\endfish
+
+The `rpm` command has several different modes. If the `-e` or `--erase` flag has been specified, `rpm` should delete one or more packages, in which case several switches related to deleting packages are valid, like the `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>
+\fish
+complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d "Don't check dependencies"
+\endfish
 
-where \c __fish_contains_opt is a function that checks the commandline buffer for the presense of a specified set of options. 
+where `__fish_contains_opt` is a function that checks the commandline buffer for the presence of a specified set of options.
+
+To implement an alias, use the `-w` or `--wraps` option:
+
+\fish
+complete -c hub -w git
+\endfish
+
+Now hub inherits all of the completions from git. Note this can also be specified in a function declaration.
 

doc_src/contains.txt

@@ -0,0 +1,38 @@
+\section contains contains - test if a word is present in a list
+
+\subsection contains-synopsis Synopsis
+\fish{synopsis}
+contains [OPTIONS] KEY [VALUES...]
+\endfish
+
+\subsection contains-description Description
+
+`contains` tests whether the set `VALUES` contains the string `KEY`. If so, `contains` exits with status 0; if not, it exits with status 1.
+
+The following options are available:
+
+- `-i` or `--index` print the word index
+
+Note that, like GNU tools, `contains` interprets all arguments starting with a `-` as options to contains, until it reaches an argument that is `--` (two dashes). See the examples below.
+
+\subsection contains-example Example
+
+\fish
+for i in ~/bin /usr/local/bin
+    if not contains $i $PATH
+        set PATH $PATH $i
+    end
+end
+\endfish
+
+The above code tests if `~/bin` and `/usr/local/bin` are in the path and adds them if not.
+
+\fish
+function hasargs
+    if contains -- -q $argv
+        echo '$argv contains a -q option'
+    end
+end
+\endfish
+
+The above code checks for `-q` in the argument list, using the `--` argument to demarcate options to `contains` from the key to search for.

doc_src/continue.txt

@@ -1,20 +1,23 @@
-
-\section continue continue - skip the rest of the current lap of the innermost currently evaluated loop
+\section continue continue - skip the remainder of the current iteration of the current inner loop
 
 \subsection continue-synopsis Synopsis
-<tt>LOOP_CONSTRUCT; [COMMANDS...] continue; [COMMANDS...] end</tt>
+\fish{synopsis}
+LOOP_CONSTRUCT; [COMMANDS...;] continue; [COMMANDS...;] end
+\endfish
 
 \subsection continue-description Description
-The \c continue builtin is used to skip the current lap of the innermost 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.
+
+`continue` skips the remainder of the current iteration of the current inner 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 continue-example Example
-The following code removes all tmp files without smurfs.
-<p>
-<tt>for i in *.tmp;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;if grep smurf $i;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;continue;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;end;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;rm $i;
-<br>end;
-</tt>
-</p>
+
+The following code removes all tmp files that do not contain the word smurf.
+
+\fish
+for i in *.tmp
+    if grep smurf $i
+        continue
+    end
+    rm $i
+end
+\endfish

doc_src/count.txt

@@ -1,33 +1,25 @@
-
-\section count count - Count the number of elements of an array
+\section count count - count the number of elements of an array
 
 \subsection count-synopsis Synopsis
- <tt>count $VARIABLE</tt>
+\fish{synopsis}
+count $VARIABLE
+\endfish
 
 \subsection count-description Description
 
-<tt>count</tt> returns 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. 
+`count` 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.
+
+`count` does not accept any options, including `-h` or `--help`.
+
+`count` exits with a non-zero exit status if no arguments were passed to it, and with zero if at least one argument was passed.
 
-The count command does not accept any options, not even '-h'. This way
-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.
 
 \subsection count-example Example
 
-<pre>
+\fish
 count $PATH
-</pre>
+# Returns the number of directories in the users PATH variable.
 
-returns the number of directories in the users PATH variable.
-
-<pre>
 count *.txt
-</pre>
-
-returns the number of files in the current working directory ending with the suffix '.txt'.
+# Returns the number of files in the current working directory ending with the suffix '.txt'.
+\endfish

doc_src/design.hdr

@@ -0,0 +1,110 @@
+/**
+\page design Design document
+\htmlonly[block]
+<div class="fish_only_bar">
+<div class="design">
+<h1 class="interior_title">Design documentation</h1>
+\endhtmlonly
+
+\section design-overview Overview
+
+This is a description of the design principles that have been used to design fish. The fish design has three high level goals. These are:
+
+-# Everything that can be done in other shell languages should be possible to do in fish, though fish may rely on external commands in doing so.
+
+-# Fish should be user friendly, but not at the expense of expressiveness. Most tradeoffs between power and ease of use can be avoided with careful design.
+
+-# Whenever possible without breaking the above goals, fish should follow the Posix syntax.
+
+To achieve these high-level goals, the fish design relies on a number of more specific design principles. These are presented below, together with a rationale and a few examples for each.
+
+
+\section ortho The law of orthogonality
+
+The shell language should have a small set of orthogonal features. Any situation where two features are related but not identical, one of them should be removed, and the other should be made powerful and general enough to handle all common use cases of either feature.
+
+Rationale:
+
+Related features make the language larger, which makes it harder to learn. It also increases the size of the source code, making the program harder to maintain and update.
+
+Examples:
+
+- Here documents are too similar to using echo inside of a pipeline.
+
+- Subshells, command substitution and process substitution are strongly related. `fish` only supports command substitution, the others can be achieved either using a block or the psub shellscript function.
+
+- Having both aliases and functions is confusing, especially since both of them have limitations and problems. `fish` functions have none of the drawbacks of either syntax.
+
+- The many Posix quoting styles are silly, especially $''.
+
+
+\section design-response The law of responsiveness
+
+The shell should attempt to remain responsive to the user at all times, even in the face of contended or unresponsive filesystems. It is only acceptable to block in response to a user initiated action, such as running a command.
+
+Rationale:
+Bad performance increases user-facing complexity, because it trains users to recognize and route around slow use cases. It is also incredibly frustrating.
+
+Examples:
+
+- Features like syntax highlighting and autosuggestions must perform all of their disk I/O asynchronously.
+
+- Startup should minimize forks and disk I/O, so that fish can be started even if the system is under load.
+
+\section design-configurability Configurability is the root of all evil
+
+Every configuration option in a program is a place where the program is too stupid to figure out for itself what the user really wants, and should be considered a failure of both the program and the programmer who implemented it.
+
+Rationale:
+Different configuration options are a nightmare to maintain, since the number of potential bugs caused by specific configuration combinations quickly becomes an issue. Configuration options often imply assumptions about the code which change when reimplementing the code, causing issues with backwards compatibility. But mostly, configuration options should be avoided since they simply should not exist, as the program should be smart enough to do what is best, or at least a good enough approximation of it.
+
+Examples:
+
+- Fish allows the user to set various syntax highlighting colors. This is needed because fish does not know what colors the terminal uses by default, which might make some things unreadable. The proper solution would be for text color preferences to be defined centrally by the user for all programs, and for the terminal emulator to send these color properties to fish.
+
+- Fish does not allow you to set the history filename, the number of history entries, different language substyles or any number of other common shell configuration options.
+
+A special note on the evils of configurability is the long list of very useful features found in some shells, that are not turned on by default. Both zsh and bash support command-specific completions, but no such completions are shipped with bash by default, and they are turned off by default in zsh. Other features that zsh supports that are disabled by default include tab-completion of strings containing wildcards, a sane completion pager and a history file.
+
+\section user The law of user focus
+
+When designing a program, one should first think about how to make a intuitive and powerful program. Implementation issues should only be considered once a user interface has been designed.
+
+Rationale:
+
+This design rule is different than the others, since it describes how one should go about designing new features, not what the features should be. The problem with focusing on what can be done, and what is easy to do, is that too much of the implementation is exposed. This means that the user must know a great deal about the underlying system to be able to guess how the shell works, it also means that the language will often be rather low-level.
+
+Examples:
+- There should only be one type of input to the shell, lists of commands. Loops, conditionals and variable assignments are all performed through regular commands.
+
+- The differences between built-in commands and shellscript functions should be made as small as possible. Built-ins and shellscript functions should have exactly the same types of argument expansion as other commands, should be possible to use in any position in a pipeline, and should support any I/O redirection.
+
+- Instead of forking when performing command substitution to provide a fake variable scope, all fish commands are performed from the same process, and fish instead supports true scoping.
+
+- All blocks end with the `end` built-in.
+
+\section disc The law of discoverability
+
+A program should be designed to make its features as easy as possible to discover for the user.
+
+Rationale:
+A program whose features are discoverable turns a new user into an expert in a shorter span of time, since the user will become an expert on the program simply by using it.
+
+The main benefit of a graphical program over a command-line-based program is discoverability. In a graphical program, one can discover all the common features by simply looking at the user interface and guessing what the different buttons, menus and other widgets do. The traditional way to discover features in command-line programs is through manual pages. This requires both that the user starts to use a different program, and then she/he remembers the new information until the next time she/he uses the same program.
+
+Examples:
+- Everything should be tab-completable, and every tab completion should have a description.
+
+- Every syntax error and error in a built-in command should contain an error message describing what went wrong and a relevant help page. Whenever possible, errors should be flagged red by the syntax highlighter.
+
+- The help manual should be easy to read, easily available from the shell, complete and contain many examples
+
+- The language should be uniform, so that once the user understands the command/argument syntax, she/he will know the whole language, and be able to use tab-completion to discover new features.
+
+
+\htmlonly[block]
+</div>
+</div>
+\endhtmlonly
+
+*/

doc_src/dirh.txt

@@ -1,8 +1,12 @@
-\section dirh dirh
+\section dirh dirh - print directory history
 
 \subsection dirh-synopsis Synopsis
-<tt>dirh</tt>
+\fish{synopsis}
+dirh
+\endfish
 
-\subsection dirh-description Description 
-<tt>dirh</tt> prints the current directory history. The current position in the
-history is highlighted using <tt>$fish_color_history_current</tt>.
+\subsection dirh-description Description
+
+`dirh` prints the current directory history. The current position in the history is highlighted using the color defined in the `fish_color_history_current` environment variable.
+
+`dirh` does not accept any parameters.

doc_src/dirs.txt

@@ -1,7 +1,12 @@
-\section dirs dirs
+\section dirs dirs - print directory stack
 
 \subsection dirs-synopsis Synopsis
-<tt>dirs</tt>
+\fish{synopsis}
+dirs
+\endfish
 
-\subsection dirs-description Description 
-<tt>dirs</tt> prints the current directory stack.
+\subsection dirs-description Description
+
+`dirs` prints the current directory stack, as created by the <a href="#pushd">`pushd`</a> command.
+
+`dirs` does not accept any parameters.

doc_src/echo.txt

@@ -0,0 +1,60 @@
+\section echo echo - display a line of text
+
+\subsection echo-synopsis Synopsis
+\fish{synopsis}
+echo [OPTIONS] [STRING]
+\endfish
+
+\subsection echo-description Description
+
+`echo` displays a string of text.
+
+The following options are available:
+
+- `-n`, Do not output a newline
+
+- `-s`, Do not separate arguments with spaces
+
+- `-E`, Disable interpretation of backslash escapes (default)
+
+- `-e`, Enable interpretation of backslash escapes
+
+\subsection echo-escapes Escape Sequences
+
+If `-e` is used, the following sequences are recognized:
+
+- `\` backslash
+
+- `\a` alert (BEL)
+
+- `\b` backspace
+
+- `\c` produce no further output
+
+- `\e` escape
+
+- `\f` form feed
+
+- `\n` new line
+
+- `\r` carriage return
+
+- `\t` horizontal tab
+
+- `\v` vertical tab
+
+- `\0NNN` byte with octal value NNN (1 to 3 digits)
+
+- `\xHH` byte with hexadecimal value HH (1 to 2 digits)
+
+\subsection echo-example Example
+
+\fish
+echo 'Hello World'
+\endfish
+Print hello world to stdout
+
+\fish
+echo -e 'Top\nBottom'
+\endfish
+Print Top and Bottom on separate lines, using an escape sequence

doc_src/else.txt

@@ -1,17 +1,23 @@
-\section else else - execute command if a condition is not met.
+\section else else - execute command if a condition is not met
 
 \subsection else-synopsis Synopsis
-<tt>if CONDITION; COMMAND_TRUE [else; COMMAND_FALSE] end;</tt>
+\fish{synopsis}
+if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
+\endfish
 
 \subsection else-description Description
-<tt>if</tt> will execute the command CONDITION. If the commands exit
-status is zero, the command COMMAND_TRUE will execute. If it is
-not zero and COMMAND_FALSE is specified, COMMAND_FALSE will be
-executed.
+
+`if` will execute the command `CONDITION`. If the condition's exit status is 0, the commands `COMMANDS_TRUE` will execute. If it is not 0 and `else` is given, `COMMANDS_FALSE` will be executed.
+
 
 \subsection else-example Example
 
-The command <tt>if test -f foo.txt; echo foo.txt exists; else; echo foo.txt does not exist; end</tt>
-will print <tt>foo.txt exists</tt> if the file foo.txt
-exists and is a regular file, otherwise it will print 
-<tt>foo.txt does not exist</tt>.
+The following code tests whether a file `foo.txt` exists as a regular file.
+
+\fish
+if test -f foo.txt
+    echo foo.txt exists
+else
+    echo foo.txt does not exist
+end
+\endfish

doc_src/emit.txt

@@ -0,0 +1,23 @@
+\section emit emit - Emit a generic event
+
+\subsection emit-synopsis Synopsis
+\fish{synopsis}
+emit EVENT_NAME [ARGUMENTS...]
+\endfish
+
+\subsection emit-description Description
+
+`emit` emits, or fires, an event. Events are delivered to, or caught by, special functions called event handlers. The arguments are passed to the event handlers as function arguments.
+
+
+\subsection emit-example Example
+
+The following code first defines an event handler for the generic event named 'test_event', and then emits an event of that type.
+
+\fish
+function event_test --on-event test_event
+    echo event test: $argv
+end
+
+emit test_event something
+\endfish

doc_src/end.txt

@@ -1,13 +1,19 @@
 \section end end - end a block of commands.
 
 \subsection end-synopsis Synopsis
-<pre>for VARNAME in [VALUES...]; COMMANDS; end
-if CONDITION; COMMAND_TRUE [else; COMMAND_FALSE] end
-while CONDITION; COMMANDS; end
-switch VALUE; [case [WILDCARD...]; [COMMANDS...];...] end
-</pre>
+\fish{synopsis}
+begin; [COMMANDS...] end
+if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
+while CONDITION; COMMANDS...; end
+for VARNAME in [VALUES...]; COMMANDS...; end
+switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
+\endfish
 
 \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 \
-while.
+
+`end` ends a block of commands.
+
+For more information, read the
+documentation for the block constructs, such as `if`, `for` and `while`.
+
+The `end` command does not change the current exit status.

doc_src/eval.txt

@@ -1,16 +1,20 @@
-\section eval eval - eval the specified commands
+\section eval eval - evaluate the specified commands
 
 \subsection eval-synopsis Synopsis
-<tt>eval [COMMANDS...]</tt>
+\fish{synopsis}
+eval [COMMANDS...]
+\endfish
 
 \subsection eval-description Description
-The <tt>eval</tt> builtin causes fish to evaluate the specified parameters as a command. If more than one parameter is specified, all parameters will be joined using a space character as a separator.
+`eval` evaluates the specified parameters as a command. If more than one parameter is specified, all parameters will be joined using a space character as a separator.
+
 
 \subsection eval-example Example
 
-<pre>
+The following code will call the ls command. Note that `fish` does not support the use of shell variables as direct commands; `eval` can be used to work around this.
+
+\fish
 set cmd ls
 eval $cmd
-</pre>
+\endfish
 
-will call the ls command.

doc_src/exec.txt

@@ -1,16 +1,15 @@
-
-\section exec exec - Execute command in current process
+\section exec exec - execute command in current process
 
 \subsection exec-synopsis Synopsis
- <tt>exec COMMAND [OPTIONS...]</tt>
+\fish{synopsis}
+exec COMMAND [OPTIONS...]
+\endfish
 
 \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. 
+`exec` replaces the currently running shell with a new command. On successful completion, `exec` never returns. `exec` cannot be used inside a pipeline.
+
 
 \subsection exec-example Example
 
-<tt>exec emacs</tt> starts up the emacs text editor. When emacs exits,
-the session will terminate.
+`exec emacs` starts up the emacs text editor, and exits `fish`. When emacs exits, the session will terminate.

doc_src/exit.txt

@@ -1,14 +1,12 @@
-\section exit exit - exit the shell.
+\section exit exit - exit the shell
 
 \subsection exit-synopsis Synopsis
-<tt>exit [STATUS]</tt>
+\fish{synopsis}
+exit [STATUS]
+\endfish
 
 \subsection exit-description Description
 
-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.
+`exit` causes fish to exit. If `STATUS` is supplied, it will be converted to an integer and used as the exit 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.
+If exit is called while sourcing a file (using the <a href="#source">source</a> builtin) the rest of the file will be skipped, but the shell itself will not exit.

doc_src/false.txt

@@ -0,0 +1,10 @@
+\section false false - return an unsuccessful result
+
+\subsection false-synopsis Synopsis
+\fish{synopsis}
+false
+\endfish
+
+\subsection false-description Description
+
+`false` sets the exit status to 1.

doc_src/faq.hdr

@@ -0,0 +1,222 @@
+/**
+\page faq Frequently asked questions
+\htmlonly[block]
+<div class="fish_left_bar">
+<div class="logo"></div>
+<div class="menu faq_menu">
+
+\endhtmlonly
+
+- <a href='#faq-envvar'>How do I set or clear an environment variable?</a>
+- <a href='#faq-login-cmd'>How do I run a command every login? What's fish's equivalent to `.bashrc`?</a>
+- <a href='#faq-prompt'>How do I set my prompt?</a>
+- <a href='#faq-cmd-history'>How do I run a command from history?</a>
+- <a href='#faq-subcommand'>How do I run a subcommand? The backtick doesn't work!</a>
+- <a href='#faq-exit-status'>How do I get the exit status of a command?</a>
+- <a href='#faq-single-env'>How do I set an environment variable for just one command?</a>
+- <a href='#faq-customize-colors'>How do I customize my syntax highlighting colors?</a>
+- <a href='#faq-update-manpage-completions'>How do I update man page completions?</a>
+- <a href='#faq-cwd-symlink'>Why does cd, pwd and other fish commands always resolve symlinked directories to their canonical path?</a>
+- <a href='#faq-cd-implicit'>I accidentally entered a directory path and fish changed directory. What happened?</a>
+- <a href='#faq-open'>The open command doesn't work.</a>
+- <a href='#faq-default'>How do I make fish my default shell?</a>
+- <a href='#faq-titlebar'>I'm seeing weird output before each prompt when using screen. What's wrong?</a>
+- <a href='#faq-greeting'>How do I change the greeting message?</a>
+- <a href='#faq-history'>Why doesn't history substitution ("!$" etc.) work?</a>
+- <a href='#faq-uninstalling'>How do I uninstall fish?</a>
+
+\htmlonly[block]
+</div>
+</div>
+<div class="faq fish_right_bar">
+<h1 class="interior_title">Frequently Asked Questions</h1>
+\endhtmlonly
+
+
+\section faq-envvar How do I set or clear an environment variable?
+
+Use the <a href="commands.html#set">`set`</a> command:
+
+\fish{cli-dark}
+set -x key value
+set -e key
+\endfish
+
+
+\section faq-login-cmd How do I run a command every login? What's fish's equivalent to .bashrc?
+
+Edit the file `~/.config/fish/config.fish`, creating it if it does not exist (Note the leading period).
+
+<hr>
+\section faq-prompt How do I set my prompt?
+
+The prompt is the output of the `fish_prompt` function. Put it in `~/.config/fish/functions/fish_prompt.fish`. For example, a simple prompt is:
+
+\fish{cli-dark}
+function fish_prompt
+    set_color $fish_color_cwd
+    echo -n (prompt_pwd)
+    set_color normal
+    echo -n ' > '
+end
+\endfish
+
+You can also use the Web configuration tool, <a href="commands.html#fish_config">`fish_config`</a>, to preview and choose from a gallery of sample prompts.
+
+
+\section faq-cmd-history How do I run a command from history?
+
+Type some part of the command, and then hit the @cursor_key{&uarr;,up} or @cursor_key{&darr;,down} arrow keys to navigate through history matches.
+
+<hr>
+\section faq-subcommand How do I run a subcommand? The backtick doesn't work!
+
+`fish` uses parentheses for subcommands. For example:
+
+\fish{cli-dark}
+for i in (ls)
+    echo $i
+end
+\endfish
+
+
+\section faq-exit-status How do I get the exit status of a command?
+
+Use the `$status` variable. This replaces the `$?` variable used in some other shells.
+
+<hr>
+\section faq-single-env How do I set an environment variable for just one command?
+
+<i>`SOME_VAR=1 command` produces an error: `Unknown command "SOME_VAR=1"`.</i>
+
+Use the `env` command.
+
+`env SOME_VAR=1 command`
+
+You can also declare a local variable in a block:
+
+\fish{cli-dark}
+begin
+    set -lx SOME_VAR 1
+    command
+end
+\endfish
+
+
+\section faq-customize-colors How do I customize my syntax highlighting colors?
+
+Use the web configuration tool, <a href="commands.html#fish_config">`fish_config`</a>, or alter the <a href="index.html#variables-color">`fish_color` family of environment variables</a>.
+
+<hr>
+\section faq-update-manpage-completions How do I update man page completions?
+
+Use the <a href="commands.html#fish_update_completions">`fish_update_completions`</a> command.
+
+<hr>
+\section faq-cwd-symlink Why does cd, $PWD and and various fish commands always resolve symlinked directories to their canonical path?
+
+<i>For example if `~/images` is a symlink to `~/Documents/Images`, if I write '`cd images`', my prompt will say `~/Documents/Images`, not `~/images`.</i>
+
+Because it is impossible to consistently keep symlinked directories unresolved. It is indeed possible to do this partially, and many other shells do so. But it was felt there are enough serious corner cases that this is a bad idea. Most such issues have to do with how '..' is handled, and are varitations of the following example:
+
+Writing `cd images; ls ..` given the above directory structure would list the contents of `~/Documents`, not of `~`, even though using `cd ..` changes the current directory to `~`, and the prompt, the `pwd` builtin and many other directory information sources suggest that the current directory is `~/images` and its parent is `~`. This issue is not possible to fix without either making every single command into a builtin, breaking Unix semantics or implementing kludges in every single command. This issue can also be seen when doing IO redirection.
+
+Another related issue is that many programs that operate on recursive directory trees, like the find command, silently ignore symlinked directories. For example, ```find $PWD -name '*.txt'``` silently fails in shells that don't resolve symlinked paths.
+
+<hr>
+\section faq-cd-implicit I accidentally entered a directory path and fish changed directory. What happened?
+
+If fish is unable to locate a command with a given name, and it starts with '`.`', '`/`' or '`~`', fish will test if a directory of that name exists. If it does, it is implicitly assumed that you want to change working directory. For example, the fastest way to switch to your home directory is to simply press `~` and enter.
+
+<hr>
+\section faq-open The open command doesn't work.
+
+The `open` command uses the MIME type database and the `.desktop` files used by Gnome and KDE to identify filetypes and default actions. If at least one of these environments is installed, but the open command is not working, this probably means that the relevant files are installed in a non-standard location. Consider <a href="index.html#more-help">asking for more help</a>.
+
+<hr>
+\section faq-default How do I make fish my default shell?
+
+If you installed fish manually (e.g. by compiling it, not by using a package manager), you first need to add fish to the list of shells by executing the following command (assuming you installed fish in /usr/local) as root:
+
+\fish{cli-dark}
+echo /usr/local/bin/fish >>/etc/shells
+\endfish
+
+If you installed a prepackaged version of fish, the package manager should have already done this for you.
+
+In order to change your default shell, type:
+
+\fish{cli-dark}
+chsh -s /usr/local/bin/fish
+\endfish
+
+You may need to adjust the above path to e.g. `/usr/bin/fish`. Use the command `which fish` if you are unsure of where fish is installed.
+
+Unfortunately, there is no way to make the changes take effect at once. You will need to log out and back in again.
+
+<hr>
+\section faq-titlebar I'm seeing weird output before each prompt when using screen. What's wrong?
+
+Quick answer:
+
+Run the following command in fish:
+
+\fish{cli-dark}
+function fish_title; end; funcsave fish_title
+\endfish
+
+Problem solved!
+
+The long answer:
+
+Fish is trying to set the titlebar message of your terminal. While screen itself supports this feature, your terminal does not. Unfortunately, when the underlying terminal doesn't support setting the titlebar, screen simply passes through the escape codes and text to the underlying terminal instead of ignoring them. It is impossible to detect and resolve this problem from inside fish since fish has no way of knowing what the underlying terminal type is. For now, the only way to fix this is to unset the titlebar message, as suggested above.
+
+Note that fish has a default titlebar message, which will be used if the fish_title function is undefined. So simply unsetting the fish_title function will not work.
+
+<hr>
+\section faq-greeting How do I change the greeting message?
+
+Change the value of the variable `fish_greeting` or create a `fish_greeting` function. For example, to remove the greeting use:
+
+\fish{cli-dark}
+set fish_greeting
+\endfish
+
+
+\section faq-history Why doesn't history substitution ("!$" etc.) work?
+
+Because history substitution is an awkward interface that was invented before interactive line editing was even possible.  Fish drops it in favor of perfecting the interactive history recall interface.  Switching requires a small change of habits: if you want to modify an old line/word, first recall it, then edit.  E.g. don't type "sudo !!" - first press Up, then Home, then type "sudo ".
+
+Fish history recall is very simple yet effective:
+
+- As in any modern shell, the Up arrow, @cursor_key{&uarr;,Up} recalls whole lines, starting from the last line executed.  A single press replaces "!!", later presses replace "!-3" and the like.
+
+  - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
+
+- @key{Alt,&uarr;,Up} recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
+
+  - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press @key{Alt,&uarr;,Up}.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
+
+  - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (@key{Alt,D} and @key{Alt,Backspace} are your friends).
+
+See <a href='index.html#editor'>documentation</a> for more details about line editing in fish.
+
+<hr>
+\section faq-uninstalling Uninstalling fish
+
+Should you wish to uninstall fish, first ensure fish is not set as your shell. Run `chsh -s /bin/bash` if you are not sure.
+
+Next, do the following (assuming fish was installed to /usr/local):
+
+\fish{cli-dark}
+rm -Rf /usr/local/etc/fish /usr/local/share/fish ~/.config/fish
+rm /usr/local/share/man/man1/fish*.1
+cd /usr/local/bin
+rm -f fish mimedb fishd fish_indent
+\endfish
+
+\htmlonly[block]
+</div>
+\endhtmlonly
+
+*/

doc_src/fg.txt

@@ -1,14 +1,17 @@
-\section fg fg - send job to foreground
+\section fg fg - bring job to foreground
 
 \subsection fg-synopsis Synopsis
-<tt>fg [PID]</tt>
+\fish{synopsis}
+fg [PID]
+\endfish
 
 \subsection fg-description Description
-Sends the specified job to the foreground. While a foreground job is
-executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group id is put in the foreground.
 
-The PID of the desired process is usually found by using process globbing.
+`fg` brings the specified <a href="index.html#syntax-job-control">job</a> to the foreground, resuming it if it is stopped. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group ID is put in the foreground.
+
+The PID of the desired process is usually found by using <a href="index.html#expand-process">process expansion</a>.
+
 
 \subsection fg-example Example
 
-<tt>fg \%0</tt> will put the job with job id 0 in the foreground.
+`fg %1` will put the job with job ID 1 in the foreground.

doc_src/fish.1.in

@@ -1,27 +0,0 @@
-.TH fish 1  "February 25, 2005" "version @PACKAGE_VERSION@" "USER COMMANDS"
-.SH NAME
-fish - friendly interactive shell
-.SH SYNOPSIS
-.B fish
-[\-h] [\-v] [\-c command] [FILE [ARGUMENTS...]]
-.SH DESCRIPTION
-A shell written mainly with interactive use in mind. The complete fish manuals are written in HTML format. You can find them by using the
-.I
-help
-command from inside the fish shell.
-
-.SH OPTIONS
-.TP
-\-h
-display help and exit
-.TP
-\-c
-Evaluate the specified commands instead of reading from the commandline
-.TP
-\-i
-Specify that fish is to run in interactive mode
-.TP
-\-v
-display version and exit
-.SH AUTHOR
-Axel Liljencrantz ( @PACKAGE_BUGREPORT@ )