github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-12-03 08:23:51 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
83d3c9fc04
fish-shell/src/builtin.cpp

4154 lines
114 KiB
C++
Raw Normal View History

Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/** \file builtin.c
Functions for executing builtin functions.
How to add a new builtin function:
1). Create a function in builtin.c with the following signature:
Adding history builtin
2012-06-05 12:24:42 +08:00
<tt>static int builtin_NAME( parser_t &parser, wchar_t ** args )</tt>
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
where NAME is the name of the builtin, and args is a zero-terminated list of arguments.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
2). Add a line like { L"NAME", &builtin_NAME, N_(L"Bla bla bla") }, to the builtin_data_t variable. The description is used by the completion system. Note that this array is sorted!
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Minor edits of builtin.c, some reindentation and code comment improvement darcs-hash:20060205212050-ac50b-70c1b34208b442b5670fde2c6655e09c4480c7e7.gz
2006-02-06 05:20:50 +08:00
3). Create a file doc_src/NAME.txt, containing the manual for the builtin in Doxygen-format. Check the other builtin manuals for proper syntax.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Random fixes to comments.
2012-12-16 12:23:24 +08:00
4). Use 'git add doc_src/NAME.txt' to start tracking changes to the documentation file.
Add extra step in instructions on creating a builtin darcs-hash:20051214234808-ac50b-14d032091b843c4692f4548c9763b65c46b2fc92.gz
2005-12-15 07:48:08 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Initial pass with Include What You Use
2015-07-25 23:14:25 +08:00
#include "config.h" // IWYU pragma: keep
Rearrange includes so that config.h is always the first file to be included darcs-hash:20060811011835-ac50b-847fc790288e3bb3f3a0ee7734ff278d2dc65bef.gz
2006-08-11 09:18:35 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
#include <stdlib.h>
#include <stdio.h>
#include <wchar.h>
#include <unistd.h>
#include <errno.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <signal.h>
#include <wctype.h>
Fix compiler warnings darcs-hash:20050924195558-ac50b-1ad53fa963f71ce5b4aa42490789add2a3d48ab3.gz
2005-09-25 03:55:58 +08:00
#include <time.h>
CLeanup the io_stack in builtin.cpp, other changes to migrate away from al_list
2012-02-08 15:53:34 +08:00
#include <stack>
Initial pass with Include What You Use
2015-07-25 23:14:25 +08:00
#include <assert.h>
#include <algorithm>
#include <map>
#include <string>
#include <utility>
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Initial pass with Include What You Use
2015-07-25 23:14:25 +08:00
#include "fallback.h" // IWYU pragma: keep
Move all fallbacks for standard and not-so-standard unix functions to fallback.c, in order to have a one-stop place to look for such functions darcs-hash:20060228131716-ac50b-0832193dbcaf7191dcb24456dc40f2e861a1382e.gz
2006-02-28 21:17:16 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
#include "wutil.h"
#include "builtin.h"
#include "function.h"
#include "complete.h"
#include "proc.h"
#include "parser.h"
#include "reader.h"
#include "env.h"
#include "wgetopt.h"
#include "tokenizer.h"
#include "input.h"
#include "intern.h"
Initial update for new event subsystem darcs-hash:20051005223708-ac50b-8a8d7e003e1c24747f3f154cb66b6c1a1015c35b.gz
2005-10-06 06:37:08 +08:00
#include "event.h"
Move io redirection functions to their own library darcs-hash:20051008112051-ac50b-113caa4cba470a739e4bfbed9f479e2fed357be7.gz
2005-10-08 19:20:51 +08:00
#include "signal.h"
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-18 00:24:38 +08:00
#include "exec.h"
Add support for -s switch to read builtin, enables shell syntax highlighting in the read builtin darcs-hash:20070129162624-ac50b-dff9d9ebf16ce3247b83d917efbffd4942cda83f.gz
2007-01-30 00:26:24 +08:00
#include "highlight.h"
Add support for sending arguments whenusing the source builtin darcs-hash:20060214195636-ac50b-511c211368103df6923d63cef99ce20a88d31be3.gz
2006-02-15 03:56:36 +08:00
#include "parse_util.h"
Move keyword detection code to separate file darcs-hash:20070422095026-ac50b-77a840e2830370f46b7a48fd8863095d2cd7a5f0.gz
2007-04-22 17:50:26 +08:00
#include "parser_keywords.h"
Add support for sending arguments whenusing the source builtin darcs-hash:20060214195636-ac50b-511c211368103df6923d63cef99ce20a88d31be3.gz
2006-02-15 03:56:36 +08:00
#include "expand.h"
First stab at directory transition. Test with care... darcs-hash:20061019115023-ac50b-30c3fd51d8af8a616d63dfcac39370d7fe6d144e.gz
2006-10-19 19:50:23 +08:00
#include "path.h"
Adding history builtin
2012-06-05 12:24:42 +08:00
#include "history.h"
Added parse builtin for testing. Lots of work on simulated execution.
2013-06-16 05:32:38 +08:00
#include "parse_tree.h"
Initial pass with Include What You Use
2015-07-25 23:14:25 +08:00
#include "parse_constants.h"
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
#include "wcstringutil.h"
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
The default prompt for the read command
*/
Fix read default prompt. It's now single line.
2012-07-03 10:28:04 +08:00
#define DEFAULT_READ_PROMPT L"set_color green; echo -n read; set_color normal; echo -n \"> \""
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
The mode name to pass to history and input
*/
#define READ_MODE_NAME L"fish_read"
Code cleanup darcs-hash:20051215135902-ac50b-e9fc18bca34459ddb56e970a16c05e9b3cc54848.gz
2005-12-15 21:59:02 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
Code cleanup darcs-hash:20051215135902-ac50b-e9fc18bca34459ddb56e970a16c05e9b3cc54848.gz
2005-12-15 21:59:02 +08:00
The send stuff to foreground message
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 20:51:02 +08:00
#define FG_MSG _( L"Send job %d, '%ls' to foreground\n" )
Revamp the jobs builtin darcs-hash:20051211233001-ac50b-24547ca41d4db05f87d59dd3e396c3190a66ef89.gz
2005-12-12 07:30:01 +08:00
Documentation updates. Fixes a few formating bugs, adds various minor missing api documentation, fixes a few typos. Also fixes a few tiny code issues, mostly missing consts, etc darcs-hash:20060617130708-ac50b-cc2ec5aa3e4bfb8e28d7b86441bfb4661f1dd7e7.gz
2006-06-17 21:07:08 +08:00
/**
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Datastructure to describe a builtin.
Documentation updates. Fixes a few formating bugs, adds various minor missing api documentation, fixes a few typos. Also fixes a few tiny code issues, mostly missing consts, etc darcs-hash:20060617130708-ac50b-cc2ec5aa3e4bfb8e28d7b86441bfb4661f1dd7e7.gz
2006-06-17 21:07:08 +08:00
*/
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
struct builtin_data_t
Clean up init code in builtin.c darcs-hash:20060205130840-ac50b-1a2b29671b7d8c557ebd284513c535e082ee5cf3.gz
2006-02-05 21:08:40 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
Name of the builtin
*/
const wchar_t *name;
/**
Function pointer tothe builtin implementation
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int (*func)(parser_t &parser, io_streams_t &streams, wchar_t **argv);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
Description of what the builtin does
*/
const wchar_t *desc;
More cleanup of static string buffers in favor of wcstring
2012-02-01 12:22:25 +08:00
bool operator<(const wcstring &) const;
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
bool operator<(const builtin_data_t *) const;
};
Clean up init code in builtin.c darcs-hash:20060205130840-ac50b-1a2b29671b7d8c557ebd284513c535e082ee5cf3.gz
2006-02-05 21:08:40 +08:00
More cleanup of static string buffers in favor of wcstring
2012-02-01 12:22:25 +08:00
bool builtin_data_t::operator<(const wcstring &other) const
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
{
More cleanup of static string buffers in favor of wcstring
2012-02-01 12:22:25 +08:00
return wcscmp(this->name, other.c_str()) < 0;
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
}
Clean up init code in builtin.c darcs-hash:20060205130840-ac50b-1a2b29671b7d8c557ebd284513c535e082ee5cf3.gz
2006-02-05 21:08:40 +08:00
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
bool builtin_data_t::operator<(const builtin_data_t *other) const
{
return wcscmp(this->name, other->name) < 0;
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
/**
Counts the number of non null pointers in the specified array
*/
Migrate builtin_string.cpp to its own object file This keeps the architecture a little less surprising
2015-09-13 04:36:22 +08:00
int builtin_count_args(const wchar_t * const * argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc = 1;
First stab at builtin set_color. Moved set_color.cpp to builtin_set_color.cpp and taught fish about it.
2013-02-15 07:50:24 +08:00
while (argv[argc] != NULL)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
argc++;
}
return argc;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
This function works like wperror, but it prints its result into
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
the streams.err string instead of to stderr. Used by the builtin
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
commands.
*/
Implement the ulimit builtin darcs-hash:20051014223301-ac50b-f4e6303dcfbe26318e23020444b54d80fed9f535.gz
2005-10-15 06:33:01 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_wperror(const wchar_t *s, io_streams_t &streams)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
char *err = strerror(errno);
if (s != NULL)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append(s);
streams.err.append(L": ");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (err != NULL)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate str2wcs
2012-12-20 05:31:06 +08:00
const wcstring werr = str2wcstring(err);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append(werr);
streams.err.push_back(L'\n');
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Documentation updates. Fixes a few formating bugs, adds various minor missing api documentation, fixes a few typos. Also fixes a few tiny code issues, mostly missing consts, etc darcs-hash:20060617130708-ac50b-cc2ec5aa3e4bfb8e28d7b86441bfb4661f1dd7e7.gz
2006-06-17 21:07:08 +08:00
/**
Count the number of times the specified character occurs in the specified string
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static int count_char(const wchar_t *str, wchar_t c)
If a help page for a builtin is showed in response to an error, make sure it fits on screen, or only print the synopsis - this patch also contains a huge number of tweaks to where and when the help pages are printed darcs-hash:20060526112402-ac50b-88993e45f411b2f1c45b3202c393c5328f1c7429.gz
2006-05-26 19:24:02 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int res = 0;
for (; *str; str++)
{
res += (*str==c);
}
return res;
If a help page for a builtin is showed in response to an error, make sure it fits on screen, or only print the synopsis - this patch also contains a huge number of tweaks to where and when the help pages are printed darcs-hash:20060526112402-ac50b-88993e45f411b2f1c45b3202c393c5328f1c7429.gz
2006-05-26 19:24:02 +08:00
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
wcstring builtin_help_get(parser_t &parser, io_streams_t &streams, const wchar_t *name)
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-18 00:24:38 +08:00
{
Teach fish how to push and pop blocks even in the face of no_exec. All tests finally pass. https://github.com/fish-shell/fish-shell/issues/624
2013-03-26 07:06:12 +08:00
/* This won't ever work if no_exec is set */
if (no_exec)
return wcstring();
Formatting and style updates
2013-05-05 17:33:17 +08:00
More work to migrate off of ad-hoc data structures
2012-01-01 07:57:30 +08:00
wcstring_list_t lst;
More cleanup of static string buffers in favor of wcstring
2012-02-01 12:22:25 +08:00
wcstring out;
const wcstring name_esc = escape_string(name, 1);
A little extra tweaking so builtin_print_help looks better The terminal width magic that __fish_print_help learned doesn't help when builtin_print_help runs it in a subshell. Instead, add an undocumented --tty-width flag to __fish_print_help that's used to pass the terminal width.
2014-10-10 15:11:23 +08:00
wcstring cmd = format_string(L"__fish_print_help %ls", name_esc.c_str());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (!streams.out_is_redirected && isatty(STDOUT_FILENO))
A little extra tweaking so builtin_print_help looks better The terminal width magic that __fish_print_help learned doesn't help when builtin_print_help runs it in a subshell. Instead, add an undocumented --tty-width flag to __fish_print_help that's used to pass the terminal width.
2014-10-10 15:11:23 +08:00
{
// since we're using a subshell, __fish_print_help can't tell we're in
// a terminal. Tell it ourselves.
int cols = common_get_width();
cmd = format_string(L"__fish_print_help --tty-width %d %ls", cols, name_esc.c_str());
}
Make subcommands modify $status, and make builtin_set not modify status unless it fails https://github.com/fish-shell/fish-shell/issues/547 https://github.com/fish-shell/fish-shell/issues/214
2013-02-01 07:57:08 +08:00
if (exec_subshell(cmd, lst, false /* don't apply exit status */) >= 0)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
for (size_t i=0; i<lst.size(); i++)
{
More cleanup of static string buffers in favor of wcstring
2012-02-01 12:22:25 +08:00
out.append(lst.at(i));
out.push_back(L'\n');
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
return out;
Update documentation display code to run roff on the client system instead of pregenerating documentation and compiling it into program binaries darcs-hash:20061117162438-ac50b-5c4c7f0bd8bf53a16e16ecfead9569e642b7160f.gz
2006-11-18 00:24:38 +08:00
}
Comment updates, minor code cleanups and other janitorial jobs darcs-hash:20071002100937-75c98-d4040e70a256e36a6334cca0a05d60500680132b.gz
2007-10-02 18:09:37 +08:00
/**
Print help for the specified builtin. If \c b is sb_err, also print
the line information
If \c b is the buffer representing standard error, and the help
message is about to be printed to an interactive screen, it may be
shortened to fit the screen.
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Comment updates, minor code cleanups and other janitorial jobs darcs-hash:20071002100937-75c98-d4040e70a256e36a6334cca0a05d60500680132b.gz
2007-10-02 18:09:37 +08:00
*/
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd, output_stream_t &b)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
bool is_stderr = (&b == &streams.err);
if (is_stderr)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
b.append(parser.current_line());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
const wcstring h = builtin_help_get(parser, streams, cmd);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!h.size())
return;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
wchar_t *str = wcsdup(h.c_str());
if (str)
{
Miscellaneous minor fixes based on cppcheck static analyzer
2014-01-13 05:33:35 +08:00
bool is_short = false;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (is_stderr)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Interactive mode help to screen - only print synopsis if
the rest won't fit
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int screen_height, lines;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
screen_height = common_get_height();
lines = count_char(str, L'\n');
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (! get_is_interactive() || (lines > 2*screen_height/3))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
wchar_t *pos;
int cut=0;
int i;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Miscellaneous minor fixes based on cppcheck static analyzer
2014-01-13 05:33:35 +08:00
is_short = true;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
First move down 4 lines
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
pos = str;
for (i=0; (i<4) && pos && *pos; i++)
{
pos = wcschr(pos+1, L'\n');
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (pos && *pos)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Then find the next empty line
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (; *pos; pos++)
{
if (*pos == L'\n')
{
wchar_t *pos2;
int is_empty = 1;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (pos2 = pos+1; *pos2; pos2++)
{
if (*pos2 == L'\n')
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (*pos2 != L'\t' && *pos2 !=L' ')
{
is_empty = 0;
break;
}
}
if (is_empty)
{
/*
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
And cut it
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
*(pos2+1)=L'\0';
cut = 1;
break;
}
}
}
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
We did not find a good place to cut message to
shorten it - so we make sure we don't print
anything.
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!cut)
{
*str = 0;
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Large set of changes to migrate sb_out and sb_err to wcstring
2012-02-23 02:51:06 +08:00
b.append(str);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (is_short)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
b.append_format(_(L"%ls: Type 'help %ls' for related documentation\n\n"), cmd, cmd);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
free(str);
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Make all error messages from options parsin in builtins redirectable darcs-hash:20070121145527-ac50b-1375af219a5eba6167e99d3fe24b26dba60eba2a.gz
2007-01-21 22:55:27 +08:00
/**
Perform error reporting for encounter with unknown option
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar_t *cmd, const wchar_t *opt)
Make all error messages from options parsin in builtins redirectable darcs-hash:20070121145527-ac50b-1375af219a5eba6167e99d3fe24b26dba60eba2a.gz
2007-01-21 22:55:27 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN, cmd, opt);
builtin_print_help(parser, streams, cmd, streams.err);
Make all error messages from options parsin in builtins redirectable darcs-hash:20070121145527-ac50b-1375af219a5eba6167e99d3fe24b26dba60eba2a.gz
2007-01-21 22:55:27 +08:00
}
Update status builtin to properly handle and document all of its options. darcs-hash:20070801194450-35ec8-e2fe5b798e728d1caef474295a92230c35c79c17.gz
2007-08-02 03:44:50 +08:00
/**
Perform error reporting for encounter with missing argument
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd, const wchar_t *opt)
Update status builtin to properly handle and document all of its options. darcs-hash:20070801194450-35ec8-e2fe5b798e728d1caef474295a92230c35c79c17.gz
2007-08-02 03:44:50 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt);
builtin_print_help(parser, streams, cmd, streams.err);
Update status builtin to properly handle and document all of its options. darcs-hash:20070801194450-35ec8-e2fe5b798e728d1caef474295a92230c35c79c17.gz
2007-08-02 03:44:50 +08:00
}
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
/*
Here follows the definition of all builtin commands. The function
names are all on the form builtin_NAME where NAME is the name of the
builtin. so the function name for the builtin 'fg' is
'builtin_fg'.
A few builtins, including 'while', 'command' and 'builtin' are not
defined here as they are handled directly by the parser. (They are
not parsed as commands, instead they only alter the parser state)
The builtins 'break' and 'continue' are so closely related that they
share the same implementation, namely 'builtin_break_continue.
Several other builtins, including jobs, ulimit and set are so big
that they have been given their own file. These files are all named
Allow the user to specify name of history file to use with the read builtin darcs-hash:20070106142430-ac50b-32ad52077e11438799b17911dc83e57f89e02f2b.gz
2007-01-06 22:24:30 +08:00
'builtin_NAME.c', where NAME is the name of the builtin. These files
are included directly below.
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
*/
Some changes to migrate towards C++ and a multithreaded model
2011-12-27 11:18:46 +08:00
#include "builtin_set.cpp"
#include "builtin_commandline.cpp"
#include "builtin_complete.cpp"
#include "builtin_ulimit.cpp"
#include "builtin_jobs.cpp"
First stab at builtin set_color. Moved set_color.cpp to builtin_set_color.cpp and taught fish about it.
2013-02-15 07:50:24 +08:00
#include "builtin_set_color.cpp"
Initial version of printf builtin
2013-01-23 01:07:28 +08:00
#include "builtin_printf.cpp"
Various code polish, including minor rearangement of builtin code to export fewer functions, a few additional input checks, and removal of the unneeded, exported error_max variable darcs-hash:20060620212016-ac50b-f76c10eea23fab14a648ea83ed0c83a171b8fef9.gz
2006-06-21 05:20:16 +08:00
Implemented test as a builtin (!)
2012-03-07 16:54:01 +08:00
/* builtin_test lives in builtin_test.cpp */
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv);
Implemented test as a builtin (!)
2012-03-07 16:54:01 +08:00
Migrate builtin_string.cpp to its own object file This keeps the architecture a little less surprising
2015-09-13 04:36:22 +08:00
/* builtin_string lives in builtin_string.cpp */
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv);
Migrate builtin_string.cpp to its own object file This keeps the architecture a little less surprising
2015-09-13 04:36:22 +08:00
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
List a single key binding.
Returns false if no binding with that sequence and mode exists.
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static bool builtin_bind_list_one(const wcstring &seq, const wcstring &bind_mode, io_streams_t &streams)
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
{
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
std::vector<wcstring> ecmds;
wcstring sets_mode;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
if (!input_mapping_get(seq, bind_mode, &ecmds, &sets_mode))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
return false;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L"bind");
Implement bind modes
2013-12-31 08:52:41 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
// Append the mode flags if applicable
if (bind_mode != DEFAULT_BIND_MODE)
{
const wcstring emode = escape_string(bind_mode, ESCAPE_ALL);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L" -M ");
streams.out.append(emode);
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
}
if (sets_mode != bind_mode)
{
const wcstring esets_mode = escape_string(sets_mode, ESCAPE_ALL);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L" -m ");
streams.out.append(esets_mode);
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
}
Run restyle.sh to enforce style rules.
2014-04-01 01:01:39 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
// Append the name
wcstring tname;
if (input_terminfo_get_name(seq, &tname))
{
// Note that we show -k here because we have an input key name
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L" -k %ls", tname.c_str());
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
}
else
{
// No key name, so no -k; we show the escape sequence directly
const wcstring eseq = escape_string(seq, ESCAPE_ALL);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L" %ls", eseq.c_str());
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
}
Show -M and -m flags in bind list
2014-09-23 03:37:11 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
// Now show the list of commands
for (size_t i = 0; i < ecmds.size(); i++)
{
const wcstring &ecmd = ecmds.at(i);
const wcstring escaped_ecmd = escape_string(ecmd, ESCAPE_ALL);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back(' ');
streams.out.append(escaped_ecmd);
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back(L'\n');
Show -M and -m flags in bind list
2014-09-23 03:37:11 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
return true;
}
Show -M and -m flags in bind list
2014-09-23 03:37:11 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
/**
List all current key bindings
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_bind_list(const wchar_t *bind_mode, io_streams_t &streams)
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
{
const std::vector<input_mapping_name_t> lst = input_mapping_get_names();
Show -M and -m flags in bind list
2014-09-23 03:37:11 +08:00
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
for (std::vector<input_mapping_name_t>::const_iterator it = lst.begin(), end = lst.end();
it != end;
++it)
{
if (bind_mode != NULL && bind_mode != it->mode)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
continue;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_bind_list_one(it->seq, it->mode, streams);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Print terminfo key binding names to string buffer used for standard output.
\param all if set, all terminfo key binding names will be
printed. If not set, only ones that are defined for this terminal
are printed.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_bind_key_names(int all, io_streams_t &streams)
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
const wcstring_list_t names = input_terminfo_get_names(!all);
for (size_t i=0; i<names.size(); i++)
{
Removed discriminated union from block_t type, allowing us to store wcstrings in it
2012-02-08 09:06:45 +08:00
const wcstring &name = names.at(i);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%ls\n", name.c_str());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Print all the special key binding functions to string buffer used for standard output.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static void builtin_bind_function_names(io_streams_t &streams)
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
{
Migrate input_function_get_names to wcstring_list_t
2012-01-24 12:48:47 +08:00
wcstring_list_t names = input_function_get_names();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (size_t i=0; i<names.size(); i++)
{
const wchar_t *seq = names.at(i).c_str();
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%ls\n", seq);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
}
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
// Wraps input_terminfo_get_sequence(), appending the correct error messages as needed.
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq, io_streams_t &streams)
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
{
if (input_terminfo_get_sequence(seq, out_seq))
{
return 1;
}
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
wcstring eseq = escape_string(seq, 0);
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
switch (errno)
{
case ENOENT:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: No key with name '%ls' found\n"), L"bind", eseq.c_str());
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
break;
}
case EILSEQ:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Key with name '%ls' does not have any mapping\n"), L"bind", eseq.c_str());
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
break;
}
default:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Unknown error trying to bind to key named '%ls'\n"), L"bind", eseq.c_str());
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
break;
}
}
return 0;
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Add specified key binding.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_bind_add(const wchar_t *seq, const wchar_t * const *cmds, size_t cmds_len,
const wchar_t *mode, const wchar_t *sets_mode, int terminfo,
io_streams_t &streams)
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (terminfo)
{
Eliminate a static string from input_terminfo_get_sequence
2013-04-16 04:07:17 +08:00
wcstring seq2;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (get_terminfo_sequence(seq, &seq2, streams))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Rename 'new-mode' to 'sets-mode', prepare for selection support.
2014-01-15 18:39:19 +08:00
input_mapping_add(seq2.c_str(), cmds, cmds_len, mode, sets_mode);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
return 1;
}
}
else
{
Rename 'new-mode' to 'sets-mode', prepare for selection support.
2014-01-15 18:39:19 +08:00
input_mapping_add(seq, cmds, cmds_len, mode, sets_mode);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
return 0;
First stab at dropping all support for readlines inputrc files and instead using an internal system for performing keybinding. darcs-hash:20070925161447-75c98-1feaef88a4b518badb7879f598f06ab650a8f93b.gz
2007-09-26 00:14:47 +08:00
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Erase specified key bindings
\param seq an array of all key bindings to erase
\param all if specified, _all_ key bindings will be erased
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
\param mode if specified, only bindings from that mode will be erased. If not given and \c all is \c false, \c DEFAULT_BIND_MODE will be used.
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_bind_erase(wchar_t **seq, int all, const wchar_t *mode, int use_terminfo, io_streams_t &streams)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (all)
{
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
const std::vector<input_mapping_name_t> lst = input_mapping_get_names();
for (std::vector<input_mapping_name_t>::const_iterator it = lst.begin(), end = lst.end();
it != end;
++it)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
if (mode == NULL || mode == it->mode)
{
input_mapping_erase(it->seq, it->mode);
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
return 0;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
int res = 0;
Rework mode handling of `bind` Binds with the same sequence in multiple modes was not working right. Fix up the implementation to propagate modes everywhere as necessary. This means that `bind` will properly list distinct binds with the same sequence, and `bind -e` will take mode into account properly as well. Note that `bind -e seq` now assumes the bind is in the default bind mode, whereas before it would erase the first binding with that sequence regardless of mode. `bind -e -a` still erases all binds in all modes, though `bind -M mode -e -a` still only erases all binds in the selected mode.
2014-09-23 12:04:06 +08:00
if (mode == NULL) mode = DEFAULT_BIND_MODE;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (*seq)
{
Fix `bind -e` without `-k` In adding `-k` support to `bind -e` I broke the ability to use `bind -e` without specifyign `-k`. Oops.
2014-09-23 11:56:45 +08:00
if (use_terminfo)
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
{
Fix `bind -e` without `-k` In adding `-k` support to `bind -e` I broke the ability to use `bind -e` without specifyign `-k`. Oops.
2014-09-23 11:56:45 +08:00
wcstring seq2;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (get_terminfo_sequence(*seq++, &seq2, streams))
Fix `bind -e` without `-k` In adding `-k` support to `bind -e` I broke the ability to use `bind -e` without specifyign `-k`. Oops.
2014-09-23 11:56:45 +08:00
{
Make C_ (gettext used in completions) return wcstring
2014-10-31 09:19:47 +08:00
input_mapping_erase(seq2, mode);
Fix `bind -e` without `-k` In adding `-k` support to `bind -e` I broke the ability to use `bind -e` without specifyign `-k`. Oops.
2014-09-23 11:56:45 +08:00
}
else
{
res = 1;
}
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
}
else
{
Fix `bind -e` without `-k` In adding `-k` support to `bind -e` I broke the ability to use `bind -e` without specifyign `-k`. Oops.
2014-09-23 11:56:45 +08:00
input_mapping_erase(*seq++, mode);
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Initial blocking implementation darcs-hash:20051211222101-ac50b-6e11220bd608187fbb32a0313b5b73dbdc8354fc.gz
2005-12-12 06:21:01 +08:00
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
return res;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Initial blocking implementation darcs-hash:20051211222101-ac50b-6e11220bd608187fbb32a0313b5b73dbdc8354fc.gz
2005-12-12 06:21:01 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
The bind builtin, used for setting character sequences
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
enum
{
BIND_INSERT,
BIND_ERASE,
BIND_KEY_NAMES,
BIND_FUNCTION_NAMES
Test and fix issue where, if binding X is a prefix of binding Y, and X is specified before Y, then Y will never be invoked because X will always get there first. Now instead we order bindings in descending order by length, so that we always test the binding before any others that prefixes it. Fixes #1283.
2014-02-13 04:49:32 +08:00
};
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc=builtin_count_args(argv);
int mode = BIND_INSERT;
int res = STATUS_BUILTIN_OK;
int all = 0;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Implement bind modes
2013-12-31 08:52:41 +08:00
const wchar_t *bind_mode = DEFAULT_BIND_MODE;
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
bool bind_mode_given = false;
Replace builtin 'bind_mode' with variable $fish_bind_mode
2014-01-15 19:04:52 +08:00
const wchar_t *sets_bind_mode = DEFAULT_BIND_MODE;
bool sets_bind_mode_given = false;
Implement bind modes
2013-12-31 08:52:41 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int use_terminfo = 0;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptind=0;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Merge branch 'master' into 1218_rebase Conflicts: builtin.cpp builtin_commandline.cpp highlight.cpp input.cpp input.h reader.cpp screen.cpp screen.h
2014-03-30 05:19:45 +08:00
static const struct woption long_options[] =
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Increased support for completion search field. Use btab (shift-tab) to complete-and-search.
2014-01-27 16:56:13 +08:00
{ L"all", no_argument, 0, 'a' },
{ L"erase", no_argument, 0, 'e' },
{ L"function-names", no_argument, 0, 'f' },
{ L"help", no_argument, 0, 'h' },
{ L"key", no_argument, 0, 'k' },
{ L"key-names", no_argument, 0, 'K' },
Merge branch 'master' into 1218_rebase Conflicts: builtin.cpp builtin_commandline.cpp highlight.cpp input.cpp input.h reader.cpp screen.cpp screen.h
2014-03-30 05:19:45 +08:00
{ L"mode", required_argument, 0, 'M' },
{ L"sets-mode", required_argument, 0, 'm' },
Increased support for completion search field. Use btab (shift-tab) to complete-and-search.
2014-01-27 16:56:13 +08:00
{ 0, 0, 0, 0 }
};
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"aehkKfM:m:",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'a':
all = 1;
break;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'e':
mode = BIND_ERASE;
break;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'k':
use_terminfo = 1;
break;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'K':
mode = BIND_KEY_NAMES;
break;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'f':
mode = BIND_FUNCTION_NAMES;
break;
Add a 'generic' type of event that can be emited from any piece of code or by the user. Use this event layer to perform interactive configuration startup at the correct time. darcs-hash:20070819164230-75c98-f91b8a73de7bbbb500d80770ddf4d2d46ae592cc.gz
2007-08-20 00:42:30 +08:00
Implement bind modes
2013-12-31 08:52:41 +08:00
case 'M':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
bind_mode = w.woptarg;
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
bind_mode_given = true;
Implement bind modes
2013-12-31 08:52:41 +08:00
break;
case 'm':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
sets_bind_mode = w.woptarg;
Replace builtin 'bind_mode' with variable $fish_bind_mode
2014-01-15 19:04:52 +08:00
sets_bind_mode_given = true;
Implement bind modes
2013-12-31 08:52:41 +08:00
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Implement bind modes
2013-12-31 08:52:41 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
/*
Run restyle.sh to enforce style rules.
2014-04-01 01:01:39 +08:00
* if mode is given, but not new mode, default to new mode to mode
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
*/
Run restyle.sh to enforce style rules.
2014-04-01 01:01:39 +08:00
if (bind_mode_given && !sets_bind_mode_given)
Allow restricting earsing and listing of bindings to specific mode; implement force repaint and multi-char bindings;
2013-12-31 21:53:29 +08:00
{
Run restyle.sh to enforce style rules.
2014-04-01 01:01:39 +08:00
sets_bind_mode = bind_mode;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
switch (mode)
{
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case BIND_ERASE:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (builtin_bind_erase(&argv[w.woptind], all, bind_mode_given ? bind_mode : NULL, use_terminfo, streams))
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
{
res = STATUS_BUILTIN_ERROR;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case BIND_INSERT:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
switch (argc-w.woptind)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
{
case 0:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_bind_list(bind_mode_given ? bind_mode : NULL, streams);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Better input handling; add support multiple binding commands
2014-01-01 07:11:32 +08:00
case 1:
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
{
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
wcstring seq;
if (use_terminfo)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (!get_terminfo_sequence(argv[w.woptind], &seq, streams))
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
{
res = STATUS_BUILTIN_ERROR;
// get_terminfo_sequence already printed the error
break;
}
}
else
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
seq = argv[w.woptind];
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (!builtin_bind_list_one(seq, bind_mode, streams))
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
{
res = STATUS_BUILTIN_ERROR;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wcstring eseq = escape_string(argv[w.woptind], 0);
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
if (use_terminfo)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: No binding found for key '%ls'\n"), argv[0], eseq.c_str());
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: No binding found for sequence '%ls'\n"), argv[0], eseq.c_str());
Support `bind SEQ` to print a binding for `SEQ`
2014-09-23 12:30:44 +08:00
}
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
default:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (builtin_bind_add(argv[w.woptind], argv + (w.woptind + 1), argc - (w.woptind + 1), bind_mode, sets_bind_mode, use_terminfo, streams))
Support -k with `bind -e` Also return an exit code of 1 if `bind -k` can't match the key name.
2014-09-23 10:21:08 +08:00
{
res = STATUS_BUILTIN_ERROR;
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Better input handling; add support multiple binding commands
2014-01-01 07:11:32 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
Minor edits, mostly tweaks of the API documentation darcs-hash:20060123233347-ac50b-44ebb96ba202c062739ba3d183519e28a95511b2.gz
2006-01-24 07:33:47 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case BIND_KEY_NAMES:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_bind_key_names(all, streams);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
Minor edits, mostly tweaks of the API documentation darcs-hash:20060123233347-ac50b-44ebb96ba202c062739ba3d183519e28a95511b2.gz
2006-01-24 07:33:47 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case BIND_FUNCTION_NAMES:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_bind_function_names(streams);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
make the functions builtin output descriptions and event handlers for functions darcs-hash:20051217122546-ac50b-2bf9b1118fcbf9079398e113fb201ddde813e40a.gz
2005-12-17 20:25:46 +08:00
Update funced * Editor mode is no the default * Use -i or --interactive or -e fish to edit function in interactive mode * tmpname is now created with random number added and check that file do not already exist * check $TMPDIR existence and put /tmp if it does not exist * There is an undocumented feature to use functions, started with dash. Introduce necessary changes to funced, functions, def_function() in order to make it work properly. * Delete editor guessing. Use $EDITOR variable or -e key
2012-06-30 10:22:41 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
default:
{
res = STATUS_BUILTIN_ERROR;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Invalid state\n"), argv[0]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Make the functions builtin have a bit nicer output Stop autosuggesting things with newlines Make webconfig a little nicer
2012-03-26 13:41:22 +08:00
}
make the functions builtin output descriptions and event handlers for functions darcs-hash:20051217122546-ac50b-2bf9b1118fcbf9079398e113fb201ddde813e40a.gz
2005-12-17 20:25:46 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return res;
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Implement bind modes
2013-12-31 08:52:41 +08:00
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
The block builtin, used for temporarily blocking events
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_block(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
enum
{
UNSET,
GLOBAL,
LOCAL,
}
;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int scope=UNSET;
int erase = 0;
int argc=builtin_count_args(argv);
Added some missing calls to setup_fork_guards() in utilities. Made echo a builtin
2012-03-08 03:35:22 +08:00
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptind=0;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static const struct woption
long_options[] =
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
L"erase", no_argument, 0, 'e'
}
,
{
L"local", no_argument, 0, 'l'
}
,
{
L"global", no_argument, 0, 'g'
}
,
{
L"help", no_argument, 0, 'h'
}
,
{
0, 0, 0, 0
}
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
;
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"elgh",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'g':
scope = GLOBAL;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'l':
scope = LOCAL;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'e':
erase = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
if (erase)
{
if (scope != UNSET)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Can not specify scope when removing block\n"), argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if (parser.global_event_blocks.empty())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: No blocks defined\n"), argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
parser.global_event_blocks.pop_front();
}
else
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
size_t block_idx = 0;
block_t *block = parser.block_at_index(block_idx);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
event_blockage_t eb = {};
Miscellaneous minor fixes based on cppcheck static analyzer
2014-01-13 05:33:35 +08:00
eb.typemask = (1<<EVENT_ANY);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
switch (scope)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case LOCAL:
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
// If this is the outermost block, then we're global
if (block_idx + 1 >= parser.block_count())
{
block = NULL;
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
case GLOBAL:
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
block=NULL;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
case UNSET:
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
while (block != NULL && block->type() != FUNCTION_CALL && block->type() != FUNCTION_CALL_NO_SHADOW)
{
// Set it in function scope
block = parser.block_at_index(++block_idx);
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
if (block)
{
block->event_blocks.push_front(eb);
}
else
{
parser.global_event_blocks.push_front(eb);
}
}
return STATUS_BUILTIN_OK;
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
The builtin builtin, used for giving builtins precedence over
functions. Mostly handled by the parser. All this code does is some
additional operational modes, such as printing a list of all
builtins, printing help, etc.
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_builtin(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc=builtin_count_args(argv);
int list=0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static const struct woption
long_options[] =
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
L"names", no_argument, 0, 'n'
}
,
{
L"help", no_argument, 0, 'h'
}
,
{
0, 0, 0, 0
}
}
;
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"nh",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'n':
list=1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Simplify handling of escape sequences in echo -e
2012-10-18 08:08:45 +08:00
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (list)
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
wcstring_list_t names = builtin_get_names();
sort(names.begin(), names.end());
for (size_t i=0; i<names.size(); i++)
{
const wchar_t *el = names.at(i).c_str();
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(el);
streams.out.append(L"\n");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
}
/**
Implementation of the builtin emit command, used to create events.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_emit(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc=builtin_count_args(argv);
static const struct woption
long_options[] =
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Simplify handling of escape sequences in echo -e
2012-10-18 08:08:45 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
L"help", no_argument, 0, 'h'
Simplify handling of escape sequences in echo -e
2012-10-18 08:08:45 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
,
Simplify handling of escape sequences in echo -e
2012-10-18 08:08:45 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
0, 0, 0, 0
Simplify handling of escape sequences in echo -e
2012-10-18 08:08:45 +08:00
}
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
;
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"h",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (!argv[w.woptind])
Formatting
2012-12-23 04:21:31 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(L"%ls: expected event name\n", argv[0]);
Formatting
2012-12-23 04:21:31 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
const wchar_t *eventname = argv[w.woptind];
wcstring_list_t args(argv + w.woptind + 1, argv + argc);
Allow 'emit' to accept event arguments
2012-12-20 08:11:55 +08:00
event_fire_generic(eventname, &args);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
/**
Implementation of the builtin 'command'. Actual command running is handled by
the parser, this just processes the flags.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_command(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
int argc=builtin_count_args(argv);
int print_path=0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptind=0;
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
static const struct woption
long_options[] =
{
command: Rename -p/--path flag to -s/--search
2014-07-11 10:16:32 +08:00
{ L"search", no_argument, 0, 's' },
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
{ L"help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 }
};
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"svh",
long_options,
&opt_index);
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
if (opt == -1)
break;
switch (opt)
{
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
return STATUS_BUILTIN_ERROR;
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
return STATUS_BUILTIN_OK;
command: Rename -p/--path flag to -s/--search
2014-07-11 10:16:32 +08:00
case 's':
case 'v':
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
print_path=1;
break;
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
return STATUS_BUILTIN_ERROR;
}
}
if (!print_path)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
return STATUS_BUILTIN_ERROR;
}
int found=0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
for (int idx = w.woptind; argv[idx]; ++idx)
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
{
const wchar_t *command_name = argv[idx];
wcstring path;
if (path_get_path(command_name, &path))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%ls\n", path.c_str());
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
++found;
}
}
return found ? STATUS_BUILTIN_OK : STATUS_BUILTIN_ERROR;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
A generic bultin that only supports showing a help message. This is
only a placeholder that prints the help message. Useful for
commands that live in the parser.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_generic(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Added some missing calls to setup_fork_guards() in utilities. Made echo a builtin
2012-03-08 03:35:22 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc=builtin_count_args(argv);
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Improvements to error messages with new parser. In particular, "naked builtins" now print their help (e.g. just 'while')
2014-01-13 07:10:59 +08:00
/* Hackish - if we have no arguments other than the command, we are a "naked invocation" and we just print help */
if (argc == 1)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Improvements to error messages with new parser. In particular, "naked builtins" now print their help (e.g. just 'while')
2014-01-13 07:10:59 +08:00
return STATUS_BUILTIN_ERROR;
}
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static const struct woption
long_options[] =
{
Improvements to error messages with new parser. In particular, "naked builtins" now print their help (e.g. just 'while')
2014-01-13 07:10:59 +08:00
{ L"help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 }
};
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"h",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
Added a -s option to echo to mean "don't output spaces" Replaced default prompt to stop calling printf. I opened a bug to replace the default prompt entirely with one that's cheaper.
2012-05-20 07:59:56 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Added a -s option to echo to mean "don't output spaces" Replaced default prompt to stop calling printf. I opened a bug to replace the default prompt entirely with one that's cheaper.
2012-05-20 07:59:56 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Added some missing calls to setup_fork_guards() in utilities. Made echo a builtin
2012-03-08 03:35:22 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
Return a definition of the specified function. Used by the functions builtin.
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static wcstring functions_def(const wcstring &name)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
CHECK(! name.empty(), L"");
wcstring out;
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
wcstring desc, def;
function_get_desc(name, &desc);
function_get_definition(name, &def);
event_t search(EVENT_ANY);
search.function_name = name;
std::vector<event_t *> ev;
reference'ize event.cpp/h
2012-12-20 18:48:36 +08:00
event_get(search, &ev);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
out.append(L"function ");
/* Typically we prefer to specify the function name first, e.g. "function foo --description bar"
But If the function name starts with a -, we'll need to output it after all the options. */
bool defer_function_name = (name.at(0) == L'-');
if (! defer_function_name)
{
Escape characters in function names. Fixes #1031.
2013-10-09 22:39:24 +08:00
out.append(escape_string(name, true));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
if (! desc.empty())
{
wcstring esc_desc = escape_string(desc, true);
out.append(L" --description ");
out.append(esc_desc);
}
if (!function_get_shadows(name))
{
out.append(L" --no-scope-shadowing");
}
for (size_t i=0; i<ev.size(); i++)
{
event_t *next = ev.at(i);
switch (next->type)
Implement -e option to echo (to interpret special characters), and -E to not interpret them https://github.com/fish-shell/fish-shell/issues/337
2012-10-17 17:56:03 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case EVENT_SIGNAL:
{
append_format(out, L" --on-signal %ls", sig2wcs(next->param1.signal));
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case EVENT_VARIABLE:
{
append_format(out, L" --on-variable %ls", next->str_param1.c_str());
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case EVENT_EXIT:
{
if (next->param1.pid > 0)
append_format(out, L" --on-process-exit %d", next->param1.pid);
else
append_format(out, L" --on-job-exit %d", -next->param1.pid);
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case EVENT_JOB_ID:
{
const job_t *j = job_get(next->param1.job_id);
if (j)
append_format(out, L" --on-job-exit %d", j->pgid);
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case EVENT_GENERIC:
{
append_format(out, L" --on-event %ls", next->str_param1.c_str());
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
wcstring_list_t named = function_get_named_arguments(name);
First round of fixes based on cppcheck https://github.com/fish-shell/fish-shell/issues/575
2013-02-16 16:02:40 +08:00
if (! named.empty())
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
append_format(out, L" --argument");
for (size_t i=0; i < named.size(); i++)
{
append_format(out, L" %ls", named.at(i).c_str());
}
}
/* Output the function name if we deferred it */
if (defer_function_name)
{
out.append(L" -- ");
Escape characters in function names. Fixes #1031.
2013-10-09 22:39:24 +08:00
out.append(escape_string(name, true));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
/* Output any inherited variables as `set -l` lines */
std::map<wcstring,env_var_t> inherit_vars = function_get_inherit_vars(name);
for (std::map<wcstring,env_var_t>::const_iterator it = inherit_vars.begin(), end = inherit_vars.end(); it != end; ++it)
{
wcstring_list_t lst;
if (!it->second.missing())
{
tokenize_variable_array(it->second, lst);
}
/* This forced tab is crummy, but we don't know what indentation style the function uses */
append_format(out, L"\n\tset -l %ls", it->first.c_str());
for (wcstring_list_t::const_iterator arg_it = lst.begin(), arg_end = lst.end(); arg_it != arg_end; ++arg_it)
{
wcstring earg = escape_string(*arg_it, ESCAPE_ALL);
out.push_back(L' ');
out.append(earg);
}
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/* This forced tab is sort of crummy - not all functions start with a tab */
append_format(out, L"\n\t%ls", def.c_str());
/* Append a newline before the 'end', unless there already is one there */
if (! string_suffixes_string(L"\n", def))
{
out.push_back(L'\n');
}
out.append(L"end\n");
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
return out;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
/**
The functions builtin, used for listing and erasing functions.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int i;
int erase=0;
wchar_t *desc=0;
int argc=builtin_count_args(argv);
int list=0;
int show_hidden=0;
int res = STATUS_BUILTIN_OK;
int query = 0;
int copy = 0;
static const struct woption
long_options[] =
{
{
L"erase", no_argument, 0, 'e'
}
,
{
L"description", required_argument, 0, 'd'
}
,
{
L"names", no_argument, 0, 'n'
}
,
{
L"all", no_argument, 0, 'a'
}
,
{
L"help", no_argument, 0, 'h'
}
,
{
L"query", no_argument, 0, 'q'
}
,
{
L"copy", no_argument, 0, 'c'
}
,
{
0, 0, 0, 0
}
}
;
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"ed:nahqc",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'e':
erase=1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'd':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
desc=w.woptarg;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'n':
list=1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'a':
show_hidden=1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'q':
query = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'c':
copy = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
/*
Erase, desc, query, copy and list are mutually exclusive
*/
if ((erase + (!!desc) + list + query + copy) > 1)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Invalid combination of options\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if (erase)
{
int i;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
for (i=w.woptind; i<argc; i++)
Revert 1349d12 and properly fix #213 As suggested by @ridiculousfish, when removing autoloaded functions, add them to a tombstones set. These functions will never be autoloaded again in the current shell, not even when the timestamp changes. Tested as per comment 1 of #1033. `~/.config/fish/functions/ls.fish` contains the function definition. `function -e ls` removes the redefined `ls` (and reverts back to the built-in command). `touch .../ls.fish` does not cause the function to be reloaded.
2015-03-11 21:14:56 +08:00
function_remove(argv[i]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
}
else if (desc)
{
wchar_t *func;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (argc-w.woptind != 1)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Expected exactly one function name\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
func = argv[w.woptind];
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!function_exists(func))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
func);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
function_set_desc(func, desc);
return STATUS_BUILTIN_OK;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
else if (list || (argc==w.woptind))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int is_screen = !streams.out_is_redirected && isatty(STDOUT_FILENO);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
size_t i;
wcstring_list_t names = function_get_names(show_hidden);
std::sort(names.begin(), names.end());
if (is_screen)
{
wcstring buff;
for (i=0; i<names.size(); i++)
{
buff.append(names.at(i));
buff.append(L", ");
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(reformat_for_screen(buff));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
for (i=0; i<names.size(); i++)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(names.at(i).c_str());
streams.out.append(L"\n");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
return STATUS_BUILTIN_OK;
}
else if (copy)
{
wcstring current_func;
wcstring new_func;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (argc-w.woptind != 2)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Expected exactly two names (current function name, and new function name)\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
current_func = argv[w.woptind];
new_func = argv[w.woptind+1];
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!function_exists(current_func))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
current_func.c_str());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
if ((wcsfuncname(new_func) != 0) || parser_keywords_is_reserved(new_func))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Illegal function name '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
new_func.c_str());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
// keep things simple: don't allow existing names to be copy targets.
if (function_exists(new_func))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
new_func.c_str(),
current_func.c_str());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if (function_copy(current_func, new_func))
return STATUS_BUILTIN_OK;
return STATUS_BUILTIN_ERROR;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
for (i=w.woptind; i<argc; i++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
if (!function_exists(argv[i]))
res++;
else
{
if (!query)
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (i != w.woptind)
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L"\n");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(functions_def(argv[i]));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
}
return res;
}
static unsigned int builtin_echo_digit(wchar_t wc, unsigned int base)
{
// base must be hex or octal
assert(base == 8 || base == 16);
switch (wc)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
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;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
if (base == 16) switch (wc)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
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;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
return UINT_MAX;
}
/* Parse a numeric escape sequence in str, returning whether we succeeded.
Also return the number of characters consumed and the resulting value.
Supported escape sequences:
\0nnn: octal value, zero to three digits
\nnn: octal value, one to three digits
\xhh: hex value, one to two digits
*/
static bool builtin_echo_parse_numeric_sequence(const wchar_t *str, size_t *consumed, unsigned char *out_val)
{
bool success = false;
unsigned char val = 0; //resulting character
unsigned int start = 0; //the first character of the numeric part of the sequence
unsigned int base = 0, max_digits = 0;
if (builtin_echo_digit(str[0], 8) != UINT_MAX)
{
// Octal escape
base = 8;
// If the first digit is a 0, we allow four digits (including that zero)
// Otherwise we allow 3.
max_digits = (str[0] == L'0' ? 4 : 3);
}
else if (str[0] == L'x')
{
// Hex escape
base = 16;
max_digits = 2;
// Skip the x
start = 1;
}
if (base != 0)
{
unsigned int idx;
for (idx = start; idx < start + max_digits; idx++)
{
unsigned int digit = builtin_echo_digit(str[idx], base);
if (digit == UINT_MAX) break;
val = val * base + digit;
}
// We succeeded if we consumed at least one digit
if (idx > start)
{
*consumed = idx;
*out_val = val;
success = true;
}
}
return success;
}
/** The echo builtin.
bash only respects -n if it's the first argument. We'll do the same.
We also support a new option -s to mean "no spaces"
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_echo(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
/* Skip first arg */
if (! *argv++)
return STATUS_BUILTIN_ERROR;
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
/* Process options. Options must come at the beginning - the first non-option kicks us out. */
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
bool print_newline = true, print_spaces = true, interpret_special_chars = false;
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
size_t option_idx = 0;
for (option_idx = 0; argv[option_idx] != NULL; option_idx++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
const wchar_t *arg = argv[option_idx];
assert(arg != NULL);
bool arg_is_valid_option = false;
if (arg[0] == L'-')
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
// We have a leading dash. Ensure that every subseqnent character is a valid option.
size_t i = 1;
while (arg[i] != L'\0' && wcschr(L"nesE", arg[i]) != NULL)
Refactored builtin_echo with better argument parsing.
2013-09-20 05:20:05 +08:00
{
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
i++;
Refactored builtin_echo with better argument parsing.
2013-09-20 05:20:05 +08:00
}
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
// We must have at least two characters to be a valid option, and have consumed the whole string
arg_is_valid_option = (i >= 2 && arg[i] == L'\0');
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
if (! arg_is_valid_option)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
// This argument is not an option, so there are no more options
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
// Ok, we are sure the argument is an option. Parse it.
assert(arg_is_valid_option);
for (size_t i=1; arg[i] != L'\0'; i++)
{
switch (arg[i])
{
case L'n':
print_newline = false;
break;
case L'e':
interpret_special_chars = true;
break;
case L's':
print_spaces = false;
break;
case L'E':
interpret_special_chars = false;
break;
default:
assert(0 && "Unexpected character in builtin_echo argument");
break;
}
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
/* The special character \c can be used to indicate no more output */
bool continue_output = true;
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
/* Skip over the options */
const wchar_t * const *args_to_echo = argv + option_idx;
for (size_t idx = 0; continue_output && args_to_echo[idx] != NULL; idx++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
if (print_spaces && idx > 0)
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back(' ');
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
const wchar_t *str = args_to_echo[idx];
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (size_t j=0; continue_output && str[j]; j++)
{
if (! interpret_special_chars || str[j] != L'\\')
{
/* Not an escape */
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back(str[j]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
/* Most escapes consume one character in addition to the backslash; the numeric sequences may consume more, while an unrecognized escape sequence consumes none. */
wchar_t wc;
size_t consumed = 1;
switch (str[j+1])
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'a':
wc = L'\a';
break;
case L'b':
wc = L'\b';
break;
case L'e':
Use \x1B instead of \e.
2013-07-12 15:40:29 +08:00
wc = L'\x1B';
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
case L'f':
wc = L'\f';
break;
case L'n':
wc = L'\n';
break;
case L'r':
wc = L'\r';
break;
case L't':
wc = L'\t';
break;
case L'v':
wc = L'\v';
break;
case L'\\':
wc = L'\\';
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'c':
wc = 0;
continue_output = false;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
default:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
/* Octal and hex escape sequences */
unsigned char narrow_val = 0;
if (builtin_echo_parse_numeric_sequence(str + j + 1, &consumed, &narrow_val))
{
Make octal/hex escapes in printf and echo output literal bytes Fixes #1894
2015-01-16 03:21:07 +08:00
/* Here consumed must have been set to something. The narrow_val is a literal byte that we want to output (#1894) */
wc = ENCODE_DIRECT_BASE + narrow_val % 256;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
else
{
/* Not a recognized escape. We consume only the backslash. */
wc = L'\\';
consumed = 0;
}
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
/* Skip over characters that were part of this escape sequence (but not the backslash, which will be handled by the loop increment */
j += consumed;
if (continue_output)
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back(wc);
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
}
if (print_newline && continue_output)
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.push_back('\n');
'echo -' should output a dash instead of treating it as options Fixes #1459
2014-05-16 15:19:07 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
}
/** The pwd builtin. We don't respect -P to resolve symbolic links because we try to always resolve them. */
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
wchar_t dir_path[4096];
wchar_t *res = wgetcwd(dir_path, 4096);
if (res == NULL)
{
return STATUS_BUILTIN_ERROR;
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(dir_path);
streams.out.push_back(L'\n');
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
}
}
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
/** Adds a function to the function set. It calls into function.cpp to perform any heavy lifting. */
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int define_function(parser_t &parser, io_streams_t &streams, const wcstring_list_t &c_args, const wcstring &contents, int definition_line_offset, wcstring *out_err)
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
assert(out_err != NULL);
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Bringup of function definitions, switch statements with new parser
2013-12-27 19:58:42 +08:00
/* wgetopt expects 'function' as the first argument. Make a new wcstring_list with that property. */
wcstring_list_t args;
args.push_back(L"function");
args.insert(args.end(), c_args.begin(), c_args.end());
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
/* Hackish const_cast matches the one in builtin_run */
const null_terminated_array_t<wchar_t> argv_array(args);
wchar_t **argv = const_cast<wchar_t **>(argv_array.get());
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc = builtin_count_args(argv);
int res=STATUS_BUILTIN_OK;
wchar_t *desc=0;
std::vector<event_t> events;
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
bool has_named_arguments = false;
wcstring_list_t named_arguments;
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
wcstring_list_t inherit_vars;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
bool shadows = true;
Support for command wrapping ("aliases") Add the --wraps option to 'complete' and 'function'. This allows a command to (recursively) inherit the completions of a wrapped command. Fixes #393. When evaluating a completion, we inspect the entire "wrap chain" for a command, i.e. we follow the sequence of wrapping until we either hit a loop (which we silently ignore) or the end of the chain. We then evaluate completions as if the wrapping command were substituted with the wrapped command. Currently this only works for commands, i.e. 'complete --command gco --wraps git\ checkout' won't work (that would seem to encroaching on abbreviations anyways). It might be useful to show an error message for that case. The commandline builtin reflects the commandline with the wrapped command substituted in, so e.g. git completions (which inspect the command line) will just work. This sort of command line munging is also performed by 'complete -C' so it's not totally without precedent. 'alias will also now mark its generated function as wrapping the 'target.
2014-08-16 09:14:36 +08:00
wcstring_list_t wrap_targets;
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
/* If -a/--argument-names is specified before the function name,
then the function name is the last positional, e.g. `function -a arg1 arg2 name`.
If it is specified after the function name (or not specified at all) then the
function name is the first positional. This is the common case. */
bool name_is_first_positional = true;
wcstring_list_t positionals;
Reduce compiled code size a bit
2013-04-13 16:32:07 +08:00
const struct woption long_options[] =
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Reduce compiled code size a bit
2013-04-13 16:32:07 +08:00
{ L"description", required_argument, 0, 'd' },
{ L"on-signal", required_argument, 0, 's' },
{ L"on-job-exit", required_argument, 0, 'j' },
{ L"on-process-exit", required_argument, 0, 'p' },
{ L"on-variable", required_argument, 0, 'v' },
{ L"on-event", required_argument, 0, 'e' },
Support for command wrapping ("aliases") Add the --wraps option to 'complete' and 'function'. This allows a command to (recursively) inherit the completions of a wrapped command. Fixes #393. When evaluating a completion, we inspect the entire "wrap chain" for a command, i.e. we follow the sequence of wrapping until we either hit a loop (which we silently ignore) or the end of the chain. We then evaluate completions as if the wrapping command were substituted with the wrapped command. Currently this only works for commands, i.e. 'complete --command gco --wraps git\ checkout' won't work (that would seem to encroaching on abbreviations anyways). It might be useful to show an error message for that case. The commandline builtin reflects the commandline with the wrapped command substituted in, so e.g. git completions (which inspect the command line) will just work. This sort of command line munging is also performed by 'complete -C' so it's not totally without precedent. 'alias will also now mark its generated function as wrapping the 'target.
2014-08-16 09:14:36 +08:00
{ L"wraps", required_argument, 0, 'w' },
Reduce compiled code size a bit
2013-04-13 16:32:07 +08:00
{ L"help", no_argument, 0, 'h' },
{ L"argument-names", no_argument, 0, 'a' },
{ L"no-scope-shadowing", no_argument, 0, 'S' },
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
{ L"inherit-variable", required_argument, 0, 'V' },
Reduce compiled code size a bit
2013-04-13 16:32:07 +08:00
{ 0, 0, 0, 0 }
};
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1 && (!res))
{
int opt_index = 0;
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
// The leading - here specifies RETURN_IN_ORDER
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"-d:s:j:p:v:e:haSV:",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
BUILTIN_ERR_UNKNOWN,
argv[0],
long_options[opt_index].name);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'd':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
desc=w.woptarg;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 's':
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int sig = wcs2sig(w.woptarg);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if (sig < 0)
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Unknown signal '%ls'"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptarg);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res=1;
break;
}
events.push_back(event_t::signal_event(sig));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'v':
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (wcsvarname(w.woptarg))
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Invalid variable name '%ls'"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptarg);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res=STATUS_BUILTIN_ERROR;
break;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
events.push_back(event_t::variable_event(w.woptarg));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'e':
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
events.push_back(event_t::generic_event(w.woptarg));
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'j':
case 'p':
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
pid_t pid;
wchar_t *end;
event_t e(EVENT_ANY);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if ((opt == 'j') &&
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
(wcscasecmp(w.woptarg, L"caller") == 0))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
int job_id = -1;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if (is_subshell)
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
size_t block_idx = 0;
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Find the outermost substitution block */
for (block_idx = 0; ; block_idx++)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
const block_t *b = parser.block_at_index(block_idx);
if (b == NULL || b->type() == SUBST)
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Go one step beyond that, to get to the caller */
const block_t *caller_block = parser.block_at_index(block_idx + 1);
if (caller_block != NULL && caller_block->job != NULL)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
job_id = caller_block->job->job_id;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
}
}
if (job_id == -1)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Cannot find calling job for event handler"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0]);
res=1;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
else
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
e.type = EVENT_JOB_ID;
e.param1.job_id = job_id;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
else
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
errno = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
pid = fish_wcstoi(w.woptarg, &end, 10);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if (errno || !end || *end)
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Invalid process id %ls"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptarg);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res=1;
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
e.type = EVENT_EXIT;
e.param1.pid = (opt=='j'?-1:1)*abs(pid);
}
if (res)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
/* nothing */
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
else
{
events.push_back(e);
}
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'a':
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
has_named_arguments = true;
/* The function name is the first positional unless -a comes before all positionals */
name_is_first_positional = ! positionals.empty();
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'S':
shadows = 0;
break;
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
Support for command wrapping ("aliases") Add the --wraps option to 'complete' and 'function'. This allows a command to (recursively) inherit the completions of a wrapped command. Fixes #393. When evaluating a completion, we inspect the entire "wrap chain" for a command, i.e. we follow the sequence of wrapping until we either hit a loop (which we silently ignore) or the end of the chain. We then evaluate completions as if the wrapping command were substituted with the wrapped command. Currently this only works for commands, i.e. 'complete --command gco --wraps git\ checkout' won't work (that would seem to encroaching on abbreviations anyways). It might be useful to show an error message for that case. The commandline builtin reflects the commandline with the wrapped command substituted in, so e.g. git completions (which inspect the command line) will just work. This sort of command line munging is also performed by 'complete -C' so it's not totally without precedent. 'alias will also now mark its generated function as wrapping the 'target.
2014-08-16 09:14:36 +08:00
case 'w':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wrap_targets.push_back(w.woptarg);
Support for command wrapping ("aliases") Add the --wraps option to 'complete' and 'function'. This allows a command to (recursively) inherit the completions of a wrapped command. Fixes #393. When evaluating a completion, we inspect the entire "wrap chain" for a command, i.e. we follow the sequence of wrapping until we either hit a loop (which we silently ignore) or the end of the chain. We then evaluate completions as if the wrapping command were substituted with the wrapped command. Currently this only works for commands, i.e. 'complete --command gco --wraps git\ checkout' won't work (that would seem to encroaching on abbreviations anyways). It might be useful to show an error message for that case. The commandline builtin reflects the commandline with the wrapped command substituted in, so e.g. git completions (which inspect the command line) will just work. This sort of command line munging is also performed by 'complete -C' so it's not totally without precedent. 'alias will also now mark its generated function as wrapping the 'target.
2014-08-16 09:14:36 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
case 'V':
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (wcsvarname(w.woptarg))
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
{
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
append_format(*out_err, _(L"%ls: Invalid variable name '%ls'"), argv[0], w.woptarg);
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
res = STATUS_BUILTIN_ERROR;
break;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
inherit_vars.push_back(w.woptarg);
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
break;
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
case 1:
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
assert(w.woptarg != NULL);
positionals.push_back(w.woptarg);
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
if (!res)
{
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
/* Determine the function name, and remove it from the list of positionals */
Stop showing help for function on an error It's long and obnoxious
2015-05-18 05:20:18 +08:00
wcstring function_name;
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
bool name_is_missing = positionals.empty();
if (! name_is_missing)
{
if (name_is_first_positional)
{
function_name = positionals.front();
positionals.erase(positionals.begin());
}
else
{
function_name = positionals.back();
positionals.erase(positionals.end() - 1);
}
}
if (name_is_missing)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Expected function name"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
res=1;
}
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
else if (wcsfuncname(function_name))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Illegal function name '%ls'"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
function_name.c_str());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
res=1;
}
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
else if (parser_keywords_is_reserved(function_name))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: The name '%ls' is reserved,\nand can not be used as a function name"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
function_name.c_str());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
res=1;
}
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
else if (function_name.empty())
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
{
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
append_format(*out_err, _(L"%ls: No function name given"), argv[0]);
Fix NULL dereference when function name is not specified It was possible to type `function ""; end`, and this caused fish to crash because of NULL pointer.
2014-05-06 18:07:16 +08:00
res=1;
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
else
{
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
if (has_named_arguments)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
/* All remaining positionals are named arguments */
named_arguments.swap(positionals);
for (size_t i=0; i < named_arguments.size(); i++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
if (wcsvarname(named_arguments.at(i)))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Invalid variable name '%ls'"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
named_arguments.at(i).c_str());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
res = STATUS_BUILTIN_ERROR;
break;
}
}
}
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
else if (! positionals.empty())
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Correctly handle mixing named arguments with function name Before this fix, `function -a arg1 name1` would produce a function named 'arg1'. After this fix, it will produce a function named 'name'. See #2068 for more.
2015-05-18 05:17:01 +08:00
// +1 because we already got the function name
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
append_format(*out_err,
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
_(L"%ls: Expected one argument, got %lu"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
Remove some extra newlines from function error messages
2015-12-28 07:55:49 +08:00
(unsigned long)(positionals.size() + 1));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
res=1;
}
}
Stop showing help for function on an error It's long and obnoxious
2015-05-18 05:20:18 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
if (!res)
{
/* Here we actually define the function! */
function_data_t d;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
d.name = function_name;
if (desc)
d.description = desc;
d.events.swap(events);
d.shadows = shadows;
d.named_arguments.swap(named_arguments);
d.inherit_vars.swap(inherit_vars);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
for (size_t i=0; i<d.events.size(); i++)
{
event_t &e = d.events.at(i);
e.function_name = d.name;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
d.definition = contents.c_str();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
function_add(d, parser, definition_line_offset);
Add new `functions` flag -V/--inherit-variable --inherit-variable takes a variable name and snapshots its current value. When the function is executed, it will have a local variable with this value already defined. Printing the function source will include synthesized `set -l` lines for the values. This is primarily useful for functions that are created on the fly, such as in `psub`.
2014-10-03 06:59:24 +08:00
Don't define a function if there's an error in function's args Fixes #2519
2015-12-20 10:03:46 +08:00
// Handle wrap targets
for (size_t w=0; w < wrap_targets.size(); w++)
{
complete_add_wrapper(function_name, wrap_targets.at(w));
}
Support for command wrapping ("aliases") Add the --wraps option to 'complete' and 'function'. This allows a command to (recursively) inherit the completions of a wrapped command. Fixes #393. When evaluating a completion, we inspect the entire "wrap chain" for a command, i.e. we follow the sequence of wrapping until we either hit a loop (which we silently ignore) or the end of the chain. We then evaluate completions as if the wrapping command were substituted with the wrapped command. Currently this only works for commands, i.e. 'complete --command gco --wraps git\ checkout' won't work (that would seem to encroaching on abbreviations anyways). It might be useful to show an error message for that case. The commandline builtin reflects the commandline with the wrapped command substituted in, so e.g. git completions (which inspect the command line) will just work. This sort of command line munging is also performed by 'complete -C' so it's not totally without precedent. 'alias will also now mark its generated function as wrapping the 'target.
2014-08-16 09:14:36 +08:00
}
Hook up for statements, if statements, and function definition in new parser
2013-12-27 17:38:43 +08:00
}
return res;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
/**
The random builtin. For generating random numbers.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
static int seeded=0;
static struct drand48_data seed_buffer;
int argc = builtin_count_args(argv);
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static const struct woption
long_options[] =
{
{
L"help", no_argument, 0, 'h'
}
,
{
0, 0, 0, 0
}
}
;
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"h",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
switch (argc-w.woptind)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
long res;
if (!seeded)
{
seeded=1;
srand48_r(time(0), &seed_buffer);
}
lrand48_r(&seed_buffer, &res);
clarify the documentation of builtin random The random builtin command may or may not produce values with a truly random distribution. So make the documentation reflect that reality. Also, make the command consistent with similar shells (e.g., bash, zsh) which produce a range of [0..32767]. Resolves issue #1272.
2015-12-29 12:31:12 +08:00
// The labs() shouldn't be necessary since lrand48 is supposed to
// return only positive integers but we're going to play it safe.
streams.out.append_format(L"%ld\n", labs(res % 32768));
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 1:
{
long foo;
wchar_t *end=0;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
errno=0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
foo = wcstol(argv[w.woptind], &end, 10);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if (errno || *end)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Seed value '%ls' is not a valid number\n"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
argv[w.woptind]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
}
seeded=1;
srand48_r(foo, &seed_buffer);
break;
}
default:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Expected zero or one argument, got %d\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
argc-w.woptind);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
}
return STATUS_BUILTIN_OK;
}
/**
The read builtin. Reads from stdin and stores the values in environment variables.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
wcstring buff;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int i, argc = builtin_count_args(argv);
int place = ENV_USER;
const wchar_t *prompt = DEFAULT_READ_PROMPT;
Add --right-prompt flag to read Add a flag to read to allow for setting the right prompt command in addition to the existing support for setting the prompt command. Fixes #1698.
2014-09-22 12:09:21 +08:00
const wchar_t *right_prompt = L"";
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
const wchar_t *commandline = L"";
int exit_res=STATUS_BUILTIN_OK;
const wchar_t *mode_name = READ_MODE_NAME;
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
int nchars=0;
wchar_t *end;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int shell = 0;
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
int array = 0;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
bool split_null = false;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
{
static const struct woption
long_options[] =
{
{
L"export", no_argument, 0, 'x'
}
,
{
L"global", no_argument, 0, 'g'
}
,
{
L"local", no_argument, 0, 'l'
}
,
{
L"universal", no_argument, 0, 'U'
}
,
{
L"unexport", no_argument, 0, 'u'
}
,
{
L"prompt", required_argument, 0, 'p'
}
,
Add --right-prompt flag to read Add a flag to read to allow for setting the right prompt command in addition to the existing support for setting the prompt command. Fixes #1698.
2014-09-22 12:09:21 +08:00
{
L"right-prompt", required_argument, 0, 'R'
}
,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
L"command", required_argument, 0, 'c'
}
,
{
L"mode-name", required_argument, 0, 'm'
}
,
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
{
L"nchars", required_argument, 0, 'n'
}
,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
L"shell", no_argument, 0, 's'
}
,
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
{
L"array", no_argument, 0, 'a'
}
,
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
{
L"null", no_argument, 0, 'z'
}
,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
L"help", no_argument, 0, 'h'
}
,
{
0, 0, 0, 0
}
}
;
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"xglUup:R:c:hm:n:saz",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'x':
place |= ENV_EXPORT;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'g':
place |= ENV_GLOBAL;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'l':
place |= ENV_LOCAL;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'U':
place |= ENV_UNIVERSAL;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'u':
place |= ENV_UNEXPORT;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'p':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
prompt = w.woptarg;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Add --right-prompt flag to read Add a flag to read to allow for setting the right prompt command in addition to the existing support for setting the prompt command. Fixes #1698.
2014-09-22 12:09:21 +08:00
case L'R':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
right_prompt = w.woptarg;
Add --right-prompt flag to read Add a flag to read to allow for setting the right prompt command in addition to the existing support for setting the prompt command. Fixes #1698.
2014-09-22 12:09:21 +08:00
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'c':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
commandline = w.woptarg;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'm':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
mode_name = w.woptarg;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
case L'n':
errno = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
nchars = fish_wcstoi(w.woptarg, &end, 10);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
if (errno || *end != 0)
{
switch (errno)
{
case ERANGE:
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format( _(L"%ls: Argument '%ls' is out of range\n"),
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptarg);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
return STATUS_BUILTIN_ERROR;
default:
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format( _(L"%ls: Argument '%ls' must be an integer\n"),
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
argv[0],
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
w.woptarg);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
return STATUS_BUILTIN_ERROR;
}
}
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 's':
shell = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
case 'a':
array = 1;
break;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
case L'z':
split_null = true;
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case L'?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
if ((place & ENV_UNEXPORT) && (place & ENV_EXPORT))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_EXPUNEXP,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if ((place&ENV_LOCAL?1:0) + (place & ENV_GLOBAL?1:0) + (place & ENV_UNIVERSAL?1:0) > 1)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_GLOCAL,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (array && w.woptind+1 != argc)
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: --array option requires a single variable name.\n"), argv[0]);
builtin_print_help(parser, streams, argv[0], streams.err);
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
return STATUS_BUILTIN_ERROR;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Verify all variable names
*/
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
for (i=w.woptind; i<argc; i++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
wchar_t *src;
if (!wcslen(argv[i]))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_VARNAME_ZERO, argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
for (src=argv[i]; *src; src++)
{
if ((!iswalnum(*src)) && (*src != L'_'))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_VARCHAR, argv[0], *src);
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
}
}
/*
The call to reader_readline may change woptind, so we save it away here
*/
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
i=w.woptind;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/*
Check if we should read interactively using \c reader_readline()
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (isatty(0) && streams.stdin_fd == STDIN_FILENO && !split_null)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
const wchar_t *line;
reader_push(mode_name);
reader_set_left_prompt(prompt);
Add --right-prompt flag to read Add a flag to read to allow for setting the right prompt command in addition to the existing support for setting the prompt command. Fixes #1698.
2014-09-22 12:09:21 +08:00
reader_set_right_prompt(right_prompt);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (shell)
{
reader_set_complete_function(&complete);
reader_set_highlight_function(&highlight_shell);
reader_set_test_function(&reader_shell_test);
}
Initial abbreviation work. Tests currently fail.
2013-07-17 15:38:04 +08:00
/* No autosuggestions or abbreviations in builtin_read */
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
reader_set_allow_autosuggesting(false);
Initial abbreviation work. Tests currently fail.
2013-07-17 15:38:04 +08:00
reader_set_expand_abbreviations(false);
rename reader_data_t.interruptible to exit_on_interrupt
2013-01-22 18:25:17 +08:00
reader_set_exit_on_interrupt(true);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
reader_set_buffer(commandline, wcslen(commandline));
proc_push_interactive(1);
event_fire_generic(L"fish_prompt");
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
line = reader_readline(nchars);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
proc_pop_interactive();
if (line)
{
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
if (0 < nchars && nchars < wcslen(line))
{
// line may be longer than nchars if a keybinding used `commandline -i`
// note: we're deliberately throwing away the tail of the commandline.
// It shouldn't be unread because it was produced with `commandline -i`,
// not typed.
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
buff = wcstring(line, nchars);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
}
else
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
buff = wcstring(line);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
exit_res = STATUS_BUILTIN_ERROR;
}
reader_pop();
}
else
{
int eof=0;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
buff.clear();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
{
int finished=0;
wchar_t res=0;
No need for mbstate_t to be static
2014-09-22 11:47:03 +08:00
mbstate_t state = {};
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (!finished)
{
char b;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (read_blocked(streams.stdin_fd, &b, 1) <= 0)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
eof=1;
break;
}
size_t sz = mbrtowc(&res, &b, 1, &state);
switch (sz)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case (size_t)(-1):
memset(&state, '\0', sizeof(state));
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case (size_t)(-2):
break;
case 0:
finished = 1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
default:
finished=1;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
if (eof)
break;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
if (!split_null && res == L'\n')
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
break;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
if (split_null && res == L'\0')
break;
buff.push_back(res);
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
if (0 < nchars && (size_t)nchars <= buff.size())
New -n option for read builtin Usage: read -n nchars Reads maximum of nchars characters. If nchars <= 0, there's no limit.
2014-08-19 20:28:08 +08:00
{
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Fix incorrect error on `read` with 1-character input When `read` is given a single character of input (including the newline), it was bailing as if it had been given no input. This is incorrect.
2014-09-22 11:00:26 +08:00
if (buff.empty() && eof)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
exit_res = 1;
}
}
if (i != argc && !exit_res)
{
env_var_t ifs = env_get_string(L"IFS");
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
if (ifs.missing_or_empty())
{
/* Every character is a separate token */
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
size_t bufflen = buff.size();
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
if (array)
{
if (bufflen > 0)
{
wcstring chars(bufflen+(bufflen-1), ARRAY_SEP);
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
wcstring::iterator out = chars.begin();
for (wcstring::const_iterator it = buff.begin(), end = buff.end(); it != end; ++it)
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
*out = *it;
out += 2;
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
}
env_set(argv[i], chars.c_str(), place);
}
else
{
env_set(argv[i], NULL, place);
}
}
else
{
size_t j = 0;
for (; i+1 < argc; ++i)
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
if (j < bufflen)
{
wchar_t buffer[2] = {buff[j++], 0};
Fix the compilation under gcc 4.9.0. gcc interpretes C99's compound literals more strictly by invalid the compound literal on implicit to pointer cast (because of automatic storage duration, 6.5.2.5.6 in C99 standard draft). This fixes the issue by not using compound literals at all.
2014-08-23 03:52:41 +08:00
env_set(argv[i], buffer, place);
}
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
else
{
Fix the compilation under gcc 4.9.0. gcc interpretes C99's compound literals more strictly by invalid the compound literal on implicit to pointer cast (because of automatic storage duration, 6.5.2.5.6 in C99 standard draft). This fixes the issue by not using compound literals at all.
2014-08-23 03:52:41 +08:00
env_set(argv[i], L"", place);
}
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
}
if (i < argc) env_set(argv[i], &buff[j], place);
}
}
else if (array)
{
wcstring tokens;
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
tokens.reserve(buff.size());
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
bool empty = true;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
for (wcstring_range loc = wcstring_tok(buff, ifs); loc.first != wcstring::npos; loc = wcstring_tok(buff, ifs, loc))
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
if (!empty) tokens.push_back(ARRAY_SEP);
tokens.append(buff, loc.first, loc.second);
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
empty = false;
}
env_set(argv[i], empty ? NULL : tokens.c_str(), place);
}
else
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
wcstring_range loc = wcstring_range(0,0);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
while (i<argc)
{
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
loc = wcstring_tok(buff, (i+1<argc) ? ifs : L"", loc);
env_set(argv[i], loc.first == wcstring::npos ? L"" : &buff.c_str()[loc.first], place);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
++i;
read: Support arrays, character splitting Enhance the `read` builtin to support creating an array with the --array flag. With --array, only a single variable name is allowed and the entire input is tokenized and placed into that variable as an array. Also add custom behavior if IFS is empty or unset. In that event, split the input on every character, instead of the previous behavior of doing no splitting at all.
2014-07-14 13:36:26 +08:00
}
Implement new `read --null` flag The `--null` flag to `read` makes it split incoming lines on NUL instead of newlines. This is intended for processing the output of a command that uses NUL separators (such as `find -print0`). Fixes #1694.
2014-09-22 10:18:56 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
return exit_res;
}
/**
The status builtin. Gives various status information on fish.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
enum
{
NORMAL,
IS_SUBST,
IS_BLOCK,
IS_INTERACTIVE,
IS_LOGIN,
IS_FULL_JOB_CONTROL,
IS_INTERACTIVE_JOB_CONTROL,
IS_NO_JOB_CONTROL,
STACK_TRACE,
DONE,
CURRENT_FILENAME,
CURRENT_LINE_NUMBER
}
;
int mode = NORMAL;
int argc = builtin_count_args(argv);
int res=STATUS_BUILTIN_OK;
const struct woption
long_options[] =
{
{
L"help", no_argument, 0, 'h'
}
,
{
L"is-command-substitution", no_argument, 0, 'c'
}
,
{
L"is-block", no_argument, 0, 'b'
}
,
{
L"is-interactive", no_argument, 0, 'i'
}
,
{
L"is-login", no_argument, 0, 'l'
}
,
{
L"is-full-job-control", no_argument, &mode, IS_FULL_JOB_CONTROL
}
,
{
L"is-interactive-job-control", no_argument, &mode, IS_INTERACTIVE_JOB_CONTROL
}
,
{
L"is-no-job-control", no_argument, &mode, IS_NO_JOB_CONTROL
}
,
{
L"current-filename", no_argument, 0, 'f'
}
,
{
L"current-line-number", no_argument, 0, 'n'
}
,
{
L"job-control", required_argument, 0, 'j'
}
,
{
L"print-stack-trace", no_argument, 0, 't'
}
,
{
0, 0, 0, 0
}
}
;
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L":cbilfnhj:t",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'c':
mode = IS_SUBST;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'b':
mode = IS_BLOCK;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'i':
mode = IS_INTERACTIVE;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'l':
mode = IS_LOGIN;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'f':
mode = CURRENT_FILENAME;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'n':
mode = CURRENT_LINE_NUMBER;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
case 'j':
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
if (wcscmp(w.woptarg, L"full") == 0)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
job_control_mode = JOB_CONTROL_ALL;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
else if (wcscmp(w.woptarg, L"interactive") == 0)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
job_control_mode = JOB_CONTROL_INTERACTIVE;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
else if (wcscmp(w.woptarg, L"none") == 0)
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
job_control_mode = JOB_CONTROL_NONE;
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(L"%ls: Invalid job control mode '%ls'\n",
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
L"status", w.woptarg);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
res = 1;
}
mode = DONE;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 't':
mode = STACK_TRACE;
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case ':':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_missing_argument(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
if (!res)
{
switch (mode)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case CURRENT_FILENAME:
{
const wchar_t *fn = parser.current_filename();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
if (!fn)
fn = _(L"Standard input");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%ls\n", fn);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case CURRENT_LINE_NUMBER:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%d\n", parser.get_lineno());
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Add support for specifying event handler for calling job in command supstitution. Add psub shellscript function for process substitution darcs-hash:20051015005126-ac50b-d2aedca3a50a78362502f3fa9dd8bf25cb7dc6e1.gz
2005-10-15 08:51:26 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_INTERACTIVE:
return !is_interactive_session;
Fixed named_arguments to be wcstring_list_t instead of al_list
2012-02-09 15:53:23 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_SUBST:
return !is_subshell;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_BLOCK:
return !is_block;
Add i18n through gettext, as well as a Swedish translation darcs-hash:20060104125102-ac50b-5bf026578a69bd94f7a7a3c8dee0ebccd95e5c24.gz
2006-01-04 20:51:02 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_LOGIN:
return !is_login;
Fix broken method for sorting output of builtin commands 'functions', 'set' and others darcs-hash:20060514094721-ac50b-9f1d8b6a2e8b4438e6a655de61af54d15cd4f537.gz
2006-05-14 17:47:21 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_FULL_JOB_CONTROL:
return job_control_mode != JOB_CONTROL_ALL;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_INTERACTIVE_JOB_CONTROL:
return job_control_mode != JOB_CONTROL_INTERACTIVE;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case IS_NO_JOB_CONTROL:
return job_control_mode != JOB_CONTROL_NONE;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case STACK_TRACE:
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(parser.stack_trace());
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case NORMAL:
{
if (is_login)
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( _(L"This is a login shell\n"));
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
else
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( _(L"This is not a login shell\n"));
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( _(L"Job control: %ls\n"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
job_control_mode==JOB_CONTROL_INTERACTIVE?_(L"Only on interactive jobs"):
(job_control_mode==JOB_CONTROL_NONE ? _(L"Never") : _(L"Always")));
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(parser.stack_trace());
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return res;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
The exit builtin. Calls reader_exit to exit and returns the value specified.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc = builtin_count_args(argv);
long ec=0;
switch (argc)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 1:
{
ec = proc_get_last_status();
break;
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 2:
{
wchar_t *end;
errno = 0;
ec = wcstol(argv[1],&end,10);
if (errno || *end != 0)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
argv[1]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
}
break;
}
default:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
}
reader_exit(1, 0);
return (int)ec;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
The cd builtin. Changes the current directory to the one specified
Indentation and comments darcs-hash:20070928213922-75c98-96ae445e28ad3273c98ddc4ca16597988eb66d37.gz
2007-09-29 05:39:22 +08:00
or to $HOME if none is specified. The directory can be relative to
any directory in the CDPATH variable.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
env_var_t dir_in;
wcstring dir;
int res=STATUS_BUILTIN_OK;
if (argv[1] == NULL)
{
dir_in = env_get_string(L"HOME");
if (dir_in.missing_or_empty())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Could not find home directory\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
}
}
else
{
dir_in = argv[1];
Lots of modernization changed Removed wcsdupcat
2012-05-09 17:33:42 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Lots of miscellaneous cleanup. Unified the path_get_cd_path, path_allocate_cd_path, etc. functions
2012-07-21 13:11:05 +08:00
bool got_cd_path = false;
if (! dir_in.missing())
{
got_cd_path = path_get_cdpath(dir_in, &dir);
Lots of modernization changed Removed wcsdupcat
2012-05-09 17:33:42 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!got_cd_path)
{
if (errno == ENOTDIR)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir_in.c_str());
}
else if (errno == ENOENT)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: The directory '%ls' does not exist\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir_in.c_str());
}
else if (errno == EROTTEN)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is a rotten symlink\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir_in.c_str());
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Unknown error trying to locate directory '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir_in.c_str());
}
if (!get_is_interactive())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append(parser.current_line());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
res = 1;
}
else if (wchdir(dir) != 0)
{
struct stat buffer;
int status;
status = wstat(dir, &buffer);
if (!status && S_ISDIR(buffer.st_mode))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Permission denied: '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir.c_str());
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
dir.c_str());
}
if (!get_is_interactive())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append(parser.current_line());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
res = 1;
}
else if (!env_set_pwd())
{
res=1;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Could not set PWD variable\n"), argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
return res;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Implementation of the builtin count command, used to count the
number of arguments sent to it.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_count(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Replace the count function with a builtin for performance reasons. The count function used at least two forks, which was noticable on systems such as OS X with slow forks darcs-hash:20070731212332-ac50b-8f5b2e70008ddb131dc8bae3f361d8d65a294948.gz
2007-08-01 05:23:32 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc;
argc = builtin_count_args(argv);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append_format( L"%d\n", argc-1);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return !(argc-1);
Replace the count function with a builtin for performance reasons. The count function used at least two forks, which was noticable on systems such as OS X with slow forks darcs-hash:20070731212332-ac50b-8f5b2e70008ddb131dc8bae3f361d8d65a294948.gz
2007-08-01 05:23:32 +08:00
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
Implementation of the builtin contains command, used to check if a
specified string is part of a list.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_contains(parser_t &parser, io_streams_t &streams, wchar_t ** argv)
Replace the contains function with a builtin for performance reasons. The contains function used at lots of forks, which was noticable on systems such as OS X with slow forks, as well as on completions that do a lot of tests, like svn darcs-hash:20070801225318-75c98-48cc4d685ab665c7c2eb93ac3c374bf5afecd28a.gz
2007-08-02 06:53:18 +08:00
{
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc;
argc = builtin_count_args(argv);
wchar_t *needle;
Formatting cleanup of builtin_contains
2013-04-29 05:35:00 +08:00
bool should_output_index = false;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Formatting cleanup of builtin_contains
2013-04-29 05:35:00 +08:00
const struct woption long_options[] =
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Formatting cleanup of builtin_contains
2013-04-29 05:35:00 +08:00
{ L"help", no_argument, 0, 'h' } ,
{ L"index", no_argument, 0, 'i' },
{ 0, 0, 0, 0 }
};
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
while (1)
{
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
int opt = w.wgetopt_long(argc,
argv,
L"+hi",
long_options,
&opt_index);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (opt == -1)
break;
switch (opt)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 0:
assert(opt_index >= 0 && (size_t)opt_index < sizeof long_options / sizeof *long_options);
if (long_options[opt_index].flag != 0)
break;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
long_options[opt_index].name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case ':':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_missing_argument(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_unknown_option(parser, streams, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'i':
Formatting cleanup of builtin_contains
2013-04-29 05:35:00 +08:00
should_output_index = true;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
needle = argv[w.woptind];
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (!needle)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Key not specified\n"), argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
for (int i=w.woptind+1; i<argc; i++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
if (!wcscmp(needle, argv[i]))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (should_output_index) streams.out.append_format( L"%d\n", i-w.woptind);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return 0;
}
}
return 1;
Make the contains builtin not allow reordering of switches and non-switches darcs-hash:20070814214257-75c98-a50161a8146dfd0a6c6a948e1960f93dd52275fd.gz
2007-08-15 05:42:57 +08:00
Replace the contains function with a builtin for performance reasons. The contains function used at lots of forks, which was noticable on systems such as OS X with slow forks, as well as on completions that do a lot of tests, like svn darcs-hash:20070801225318-75c98-48cc4d685ab665c7c2eb93ac3c374bf5afecd28a.gz
2007-08-02 06:53:18 +08:00
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
The . (dot) builtin, sometimes called source. Evaluates the contents of a file.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Some initial changes to use CLO_EXEC, with an eye towards some day using it correctly.
2012-03-02 16:27:40 +08:00
ASSERT_IS_MAIN_THREAD();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int fd;
int res = STATUS_BUILTIN_OK;
struct stat buf;
int argc;
argc = builtin_count_args(argv);
Stop using realpath() in builtin_source, so as to preserve relative path reporting in backtraces
2013-12-16 08:43:22 +08:00
const wchar_t *fn, *fn_intern;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (argc < 2 || (wcscmp(argv[1], L"-") == 0))
{
fn = L"-";
fn_intern = fn;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
fd = dup(streams.stdin_fd);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
if ((fd = wopen_cloexec(argv[1], O_RDONLY)) == -1)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Error encountered while sourcing file '%ls':\n"), argv[0], argv[1]);
builtin_wperror(L"source", streams);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if (fstat(fd, &buf) == -1)
{
close(fd);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Error encountered while sourcing file '%ls':\n"), argv[0], argv[1]);
builtin_wperror(L"source", streams);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
if (!S_ISREG(buf.st_mode))
{
close(fd);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is not a file\n"), argv[0], argv[1]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Stop using realpath() in builtin_source, so as to preserve relative path reporting in backtraces
2013-12-16 08:43:22 +08:00
fn_intern = intern(argv[1]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
parser.push_block(new source_block_t(fn_intern));
reader_push_current_filename(fn_intern);
Factor function environment preparation into its own function
2015-08-16 04:37:17 +08:00
env_set_argv((argc>2)?(argv+2):(argv+1));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
res = reader_read(fd, streams.io_chain ? *streams.io_chain : io_chain_t());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
parser.pop_block();
if (res)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Error while reading file '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
fn_intern == intern_static(L"-") ? L"<stdin>" : fn_intern);
}
else
{
res = proc_get_last_status();
}
/*
Do not close fd after calling reader_read. reader_read
automatically closes it before calling eval.
*/
reader_pop_current_filename();
return res;
}
/**
Make the specified job the first job of the job list. Moving jobs
around in the list makes the list reflect the order in which the
jobs were used.
*/
static void make_first(job_t *j)
{
job_promote(j);
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
/**
Builtin for putting a job in the foreground
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
job_t *j=NULL;
if (argv[1] == 0)
{
/*
Select last constructed job (I.e. first job in the job que)
that is possible to put in the foreground
*/
job_iterator_t jobs;
while ((j = jobs.next()))
{
if (job_get_flag(j, JOB_CONSTRUCTED) && (!job_is_completed(j)) &&
((job_is_stopped(j) || (!job_get_flag(j, JOB_FOREGROUND))) && job_get_flag(j, JOB_CONTROL)))
{
break;
}
}
if (!j)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: There are no suitable jobs\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
}
}
else if (argv[2] != 0)
{
/*
Specifying what more than one job to put to the foreground
is a syntax error, we still try to locate the job argv[1],
since we want to know if this is an ambigous job
specification or if this is an malformed job id
*/
wchar_t *endptr;
int pid;
int found_job = 0;
errno = 0;
pid = fish_wcstoi(argv[1], &endptr, 10);
if (!(*endptr || errno))
{
j = job_get_from_pid(pid);
if (j)
found_job = 1;
}
if (found_job)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Ambiguous job\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is not a job\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
argv[1]);
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
j=0;
}
else
{
wchar_t *end;
int pid;
errno = 0;
pid = abs(fish_wcstoi(argv[1], &end, 10));
if (*end || errno)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_NOT_NUMBER,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
argv[1]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
j = job_get_from_pid(pid);
if (!j || !job_get_flag(j, JOB_CONSTRUCTED) || job_is_completed(j))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: No suitable job: %d\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
pid);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
j=0;
}
else if (!job_get_flag(j, JOB_CONTROL))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because it is not under job control\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
pid,
j->command_wcstr());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
j=0;
}
}
}
if (j)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
if (streams.err_is_redirected)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(FG_MSG,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
j->job_id,
j->command_wcstr());
}
else
{
/*
If we aren't redirecting, send output to real stderr,
since stuff in sb_err won't get printed until the
command finishes.
*/
fwprintf(stderr,
FG_MSG,
j->job_id,
j->command_wcstr());
}
Continue to refine tokenizer interface Migrate some functions into tokenizer instance methods
2015-07-26 15:58:32 +08:00
const wcstring ft = tok_first(j->command());
Make tok_first return a wcstring instead of a wchar_t*
2012-11-22 14:23:48 +08:00
if (! ft.empty())
env_set(L"_", ft.c_str(), ENV_EXPORT);
Clean up reader_write_title to work with wcstring
2014-08-03 12:01:40 +08:00
reader_write_title(j->command());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
make_first(j);
job_set_flag(j, JOB_FOREGROUND, 1);
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
job_continue(j, job_is_stopped(j));
}
return j != 0;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
Helper function for builtin_bg()
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j, const wchar_t *name)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (j == 0)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Unknown job '%ls'\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
L"bg",
name);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, L"bg", streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
else if (!job_get_flag(j, JOB_CONTROL))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to background because it is not under job control\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
L"bg",
j->job_id,
j->command_wcstr());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, L"bg", streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"Send job %d '%ls' to background\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
j->job_id,
j->command_wcstr());
}
make_first(j);
job_set_flag(j, JOB_FOREGROUND, 0);
job_continue(j, job_is_stopped(j));
return STATUS_BUILTIN_OK;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
Builtin for putting a job in the background
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int res = STATUS_BUILTIN_OK;
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (argv[1] == 0)
{
job_t *j;
Convert jobs list to std::list
2012-01-30 08:36:21 +08:00
job_iterator_t jobs;
while ((j = jobs.next()))
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (job_is_stopped(j) && job_get_flag(j, JOB_CONTROL) && (!job_is_completed(j)))
{
break;
}
}
if (!j)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: There are no suitable jobs\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
res = 1;
}
else
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
res = send_to_bg(parser, streams, j, _(L"(default)"));
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
else
{
wchar_t *end;
int i;
int pid;
int err = 0;
for (i=1; argv[i]; i++)
{
errno=0;
pid = fish_wcstoi(argv[i], &end, 10);
if (errno || pid < 0 || *end || !job_get_from_pid(pid))
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: '%ls' is not a job\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
argv[i]);
err = 1;
break;
}
}
if (!err)
{
for (i=1; !res && argv[i]; i++)
{
pid = fish_wcstoi(argv[i], 0, 10);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
res |= send_to_bg(parser, streams, job_get_from_pid(pid), *argv);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
}
}
return res;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
This function handles both the 'continue' and the 'break' builtins
that are used for loop control.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int is_break = (wcscmp(argv[0],L"break")==0);
int argc = builtin_count_args(argv);
if (argc != 1)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN,
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0],
argv[1]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Find the index of the enclosing for or while loop. Recall that incrementing loop_idx goes 'up' to outer blocks */
size_t loop_idx;
for (loop_idx = 0; loop_idx < parser.block_count(); loop_idx++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
const block_t *b = parser.block_at_index(loop_idx);
if (b->type() == WHILE || b->type() == FOR)
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
if (loop_idx >= parser.block_count())
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Not inside of loop\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Skip blocks interior to the loop */
size_t block_idx = loop_idx;
while (block_idx--)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
parser.block_at_index(block_idx)->skip = true;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Skip the loop itself */
block_t *loop_block = parser.block_at_index(loop_idx);
loop_block->skip = true;
loop_block->loop_status = is_break ? LOOP_BREAK : LOOP_CONTINUE;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
/**
First stab at getting rid of the ugly state1, state2 properties of block_t
2012-08-27 13:42:29 +08:00
Implementation of the builtin breakpoint command, used to launch the
Add lots of new code comments. darcs-hash:20080113164747-75c98-9d0cefd27be7aef7ba60772616d9da7e6bb52912.gz
2008-01-14 00:47:47 +08:00
interactive debugger.
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Add breakpoint builtin darcs-hash:20061111105400-ac50b-18b9165f8719efd45b46e3b3786f7079edd721e7.gz
2006-11-11 18:54:00 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
parser.push_block(new breakpoint_block_t());
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
reader_read(STDIN_FILENO, streams.io_chain ? *streams.io_chain : io_chain_t());
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
parser.pop_block();
return proc_get_last_status();
Add breakpoint builtin darcs-hash:20061111105400-ac50b-18b9165f8719efd45b46e3b3786f7079edd721e7.gz
2006-11-11 18:54:00 +08:00
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/**
Function for handling the \c return builtin
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int argc = builtin_count_args(argv);
int status = proc_get_last_status();
switch (argc)
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 1:
break;
case 2:
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
wchar_t *end;
errno = 0;
status = fish_wcstoi(argv[1],&end,10);
if (errno || *end != 0)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0],
argv[1]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
}
break;
}
default:
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Too many arguments\n"),
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Find the function block */
size_t function_block_idx;
for (function_block_idx = 0; function_block_idx < parser.block_count(); function_block_idx++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
const block_t *b = parser.block_at_index(function_block_idx);
if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW)
break;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
if (function_block_idx >= parser.block_count())
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(_(L"%ls: Not inside of function\n"),
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.err);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_ERROR;
}
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
/* Skip everything up to (and then including) the function block */
for (size_t i=0; i < function_block_idx; i++)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
block_t *b = parser.block_at_index(i);
b->skip = true;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Refactor block_t storage in parser_t from a linked list to a vector
2013-12-21 09:41:21 +08:00
parser.block_at_index(function_block_idx)->skip = true;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return status;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Adding history builtin
2012-06-05 12:24:42 +08:00
/**
History of commands executed by user
*/
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Adding history builtin
2012-06-05 12:24:42 +08:00
{
int argc = builtin_count_args(argv);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
bool search_history = false;
Adding history builtin
2012-06-05 12:24:42 +08:00
bool delete_item = false;
bool search_prefix = false;
bool save_history = false;
bool clear_history = false;
Add support for history --merge to incorporate history changes from other sessions. Fixes #825
2014-07-26 01:08:21 +08:00
bool merge_history = false;
Adding history builtin
2012-06-05 12:24:42 +08:00
static const struct woption long_options[] =
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
{ L"prefix", no_argument, 0, 'p' },
{ L"delete", no_argument, 0, 'd' },
{ L"search", no_argument, 0, 's' },
{ L"contains", no_argument, 0, 'c' },
{ L"save", no_argument, 0, 'v' },
{ L"clear", no_argument, 0, 'l' },
Add support for history --merge to incorporate history changes from other sessions. Fixes #825
2014-07-26 01:08:21 +08:00
{ L"merge", no_argument, 0, 'm' },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 }
};
Adding history builtin
2012-06-05 12:24:42 +08:00
int opt = 0;
int opt_index = 0;
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
wgetopter_t w;
Adding history builtin
2012-06-05 12:24:42 +08:00
history_t *history = reader_get_history();
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
/* Use the default history if we have none (which happens if invoked non-interactively, e.g. from webconfig.py */
if (! history)
history = &history_t::history_with_name(L"fish");
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
while ((opt = w.wgetopt_long_only(argc, argv, L"pdscvl", long_options, &opt_index)) != EOF)
Adding history builtin
2012-06-05 12:24:42 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
switch (opt)
Adding history builtin
2012-06-05 12:24:42 +08:00
{
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'p':
search_prefix = true;
break;
case 'd':
delete_item = true;
break;
case 's':
search_history = true;
break;
case 'c':
break;
case 'v':
save_history = true;
break;
case 'l':
clear_history = true;
break;
Add support for history --merge to incorporate history changes from other sessions. Fixes #825
2014-07-26 01:08:21 +08:00
case 'm':
merge_history = true;
break;
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
case 'h':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_OK;
break;
case '?':
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
break;
default:
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_UNKNOWN, argv[0], argv[w.woptind-1]);
Fix indentation of switch statements
2012-11-19 16:31:03 +08:00
return STATUS_BUILTIN_ERROR;
Adding history builtin
2012-06-05 12:24:42 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Adding history builtin
2012-06-05 12:24:42 +08:00
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
/* Everything after is an argument */
Eliminate wgetopt global variables Replace them with a new struct wgetopter_t that uses instance variables instead.
2015-07-26 09:16:00 +08:00
const wcstring_list_t args(argv + w.woptind, argv + argc);
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
Adding history builtin
2012-06-05 12:24:42 +08:00
if (argc == 1)
{
wcstring full_history;
Improve history robustness against corrupt files Fixes #1581
2014-07-30 05:41:21 +08:00
history->get_string_representation(&full_history, wcstring(L"\n"));
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(full_history);
streams.out.push_back('\n');
Adding history builtin
2012-06-05 12:24:42 +08:00
return STATUS_BUILTIN_OK;
}
Add support for history --merge to incorporate history changes from other sessions. Fixes #825
2014-07-26 01:08:21 +08:00
if (merge_history)
{
history->incorporate_external_changes();
}
Adding history builtin
2012-06-05 12:24:42 +08:00
if (search_history)
{
int res = STATUS_BUILTIN_ERROR;
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
for (wcstring_list_t::const_iterator iter = args.begin(); iter != args.end(); ++iter)
Adding history builtin
2012-06-05 12:24:42 +08:00
{
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
const wcstring &search_string = *iter;
if (search_string.empty())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.err.append_format(BUILTIN_ERR_COMBO2, argv[0], L"Use --search with either --contains or --prefix");
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
return res;
}
history_search_t searcher = history_search_t(*history, search_string, search_prefix?HISTORY_SEARCH_TYPE_PREFIX:HISTORY_SEARCH_TYPE_CONTAINS);
while (searcher.go_backwards())
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(searcher.current_string());
streams.out.append(L"\n");
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
res = STATUS_BUILTIN_OK;
}
Adding history builtin
2012-06-05 12:24:42 +08:00
}
return res;
}
if (delete_item)
{
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
for (wcstring_list_t::const_iterator iter = args.begin(); iter != args.end(); ++iter)
{
wcstring delete_string = *iter;
if (delete_string[0] == '"' && delete_string[delete_string.length() - 1] == '"')
delete_string = delete_string.substr(1, delete_string.length() - 2);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
Implemented history deletion from fish_config Fixes https://github.com/fish-shell/fish-shell/issues/250
2012-07-27 15:31:00 +08:00
history->remove(delete_string);
}
Adding history builtin
2012-06-05 12:24:42 +08:00
return STATUS_BUILTIN_OK;
}
if (save_history)
{
history->save();
return STATUS_BUILTIN_OK;
}
if (clear_history)
{
history->clear();
history->save();
return STATUS_BUILTIN_OK;
}
return STATUS_BUILTIN_ERROR;
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_parse(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Added parse builtin for testing. Lots of work on simulated execution.
2013-06-16 05:32:38 +08:00
{
Implement support for switch
2013-07-01 06:38:31 +08:00
struct sigaction act;
sigemptyset(& act.sa_mask);
act.sa_flags=0;
act.sa_handler=SIG_DFL;
sigaction(SIGINT, &act, 0);
Added parse builtin for testing. Lots of work on simulated execution.
2013-06-16 05:32:38 +08:00
std::vector<char> txt;
for (;;)
{
char buff[256];
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
ssize_t amt = read_loop(streams.stdin_fd, buff, sizeof buff);
Added parse builtin for testing. Lots of work on simulated execution.
2013-06-16 05:32:38 +08:00
if (amt <= 0) break;
txt.insert(txt.end(), buff, buff + amt);
}
if (! txt.empty())
{
const wcstring src = str2wcstring(&txt.at(0), txt.size());
parse_node_tree_t parse_tree;
Beginning support for new parser error messages
2013-06-16 06:21:35 +08:00
parse_error_list_t errors;
Tweak comment handling. Mark a parse node with a new flag when it has comments
2014-12-24 02:58:45 +08:00
bool success = parse_tree_from_string(src, parse_flag_include_comments, &parse_tree, &errors);
Beginning support for new parser error messages
2013-06-16 06:21:35 +08:00
if (! success)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L"Parsing failed:\n");
Beginning support for new parser error messages
2013-06-16 06:21:35 +08:00
for (size_t i=0; i < errors.size(); i++)
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(errors.at(i).describe(src));
streams.out.push_back(L'\n');
Beginning support for new parser error messages
2013-06-16 06:21:35 +08:00
}
Update style and formatting to conform to fish style guide.
2014-01-15 17:40:40 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(L"(Reparsed with continue after error)\n");
Better support for parse errors in indenting
2013-12-09 06:13:23 +08:00
parse_tree.clear();
errors.clear();
Tweak comment handling. Mark a parse node with a new flag when it has comments
2014-12-24 02:58:45 +08:00
parse_tree_from_string(src, parse_flag_continue_after_error | parse_flag_include_comments, &parse_tree, &errors);
Better support for parse errors in indenting
2013-12-09 06:13:23 +08:00
}
const wcstring dump = parse_dump_tree(parse_tree, src);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
streams.out.append(dump);
Added parse builtin for testing. Lots of work on simulated execution.
2013-06-16 05:32:38 +08:00
}
return STATUS_BUILTIN_OK;
}
Adding history builtin
2012-06-05 12:24:42 +08:00
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_true(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Make false/true into builtins Making `true` into a builtin is a significant optimization to `while true` loops. As long as `true` is a builtin, we may as well make `false` builtin as well (despite the fact that it's not typically executed in a loop).
2014-09-30 04:26:28 +08:00
{
return STATUS_BUILTIN_OK;
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_false(parser_t &parser, io_streams_t &streams, wchar_t **argv)
Make false/true into builtins Making `true` into a builtin is a significant optimization to `while true` loops. As long as `true` is a builtin, we may as well make `false` builtin as well (despite the fact that it's not typically executed in a loop).
2014-09-30 04:26:28 +08:00
{
return STATUS_BUILTIN_ERROR;
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
/*
END OF BUILTIN COMMANDS
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
Below are functions for handling the builtin commands.
THESE MUST BE SORTED BY NAME! Completion lookup uses binary search.
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
*/
Code cleanup darcs-hash:20051215135902-ac50b-e9fc18bca34459ddb56e970a16c05e9b3cc54848.gz
2005-12-15 21:59:02 +08:00
Documentation updates. Fixes a few formating bugs, adds various minor missing api documentation, fixes a few typos. Also fixes a few tiny code issues, mostly missing consts, etc darcs-hash:20060617130708-ac50b-cc2ec5aa3e4bfb8e28d7b86441bfb4661f1dd7e7.gz
2006-06-17 21:07:08 +08:00
/**
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
Data about all the builtin commands in fish.
Functions that are bound to builtin_generic are handled directly by the parser.
First stab at elseif implementation
2012-09-01 16:46:14 +08:00
NOTE: These must be kept in sorted order!
Documentation updates. Fixes a few formating bugs, adds various minor missing api documentation, fixes a few typos. Also fixes a few tiny code issues, mostly missing consts, etc darcs-hash:20060617130708-ac50b-cc2ec5aa3e4bfb8e28d7b86441bfb4661f1dd7e7.gz
2006-06-17 21:07:08 +08:00
*/
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
static const builtin_data_t builtin_datas[]=
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Implement builtin [ via builtin test
2013-01-05 17:30:03 +08:00
{ L"[", &builtin_test, N_(L"Test a condition") },
Disable __fish_parse for 2.2 release Fixes #1809
2015-05-03 12:35:49 +08:00
#if 0
Rename builtin parse to __fish_parse
2014-01-09 07:13:08 +08:00
{ L"__fish_parse", &builtin_parse, N_(L"Try out the new parser") },
Disable __fish_parse for 2.2 release Fixes #1809
2015-05-03 12:35:49 +08:00
#endif
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"and", &builtin_generic, N_(L"Execute command if previous command suceeded") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"begin", &builtin_generic, N_(L"Create a block of code") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"bg", &builtin_bg, N_(L"Send job to background") },
{ L"bind", &builtin_bind, N_(L"Handle fish key bindings") },
{ L"block", &builtin_block, N_(L"Temporarily block delivery of events") },
{ L"break", &builtin_break_continue, N_(L"Stop the innermost loop") },
{ L"breakpoint", &builtin_breakpoint, N_(L"Temporarily halt execution of a script and launch an interactive debug prompt") },
{ L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"case", &builtin_generic, N_(L"Conditionally execute a block of commands") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"cd", &builtin_cd, N_(L"Change working directory") },
Teach `command` builtin a -p/--path flag Give the `command` builtin a single flag, -p/--path, that causes it to print the full path that would be executed for the given command.
2014-07-10 09:21:06 +08:00
{ L"command", &builtin_command, N_(L"Run a program instead of a function or builtin") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"commandline", &builtin_commandline, N_(L"Set or get the commandline") },
{ L"complete", &builtin_complete, N_(L"Edit command specific completions") },
{ L"contains", &builtin_contains, N_(L"Search for a specified string in a list") },
{ L"continue", &builtin_break_continue, N_(L"Skip the rest of the current lap of the innermost loop") },
{ L"count", &builtin_count, N_(L"Count the number of arguments") },
{ L"echo", &builtin_echo, N_(L"Print arguments") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"else", &builtin_generic, N_(L"Evaluate block if condition is false") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"emit", &builtin_emit, N_(L"Emit an event") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"end", &builtin_generic, N_(L"End a block of commands") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"exec", &builtin_generic, N_(L"Run command in current process") },
{ L"exit", &builtin_exit, N_(L"Exit the shell") },
Make false/true into builtins Making `true` into a builtin is a significant optimization to `while true` loops. As long as `true` is a builtin, we may as well make `false` builtin as well (despite the fact that it's not typically executed in a loop).
2014-09-30 04:26:28 +08:00
{ L"false", &builtin_false, N_(L"Return an unsuccessful result") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"fg", &builtin_fg, N_(L"Send job to foreground") },
Clean up various block types and state as part of new parser
2014-03-03 05:46:30 +08:00
{ L"for", &builtin_generic, N_(L"Perform a set of commands multiple times") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"function", &builtin_generic, N_(L"Define a new function") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"functions", &builtin_functions, N_(L"List or remove functions") },
{ L"history", &builtin_history, N_(L"History of commands executed by user") },
{ L"if", &builtin_generic, N_(L"Evaluate block if condition is true") },
{ L"jobs", &builtin_jobs, N_(L"Print currently running jobs") },
{ L"not", &builtin_generic, N_(L"Negate exit status of job") },
{ L"or", &builtin_generic, N_(L"Execute command if previous command failed") },
Initial version of printf builtin
2013-01-23 01:07:28 +08:00
{ L"printf", &builtin_printf, N_(L"Prints formatted text") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"pwd", &builtin_pwd, N_(L"Print the working directory") },
{ L"random", &builtin_random, N_(L"Generate random number") },
{ L"read", &builtin_read, N_(L"Read a line of input into variables") },
{ L"return", &builtin_return, N_(L"Stop the currently evaluated function") },
{ L"set", &builtin_set, N_(L"Handle environment variables") },
First stab at builtin set_color. Moved set_color.cpp to builtin_set_color.cpp and taught fish about it.
2013-02-15 07:50:24 +08:00
{ L"set_color", &builtin_set_color, N_(L"Set the terminal color") },
Deprecate "." command. Fixes #310. Needs documentation (for the new name), but manages to move . to source, while preserving compatibility.
2013-08-14 23:43:09 +08:00
{ L"source", &builtin_source, N_(L"Evaluate contents of file") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"status", &builtin_status, N_(L"Return status information about fish") },
Merge new string builtin This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge: 11c8a47 7974aab Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit 7974aab6d367f999f1140ab34c2535cef5cf3b00 Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commit eb20b43d2d96b7e6d24618158ce71078de83c40b Merge: 1a09e70 5f519cb Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit 1a09e709d028393c9e9e6dc9a84278f399a15f3d Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commit a0ec9772cd1a0a548a501a7633be05dab4e5ee46 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 64c25a01e3f7234f220ba13545cf658a7492b1a4 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit ece7f35ec5f4093763627d68d671b6c0c876896d Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 9ff7477a926c4572e26171cab3cd42f8086be678 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit baf4e096b22dde3063b85b833795eb570d660ba7 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 896a2c2b279a419747bea26102229fbe84534a6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit efd47dcbda2ca247d58bee56a7774cd75a1062fd Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit ed0850e2db467362066a3d94e3ececd17c1756cd Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 9492e7a7e929c03554336be1ddf80ca6b37f53c5 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 1a60b933718feb20c0bf7c9e257b8e495014ea1b Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit 5f519cb2a2c05213e0a88a7add7af288bc1c1352 Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit 2ecd24f79500879e2de5bdf1b4c19dd44fc6ac85 Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit 45b777e4dc85c05cd4a186f4bdcae543c21aaf08 Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit 981cbb6ddf742a5fe8881af916e7b870b7e6422a Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commit ddb6a2a8fdb6aa31aad41e80d5481bb32c6ed8ff Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit 1e34e3191b028162863d263e9868052f75194aa5 Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit 34232e152df17a3cfbf0a094dd51d148a4f04e6f Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit 00d7e781697f53454beb91c1d0fc4b2d28d6e034 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit 4498aa5f576e09634f7f619443e74d2f33c108e4 Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit 290c58c72e22db644ccf6fa9088051644980ed0a Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
2015-09-13 03:59:40 +08:00
{ L"string", &builtin_string, N_(L"Manipulate strings") },
Remove obviated builtins and additional cleanup of old parser
2014-03-03 05:11:17 +08:00
{ L"switch", &builtin_generic, N_(L"Conditionally execute a block of commands") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"test", &builtin_test, N_(L"Test a condition") },
Make false/true into builtins Making `true` into a builtin is a significant optimization to `while true` loops. As long as `true` is a builtin, we may as well make `false` builtin as well (despite the fact that it's not typically executed in a loop).
2014-09-30 04:26:28 +08:00
{ L"true", &builtin_true, N_(L"Return a successful result") },
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{ L"ulimit", &builtin_ulimit, N_(L"Set or get the shells resource usage limits") },
{ L"while", &builtin_generic, N_(L"Perform a command multiple times") }
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
};
#define BUILTIN_COUNT (sizeof builtin_datas / sizeof *builtin_datas)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static const builtin_data_t *builtin_lookup(const wcstring &name)
{
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
const builtin_data_t *array_end = builtin_datas + BUILTIN_COUNT;
const builtin_data_t *found = std::lower_bound(builtin_datas, array_end, name);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (found != array_end && name == found->name)
{
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
return found;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
else
{
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
return NULL;
}
Clean up init code in builtin.c darcs-hash:20060205130840-ac50b-1a2b29671b7d8c557ebd284513c535e082ee5cf3.gz
2006-02-05 21:08:40 +08:00
}
Improve the status builtin darcs-hash:20060130195310-ac50b-5da6881a847170242be56555646bbf037218d545.gz
2006-01-31 03:53:10 +08:00
Clean up init code in builtin.c darcs-hash:20060205130840-ac50b-1a2b29671b7d8c557ebd284513c535e082ee5cf3.gz
2006-02-05 21:08:40 +08:00
void builtin_init()
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (size_t i=0; i < BUILTIN_COUNT; i++)
{
intern_static(builtin_datas[i].name);
}
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
void builtin_destroy()
{
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
int builtin_exists(const wcstring &cmd)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return !!builtin_lookup(cmd);
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
/**
Return true if the specified builtin should handle it's own help,
false otherwise.
*/
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
static int internal_help(const wchar_t *cmd)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
CHECK(cmd, 0);
return contains(cmd, L"for", L"while", L"function",
Don't suppress output for `printf --help` Fixes #746.
2014-09-22 14:48:47 +08:00
L"if", L"end", L"switch", L"case", L"count", L"printf");
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int builtin_run(parser_t &parser, const wchar_t * const *argv, io_streams_t &streams)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
int (*cmd)(parser_t &parser, io_streams_t &streams, const wchar_t * const *argv)=NULL;
Use scoped_push to save and restore real_io Fixes a dangling pointer
2015-01-08 08:41:16 +08:00
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
CHECK(argv, STATUS_BUILTIN_ERROR);
CHECK(argv[0], STATUS_BUILTIN_ERROR);
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
const builtin_data_t *data = builtin_lookup(argv[0]);
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
cmd = (int (*)(parser_t &parser, io_streams_t &streams, const wchar_t * const*))(data ? data->func : NULL);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
if (argv[1] != 0 && !internal_help(argv[0]))
{
Remove additional dead code from old parser
2014-03-19 05:42:38 +08:00
if (argv[2] == 0 && (parse_util_argument_is_help(argv[1], 0)))
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
builtin_print_help(parser, streams, argv[0], streams.out);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return STATUS_BUILTIN_OK;
}
}
if (data != NULL)
{
int status;
Eliminate global variables associated with builtin IO This change eliminates global variables like stdout_buffer. Instead we wrap up the IO information into a new struct io_streams_t, and thread that through every builtin. This makes the intent clearer, gives us a place to hang new IO data, and eliminates the ugly global state management like builtin_push_io.
2015-09-22 02:24:49 +08:00
status = cmd(parser, streams, argv);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
return status;
}
else
{
Teach parse_util_detect_errors to report invalid builtins, as found in issue #1252
2014-03-27 09:20:38 +08:00
debug(0, UNKNOWN_BUILTIN_ERR_MSG, argv[0]);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
return STATUS_BUILTIN_ERROR;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
wcstring_list_t builtin_get_names(void)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
wcstring_list_t result;
result.reserve(BUILTIN_COUNT);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (size_t i=0; i < BUILTIN_COUNT; i++)
{
Cleanup of builtins. No more hashes.
2012-02-01 11:47:56 +08:00
result.push_back(builtin_datas[i].name);
}
return result;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Stop passing mutable references to completions around Replace uses of vector<completion_t>& with vector<completion_t>* This makes it clear at the call site that the object may be mutated.
2015-07-28 09:45:47 +08:00
void builtin_get_names(std::vector<completion_t> *list)
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
{
Stop passing mutable references to completions around Replace uses of vector<completion_t>& with vector<completion_t>* This makes it clear at the call site that the object may be mutated.
2015-07-28 09:45:47 +08:00
assert(list != NULL);
list->reserve(list->size() + BUILTIN_COUNT);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
for (size_t i=0; i < BUILTIN_COUNT; i++)
{
Miscellaneous optimizations to reduce string copying
2014-01-08 06:57:58 +08:00
append_completion(list, builtin_datas[i].name);
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
}
Converted all auto completion calls (on pressing tab) to use std::vector<completion_t>, bugs are yet to be fixed
2012-01-17 00:56:47 +08:00
}
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
wcstring builtin_get_desc(const wcstring &name)
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
{
Work towards getting function.h off of shared_ptr
2012-05-18 10:37:46 +08:00
wcstring result;
Apply new indentation, brace, and whitespace style
2012-11-19 08:30:30 +08:00
const builtin_data_t *builtin = builtin_lookup(name);
if (builtin)
{
Work towards getting function.h off of shared_ptr
2012-05-18 10:37:46 +08:00
result = _(builtin->desc);
}
return result;
Initial revision darcs-hash:20050920132639-ac50b-fa3b476891e1f5f67207cf4cc7bf623834cc5edc.gz
2005-09-20 21:26:39 +08:00
}
Reference in New Issue Copy Permalink