github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-indentation-merge

Browse Source
This commit is contained in:
ridiculousfish 2012-11-18 15:12:22 -08:00
commit bab69f2672
9 changed files with 7379 additions and 7324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5388
builtin.cpp
View File

File diff suppressed because it is too large Load Diff

2415
common.cpp
View File

File diff suppressed because it is too large Load Diff

168
common.h
View File

@ -1,5 +1,5 @@
/** \file common.h /** \file common.h
Prototypes for various functions, mostly string utilities, that are used by most parts of fish. Prototypes for various functions, mostly string utilities, that are used by most parts of fish.
*/ */
#ifndef FISH_COMMON_H #ifndef FISH_COMMON_H
@ -67,10 +67,10 @@ typedef std::vector<wcstring> wcstring_list_t;
enum { enum {
/** Escape all characters, including magic characters like the semicolon */ /** Escape all characters, including magic characters like the semicolon */
ESCAPE_ALL = 1 << 0, ESCAPE_ALL = 1 << 0,
/** Do not try to use 'simplified' quoted escapes, and do not use empty quotes as the empty string */ /** Do not try to use 'simplified' quoted escapes, and do not use empty quotes as the empty string */
ESCAPE_NO_QUOTED = 1 << 1, ESCAPE_NO_QUOTED = 1 << 1,
/** Do not escape tildes */ /** Do not escape tildes */
ESCAPE_NO_TILDE = 1 << 2 ESCAPE_NO_TILDE = 1 << 2
}; };
@ -84,10 +84,10 @@ typedef unsigned int escape_flags_t;
/** Exits without invoking destructors (via _exit), useful for code after fork. */ /** Exits without invoking destructors (via _exit), useful for code after fork. */
void exit_without_destructors(int code) __attribute__ ((noreturn)); void exit_without_destructors(int code) __attribute__ ((noreturn));
/** /**
Save the shell mode on startup so we can restore them on exit Save the shell mode on startup so we can restore them on exit
*/ */
extern struct termios shell_modes; extern struct termios shell_modes;
/** /**
The character to use where the text has been truncated. Is an The character to use where the text has been truncated. Is an
@ -118,57 +118,57 @@ extern const wchar_t *program_name;
failiure, the current function is ended at once. The second failiure, the current function is ended at once. The second
parameter is the return value of the current function on failiure. parameter is the return value of the current function on failiure.
*/ */
#define CHECK( arg, retval ) \ #define CHECK( arg, retval ) \
if( !(arg) ) \ if( !(arg) ) \
{ \ { \
debug( 0, \ debug( 0, \
"function %s called with null value for argument %s. ", \ "function %s called with null value for argument %s. ", \
__func__, \ __func__, \
#arg ); \ #arg ); \
bugreport(); \ bugreport(); \
show_stackframe(); \ show_stackframe(); \
return retval; \ return retval; \
} }
/** /**
Pause for input, then exit the program. If supported, print a backtrace first. Pause for input, then exit the program. If supported, print a backtrace first.
*/ */
#define FATAL_EXIT() \ #define FATAL_EXIT() \
{ \ { \
char exit_read_buff; \ char exit_read_buff; \
show_stackframe(); \ show_stackframe(); \
read( 0, &exit_read_buff, 1 ); \ read( 0, &exit_read_buff, 1 ); \
exit_without_destructors( 1 ); \ exit_without_destructors( 1 ); \
} \ } \
/** /**
Exit program at once, leaving an error message about running out of memory. Exit program at once, leaving an error message about running out of memory.
*/ */
#define DIE_MEM() \ #define DIE_MEM() \
{ \ { \
fwprintf( stderr, \ fwprintf( stderr, \
L"fish: Out of memory on line %ld of file %s, shutting down fish\n", \ L"fish: Out of memory on line %ld of file %s, shutting down fish\n", \
(long)__LINE__, \ (long)__LINE__, \
__FILE__ ); \ __FILE__ ); \
FATAL_EXIT(); \ FATAL_EXIT(); \
} }
/** /**
Check if signals are blocked. If so, print an error message and Check if signals are blocked. If so, print an error message and
return from the function performing this check. return from the function performing this check.
*/ */
#define CHECK_BLOCK( retval ) \ #define CHECK_BLOCK( retval ) \
if( signal_is_blocked() ) \ if( signal_is_blocked() ) \
{ \ { \
debug( 0, \ debug( 0, \
"function %s called while blocking signals. ", \ "function %s called while blocking signals. ", \
__func__); \ __func__); \
bugreport(); \ bugreport(); \
show_stackframe(); \ show_stackframe(); \
return retval; \ return retval; \
} }
/** /**
Shorthand for wgettext call Shorthand for wgettext call
*/ */
@ -176,7 +176,7 @@ extern const wchar_t *program_name;
/** /**
Noop, used to tell xgettext that a string should be translated, Noop, used to tell xgettext that a string should be translated,
even though it is not directly sent to wgettext. even though it is not directly sent to wgettext.
*/ */
#define N_(wstr) wstr #define N_(wstr) wstr
@ -192,7 +192,7 @@ void show_stackframe();
/** /**
Read a line from the stream f into the string. Returns Read a line from the stream f into the string. Returns
the number of bytes read or -1 on failiure. the number of bytes read or -1 on failiure.
If the carriage return character is encountered, it is If the carriage return character is encountered, it is
@ -214,7 +214,7 @@ wchar_t *str2wcs( const char *in );
/** /**
Returns a newly allocated wide character string equivalent of the Returns a newly allocated wide character string equivalent of the
specified multibyte character string specified multibyte character string
This function encodes illegal character sequences in a reversible This function encodes illegal character sequences in a reversible
way using the private use area. way using the private use area.
*/ */
@ -344,7 +344,7 @@ inline wcstring to_string(const int &x) {
template <typename CharType_t> template <typename CharType_t>
class null_terminated_array_t { class null_terminated_array_t {
CharType_t **array; CharType_t **array;
typedef std::basic_string<CharType_t> string_t; typedef std::basic_string<CharType_t> string_t;
typedef std::vector<string_t> string_list_t; typedef std::vector<string_t> string_list_t;
@ -356,7 +356,7 @@ class null_terminated_array_t {
size_t len; size_t len;
for (len=0; arr[len] != T(0); len++) for (len=0; arr[len] != T(0); len++)
; ;
return len; return len;
} }
size_t size() const { size_t size() const {
@ -372,24 +372,24 @@ class null_terminated_array_t {
array = NULL; array = NULL;
} }
} }
public: public:
null_terminated_array_t() : array(NULL) { } null_terminated_array_t() : array(NULL) { }
null_terminated_array_t(const string_list_t &argv) : array(NULL) { this->set(argv); } null_terminated_array_t(const string_list_t &argv) : array(NULL) { this->set(argv); }
~null_terminated_array_t() { this->free(); } ~null_terminated_array_t() { this->free(); }
/** operator=. Notice the pass-by-value parameter. */ /** operator=. Notice the pass-by-value parameter. */
null_terminated_array_t& operator=(null_terminated_array_t rhs) { null_terminated_array_t& operator=(null_terminated_array_t rhs) {
if (this != &rhs) if (this != &rhs)
this->swap(rhs); this->swap(rhs);
return *this; return *this;
} }
/* Copy constructor. */ /* Copy constructor. */
null_terminated_array_t(const null_terminated_array_t &him) : array(NULL) { null_terminated_array_t(const null_terminated_array_t &him) : array(NULL) {
this->set(him.array); this->set(him.array);
} }
void set(const string_list_t &argv) { void set(const string_list_t &argv) {
/* Get rid of the old argv */ /* Get rid of the old argv */
this->free(); this->free();
@ -405,14 +405,14 @@ class null_terminated_array_t {
} }
this->array[count] = NULL; this->array[count] = NULL;
} }
void set(const CharType_t * const *new_array) { void set(const CharType_t * const *new_array) {
if (new_array == array) if (new_array == array)
return; return;
/* Get rid of the old argv */ /* Get rid of the old argv */
this->free(); this->free();
/* Copy the new one */ /* Copy the new one */
if (new_array) { if (new_array) {
size_t i, count = count_not_null(new_array); size_t i, count = count_not_null(new_array);
@ -426,10 +426,10 @@ class null_terminated_array_t {
this->array[count] = NULL; this->array[count] = NULL;
} }
} }
CharType_t **get() { return array; } CharType_t **get() { return array; }
const CharType_t * const *get() const { return array; } const CharType_t * const *get() const { return array; }
string_list_t to_list() const { string_list_t to_list() const {
string_list_t lst; string_list_t lst;
if (array != NULL) { if (array != NULL) {
@ -448,23 +448,23 @@ null_terminated_array_t<char> convert_wide_array_to_narrow(const null_terminated
class narrow_string_rep_t { class narrow_string_rep_t {
private: private:
const char *str; const char *str;
/* No copying */ /* No copying */
narrow_string_rep_t &operator=(const narrow_string_rep_t &); narrow_string_rep_t &operator=(const narrow_string_rep_t &);
narrow_string_rep_t(const narrow_string_rep_t &x); narrow_string_rep_t(const narrow_string_rep_t &x);
public: public:
~narrow_string_rep_t() { ~narrow_string_rep_t() {
free((void *)str); free((void *)str);
} }
narrow_string_rep_t() : str(NULL) {} narrow_string_rep_t() : str(NULL) {}
void set(const wcstring &s) { void set(const wcstring &s) {
free((void *)str); free((void *)str);
str = wcs2str(s.c_str()); str = wcs2str(s.c_str());
} }
const char *get() const { const char *get() const {
return str; return str;
} }
@ -476,7 +476,7 @@ bool is_forked_child();
class scoped_lock { class scoped_lock {
pthread_mutex_t *lock_obj; pthread_mutex_t *lock_obj;
bool locked; bool locked;
/* No copying */ /* No copying */
scoped_lock &operator=(const scoped_lock &); scoped_lock &operator=(const scoped_lock &);
scoped_lock(const scoped_lock &); scoped_lock(const scoped_lock &);
@ -492,18 +492,18 @@ public:
class wcstokenizer { class wcstokenizer {
wchar_t *buffer, *str, *state; wchar_t *buffer, *str, *state;
const wcstring sep; const wcstring sep;
/* No copying */ /* No copying */
wcstokenizer &operator=(const wcstokenizer &); wcstokenizer &operator=(const wcstokenizer &);
wcstokenizer(const wcstokenizer &); wcstokenizer(const wcstokenizer &);
public: public:
wcstokenizer(const wcstring &s, const wcstring &separator); wcstokenizer(const wcstring &s, const wcstring &separator);
bool next(wcstring &result); bool next(wcstring &result);
~wcstokenizer(); ~wcstokenizer();
}; };
/** /**
Appends a path component, with a / if necessary Appends a path component, with a / if necessary
*/ */
void append_path_component(wcstring &path, const wcstring &component); void append_path_component(wcstring &path, const wcstring &component);
@ -519,7 +519,7 @@ void append_format(wcstring &str, const wchar_t *format, ...);
char **wcsv2strv( const wchar_t * const *in ); char **wcsv2strv( const wchar_t * const *in );
/** /**
Test if the given string is a valid variable name. Test if the given string is a valid variable name.
\return null if this is a valid name, and a pointer to the first invalid character otherwise \return null if this is a valid name, and a pointer to the first invalid character otherwise
*/ */
@ -528,7 +528,7 @@ wchar_t *wcsvarname( const wchar_t *str );
/** /**
Test if the given string is a valid function name. Test if the given string is a valid function name.
\return null if this is a valid name, and a pointer to the first invalid character otherwise \return null if this is a valid name, and a pointer to the first invalid character otherwise
*/ */
@ -536,7 +536,7 @@ wchar_t *wcsvarname( const wchar_t *str );
const wchar_t *wcsfuncname( const wchar_t *str ); const wchar_t *wcsfuncname( const wchar_t *str );
/** /**
Test if the given string is valid in a variable name Test if the given string is valid in a variable name
\return 1 if this is a valid name, 0 otherwise \return 1 if this is a valid name, 0 otherwise
*/ */
@ -572,14 +572,14 @@ void error_reset();
This function behaves exactly like a wide character equivalent of This function behaves exactly like a wide character equivalent of
the C function setlocale, except that it will also try to detect if the C function setlocale, except that it will also try to detect if
the user is using a Unicode character set, and if so, use the the user is using a Unicode character set, and if so, use the
unicode ellipsis character as ellipsis, instead of '$'. unicode ellipsis character as ellipsis, instead of '$'.
*/ */
wcstring wsetlocale( int category, const wchar_t *locale ); wcstring wsetlocale( int category, const wchar_t *locale );
/** /**
Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero. Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero.
\param needle the string to search for in the list \param needle the string to search for in the list
\return zero if needle is not found, of if needle is null, non-zero otherwise \return zero if needle is not found, of if needle is null, non-zero otherwise
*/ */
@ -614,9 +614,9 @@ ssize_t read_loop(int fd, void *buff, size_t count);
Because debug is often called to tell the user about an error, Because debug is often called to tell the user about an error,
before using wperror to give a specific error message, debug will before using wperror to give a specific error message, debug will
never ever modify the value of errno. never ever modify the value of errno.
\param level the priority of the message. Lower number means higher priority. Messages with a priority_number higher than \c debug_level will be ignored.. \param level the priority of the message. Lower number means higher priority. Messages with a priority_number higher than \c debug_level will be ignored..
\param msg the message format string. \param msg the message format string.
Example: Example:
@ -629,7 +629,7 @@ void debug( int level, const wchar_t *msg, ... );
/** /**
Replace special characters with backslash escape sequences. Newline is Replace special characters with backslash escape sequences. Newline is
replaced with \n, etc. replaced with \n, etc.
\param in The string to be escaped \param in The string to be escaped
\param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters \param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters
@ -650,14 +650,14 @@ wcstring escape_string( const wcstring &in, escape_flags_t flags );
an invalid sequence is specified, 0 is returned. an invalid sequence is specified, 0 is returned.
*/ */
wchar_t *unescape( const wchar_t * in, wchar_t *unescape( const wchar_t * in,
int escape_special ); int escape_special );
bool unescape_string( wcstring &str, bool unescape_string( wcstring &str,
int escape_special ); int escape_special );
/** /**
Returns the width of the terminal window, so that not all Returns the width of the terminal window, so that not all
functions that use these values continually have to keep track of functions that use these values continually have to keep track of
it separately. it separately.
@ -688,9 +688,9 @@ void common_handle_winch( int signal );
void write_screen( const wcstring &msg, wcstring &buff ); void write_screen( const wcstring &msg, wcstring &buff );
/** /**
Tokenize the specified string into the specified wcstring_list_t. Tokenize the specified string into the specified wcstring_list_t.
\param val the input string. The contents of this string is not changed. \param val the input string. The contents of this string is not changed.
\param out the list in which to place the elements. \param out the list in which to place the elements.
*/ */
void tokenize_variable_array( const wcstring &val, wcstring_list_t &out); void tokenize_variable_array( const wcstring &val, wcstring_list_t &out);
@ -717,7 +717,7 @@ void bugreport();
double timef(); double timef();
/** /**
Call the following function early in main to set the main thread. Call the following function early in main to set the main thread.
This is our replacement for pthread_main_np(). This is our replacement for pthread_main_np().
*/ */
void set_main_thread(); void set_main_thread();
@ -729,6 +729,10 @@ void configure_thread_assertions_for_testing();
/** Set up a guard to complain if we try to do certain things (like take a lock) after calling fork */ /** Set up a guard to complain if we try to do certain things (like take a lock) after calling fork */
void setup_fork_guards(void); void setup_fork_guards(void);
/** Save the value of tcgetpgrp so we can restore it on exit */
void save_term_foreground_process_group(void);
void restore_term_foreground_process_group(void);
/** Return whether we are the child of a fork */ /** Return whether we are the child of a fork */
bool is_forked_child(void); bool is_forked_child(void);
void assert_is_not_forked_child(const char *who); void assert_is_not_forked_child(const char *who);

621
fish.cpp
View File

@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file fish.c /** \file fish.c
The main loop of <tt>fish</tt>. The main loop of <tt>fish</tt>.
*/ */
#include "config.h" #include "config.h"
@ -104,12 +104,12 @@ static std::string get_executable_path(const char *argv0)
uint32_t buffSize = sizeof buff; uint32_t buffSize = sizeof buff;
if (0 == _NSGetExecutablePath(buff, &buffSize)) if (0 == _NSGetExecutablePath(buff, &buffSize))
return std::string(buff); return std::string(buff);
/* Loop until we're big enough */ /* Loop until we're big enough */
char *mbuff = (char *)malloc(buffSize); char *mbuff = (char *)malloc(buffSize);
while (0 > _NSGetExecutablePath(mbuff, &buffSize)) while (0 > _NSGetExecutablePath(mbuff, &buffSize))
mbuff = (char *)realloc(mbuff, buffSize); mbuff = (char *)realloc(mbuff, buffSize);
/* Return the string */ /* Return the string */
std::string result = mbuff; std::string result = mbuff;
free(mbuff); free(mbuff);
@ -125,7 +125,7 @@ static std::string get_executable_path(const char *argv0)
return std::string(buff); return std::string(buff);
} }
} }
/* Just return argv0, which probably won't work (i.e. it's not an absolute path or a path relative to the working directory, but instead something the caller found via $PATH). We'll eventually fall back to the compile time paths. */ /* Just return argv0, which probably won't work (i.e. it's not an absolute path or a path relative to the working directory, but instead something the caller found via $PATH). We'll eventually fall back to the compile time paths. */
return std::string(argv0 ? argv0 : ""); return std::string(argv0 ? argv0 : "");
} }
@ -137,9 +137,9 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
bool done = false; bool done = false;
std::string exec_path = get_executable_path(argv0); std::string exec_path = get_executable_path(argv0);
if (get_realpath(exec_path)) if (get_realpath(exec_path))
{ {
#if __APPLE__ #if __APPLE__
/* On OS X, maybe we're an app bundle, and should use the bundle's files. Since we don't link CF, use this lame approach to test it: see if the resolved path ends with /Contents/MacOS/fish, case insensitive since HFS+ usually is. /* On OS X, maybe we're an app bundle, and should use the bundle's files. Since we don't link CF, use this lame approach to test it: see if the resolved path ends with /Contents/MacOS/fish, case insensitive since HFS+ usually is.
*/ */
if (! done) if (! done)
@ -152,28 +152,28 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
wcstring wide_resolved_path = str2wcstring(exec_path); wcstring wide_resolved_path = str2wcstring(exec_path);
wide_resolved_path.resize(exec_path.size() - suffixlen); wide_resolved_path.resize(exec_path.size() - suffixlen);
wide_resolved_path.append(L"/Contents/Resources/"); wide_resolved_path.append(L"/Contents/Resources/");
/* Append share, etc, doc */ /* Append share, etc, doc */
paths.data = wide_resolved_path + L"share/fish"; paths.data = wide_resolved_path + L"share/fish";
paths.sysconf = wide_resolved_path + L"etc/fish"; paths.sysconf = wide_resolved_path + L"etc/fish";
paths.doc = wide_resolved_path + L"doc/fish"; paths.doc = wide_resolved_path + L"doc/fish";
/* But the bin_dir is the resolved_path, minus fish (aka the MacOS directory) */ /* But the bin_dir is the resolved_path, minus fish (aka the MacOS directory) */
paths.bin = str2wcstring(exec_path); paths.bin = str2wcstring(exec_path);
paths.bin.resize(paths.bin.size() - strlen("/fish")); paths.bin.resize(paths.bin.size() - strlen("/fish"));
done = true; done = true;
} }
} }
#endif #endif
if (! done) if (! done)
{ {
/* The next check is that we are in a reloctable directory tree like this: /* The next check is that we are in a reloctable directory tree like this:
bin/fish bin/fish
etc/fish etc/fish
share/fish share/fish
Check it! Check it!
*/ */
const char *suffix = "/bin/fish"; const char *suffix = "/bin/fish";
@ -181,12 +181,12 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
{ {
wcstring base_path = str2wcstring(exec_path); wcstring base_path = str2wcstring(exec_path);
base_path.resize(base_path.size() - strlen(suffix)); base_path.resize(base_path.size() - strlen(suffix));
paths.data = base_path + L"/share/fish"; paths.data = base_path + L"/share/fish";
paths.sysconf = base_path + L"/etc/fish"; paths.sysconf = base_path + L"/etc/fish";
paths.doc = base_path + L"/share/doc/fish"; paths.doc = base_path + L"/share/doc/fish";
paths.bin = base_path + L"/bin"; paths.bin = base_path + L"/bin";
struct stat buf; struct stat buf;
if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf)) if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf))
{ {
@ -195,7 +195,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
} }
} }
} }
if (! done) if (! done)
{ {
/* Fall back to what got compiled in. */ /* Fall back to what got compiled in. */
@ -203,10 +203,10 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
paths.sysconf = L"" SYSCONFDIR "/fish"; paths.sysconf = L"" SYSCONFDIR "/fish";
paths.doc = L"" DATADIR "/doc/fish"; paths.doc = L"" DATADIR "/doc/fish";
paths.bin = L"" PREFIX "/bin"; paths.bin = L"" PREFIX "/bin";
done = true; done = true;
} }
return paths; return paths;
} }
@ -217,27 +217,27 @@ static int read_init(const struct config_paths_t &paths)
{ {
parser_t &parser = parser_t::principal_parser(); parser_t &parser = parser_t::principal_parser();
const io_chain_t empty_ios; const io_chain_t empty_ios;
parser.eval( L"builtin . " + paths.data + L"/config.fish 2>/dev/null", empty_ios, TOP ); parser.eval( L"builtin . " + paths.data + L"/config.fish 2>/dev/null", empty_ios, TOP );
parser.eval( L"builtin . " + paths.sysconf + L"/config.fish 2>/dev/null", empty_ios, TOP ); parser.eval( L"builtin . " + paths.sysconf + L"/config.fish 2>/dev/null", empty_ios, TOP );
/*
We need to get the configuration directory before we can source the user configuration file
*/
wcstring config_dir;
/* /*
We need to get the configuration directory before we can source the user configuration file If path_get_config returns false then we have no configuration directory
*/ and no custom config to load.
wcstring config_dir; */
/*
If path_get_config returns false then we have no configuration directory
and no custom config to load.
*/
if (path_get_config(config_dir)) if (path_get_config(config_dir))
{ {
wcstring config_dir_escaped = escape_string( config_dir, 1 ); wcstring config_dir_escaped = escape_string( config_dir, 1 );
wcstring eval_buff = format_string(L"builtin . %ls/config.fish 2>/dev/null", config_dir_escaped.c_str()); wcstring eval_buff = format_string(L"builtin . %ls/config.fish 2>/dev/null", config_dir_escaped.c_str());
parser.eval( eval_buff, empty_ios, TOP ); parser.eval( eval_buff, empty_ios, TOP );
} }
return 1; return 1;
} }
@ -247,162 +247,162 @@ static int read_init(const struct config_paths_t &paths)
*/ */
static int fish_parse_opt( int argc, char **argv, const char **cmd_ptr ) static int fish_parse_opt( int argc, char **argv, const char **cmd_ptr )
{ {
int my_optind; int my_optind;
int force_interactive=0; int force_interactive=0;
while( 1 )
{
static struct option
long_options[] =
{
{
"command", required_argument, 0, 'c'
}
,
{
"debug-level", required_argument, 0, 'd'
}
,
{
"interactive", no_argument, 0, 'i'
}
,
{
"login", no_argument, 0, 'l'
}
,
{
"no-execute", no_argument, 0, 'n'
}
,
{
"profile", required_argument, 0, 'p'
}
,
{
"help", no_argument, 0, 'h'
}
,
{
"version", no_argument, 0, 'v'
}
,
{
0, 0, 0, 0
}
}
;
int opt_index = 0;
int opt = getopt_long( argc,
argv,
GETOPT_STRING,
long_options,
&opt_index );
if( opt == -1 )
break;
switch( opt )
{
case 0:
{
break;
}
case 'c':
{
*cmd_ptr = optarg;
is_interactive_session = 0;
break;
}
case 'd':
{
char *end;
long tmp;
while( 1 ) errno = 0;
{ tmp = strtol(optarg, &end, 10);
static struct option
long_options[] = if( tmp >= 0 && tmp <=10 && !*end && !errno )
{ {
{ debug_level = (int)tmp;
"command", required_argument, 0, 'c' }
} else
, {
{ debug( 0, _(L"Invalid value '%s' for debug level switch"), optarg );
"debug-level", required_argument, 0, 'd' exit_without_destructors(1);
} }
, break;
{ }
"interactive", no_argument, 0, 'i'
} case 'h':
, {
{ *cmd_ptr = "__fish_print_help fish";
"login", no_argument, 0, 'l' break;
} }
,
{ case 'i':
"no-execute", no_argument, 0, 'n' {
} force_interactive = 1;
, break;
{ }
"profile", required_argument, 0, 'p'
} case 'l':
, {
{ is_login=1;
"help", no_argument, 0, 'h' break;
} }
,
{ case 'n':
"version", no_argument, 0, 'v' {
} no_exec=1;
, break;
{ }
0, 0, 0, 0
} case 'p':
} {
; profile = optarg;
break;
}
case 'v':
{
fwprintf( stderr,
_(L"%s, version %s\n"),
PACKAGE_NAME,
PACKAGE_VERSION );
exit_without_destructors( 0 );
}
case '?':
{
exit_without_destructors( 1 );
}
}
}
int opt_index = 0; my_optind = optind;
is_login |= (strcmp( argv[0], "-fish") == 0);
/*
We are an interactive session if we have not been given an
explicit command to execute, _and_ stdin is a tty.
*/
is_interactive_session &= (*cmd_ptr == 0);
is_interactive_session &= (my_optind == argc);
is_interactive_session &= isatty(STDIN_FILENO);
int opt = getopt_long( argc, /*
argv, We are also an interactive session if we have are forced-
GETOPT_STRING, */
long_options, is_interactive_session |= force_interactive;
&opt_index );
if( opt == -1 ) return my_optind;
break;
switch( opt )
{
case 0:
{
break;
}
case 'c':
{
*cmd_ptr = optarg;
is_interactive_session = 0;
break;
}
case 'd':
{
char *end;
long tmp;
errno = 0;
tmp = strtol(optarg, &end, 10);
if( tmp >= 0 && tmp <=10 && !*end && !errno )
{
debug_level = (int)tmp;
}
else
{
debug( 0, _(L"Invalid value '%s' for debug level switch"), optarg );
exit_without_destructors(1);
}
break;
}
case 'h':
{
*cmd_ptr = "__fish_print_help fish";
break;
}
case 'i':
{
force_interactive = 1;
break;
}
case 'l':
{
is_login=1;
break;
}
case 'n':
{
no_exec=1;
break;
}
case 'p':
{
profile = optarg;
break;
}
case 'v':
{
fwprintf( stderr,
_(L"%s, version %s\n"),
PACKAGE_NAME,
PACKAGE_VERSION );
exit_without_destructors( 0 );
}
case '?':
{
exit_without_destructors( 1 );
}
}
}
my_optind = optind;
is_login |= (strcmp( argv[0], "-fish") == 0);
/*
We are an interactive session if we have not been given an
explicit command to execute, _and_ stdin is a tty.
*/
is_interactive_session &= (*cmd_ptr == 0);
is_interactive_session &= (my_optind == argc);
is_interactive_session &= isatty(STDIN_FILENO);
/*
We are also an interactive session if we have are forced-
*/
is_interactive_session |= force_interactive;
return my_optind;
} }
/** /**
@ -412,68 +412,68 @@ static int fish_parse_opt( int argc, char **argv, const char **cmd_ptr )
static wcstring full_escape( const wchar_t *in ) static wcstring full_escape( const wchar_t *in )
{ {
wcstring out; wcstring out;
for( ; *in; in++ ) for( ; *in; in++ )
{ {
if( *in < 32 ) if( *in < 32 )
{ {
append_format( out, L"\\x%.2x", *in ); append_format( out, L"\\x%.2x", *in );
} }
else if( *in < 128 ) else if( *in < 128 )
{ {
out.push_back(*in); out.push_back(*in);
} }
else if( *in < 65536 ) else if( *in < 65536 )
{ {
append_format( out, L"\\u%.4x", *in ); append_format( out, L"\\u%.4x", *in );
} }
else else
{ {
append_format( out, L"\\U%.8x", *in ); append_format( out, L"\\U%.8x", *in );
} }
} }
return out; return out;
} }
extern int g_fork_count; extern int g_fork_count;
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
int res=1; int res=1;
const char *cmd=0; const char *cmd=0;
int my_optind=0; int my_optind=0;
set_main_thread(); set_main_thread();
setup_fork_guards(); setup_fork_guards();
save_term_foreground_process_group();
wsetlocale( LC_ALL, L"" );
is_interactive_session=1; wsetlocale( LC_ALL, L"" );
program_name=L"fish"; is_interactive_session=1;
program_name=L"fish";
//struct stat tmp; //struct stat tmp;
//stat("----------FISH_HIT_MAIN----------", &tmp); //stat("----------FISH_HIT_MAIN----------", &tmp);
my_optind = fish_parse_opt( argc, argv, &cmd ); my_optind = fish_parse_opt( argc, argv, &cmd );
/* /*
No-exec is prohibited when in interactive mode No-exec is prohibited when in interactive mode
*/ */
if( is_interactive_session && no_exec) if( is_interactive_session && no_exec)
{ {
debug( 1, _(L"Can not use the no-execute mode when running an interactive session") ); debug( 1, _(L"Can not use the no-execute mode when running an interactive session") );
no_exec = 0; no_exec = 0;
} }
const struct config_paths_t paths = determine_config_directory_paths(argv[0]); const struct config_paths_t paths = determine_config_directory_paths(argv[0]);
proc_init(); proc_init();
event_init(); event_init();
wutil_init(); wutil_init();
//parser_init(); builtin_init();
builtin_init(); function_init();
function_init(); env_init(&paths);
env_init(&paths); reader_init();
reader_init(); history_init();
history_init();
parser_t &parser = parser_t::principal_parser(); parser_t &parser = parser_t::principal_parser();
@ -481,91 +481,92 @@ int main( int argc, char **argv )
printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count); printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
const io_chain_t empty_ios; const io_chain_t empty_ios;
if( read_init(paths) ) if( read_init(paths) )
{ {
if( cmd != 0 ) if( cmd != 0 )
{ {
wchar_t *cmd_wcs = str2wcs( cmd ); wchar_t *cmd_wcs = str2wcs( cmd );
res = parser.eval( cmd_wcs, empty_ios, TOP ); res = parser.eval( cmd_wcs, empty_ios, TOP );
free(cmd_wcs); free(cmd_wcs);
reader_exit(0, 0); reader_exit(0, 0);
} }
else else
{ {
if( my_optind == argc ) if( my_optind == argc )
{ {
res = reader_read( STDIN_FILENO, empty_ios ); res = reader_read( STDIN_FILENO, empty_ios );
} }
else else
{ {
char **ptr; char **ptr;
char *file = *(argv+(my_optind++)); char *file = *(argv+(my_optind++));
int i; int i;
int fd; int fd;
wchar_t *rel_filename, *abs_filename; wchar_t *rel_filename, *abs_filename;
if( ( fd = open(file, O_RDONLY) ) == -1 )
{
wperror( L"open" );
return 1;
}
if( ( fd = open(file, O_RDONLY) ) == -1 )
{
wperror( L"open" );
return 1;
}
// OK to not do this atomically since we cannot have gone multithreaded yet // OK to not do this atomically since we cannot have gone multithreaded yet
set_cloexec(fd); set_cloexec(fd);
if( *(argv+my_optind)) if( *(argv+my_optind))
{ {
wcstring sb; wcstring sb;
for( i=1,ptr = argv+my_optind; *ptr; i++, ptr++ ) for( i=1,ptr = argv+my_optind; *ptr; i++, ptr++ )
{ {
if( i != 1 ) if( i != 1 )
sb.append( ARRAY_SEP_STR ); sb.append( ARRAY_SEP_STR );
sb.append( str2wcstring( *ptr )); sb.append( str2wcstring( *ptr ));
} }
env_set( L"argv", sb.c_str(), 0 );
}
env_set( L"argv", sb.c_str(), 0 ); rel_filename = str2wcs( file );
} abs_filename = wrealpath( rel_filename, 0 );
rel_filename = str2wcs( file ); if( !abs_filename )
abs_filename = wrealpath( rel_filename, 0 ); {
abs_filename = wcsdup(rel_filename);
}
if( !abs_filename ) reader_push_current_filename( intern( abs_filename ) );
{ free( rel_filename );
abs_filename = wcsdup(rel_filename); free( abs_filename );
}
reader_push_current_filename( intern( abs_filename ) ); res = reader_read( fd, empty_ios );
free( rel_filename );
free( abs_filename );
res = reader_read( fd, empty_ios );
if( res )
{
debug( 1,
_(L"Error while reading file %ls\n"),
reader_current_filename()?reader_current_filename(): _(L"Standard input") );
}
reader_pop_current_filename();
}
}
}
proc_fire_event( L"PROCESS_EXIT", EVENT_EXIT, getpid(), res );
history_destroy();
proc_destroy();
builtin_destroy();
reader_destroy();
parser.destroy();
wutil_destroy();
event_destroy();
env_destroy();
if( res )
{
debug( 1,
_(L"Error while reading file %ls\n"),
reader_current_filename()?reader_current_filename(): _(L"Standard input") );
}
reader_pop_current_filename();
}
}
}
proc_fire_event( L"PROCESS_EXIT", EVENT_EXIT, getpid(), res );
restore_term_foreground_process_group();
history_destroy();
proc_destroy();
builtin_destroy();
reader_destroy();
parser.destroy();
wutil_destroy();
event_destroy();
env_destroy();
if (g_log_forks) if (g_log_forks)
printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count); printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
return res?STATUS_UNKNOWN_COMMAND:proc_get_last_status(); return res?STATUS_UNKNOWN_COMMAND:proc_get_last_status();
} }

1587
proc.cpp
View File

File diff suppressed because it is too large Load Diff

3599
reader.cpp
View File

File diff suppressed because it is too large Load Diff

22
reader.h
View File

@ -1,9 +1,9 @@
/** \file reader.h /** \file reader.h
Prototypes for functions for reading data from stdin and passing Prototypes for functions for reading data from stdin and passing
to the parser. If stdin is a keyboard, it supplies a killring, to the parser. If stdin is a keyboard, it supplies a killring,
history, syntax highlighting, tab-completion and various other history, syntax highlighting, tab-completion and various other
features. features.
*/ */
#ifndef FISH_READER_H #ifndef FISH_READER_H
@ -53,7 +53,7 @@ const wchar_t *reader_current_filename();
/** /**
Push a new filename on the stack of read files Push a new filename on the stack of read files
\param fn The fileanme to push \param fn The fileanme to push
*/ */
void reader_push_current_filename( const wchar_t *fn ); void reader_push_current_filename( const wchar_t *fn );
@ -125,7 +125,7 @@ int reader_interrupted();
const wchar_t *reader_readline(); const wchar_t *reader_readline();
/** /**
Push a new reader environment. Push a new reader environment.
*/ */
void reader_push( const wchar_t *name ); void reader_push( const wchar_t *name );
@ -135,7 +135,7 @@ void reader_push( const wchar_t *name );
void reader_pop(); void reader_pop();
/** /**
Specify function to use for finding possible tab completions. The function must take these arguments: Specify function to use for finding possible tab completions. The function must take these arguments:
- The command to be completed as a null terminated array of wchar_t - The command to be completed as a null terminated array of wchar_t
- An array_list_t in which completions will be inserted. - An array_list_t in which completions will be inserted.
@ -151,7 +151,7 @@ typedef void (*highlight_function_t)( const wcstring &, std::vector<int> &, size
/** /**
Specify function for syntax highlighting. The function must take these arguments: Specify function for syntax highlighting. The function must take these arguments:
- The command to be highlighted as a null terminated array of wchar_t - The command to be highlighted as a null terminated array of wchar_t
- The color code of each character as an array of ints - The color code of each character as an array of ints
- The cursor position - The cursor position
@ -177,8 +177,12 @@ void reader_set_left_prompt( const wcstring &prompt );
*/ */
void reader_set_right_prompt( const wcstring &prompt ); void reader_set_right_prompt( const wcstring &prompt );
/** Sets whether autosuggesting is allowed. */
void reader_set_allow_autosuggesting(bool flag);
/** /**
Returns true if the shell is exiting, 0 otherwise. Returns true if the shell is exiting, 0 otherwise.
*/ */
int exit_status(); int exit_status();

2
share/functions/__fish_config_interactive.fish
View File

@ -120,7 +120,7 @@ function __fish_config_interactive -d "Initializations that should be performed
# Pager colors # Pager colors
set_default fish_pager_color_prefix cyan set_default fish_pager_color_prefix cyan
set_default fish_pager_color_completion normal set_default fish_pager_color_completion normal
set_default fish_pager_color_description normal set_default fish_pager_color_description 555 yellow
set_default fish_pager_color_progress cyan set_default fish_pager_color_progress cyan
# #

901
signal.cpp
View File

File diff suppressed because it is too large Load Diff