Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

change env_var_t to a vector of strings

Browse source 
Internally fish should store vars as a vector of elements. The current
flat string representation is a holdover from when the code was written
in C.

Fixes #4200
This commit is contained in:
Kurtis Rader 2017-08-05 15:08:39 -07:00
parent 6e02ec83d1
commit f872f25f5b
30 changed files with 503 additions and 543 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -360,7 +360,7 @@ test_goals := test_low_level test_fishscript test_interactive test_invocation
# are added that depend, directly or indirectly, on tests, they need to be recorded here. # are added that depend, directly or indirectly, on tests, they need to be recorded here.
# #
test_test_deps = test_low_level $(test_high_level_test_deps) test_test_deps = test_low_level $(test_high_level_test_deps)
test_high_level_test_deps = test_invocation test_fishscript test_interactive test_high_level_test_deps = test_fishscript test_interactive test_invocation
active_test_goals = $(filter $(test_goals),$(foreach a,$(or $(MAKECMDGOALS),$(.DEFAULT_GOAL)),$(a) $($(a)_test_deps))) active_test_goals = $(filter $(test_goals),$(foreach a,$(or $(MAKECMDGOALS),$(.DEFAULT_GOAL)),$(a) $($(a)_test_deps)))
filter_up_to = $(eval b:=1)$(foreach a,$(2),$(and $(b),$(if $(subst $(1),,$(a)),$(a),$(eval b:=)))) filter_up_to = $(eval b:=1)$(foreach a,$(2),$(and $(b),$(if $(subst $(1),,$(a)),$(a),$(eval b:=))))

17
src/builtin_argparse.cpp
View file

@ -458,13 +458,14 @@ static int validate_arg(argparse_cmd_opts_t &opts, option_spec_t *opt_spec, bool
wcstring_list_t cmd_output; wcstring_list_t cmd_output;
env_push(true); env_push(true);
env_set(L"_argparse_cmd", ENV_LOCAL, opts.name.c_str()); env_set_one(L"_argparse_cmd", ENV_LOCAL, opts.name);
if (is_long_flag) { if (is_long_flag) {
env_set(var_name_prefix + L"name", ENV_LOCAL, opt_spec->long_flag.c_str()); env_set_one(var_name_prefix + L"name", ENV_LOCAL, opt_spec->long_flag);
} else { } else {
env_set(var_name_prefix + L"name", ENV_LOCAL, wcstring(1, opt_spec->short_flag).c_str()); env_set_one(var_name_prefix + L"name", ENV_LOCAL,
wcstring(1, opt_spec->short_flag).c_str());
} }
env_set(var_name_prefix + L"value", ENV_LOCAL, woptarg); env_set_one(var_name_prefix + L"value", ENV_LOCAL, woptarg);
int retval = exec_subshell(opt_spec->validation_command, cmd_output, false); int retval = exec_subshell(opt_spec->validation_command, cmd_output, false);
for (auto it : cmd_output) { for (auto it : cmd_output) {
@ -643,9 +644,8 @@ static void set_argparse_result_vars(argparse_cmd_opts_t &opts) {
option_spec_t *opt_spec = it.second; option_spec_t *opt_spec = it.second;
if (!opt_spec->num_seen) continue; if (!opt_spec->num_seen) continue;
auto val = list_to_array_val(opt_spec->vals);
if (opt_spec->short_flag_valid) { if (opt_spec->short_flag_valid) {
env_set(var_name_prefix + opt_spec->short_flag, ENV_LOCAL, val->c_str()); env_set(var_name_prefix + opt_spec->short_flag, ENV_LOCAL, opt_spec->vals);
} }
if (!opt_spec->long_flag.empty()) { if (!opt_spec->long_flag.empty()) {
// We do a simple replacement of all non alphanum chars rather than calling // We do a simple replacement of all non alphanum chars rather than calling
@ -654,12 +654,11 @@ static void set_argparse_result_vars(argparse_cmd_opts_t &opts) {
for (size_t pos = 0; pos < long_flag.size(); pos++) { for (size_t pos = 0; pos < long_flag.size(); pos++) {
if (!iswalnum(long_flag[pos])) long_flag[pos] = L'_'; if (!iswalnum(long_flag[pos])) long_flag[pos] = L'_';
} }
env_set(var_name_prefix + long_flag, ENV_LOCAL, val->c_str()); env_set(var_name_prefix + long_flag, ENV_LOCAL, opt_spec->vals);
} }
} }
auto val = list_to_array_val(opts.argv); env_set(L"argv", ENV_LOCAL, opts.argv);
env_set(L"argv", ENV_LOCAL, val->c_str());
} }
/// The argparse builtin. This is explicitly not compatible with the BSD or GNU version of this /// The argparse builtin. This is explicitly not compatible with the BSD or GNU version of this

12
src/builtin_cd.cpp
View file

@ -37,7 +37,7 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
wcstring dir; wcstring dir;
if (argv[optind]) { if (argv[optind]) {
dir_in = env_var_t(argv[optind]); dir_in = env_var_t(L"", argv[optind]); // unamed var
} else { } else {
dir_in = env_get(L"HOME"); dir_in = env_get(L"HOME");
if (dir_in.missing_or_empty()) { if (dir_in.missing_or_empty()) {
@ -53,15 +53,17 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (!got_cd_path) { if (!got_cd_path) {
if (errno == ENOTDIR) { if (errno == ENOTDIR) {
streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), cmd, dir_in.c_str()); streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), cmd,
dir_in.as_string().c_str());
} else if (errno == ENOENT) { } else if (errno == ENOENT) {
streams.err.append_format(_(L"%ls: The directory '%ls' does not exist\n"), cmd, streams.err.append_format(_(L"%ls: The directory '%ls' does not exist\n"), cmd,
dir_in.c_str()); dir_in.as_string().c_str());
} else if (errno == EROTTEN) { } else if (errno == EROTTEN) {
streams.err.append_format(_(L"%ls: '%ls' is a rotten symlink\n"), cmd, dir_in.c_str()); streams.err.append_format(_(L"%ls: '%ls' is a rotten symlink\n"), cmd,
dir_in.as_string().c_str());
} else { } else {
streams.err.append_format(_(L"%ls: Unknown error trying to locate directory '%ls'\n"), streams.err.append_format(_(L"%ls: Unknown error trying to locate directory '%ls'\n"),
cmd, dir_in.c_str()); cmd, dir_in.as_string().c_str());
} }
if (!shell_is_interactive()) streams.err.append(parser.current_line()); if (!shell_is_interactive()) streams.err.append(parser.current_line());

2
src/builtin_fg.cpp
View file

@ -102,7 +102,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
} }
const wcstring ft = tok_first(j->command()); const wcstring ft = tok_first(j->command());
if (!ft.empty()) env_set(L"_", ENV_EXPORT, ft.c_str()); if (!ft.empty()) env_set_one(L"_", ENV_EXPORT, ft);
reader_write_title(j->command()); reader_write_title(j->command());
job_promote(j); job_promote(j);

96
src/builtin_read.cpp
View file

@ -13,6 +13,7 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector>
#include "builtin.h" #include "builtin.h"
#include "builtin_read.h" #include "builtin_read.h"
@ -422,81 +423,104 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (exit_res != STATUS_CMD_OK) { if (exit_res != STATUS_CMD_OK) {
// Define the var(s) without any data. We do this because when this happens we want the user // Define the var(s) without any data. We do this because when this happens we want the user
// to be able to use the var but have it expand to nothing. // to be able to use the var but have it expand to nothing.
for (int i = 0; i < argc; i++) env_set(argv[i], opts.place, NULL); for (int i = 0; i < argc; i++) env_set_empty(argv[i], opts.place);
return exit_res; return exit_res;
} }
if (!opts.have_delimiter) { if (!opts.have_delimiter) {
env_var_t ifs = env_get(L"IFS"); env_var_t ifs = env_get(L"IFS");
if (!ifs.missing_or_empty()) { if (!ifs.missing_or_empty()) opts.delimiter = ifs.as_string();
opts.delimiter = ifs.as_string();
}
} }
if (opts.delimiter.empty()) { if (opts.delimiter.empty()) {
// Every character is a separate token. // Every character is a separate token with one wrinkle involving non-array mode where the
size_t bufflen = buff.size(); // final var gets the remaining characters as a single string.
if (opts.array) { size_t x = std::max(static_cast<size_t>(1), buff.size());
if (bufflen > 0) { size_t n_splits = (opts.array || static_cast<size_t>(argc) > x) ? x : argc;
wcstring chars(bufflen + (bufflen - 1), ARRAY_SEP); wcstring_list_t chars;
wcstring::iterator out = chars.begin(); chars.reserve(n_splits);
for (wcstring::const_iterator it = buff.begin(), end = buff.end(); it != end; x = x - n_splits + 1;
++it) { int i = 0;
*out = *it; for (auto it = buff.begin(), end = buff.end(); it != end; ++i, ++it) {
out += 2; if (opts.array || i < argc) {
} chars.emplace_back(wcstring(1, *it));
env_set(argv[0], opts.place, chars.c_str());
} else { } else {
env_set(argv[0], opts.place, NULL); if (x) {
chars.back().reserve(x);
x = 0;
}
chars.back().push_back(*it);
} }
} else { // not array mode }
if (opts.array) {
// Array mode: assign each char as a separate element of the sole var.
env_set(argv[0], opts.place, chars);
} else {
// Not array mode: assign each char to a separate var with the remainder being assigned
// to the last var.
int i = 0; int i = 0;
size_t j = 0; size_t j = 0;
for (; i + 1 < argc; ++i) { for (; i + 1 < argc; ++i) {
if (j < bufflen) { if (j < chars.size()) {
wchar_t buffer[2] = {buff[j++], 0}; env_set_one(argv[i], opts.place, chars[j]);
env_set(argv[i], opts.place, buffer); j++;
} else { } else {
env_set(argv[i], opts.place, L""); env_set_one(argv[i], opts.place, L"");
} }
} }
if (i < argc) env_set(argv[i], opts.place, &buff[j]);
if (i < argc) {
wcstring val = chars.size() == static_cast<size_t>(argc) ? chars[i] : L"";
env_set_one(argv[i], opts.place, val);
} else {
env_set_empty(argv[i], opts.place);
}
} }
} else if (opts.array) { } else if (opts.array) {
// The user has requested the input be split into a sequence of tokens and all the tokens
// assigned to a single var. How we do the tokenizing depends on whether the user specified
// the delimiter string or we're using IFS.
if (!opts.have_delimiter) { if (!opts.have_delimiter) {
// We're using IFS, so well split on every character in that, // We're using IFS, so tokenize the buffer using each IFS char. This is for backward
// not on the entire thing at once. // compatibility with old versions of fish.
wcstring tokens; wcstring_list_t tokens;
tokens.reserve(buff.size());
for (wcstring_range loc = wcstring_tok(buff, opts.delimiter); for (wcstring_range loc = wcstring_tok(buff, opts.delimiter);
loc.first != wcstring::npos; loc = wcstring_tok(buff, opts.delimiter, loc)) { loc.first != wcstring::npos; loc = wcstring_tok(buff, opts.delimiter, loc)) {
if (!tokens.empty()) tokens.push_back(ARRAY_SEP); tokens.emplace_back(wcstring(buff, loc.first, loc.second));
tokens.append(buff, loc.first, loc.second);
} }
env_set(argv[0], opts.place, tokens.empty() ? NULL : tokens.c_str()); env_set(argv[0], opts.place, tokens);
} else { } else {
// We're using a delimiter provided by the user so use the `string split` behavior.
wcstring_list_t splits; wcstring_list_t splits;
split_about(buff.begin(), buff.end(), opts.delimiter.begin(), opts.delimiter.end(), split_about(buff.begin(), buff.end(), opts.delimiter.begin(), opts.delimiter.end(),
&splits, LONG_MAX); &splits, LONG_MAX);
auto val = list_to_array_val(splits); env_set(argv[0], opts.place, splits);
env_set(argv[0], opts.place, val->c_str());
} }
} else { // not array } else {
// Not array mode. Split the input into tokens and assign each to the vars in sequence.
if (!opts.have_delimiter) { if (!opts.have_delimiter) {
// We're using IFS, so tokenize the buffer using each IFS char. This is for backward
// compatibility with old versions of fish.
wcstring_range loc = wcstring_range(0, 0); wcstring_range loc = wcstring_range(0, 0);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
wcstring substr;
loc = wcstring_tok(buff, (i + 1 < argc) ? opts.delimiter : wcstring(), loc); loc = wcstring_tok(buff, (i + 1 < argc) ? opts.delimiter : wcstring(), loc);
env_set(argv[i], opts.place, if (loc.first != wcstring::npos) {
loc.first == wcstring::npos ? L"" : &buff.c_str()[loc.first]); substr = wcstring(buff, loc.first, loc.second);
}
env_set_one(argv[i], opts.place, substr);
} }
} else { } else {
// We're using a delimiter provided by the user so use the `string split` behavior.
wcstring_list_t splits; wcstring_list_t splits;
// We're making at most argc - 1 splits so the last variable // We're making at most argc - 1 splits so the last variable
// is set to the remaining string. // is set to the remaining string.
split_about(buff.begin(), buff.end(), opts.delimiter.begin(), opts.delimiter.end(), split_about(buff.begin(), buff.end(), opts.delimiter.begin(), opts.delimiter.end(),
&splits, argc - 1); &splits, argc - 1);
for (size_t i = 0; i < (size_t)argc && i < splits.size(); i++) { for (size_t i = 0; i < (size_t)argc && i < splits.size(); i++) {
env_set(argv[i], opts.place, splits[i].c_str()); env_set_one(argv[i], opts.place, splits[i]);
} }
} }
} }

49
src/builtin_set.cpp
View file

@ -293,8 +293,7 @@ static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope,
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
} }
auto val = list_to_array_val(list); retval = env_set(key, scope | ENV_USER, list);
retval = env_set(key, scope | ENV_USER, val->c_str());
switch (retval) { switch (retval) {
case ENV_OK: { case ENV_OK: {
retval = STATUS_CMD_OK; retval = STATUS_CMD_OK;
@ -502,8 +501,9 @@ static int builtin_set_query(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
for (auto idx : indexes) { for (auto idx : indexes) {
if (idx < 1 || (size_t)idx > result.size()) retval++; if (idx < 1 || (size_t)idx > result.size()) retval++;
} }
} else if (!env_exist(arg, scope)) { } else {
retval++; env_var_t var = env_get(arg, scope);
if (var.missing()) retval++;
} }
free(dest); free(dest);
@ -533,29 +533,26 @@ static void show_scope(const wchar_t *var_name, int scope, io_streams_t &streams
} }
} }
if (env_exist(var_name, scope)) { const env_var_t var = env_get(var_name, scope);
const env_var_t evar = env_get(var_name, scope | ENV_EXPORT | ENV_USER); if (var.missing()) {
const wchar_t *exportv = evar.missing() ? _(L"unexported") : _(L"exported");
const env_var_t var = env_get(var_name, scope | ENV_USER);
wcstring_list_t result;
var.to_list(result);
streams.out.append_format(_(L"$%ls: set in %ls scope, %ls, with %d elements\n"), var_name,
scope_name, exportv, result.size());
for (size_t i = 0; i < result.size(); i++) {
if (result.size() > 100) {
if (i == 50) streams.out.append(L"...\n");
if (i >= 50 && i < result.size() - 50) continue;
}
const wcstring value = result[i];
const wcstring escaped_val =
escape_string(value.c_str(), ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT);
streams.out.append_format(_(L"$%ls[%d]: length=%d value=|%ls|\n"), var_name, i + 1,
value.size(), escaped_val.c_str());
}
} else {
streams.out.append_format(_(L"$%ls: not set in %ls scope\n"), var_name, scope_name); streams.out.append_format(_(L"$%ls: not set in %ls scope\n"), var_name, scope_name);
return;
}
const wchar_t *exportv = var.exportv ? _(L"exported") : _(L"unexported");
wcstring_list_t vals = var.as_const_list();
streams.out.append_format(_(L"$%ls: set in %ls scope, %ls, with %d elements\n"), var_name,
scope_name, exportv, vals.size());
for (size_t i = 0; i < vals.size(); i++) {
if (vals.size() > 100) {
if (i == 50) streams.out.append(L"...\n");
if (i >= 50 && i < vals.size() - 50) continue;
}
const wcstring value = vals[i];
const wcstring escaped_val =
escape_string(value.c_str(), ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT);
streams.out.append_format(_(L"$%ls[%d]: length=%d value=|%ls|\n"), var_name, i + 1,
value.size(), escaped_val.c_str());
} }
} }

8
src/common.cpp
View file

@ -1557,9 +1557,9 @@ static void validate_new_termsize(struct winsize *new_termsize) {
env_var_t row_var = env_get(L"LINES"); env_var_t row_var = env_get(L"LINES");
if (!col_var.missing_or_empty() && !row_var.missing_or_empty()) { if (!col_var.missing_or_empty() && !row_var.missing_or_empty()) {
// Both vars have to have valid values. // Both vars have to have valid values.
int col = fish_wcstoi(col_var.c_str()); int col = fish_wcstoi(col_var.as_string().c_str());
bool col_ok = errno == 0 && col > 0 && col <= USHRT_MAX; bool col_ok = errno == 0 && col > 0 && col <= USHRT_MAX;
int row = fish_wcstoi(row_var.c_str()); int row = fish_wcstoi(row_var.as_string().c_str());
bool row_ok = errno == 0 && row > 0 && row <= USHRT_MAX; bool row_ok = errno == 0 && row > 0 && row <= USHRT_MAX;
if (col_ok && row_ok) { if (col_ok && row_ok) {
new_termsize->ws_col = col; new_termsize->ws_col = col;
@ -1584,11 +1584,11 @@ static void export_new_termsize(struct winsize *new_termsize) {
env_var_t cols = env_get(L"COLUMNS", ENV_EXPORT); env_var_t cols = env_get(L"COLUMNS", ENV_EXPORT);
swprintf(buf, 64, L"%d", (int)new_termsize->ws_col); swprintf(buf, 64, L"%d", (int)new_termsize->ws_col);
env_set(L"COLUMNS", ENV_GLOBAL | (cols.missing_or_empty() ? 0 : ENV_EXPORT), buf); env_set_one(L"COLUMNS", ENV_GLOBAL | (cols.missing_or_empty() ? ENV_DEFAULT : ENV_EXPORT), buf);
env_var_t lines = env_get(L"LINES", ENV_EXPORT); env_var_t lines = env_get(L"LINES", ENV_EXPORT);
swprintf(buf, 64, L"%d", (int)new_termsize->ws_row); swprintf(buf, 64, L"%d", (int)new_termsize->ws_row);
env_set(L"LINES", ENV_GLOBAL | (lines.missing_or_empty() ? 0 : ENV_EXPORT), buf); env_set_one(L"LINES", ENV_GLOBAL | (lines.missing_or_empty() ? ENV_DEFAULT : ENV_EXPORT), buf);
#ifdef HAVE_WINSIZE #ifdef HAVE_WINSIZE
ioctl(STDOUT_FILENO, TIOCSWINSZ, new_termsize); ioctl(STDOUT_FILENO, TIOCSWINSZ, new_termsize);

5
src/complete.cpp
View file

@ -12,7 +12,9 @@
#include <wctype.h> #include <wctype.h>
#include <algorithm> #include <algorithm>
#include <cstddef>
#include <functional> #include <functional>
#include <iterator>
#include <list> #include <list>
#include <map> #include <map>
#include <memory> #include <memory>
@ -1108,7 +1110,7 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
env_var_t var = env_get(env_name); env_var_t var = env_get(env_name);
if (var.missing()) continue; if (var.missing()) continue;
wcstring value = expand_escape_variable(var.as_string()); wcstring value = expand_escape_variable(var);
if (this->type() != COMPLETE_AUTOSUGGEST) { if (this->type() != COMPLETE_AUTOSUGGEST) {
desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str()); desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str());
} }
@ -1445,7 +1447,6 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
if (i == 0) { if (i == 0) {
assert(wrap_chain.at(i) == current_command_unescape); assert(wrap_chain.at(i) == current_command_unescape);
} else if (!(flags & COMPLETION_REQUEST_AUTOSUGGESTION)) { } else if (!(flags & COMPLETION_REQUEST_AUTOSUGGESTION)) {
assert(cmd_node != NULL);
wcstring faux_cmdline = cmd; wcstring faux_cmdline = cmd;
faux_cmdline.replace(cmd_node->source_start, faux_cmdline.replace(cmd_node->source_start,
cmd_node->source_length, wrap_chain.at(i)); cmd_node->source_length, wrap_chain.at(i));

366
src/env.cpp
View file

@ -105,7 +105,6 @@ static const wcstring_list_t colon_delimited_variable({L"PATH", L"MANPATH", L"CD
// Some forward declarations to make it easy to logically group the code. // Some forward declarations to make it easy to logically group the code.
static void init_locale(); static void init_locale();
static void init_curses(); static void init_curses();
static void tokenize_variable_array(const wcstring &val, wcstring_list_t &out);
/// Construct a missing var object /// Construct a missing var object
env_var_t create_missing_var() { env_var_t create_missing_var() {
@ -116,6 +115,33 @@ env_var_t create_missing_var() {
env_var_t missing_var = create_missing_var(); env_var_t missing_var = create_missing_var();
/// This is used to convert a serialized env_var_t back into a list. It is used when reading legacy
/// (fish 2.x) encoded vars stored in the universal variable file and the environment.
static void tokenize_variable_array(const wcstring &val, wcstring_list_t &out) {
out.clear(); // ensure the output var is empty -- this will normally be a no-op
// Zero element arrays are externally encoded as this placeholder string.
if (val == ENV_NULL) return;
size_t pos = 0, end = val.size();
while (pos <= end) {
size_t next_pos = val.find(ARRAY_SEP, pos);
if (next_pos == wcstring::npos) {
next_pos = end;
}
out.resize(out.size() + 1);
out.back().assign(val, pos, next_pos - pos);
pos = next_pos + 1; // skip the separator, or skip past the end
}
}
/// This is used to convert a serialized env_var_t back into a list.
wcstring_list_t decode_serialized(const wcstring &s) {
wcstring_list_t values;
tokenize_variable_array(s, values);
return values;
}
// Struct representing one level in the function variable stack. // Struct representing one level in the function variable stack.
// Only our variable stack should create and destroy these // Only our variable stack should create and destroy these
class env_node_t { class env_node_t {
@ -139,10 +165,6 @@ class env_node_t {
const env_var_t find_entry(const wcstring &key); const env_var_t find_entry(const wcstring &key);
}; };
class variable_entry_t {
wcstring value; /**< Value of the variable */
};
static pthread_mutex_t env_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t env_lock = PTHREAD_MUTEX_INITIALIZER;
static bool local_scope_exports(const env_node_t *n); static bool local_scope_exports(const env_node_t *n);
@ -331,10 +353,11 @@ static bool var_is_timezone(const wcstring &key) { return key == L"TZ"; }
/// Properly sets all timezone information. /// Properly sets all timezone information.
static void handle_timezone(const wchar_t *env_var_name) { static void handle_timezone(const wchar_t *env_var_name) {
debug(2, L"handle_timezone() called in response to '%ls' changing", env_var_name); // const env_var_t var = env_get(env_var_name, ENV_EXPORT);
const env_var_t var = env_get(env_var_name, ENV_EXPORT); const env_var_t var = env_get(env_var_name, ENV_DEFAULT);
debug(2, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
var.missing() ? L"MISSING" : var.as_string().c_str());
const std::string &name = wcs2string(env_var_name); const std::string &name = wcs2string(env_var_name);
debug(2, L"timezone var %s='%s'", name.c_str(), var.c_str());
if (var.missing_or_empty()) { if (var.missing_or_empty()) {
unsetenv(name.c_str()); unsetenv(name.c_str());
} else { } else {
@ -370,17 +393,9 @@ static void fix_colon_delimited_var(const wcstring &var_name) {
return; return;
} }
wcstring new_val; int retval = env_set(var_name, ENV_DEFAULT | ENV_USER, new_pathsv);
for (size_t i = 0; i < new_pathsv.size(); i++) { if (retval != ENV_OK) {
new_val.append(new_pathsv[i]); debug(0, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
if (i < new_pathsv.size() - 1) {
new_val.append(ARRAY_SEP_STR);
}
}
int scope = env_set(var_name, ENV_USER, new_val.c_str());
if (scope != ENV_OK) {
debug(0, L"fix_colon_delimited_var failed unexpectedly with retval %d", scope);
} }
} }
@ -460,7 +475,7 @@ static bool does_term_support_setting_title() {
const env_var_t term_var = env_get(L"TERM"); const env_var_t term_var = env_get(L"TERM");
if (term_var.missing_or_empty()) return false; if (term_var.missing_or_empty()) return false;
const wchar_t *term = term_var.c_str(); const wchar_t *term = term_var.as_string().c_str();
bool recognized = contains(title_terms, term_var.as_string()); bool recognized = contains(title_terms, term_var.as_string());
if (!recognized) recognized = !wcsncmp(term, L"xterm-", wcslen(L"xterm-")); if (!recognized) recognized = !wcsncmp(term, L"xterm-", wcslen(L"xterm-"));
if (!recognized) recognized = !wcsncmp(term, L"screen-", wcslen(L"screen-")); if (!recognized) recognized = !wcsncmp(term, L"screen-", wcslen(L"screen-"));
@ -585,7 +600,7 @@ static void init_curses() {
if (term.missing_or_empty()) { if (term.missing_or_empty()) {
debug(1, _(L"TERM environment variable not set.")); debug(1, _(L"TERM environment variable not set."));
} else { } else {
debug(1, _(L"TERM environment variable set to '%ls'."), term.c_str()); debug(1, _(L"TERM environment variable set to '%ls'."), term.as_string().c_str());
debug(1, _(L"Check that this terminal type is supported on this system.")); debug(1, _(L"Check that this terminal type is supported on this system."));
} }
} }
@ -675,7 +690,7 @@ static void universal_callback(fish_message_type_t type, const wchar_t *name) {
static void setup_path() { static void setup_path() {
const env_var_t path = env_get(L"PATH"); const env_var_t path = env_get(L"PATH");
if (path.missing_or_empty()) { if (path.missing_or_empty()) {
const wchar_t *value = L"/usr/bin" ARRAY_SEP_STR L"/bin"; wcstring_list_t value({L"/usr/bin", L"/bin"});
env_set(L"PATH", ENV_GLOBAL | ENV_EXPORT, value); env_set(L"PATH", ENV_GLOBAL | ENV_EXPORT, value);
} }
} }
@ -685,20 +700,20 @@ static void setup_path() {
/// adjusted. /// adjusted.
static void env_set_termsize() { static void env_set_termsize() {
env_var_t cols = env_get(L"COLUMNS"); env_var_t cols = env_get(L"COLUMNS");
if (cols.missing_or_empty()) env_set(L"COLUMNS", ENV_GLOBAL, DFLT_TERM_COL_STR); if (cols.missing_or_empty()) env_set_one(L"COLUMNS", ENV_GLOBAL, DFLT_TERM_COL_STR);
env_var_t rows = env_get(L"LINES"); env_var_t rows = env_get(L"LINES");
if (rows.missing_or_empty()) env_set(L"LINES", ENV_GLOBAL, DFLT_TERM_ROW_STR); if (rows.missing_or_empty()) env_set_one(L"LINES", ENV_GLOBAL, DFLT_TERM_ROW_STR);
} }
bool env_set_pwd() { bool env_set_pwd() {
wcstring res = wgetcwd(); wcstring cwd = wgetcwd();
if (res.empty()) { if (cwd.empty()) {
debug(0, debug(0,
_(L"Could not determine current working directory. Is your locale set correctly?")); _(L"Could not determine current working directory. Is your locale set correctly?"));
return false; return false;
} }
env_set(L"PWD", ENV_EXPORT | ENV_GLOBAL, res.c_str()); env_set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, cwd);
return true; return true;
} }
@ -707,7 +722,7 @@ bool env_set_pwd() {
void env_set_read_limit() { void env_set_read_limit() {
env_var_t read_byte_limit_var = env_get(L"FISH_READ_BYTE_LIMIT"); env_var_t read_byte_limit_var = env_get(L"FISH_READ_BYTE_LIMIT");
if (!read_byte_limit_var.missing_or_empty()) { if (!read_byte_limit_var.missing_or_empty()) {
size_t limit = fish_wcstoull(read_byte_limit_var.c_str()); size_t limit = fish_wcstoull(read_byte_limit_var.as_string().c_str());
if (errno) { if (errno) {
debug(1, "Ignoring FISH_READ_BYTE_LIMIT since it is not valid"); debug(1, "Ignoring FISH_READ_BYTE_LIMIT since it is not valid");
} else { } else {
@ -730,14 +745,14 @@ wcstring env_get_pwd_slash(void) {
/// Set up the USER variable. /// Set up the USER variable.
static void setup_user(bool force) { static void setup_user(bool force) {
if (env_get(L"USER").missing_or_empty() || force) { if (force || env_get(L"USER").missing_or_empty()) {
struct passwd userinfo; struct passwd userinfo;
struct passwd *result; struct passwd *result;
char buf[8192]; char buf[8192];
int retval = getpwuid_r(getuid(), &userinfo, buf, sizeof(buf), &result); int retval = getpwuid_r(getuid(), &userinfo, buf, sizeof(buf), &result);
if (!retval && result) { if (!retval && result) {
const wcstring uname = str2wcstring(userinfo.pw_name); const wcstring uname = str2wcstring(userinfo.pw_name);
env_set(L"USER", ENV_GLOBAL | ENV_EXPORT, uname.c_str()); env_set_one(L"USER", ENV_GLOBAL | ENV_EXPORT, uname);
} }
} }
} }
@ -820,34 +835,35 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
wcstring key, val; wcstring key, val;
const char *const *envp = environ; const char *const *envp = environ;
size_t i = 0; size_t i = 0;
while (envp && envp[i]) { while (envp && envp[i]) i++;
i++;
}
while (i--) { while (i--) {
const wcstring key_and_val = str2wcstring(envp[i]); // like foo=bar const wcstring key_and_val = str2wcstring(envp[i]); // like foo=bar
size_t eql = key_and_val.find(L'='); size_t eql = key_and_val.find(L'=');
if (eql == wcstring::npos) { if (eql == wcstring::npos) {
// No equals found. // No equal-sign found so treat it as a defined var that has no value(s).
if (is_read_only(key_and_val) || is_electric(key_and_val)) continue; if (is_read_only(key_and_val) || is_electric(key_and_val)) continue;
env_set(key_and_val, ENV_EXPORT | ENV_GLOBAL, L""); env_set_empty(key_and_val, ENV_EXPORT | ENV_GLOBAL);
} else { } else {
key.assign(key_and_val, 0, eql); key.assign(key_and_val, 0, eql);
if (is_read_only(key) || is_electric(key)) continue; if (is_read_only(key) || is_electric(key)) continue;
val.assign(key_and_val, eql + 1, wcstring::npos); val.assign(key_and_val, eql + 1, wcstring::npos);
if (variable_is_colon_delimited_var(key)) { if (variable_is_colon_delimited_var(key)) {
std::replace(val.begin(), val.end(), L':', ARRAY_SEP); std::replace(val.begin(), val.end(), L':', ARRAY_SEP);
wcstring_list_t values = decode_serialized(val);
env_set(key, ENV_EXPORT | ENV_GLOBAL, values);
} else {
wcstring_list_t values = decode_serialized(val);
env_set(key, ENV_EXPORT | ENV_GLOBAL, values);
} }
env_set(key, ENV_EXPORT | ENV_GLOBAL, val.c_str());
} }
} }
// Set the given paths in the environment, if we have any. // Set the given paths in the environment, if we have any.
if (paths != NULL) { if (paths != NULL) {
env_set(FISH_DATADIR_VAR, ENV_GLOBAL, paths->data.c_str()); env_set_one(FISH_DATADIR_VAR, ENV_GLOBAL, paths->data);
env_set(FISH_SYSCONFDIR_VAR, ENV_GLOBAL, paths->sysconf.c_str()); env_set_one(FISH_SYSCONFDIR_VAR, ENV_GLOBAL, paths->sysconf);
env_set(FISH_HELPDIR_VAR, ENV_GLOBAL, paths->doc.c_str()); env_set_one(FISH_HELPDIR_VAR, ENV_GLOBAL, paths->doc);
env_set(FISH_BIN_DIR, ENV_GLOBAL, paths->bin.c_str()); env_set_one(FISH_BIN_DIR, ENV_GLOBAL, paths->bin);
} }
init_locale(); init_locale();
@ -868,7 +884,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
// Set up the version variable. // Set up the version variable.
wcstring version = str2wcstring(get_fish_version()); wcstring version = str2wcstring(get_fish_version());
env_set(L"FISH_VERSION", ENV_GLOBAL, version.c_str()); env_set_one(L"FISH_VERSION", ENV_GLOBAL, version);
// Set up SHLVL variable. // Set up SHLVL variable.
const env_var_t shlvl_var = env_get(L"SHLVL"); const env_var_t shlvl_var = env_get(L"SHLVL");
@ -876,12 +892,12 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
if (!shlvl_var.missing_or_empty()) { if (!shlvl_var.missing_or_empty()) {
const wchar_t *end; const wchar_t *end;
// TODO: Figure out how to handle invalid numbers better. Shouldn't we issue a diagnostic? // TODO: Figure out how to handle invalid numbers better. Shouldn't we issue a diagnostic?
long shlvl_i = fish_wcstol(shlvl_var.c_str(), &end); long shlvl_i = fish_wcstol(shlvl_var.as_string().c_str(), &end);
if (!errno && shlvl_i >= 0) { if (!errno && shlvl_i >= 0) {
nshlvl_str = to_string<long>(shlvl_i + 1); nshlvl_str = to_string<long>(shlvl_i + 1);
} }
} }
env_set(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, nshlvl_str.c_str()); env_set_one(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, nshlvl_str);
env_read_only.insert(L"SHLVL"); env_read_only.insert(L"SHLVL");
// Set up the HOME variable. // Set up the HOME variable.
@ -892,7 +908,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
if (env_get(L"HOME").missing_or_empty()) { if (env_get(L"HOME").missing_or_empty()) {
env_var_t user_var = env_get(L"USER"); env_var_t user_var = env_get(L"USER");
if (!user_var.missing_or_empty()) { if (!user_var.missing_or_empty()) {
char *unam_narrow = wcs2str(user_var.c_str()); char *unam_narrow = wcs2str(user_var.as_string());
struct passwd userinfo; struct passwd userinfo;
struct passwd *result; struct passwd *result;
char buf[8192]; char buf[8192];
@ -902,24 +918,22 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
setup_user(true); setup_user(true);
user_var = env_get(L"USER"); user_var = env_get(L"USER");
if (!user_var.missing_or_empty()) { if (!user_var.missing_or_empty()) {
unam_narrow = wcs2str(user_var.c_str()); unam_narrow = wcs2str(user_var.as_string());
retval = getpwnam_r(unam_narrow, &userinfo, buf, sizeof(buf), &result); retval = getpwnam_r(unam_narrow, &userinfo, buf, sizeof(buf), &result);
} }
} }
if (!retval && result && userinfo.pw_dir) { if (!retval && result && userinfo.pw_dir) {
const wcstring dir = str2wcstring(userinfo.pw_dir); const wcstring dir = str2wcstring(userinfo.pw_dir);
env_set(L"HOME", ENV_GLOBAL | ENV_EXPORT, dir.c_str()); env_set_one(L"HOME", ENV_GLOBAL | ENV_EXPORT, dir);
} else { } else {
// We cannot get $HOME, set it to the empty list. // We cannot get $HOME. This triggers warnings for history and config.fish already,
// This triggers warnings for history and config.fish already,
// so it isn't necessary to warn here as well. // so it isn't necessary to warn here as well.
env_set(L"HOME", ENV_GLOBAL | ENV_EXPORT, ENV_NULL); env_set_empty(L"HOME", ENV_GLOBAL | ENV_EXPORT);
} }
free(unam_narrow); free(unam_narrow);
} else { } else {
// If $USER is empty as well (which we tried to set above), // If $USER is empty as well (which we tried to set above), we can't get $HOME.
// we can't get $HOME. env_set_empty(L"HOME", ENV_GLOBAL | ENV_EXPORT);
env_set(L"HOME", ENV_GLOBAL | ENV_EXPORT, ENV_NULL);
} }
} }
@ -933,7 +947,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
use_posix_spawn.missing_or_empty() ? true : from_string<bool>(use_posix_spawn.as_string()); use_posix_spawn.missing_or_empty() ? true : from_string<bool>(use_posix_spawn.as_string());
// Set fish_bind_mode to "default". // Set fish_bind_mode to "default".
env_set(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE); env_set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
// This is somewhat subtle. At this point we consider our environment to be sufficiently // This is somewhat subtle. At this point we consider our environment to be sufficiently
// initialized that we can react to changes to variables. Prior to doing this we expect that the // initialized that we can react to changes to variables. Prior to doing this we expect that the
@ -966,6 +980,19 @@ static env_node_t *env_get_node(const wcstring &key) {
return env; return env;
} }
/// Sets the variable with the specified name to a single value.
int env_set_one(const wcstring &key, env_mode_flags_t mode, const wcstring &val) {
wcstring_list_t vals({
val,
});
return env_set(key, mode, vals);
}
/// Sets the variable with the specified name to no (i.e., zero) values.
int env_set_empty(const wcstring &key, env_mode_flags_t mode) {
return env_set(key, mode, wcstring_list_t());
}
/// Set the value of the environment variable whose name matches key to val. /// Set the value of the environment variable whose name matches key to val.
/// ///
/// Memory policy: All keys and values are copied, the parameters can and should be freed by the /// Memory policy: All keys and values are copied, the parameters can and should be freed by the
@ -974,8 +1001,8 @@ static env_node_t *env_get_node(const wcstring &key) {
/// \param key The key /// \param key The key
/// \param val The value /// \param val The value
/// \param var_mode The type of the variable. Can be any combination of ENV_GLOBAL, ENV_LOCAL, /// \param var_mode The type of the variable. Can be any combination of ENV_GLOBAL, ENV_LOCAL,
/// ENV_EXPORT and ENV_USER. If mode is zero, the current variable space is searched and the current /// ENV_EXPORT and ENV_USER. If mode is ENV_DEFAULT, the current variable space is searched and the
/// mode is used. If no current variable with the same name is found, ENV_LOCAL is assumed. /// current mode is used. If no current variable with the same name is found, ENV_LOCAL is assumed.
/// ///
/// Returns: /// Returns:
/// ///
@ -985,21 +1012,23 @@ static env_node_t *env_get_node(const wcstring &key) {
/// * ENV_SCOPE, the variable cannot be set in the given scope. This applies to readonly/electric /// * ENV_SCOPE, the variable cannot be set in the given scope. This applies to readonly/electric
/// variables set from the local or universal scopes, or set as exported. /// variables set from the local or universal scopes, or set as exported.
/// * ENV_INVALID, the variable value was invalid. This applies only to special variables. /// * ENV_INVALID, the variable value was invalid. This applies only to special variables.
int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val) { int env_set(const wcstring &key, env_mode_flags_t var_mode, const wcstring_list_t &vals) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
bool has_changed_old = vars_stack().has_changed_exported; bool has_changed_old = vars_stack().has_changed_exported;
int done = 0; int done = 0;
if (val && (key == L"PWD" || key == L"HOME")) { if (!vals.empty() && (key == L"PWD" || key == L"HOME")) {
// Canonicalize our path; if it changes, recurse and try again. // Canonicalize our path; if it changes, recurse and try again.
wcstring val_canonical = val; assert(vals.size() == 1);
wcstring val_canonical = vals[0];
path_make_canonical(val_canonical); path_make_canonical(val_canonical);
if (val != val_canonical) { if (vals[0] != val_canonical) {
return env_set(key, var_mode, val_canonical.c_str()); return env_set_one(key, var_mode, val_canonical);
} }
} }
if ((var_mode & (ENV_LOCAL | ENV_UNIVERSAL)) && (is_read_only(key) || is_electric(key))) { if ((var_mode & ENV_LOCAL || var_mode & ENV_UNIVERSAL) &&
(is_read_only(key) || is_electric(key))) {
return ENV_SCOPE; return ENV_SCOPE;
} }
if ((var_mode & ENV_EXPORT) && is_electric(key)) { if ((var_mode & ENV_EXPORT) && is_electric(key)) {
@ -1011,8 +1040,8 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
if (key == L"umask") { if (key == L"umask") {
// Set the new umask. // Set the new umask.
if (val && wcslen(val)) { if (!vals.empty() && vals[0].size()) {
long mask = fish_wcstol(val, NULL, 8); long mask = fish_wcstol(vals[0].c_str(), NULL, 8);
if (!errno && mask <= 0777 && mask >= 0) { if (!errno && mask <= 0777 && mask >= 0) {
umask(mask); umask(mask);
// Do not actually create a umask variable, on env_get, it will be calculated // Do not actually create a umask variable, on env_get, it will be calculated
@ -1020,15 +1049,9 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
return ENV_OK; return ENV_OK;
} }
} }
return ENV_INVALID; return ENV_INVALID;
} }
// Zero element arrays are internally not coded as an empty string but this placeholder string.
if (!val) {
val = ENV_NULL; //!OCLINT(parameter reassignment)
}
if (var_mode & ENV_UNIVERSAL) { if (var_mode & ENV_UNIVERSAL) {
const bool old_export = uvars() && uvars()->get_export(key); const bool old_export = uvars() && uvars()->get_export(key);
bool new_export; bool new_export;
@ -1043,7 +1066,7 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
new_export = old_export; new_export = old_export;
} }
if (uvars()) { if (uvars()) {
uvars()->set(key, val, new_export); uvars()->set(key, vals, new_export);
env_universal_barrier(); env_universal_barrier();
if (old_export || new_export) { if (old_export || new_export) {
vars_stack().mark_changed_exported(); vars_stack().mark_changed_exported();
@ -1092,7 +1115,7 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
exportv = uvars()->get_export(key); exportv = uvars()->get_export(key);
} }
uvars()->set(key, val, exportv); uvars()->set(key, vals, exportv);
env_universal_barrier(); env_universal_barrier();
done = 1; done = 1;
@ -1112,7 +1135,7 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
has_changed_new = true; has_changed_new = true;
} }
var.set_val(val); var.set_vals(vals);
if (var_mode & ENV_EXPORT) { if (var_mode & ENV_EXPORT) {
// The new variable is exported. // The new variable is exported.
var.exportv = true; var.exportv = true;
@ -1135,9 +1158,9 @@ int env_set(const wcstring &key, env_mode_flags_t var_mode, const wchar_t *val)
ev.arguments.push_back(L"SET"); ev.arguments.push_back(L"SET");
ev.arguments.push_back(key); ev.arguments.push_back(key);
// debug( 1, L"env_set: fire events on variable %ls", key ); // debug(1, L"env_set: fire events on variable |%ls|", key);
event_fire(&ev); event_fire(&ev);
// debug( 1, L"env_set: return from event firing" ); // debug(1, L"env_set: return from event firing");
react_to_variable_change(L"SET", key); react_to_variable_change(L"SET", key);
return ENV_OK; return ENV_OK;
@ -1217,19 +1240,29 @@ int env_remove(const wcstring &key, int var_mode) {
return !erased; return !erased;
} }
wcstring env_var_t::as_string(void) const { wcstring_list_t &env_var_t::as_list(void) { return vals; }
assert(!is_missing);
return val;
}
const wchar_t *env_var_t::c_str(void) const { const wcstring_list_t &env_var_t::as_const_list(void) const { return vals; }
assert(!is_missing);
return val.c_str(); /// Return a string representation of the var. At the present time this uses the legacy 2.x
/// encoding.
wcstring env_var_t::as_string(void) const {
assert(!this->is_missing);
if (this->vals.empty()) return wcstring(ENV_NULL);
wchar_t sep = variable_is_colon_delimited_var(this->name) ? L':' : ARRAY_SEP;
auto it = this->vals.cbegin();
wcstring result(*it);
while (++it != vals.end()) {
result.push_back(sep);
result.append(*it);
}
return result;
} }
void env_var_t::to_list(wcstring_list_t &out) const { void env_var_t::to_list(wcstring_list_t &out) const {
assert(!is_missing); assert(!is_missing);
tokenize_variable_array(val, out); out = vals;
} }
env_var_t env_get(const wcstring &key, env_mode_flags_t mode) { env_var_t env_get(const wcstring &key, env_mode_flags_t mode) {
@ -1258,34 +1291,33 @@ env_var_t env_get(const wcstring &key, env_mode_flags_t mode) {
} }
wcstring result; wcstring result;
if (history) history->get_string_representation(&result, ARRAY_SEP_STR); if (history) history->get_string_representation(&result, ARRAY_SEP_STR);
return env_var_t(result); return env_var_t(L"history", result);
} else if (key == L"status") { } else if (key == L"status") {
return env_var_t(to_string(proc_get_last_status())); return env_var_t(L"status", to_string(proc_get_last_status()));
} else if (key == L"umask") { } else if (key == L"umask") {
return env_var_t(format_string(L"0%0.3o", get_umask())); return env_var_t(L"umask", format_string(L"0%0.3o", get_umask()));
} }
// We should never get here unless the electric var list is out of sync with the above code. // We should never get here unless the electric var list is out of sync with the above code.
DIE("unerecognized electric var name"); DIE("unerecognized electric var name");
} }
if (search_local || search_global) { if (search_local || search_global) {
/* Lock around a local region */ scoped_lock locker(env_lock); // lock around a local region
scoped_lock locker(env_lock);
env_node_t *env = search_local ? vars_stack().top.get() : vars_stack().global_env; env_node_t *env = search_local ? vars_stack().top.get() : vars_stack().global_env;
while (env != NULL) { while (env != NULL) {
const env_var_t var = env->find_entry(key); if (env == vars_stack().global_env && !search_global) {
if (!var.missing() && (var.exportv ? search_exported : search_unexported)) { break;
return var;
} }
if (has_scope) { var_table_t::const_iterator result = env->env.find(key);
if (!search_global || env == vars_stack().global_env) break; if (result != env->env.end()) {
env = vars_stack().global_env; const env_var_t var = result->second;
} else { if (!var.missing() && (var.exportv ? search_exported : search_unexported)) {
env = vars_stack().next_scope_to_search(env); return var;
}
} }
env = vars_stack().next_scope_to_search(env);
} }
} }
@ -1301,66 +1333,15 @@ env_var_t env_get(const wcstring &key, env_mode_flags_t mode) {
// Okay, we couldn't find a local or global var given the requirements. If there is a matching // Okay, we couldn't find a local or global var given the requirements. If there is a matching
// universal var return that. // universal var return that.
if (uvars()) { if (uvars()) {
env_var_t env_var = uvars()->get(key); env_var_t var = uvars()->get(key);
if (!env_var.missing() && if (!var.missing() && (uvars()->get_export(key) ? search_exported : search_unexported)) {
(uvars()->get_export(key) ? search_exported : search_unexported)) { return var;
return env_var;
} }
} }
return missing_var; return missing_var;
} }
bool env_exist(const wchar_t *key, env_mode_flags_t mode) {
CHECK(key, false);
const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
const bool test_local = !has_scope || (mode & ENV_LOCAL);
const bool test_global = !has_scope || (mode & ENV_GLOBAL);
const bool test_universal = !has_scope || (mode & ENV_UNIVERSAL);
const bool test_exported = (mode & ENV_EXPORT) || !(mode & ENV_UNEXPORT);
const bool test_unexported = (mode & ENV_UNEXPORT) || !(mode & ENV_EXPORT);
if (is_electric(key)) {
// Electric variables all exist, and they are all global. A local or universal version can
// not exist. They are also never exported.
if (test_global && test_unexported) {
return true;
}
return false;
}
if (test_local || test_global) {
const env_node_t *env = test_local ? vars_stack().top.get() : vars_stack().global_env;
while (env != NULL) {
if (env == vars_stack().global_env && !test_global) {
break;
}
var_table_t::const_iterator result = env->env.find(key);
if (result != env->env.end()) {
const env_var_t var = result->second;
return var.exportv ? test_exported : test_unexported;
}
env = vars_stack().next_scope_to_search(env);
}
}
if (test_universal) {
if (!get_proc_had_barrier()) {
set_proc_had_barrier(true);
env_universal_barrier();
}
if (uvars() && !uvars()->get(key).missing()) {
return uvars()->get_export(key) ? test_exported : test_unexported;
}
}
return 0;
}
/// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported /// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
/// variable. /// variable.
static bool local_scope_exports(const env_node_t *n) { static bool local_scope_exports(const env_node_t *n) {
@ -1506,10 +1487,10 @@ void var_stack_t::update_export_array_if_necessary() {
const wcstring &key = uni.at(i); const wcstring &key = uni.at(i);
const env_var_t var = uvars()->get(key); const env_var_t var = uvars()->get(key);
if (!var.missing() && var.as_string() != ENV_NULL) { if (!var.missing() && !var.empty()) {
// Note that std::map::insert does NOT overwrite a value already in the map, // Note that std::map::insert does NOT overwrite a value already in the map,
// which we depend on here. // which we depend on here.
vals.insert(std::pair<wcstring, wcstring>(key, var.as_string())); vals.insert(std::pair<wcstring, env_var_t>(key, var));
} }
} }
} }
@ -1528,20 +1509,15 @@ const char *const *env_export_arr() {
} }
void env_set_argv(const wchar_t *const *argv) { void env_set_argv(const wchar_t *const *argv) {
if (*argv) { if (argv && *argv) {
const wchar_t *const *arg; wcstring_list_t list;
wcstring sb; for (auto arg = argv; *arg; arg++) {
list.push_back(*arg);
for (arg = argv; *arg; arg++) {
if (arg != argv) {
sb.append(ARRAY_SEP_STR);
}
sb.append(*arg);
} }
env_set(L"argv", ENV_LOCAL, sb.c_str()); env_set(L"argv", ENV_LOCAL, list);
} else { } else {
env_set(L"argv", ENV_LOCAL, NULL); env_set_empty(L"argv", ENV_LOCAL);
} }
} }
@ -1552,7 +1528,7 @@ env_vars_snapshot_t::env_vars_snapshot_t(const wchar_t *const *keys) {
key.assign(keys[i]); key.assign(keys[i]);
const env_var_t var = env_get(key); const env_var_t var = env_get(key);
if (!var.missing()) { if (!var.missing()) {
vars[key] = var.as_string(); vars[key] = var;
} }
} }
} }
@ -1571,7 +1547,7 @@ env_var_t env_vars_snapshot_t::get(const wcstring &key) const {
if (this->is_current()) { if (this->is_current()) {
return env_get(key); return env_get(key);
} }
std::map<wcstring, wcstring>::const_iterator iter = vars.find(key); std::map<wcstring, env_var_t>::const_iterator iter = vars.find(key);
return iter == vars.end() ? missing_var : env_var_t(iter->second); return iter == vars.end() ? missing_var : env_var_t(iter->second);
} }
@ -1579,61 +1555,3 @@ const wchar_t *const env_vars_snapshot_t::highlighting_keys[] = {L"PATH", L"CDPA
L"fish_function_path", NULL}; L"fish_function_path", NULL};
const wchar_t *const env_vars_snapshot_t::completing_keys[] = {L"PATH", L"CDPATH", NULL}; const wchar_t *const env_vars_snapshot_t::completing_keys[] = {L"PATH", L"CDPATH", NULL};
// The next set of functions convert between a flat string and an actual list of strings using
// the encoding employed by fish internally for "arrays".
std::unique_ptr<wcstring> list_to_array_val(const wcstring_list_t &list) {
auto val = std::unique_ptr<wcstring>(new wcstring());
if (list.size() == 0) {
// Zero element arrays are internally encoded as this placeholder string.
val->append(ENV_NULL);
} else {
bool need_sep = false;
for (auto it : list) {
if (need_sep) {
val->push_back(ARRAY_SEP);
} else {
need_sep = true;
}
val->append(it);
}
}
return val;
}
std::unique_ptr<wcstring> list_to_array_val(const wchar_t **list) {
auto val = std::unique_ptr<wcstring>(new wcstring());
if (!*list) {
// Zero element arrays are internally encoded as this placeholder string.
val->append(ENV_NULL);
} else {
for (auto it = list; *it; it++) {
if (it != list) val->push_back(ARRAY_SEP);
val->append(*it);
}
}
return val;
}
static void tokenize_variable_array(const wcstring &val, wcstring_list_t &out) {
out.clear(); // ensure the output var is empty -- this will normally be a no-op
// Zero element arrays are internally encoded as this placeholder string.
if (val == ENV_NULL) return;
size_t pos = 0, end = val.size();
while (pos <= end) {
size_t next_pos = val.find(ARRAY_SEP, pos);
if (next_pos == wcstring::npos) {
next_pos = end;
}
out.resize(out.size() + 1);
out.back().assign(val, pos, next_pos - pos);
pos = next_pos + 1; // skip the separator, or skip past the end
}
}

153
src/env.h
View file

@ -1,4 +1,4 @@
// Prototypes for functions for setting and getting environment variables. // Prototypes for functions for manipulating fish script variables.
#ifndef FISH_ENV_H #ifndef FISH_ENV_H
#define FISH_ENV_H #define FISH_ENV_H
@ -8,6 +8,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector>
#include "common.h" #include "common.h"
@ -26,27 +27,24 @@ extern bool curses_initialized;
// Flags that may be passed as the 'mode' in env_set / env_get. // Flags that may be passed as the 'mode' in env_set / env_get.
enum { enum {
/// Default mode. /// Default mode. Used with `env_get()` to indicate the caller doesn't care what scope the var
/// is in or whether it is exported or unexported.
ENV_DEFAULT = 0, ENV_DEFAULT = 0,
/// Flag for local (to the current block) variable. /// Flag for local (to the current block) variable.
ENV_LOCAL = 1, ENV_LOCAL = 1 << 0,
/// Flag for exported (to commands) variable.
ENV_EXPORT = 2,
/// Flag for unexported variable.
ENV_UNEXPORT = 16,
/// Flag for global variable. /// Flag for global variable.
ENV_GLOBAL = 4, ENV_GLOBAL = 1 << 1,
/// Flag for variable update request from the user. All variable changes that are made directly
/// by the user, such as those from the 'set' builtin must have this flag set.
ENV_USER = 8,
/// Flag for universal variable. /// Flag for universal variable.
ENV_UNIVERSAL = 32 ENV_UNIVERSAL = 1 << 2,
/// Flag for exported (to commands) variable.
ENV_EXPORT = 1 << 3,
/// Flag for unexported variable.
ENV_UNEXPORT = 1 << 4,
/// Flag for variable update request from the user. All variable changes that are made directly
/// by the user, such as those from the `read` and `set` builtin must have this flag set. It
/// serves one purpose: to indicate that an error should be returned if the user is attempting
/// to modify a var that should not be modified by direct user action; e.g., a read-only var.
ENV_USER = 1 << 5,
}; };
typedef uint32_t env_mode_flags_t; typedef uint32_t env_mode_flags_t;
@ -56,10 +54,10 @@ enum { ENV_OK, ENV_PERM, ENV_SCOPE, ENV_INVALID };
/// A struct of configuration directories, determined in main() that fish will optionally pass to /// A struct of configuration directories, determined in main() that fish will optionally pass to
/// env_init. /// env_init.
struct config_paths_t { struct config_paths_t {
wcstring data; // e.g. /usr/local/share wcstring data; // e.g., /usr/local/share
wcstring sysconf; // e.g. /usr/local/etc wcstring sysconf; // e.g., /usr/local/etc
wcstring doc; // e.g. /usr/local/share/doc/fish wcstring doc; // e.g., /usr/local/share/doc/fish
wcstring bin; // e.g. /usr/local/bin wcstring bin; // e.g., /usr/local/bin
}; };
/// Initialize environment variable data. /// Initialize environment variable data.
@ -71,68 +69,101 @@ void misc_init();
class env_var_t { class env_var_t {
private: private:
wcstring val; wcstring name; // name of the var
bool is_missing; wcstring_list_t vals; // list of values assigned to the var
bool is_missing; // true if the var is not set in the requested scope
public: public:
bool exportv; // whether the variable should be exported bool exportv; // whether the variable should be exported
env_var_t(const wcstring &x) : val(x), is_missing(false), exportv(false) {}
env_var_t(const wchar_t *x) : val(x), is_missing(false), exportv(false) {}
env_var_t() : val(L""), is_missing(false), exportv(false) {}
void set_missing(void) { is_missing = true; } void set_missing(void) { is_missing = true; }
bool empty(void) const { return val.empty() || val == ENV_NULL; } // Constructors.
env_var_t(const env_var_t &v)
: name(v.name), vals(v.vals), is_missing(v.is_missing), exportv(v.exportv) {}
env_var_t(const wcstring &our_name, const wcstring_list_t &l)
: name(our_name), vals(l), is_missing(false), exportv(false) {}
env_var_t(const wcstring &our_name, const wcstring &s)
: name(our_name),
vals({
s,
}),
is_missing(false),
exportv(false) {}
env_var_t(const wcstring &our_name, const wchar_t *s)
: name(our_name),
vals({
wcstring(s),
}),
is_missing(false),
exportv(false) {}
env_var_t() : name(), vals(), is_missing(false), exportv(false) {}
bool empty(void) const { return vals.empty() || (vals.size() == 1 && vals[0].empty()); };
bool missing(void) const { return is_missing; } bool missing(void) const { return is_missing; }
bool missing_or_empty(void) const { return missing() || empty(); } bool missing_or_empty(void) const { return missing() || empty(); }
const wchar_t *c_str(void) const; bool matches_string(const wcstring &str) {
void to_list(wcstring_list_t &out) const; if (is_missing) return false;
if (vals.size() > 1) return false;
return vals[0] == str;
}
wcstring as_string() const; wcstring as_string() const;
void to_list(wcstring_list_t &out) const;
wcstring_list_t &as_list();
const wcstring_list_t &as_const_list() const;
const wcstring get_name() const { return name; }
// You cannot convert a missing var to a non-missing var. You can only change the value of a var
// that is not missing.
void set_val(const wcstring &s) { void set_val(const wcstring &s) {
assert(!is_missing); vals = {
val = s; s,
};
} }
void set_val(const wchar_t *s) { void set_vals(const wcstring_list_t &l) { vals = l; }
assert(!is_missing);
val = s; env_var_t &operator=(const env_var_t &var) {
this->vals = var.vals;
this->exportv = var.exportv;
this->is_missing = var.is_missing;
return *this;
} }
bool operator==(const env_var_t &s) const { return is_missing == s.is_missing && val == s.val; } /// Compare a simple string to the var. Returns true iff the var is not missing, has a single
/// value and that value matches the string being compared to.
bool operator==(const wcstring &str) const {
if (is_missing) return false;
if (vals.size() > 1) return false;
return vals[0] == str;
}
bool operator==(const wcstring &s) const { return !is_missing && val == s; } bool operator==(const env_var_t &var) const {
return this->is_missing == var.is_missing && vals == var.vals;
}
bool operator==(const wchar_t *s) const { return !is_missing && val == s; } bool operator==(const wcstring_list_t &values) const { return !is_missing && vals == values; }
bool operator!=(const env_var_t &v) const { return val != v.val; } bool operator!=(const env_var_t &var) const { return vals != var.vals; }
bool operator!=(const wcstring &s) const { return val != s; }
bool operator!=(const wchar_t *s) const { return val != s; }
}; };
env_var_t create_missing_var(); env_var_t create_missing_var();
extern env_var_t missing_var; extern env_var_t missing_var;
/// Gets the variable with the specified name, or env_var_t::missing_var if it does not exist or is /// This is used to convert a serialized env_var_t back into a list.
/// an empty array. wcstring_list_t decode_serialized(const wcstring &s);
///
/// \param key The name of the variable to get /// Gets the variable with the specified name, or env_var_t::missing_var if it does not exist.
/// \param mode An optional scope to search in. All scopes are searched if unset
env_var_t env_get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT); env_var_t env_get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT);
int env_set(const wcstring &key, env_mode_flags_t mode, const wchar_t *val); /// Sets the variable with the specified name to the given values.
int env_set(const wcstring &key, env_mode_flags_t mode, const wcstring_list_t &vals);
/// Returns true if the specified key exists. This can't be reliably done using env_get, since /// Sets the variable with the specified name to a single value.
/// env_get returns null for 0-element arrays. int env_set_one(const wcstring &key, env_mode_flags_t mode, const wcstring &val);
///
/// \param key The name of the variable to remove /// Sets the variable with the specified name to no values.
/// \param mode the scope to search in. All scopes are searched if set to default int env_set_empty(const wcstring &key, env_mode_flags_t mode);
bool env_exist(const wchar_t *key, env_mode_flags_t mode);
/// Remove environment variable. /// Remove environment variable.
/// ///
@ -172,7 +203,7 @@ wcstring env_get_pwd_slash();
void env_set_read_limit(); void env_set_read_limit();
class env_vars_snapshot_t { class env_vars_snapshot_t {
std::map<wcstring, wcstring> vars; std::map<wcstring, env_var_t> vars;
bool is_current() const; bool is_current() const;
public: public:
@ -203,8 +234,4 @@ extern bool term_has_xn; // does the terminal have the "eat_newline_glitch"
/// Returns true if we think the terminal supports setting its title. /// Returns true if we think the terminal supports setting its title.
bool term_supports_setting_title(); bool term_supports_setting_title();
/// Returns the fish internal representation for an array of strings.
std::unique_ptr<wcstring> list_to_array_val(const wcstring_list_t &list);
std::unique_ptr<wcstring> list_to_array_val(const wchar_t **list);
#endif #endif

18
src/env_universal_common.cpp
View file

@ -284,7 +284,7 @@ bool env_universal_t::get_export(const wcstring &name) const {
return result; return result;
} }
void env_universal_t::set_internal(const wcstring &key, const wcstring &val, bool exportv, void env_universal_t::set_internal(const wcstring &key, const wcstring_list_t &vals, bool exportv,
bool overwrite) { bool overwrite) {
ASSERT_IS_LOCKED(lock); ASSERT_IS_LOCKED(lock);
if (!overwrite && this->modified.find(key) != this->modified.end()) { if (!overwrite && this->modified.find(key) != this->modified.end()) {
@ -293,8 +293,8 @@ void env_universal_t::set_internal(const wcstring &key, const wcstring &val, boo
} }
env_var_t &entry = vars[key]; env_var_t &entry = vars[key];
if (entry.exportv != exportv || entry.as_string() != val) { if (entry.exportv != exportv || entry.as_list() != vals) {
entry.set_val(val); entry.set_vals(vals);
entry.exportv = exportv; entry.exportv = exportv;
// If we are overwriting, then this is now modified. // If we are overwriting, then this is now modified.
@ -304,9 +304,9 @@ void env_universal_t::set_internal(const wcstring &key, const wcstring &val, boo
} }
} }
void env_universal_t::set(const wcstring &key, const wcstring &val, bool exportv) { void env_universal_t::set(const wcstring &key, const wcstring_list_t &vals, bool exportv) {
scoped_lock locker(lock); scoped_lock locker(lock);
this->set_internal(key, val, exportv, true /* overwrite */); this->set_internal(key, vals, exportv, true /* overwrite */);
} }
bool env_universal_t::remove_internal(const wcstring &key) { bool env_universal_t::remove_internal(const wcstring &key) {
@ -391,8 +391,7 @@ void env_universal_t::acquire_variables(var_table_t &vars_to_acquire) {
// source entry in vars since we are about to get rid of this->vars entirely. // source entry in vars since we are about to get rid of this->vars entirely.
env_var_t &src = src_iter->second; env_var_t &src = src_iter->second;
env_var_t &dst = vars_to_acquire[key]; env_var_t &dst = vars_to_acquire[key];
dst.set_val(src.as_string()); dst = src;
dst.exportv = src.exportv;
} }
} }
@ -533,7 +532,7 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
const wcstring tmp_name_template = directory + L"/fishd.tmp.XXXXXX"; const wcstring tmp_name_template = directory + L"/fishd.tmp.XXXXXX";
for (size_t attempt = 0; attempt < 10 && !success; attempt++) { for (size_t attempt = 0; attempt < 10 && !success; attempt++) {
char *narrow_str = wcs2str(tmp_name_template.c_str()); char *narrow_str = wcs2str(tmp_name_template);
int result_fd = fish_mkstemp_cloexec(narrow_str); int result_fd = fish_mkstemp_cloexec(narrow_str);
saved_errno = errno; saved_errno = errno;
success = result_fd != -1; success = result_fd != -1;
@ -845,7 +844,8 @@ void env_universal_t::parse_message_internal(const wcstring &msgstr, var_table_t
if (unescape_string(tmp + 1, &val, 0)) { if (unescape_string(tmp + 1, &val, 0)) {
env_var_t &entry = (*vars)[key]; env_var_t &entry = (*vars)[key];
entry.exportv = exportv; entry.exportv = exportv;
entry.set_val(val); // acquire the value wcstring_list_t values = decode_serialized(val);
entry.set_vals(values);
} }
} else { } else {
debug(1, PARSE_ERR, msg); debug(1, PARSE_ERR, msg);

5
src/env_universal_common.h
View file

@ -44,7 +44,8 @@ class env_universal_t {
bool load_from_path(const wcstring &path, callback_data_list_t &callbacks); bool load_from_path(const wcstring &path, callback_data_list_t &callbacks);
void load_from_fd(int fd, callback_data_list_t &callbacks); void load_from_fd(int fd, callback_data_list_t &callbacks);
void set_internal(const wcstring &key, const wcstring &val, bool exportv, bool overwrite); void set_internal(const wcstring &key, const wcstring_list_t &val, bool exportv,
bool overwrite);
bool remove_internal(const wcstring &name); bool remove_internal(const wcstring &name);
// Functions concerned with saving. // Functions concerned with saving.
@ -78,7 +79,7 @@ class env_universal_t {
bool get_export(const wcstring &name) const; bool get_export(const wcstring &name) const;
// Sets a variable. // Sets a variable.
void set(const wcstring &key, const wcstring &val, bool exportv); void set(const wcstring &key, const wcstring_list_t &val, bool exportv);
// Removes a variable. Returns true if it was found, false if not. // Removes a variable. Returns true if it was found, false if not.
bool remove(const wcstring &name); bool remove(const wcstring &name);

6
src/exec.cpp
View file

@ -211,7 +211,7 @@ static void launch_process_nofork(process_t *p) {
convert_wide_array_to_narrow(p->get_argv_array(), &argv_array); convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
const char *const *envv = env_export_arr(); const char *const *envv = env_export_arr();
char *actual_cmd = wcs2str(p->actual_cmd.c_str()); char *actual_cmd = wcs2str(p->actual_cmd);
// Ensure the terminal modes are what they were before we changed them. // Ensure the terminal modes are what they were before we changed them.
restore_term_mode(); restore_term_mode();
@ -379,12 +379,12 @@ void internal_exec(job_t *j, const io_chain_t &&all_ios) {
const env_var_t shlvl_var = env_get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT); const env_var_t shlvl_var = env_get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
wcstring shlvl_str = L"0"; wcstring shlvl_str = L"0";
if (!shlvl_var.missing()) { if (!shlvl_var.missing()) {
long shlvl = fish_wcstol(shlvl_var.c_str()); long shlvl = fish_wcstol(shlvl_var.as_string().c_str());
if (!errno && shlvl > 0) { if (!errno && shlvl > 0) {
shlvl_str = to_string<long>(shlvl - 1); shlvl_str = to_string<long>(shlvl - 1);
} }
} }
env_set(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, shlvl_str.c_str()); env_set_one(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, shlvl_str);
// launch_process _never_ returns. // launch_process _never_ returns.
launch_process_nofork(j->processes.front().get()); launch_process_nofork(j->processes.front().get());

21
src/expand.cpp
View file

@ -142,12 +142,6 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
errors->push_back(error); errors->push_back(error);
} }
/// Return the environment variable value for the string starting at \c in.
static env_var_t expand_var(const wchar_t *in) {
if (!in) return missing_var;
return env_get(in);
}
/// Test if the specified string does not contain character which can not be used inside a quoted /// Test if the specified string does not contain character which can not be used inside a quoted
/// string. /// string.
static int is_quotable(const wchar_t *str) { static int is_quotable(const wchar_t *str) {
@ -779,7 +773,7 @@ static int expand_variables(const wcstring &instr, std::vector<completion_t> *ou
if (var_len == 1 && var_tmp[0] == VARIABLE_EXPAND_EMPTY) { if (var_len == 1 && var_tmp[0] == VARIABLE_EXPAND_EMPTY) {
var = missing_var; var = missing_var;
} else { } else {
var = expand_var(var_tmp.c_str()); var = env_get(var_tmp);
} }
if (!var.missing()) { if (!var.missing()) {
@ -1187,7 +1181,7 @@ static void expand_home_directory(wcstring &input) {
if (retval || !result) { if (retval || !result) {
tilde_error = true; tilde_error = true;
} else { } else {
home = str2wcstring(userinfo.pw_dir); home = env_var_t(L"HOME", str2wcstring(userinfo.pw_dir));
} }
} }
@ -1421,15 +1415,14 @@ static expand_error_t expand_stage_wildcards(const wcstring &input, std::vector<
(for_command && path_to_expand.find(L'/') != wcstring::npos)) { (for_command && path_to_expand.find(L'/') != wcstring::npos)) {
effective_working_dirs.push_back(working_dir); effective_working_dirs.push_back(working_dir);
} else { } else {
// Get the PATH/CDPATH and cwd. Perhaps these should be passed in. An empty CDPATH // Get the PATH/CDPATH and CWD. Perhaps these should be passed in. An empty CDPATH
// implies just the current directory, while an empty PATH is left empty. // implies just the current directory, while an empty PATH is left empty.
env_var_t paths = env_get(for_cd ? L"CDPATH" : L"PATH"); env_var_t paths = env_get(for_cd ? L"CDPATH" : L"PATH");
if (paths.missing_or_empty()) paths = for_cd ? L"." : L""; if (paths.missing_or_empty()) {
paths = env_var_t(paths.get_name(), for_cd ? L"." : L"");
}
// Tokenize it into path names. for (auto next_path : paths.as_list()) {
std::vector<wcstring> pathsv;
paths.to_list(pathsv);
for (auto next_path : pathsv) {
effective_working_dirs.push_back( effective_working_dirs.push_back(
path_apply_working_directory(next_path, working_dir)); path_apply_working_directory(next_path, working_dir));
} }

3
src/expand.h
View file

@ -13,9 +13,10 @@
#include <vector> #include <vector>
#include "common.h" #include "common.h"
#include "env.h"
#include "parse_constants.h" #include "parse_constants.h"
class env_var_t;
enum { enum {
/// Flag specifying that cmdsubst expansion should be skipped. /// Flag specifying that cmdsubst expansion should be skipped.
EXPAND_SKIP_CMDSUBST = 1 << 0, EXPAND_SKIP_CMDSUBST = 1 << 0,

3
src/fish.cpp
View file

@ -420,8 +420,7 @@ int main(int argc, char **argv) {
for (char **ptr = argv + my_optind; *ptr; ptr++) { for (char **ptr = argv + my_optind; *ptr; ptr++) {
list.push_back(str2wcstring(*ptr)); list.push_back(str2wcstring(*ptr));
} }
auto val = list_to_array_val(list); env_set(L"argv", ENV_DEFAULT, list);
env_set(L"argv", ENV_DEFAULT, val->c_str());
const wcstring rel_filename = str2wcstring(file); const wcstring rel_filename = str2wcstring(file);

166
src/fish_tests.cpp
View file

@ -423,7 +423,7 @@ static void test_convert() {
o = &sb.at(0); o = &sb.at(0);
const wcstring w = str2wcstring(o); const wcstring w = str2wcstring(o);
n = wcs2str(w.c_str()); n = wcs2str(w);
if (!o || !n) { if (!o || !n) {
err(L"Line %d - Conversion cycle of string %s produced null pointer on %s", __LINE__, o, err(L"Line %d - Conversion cycle of string %s produced null pointer on %s", __LINE__, o,
@ -941,70 +941,6 @@ static void test_parse_util_cmdsubst_extent() {
} }
} }
/// Verify the behavior of the `list_to_aray_val()` family of functions.
static void test_list_to_array() {
auto list = wcstring_list_t();
auto val = list_to_array_val(list);
if (*val != ENV_NULL) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
list.push_back(L"");
val = list_to_array_val(list);
if (*val != list[0]) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
list.push_back(L"abc");
val = list_to_array_val(list);
if (*val != L"" ARRAY_SEP_STR L"abc") {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
list.insert(list.begin(), L"ghi");
val = list_to_array_val(list);
if (*val != L"ghi" ARRAY_SEP_STR L"" ARRAY_SEP_STR L"abc") {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
list.push_back(L"");
val = list_to_array_val(list);
if (*val != L"ghi" ARRAY_SEP_STR L"" ARRAY_SEP_STR L"abc" ARRAY_SEP_STR L"") {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
list.push_back(L"def");
val = list_to_array_val(list);
if (*val !=
L"ghi" ARRAY_SEP_STR L"" ARRAY_SEP_STR L"abc" ARRAY_SEP_STR L"" ARRAY_SEP_STR L"def") {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
const wchar_t *array1[] = {NULL};
val = list_to_array_val(array1);
if (*val != ENV_NULL) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
const wchar_t *array2[] = {L"abc", NULL};
val = list_to_array_val(array2);
if (wcscmp(val->c_str(), L"abc") != 0) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
const wchar_t *array3[] = {L"abc", L"def", NULL};
val = list_to_array_val(array3);
if (wcscmp(val->c_str(), L"abc" ARRAY_SEP_STR L"def") != 0) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
const wchar_t *array4[] = {L"abc", L"def", L"ghi", NULL};
val = list_to_array_val(array4);
if (wcscmp(val->c_str(), L"abc" ARRAY_SEP_STR L"def" ARRAY_SEP_STR L"ghi") != 0) {
err(L"test_list_to_array failed on line %lu", __LINE__);
}
}
static struct wcsfilecmp_test { static struct wcsfilecmp_test {
const wchar_t *str1; const wchar_t *str1;
const wchar_t *str2; const wchar_t *str2;
@ -1062,7 +998,6 @@ static void test_wcsfilecmp() {
static void test_utility_functions() { static void test_utility_functions() {
say(L"Testing utility functions"); say(L"Testing utility functions");
test_list_to_array();
test_wcsfilecmp(); test_wcsfilecmp();
test_parse_util_cmdsubst_extent(); test_parse_util_cmdsubst_extent();
} }
@ -1617,7 +1552,7 @@ static void test_abbreviations(void) {
{L"gc", L"git checkout"}, {L"foo", L"bar"}, {L"gx", L"git checkout"}, {L"gc", L"git checkout"}, {L"foo", L"bar"}, {L"gx", L"git checkout"},
}; };
for (auto it : abbreviations) { for (auto it : abbreviations) {
int ret = env_set(L"_fish_abbr_" + it.first, ENV_LOCAL, it.second.c_str()); int ret = env_set_one(L"_fish_abbr_" + it.first, ENV_LOCAL, it.second);
if (ret != 0) err(L"Unable to set abbreviation variable"); if (ret != 0) err(L"Unable to set abbreviation variable");
} }
@ -2479,7 +2414,7 @@ static void test_autosuggest_suggest_special() {
perform_one_autosuggestion_cd_test(L"cd 'test/autosuggest_test/5", vars, L"foo\"bar/", perform_one_autosuggestion_cd_test(L"cd 'test/autosuggest_test/5", vars, L"foo\"bar/",
__LINE__); __LINE__);
env_set(L"AUTOSUGGEST_TEST_LOC", ENV_LOCAL, wd.c_str()); env_set_one(L"AUTOSUGGEST_TEST_LOC", ENV_LOCAL, wd);
perform_one_autosuggestion_cd_test(L"cd $AUTOSUGGEST_TEST_LOC/0", vars, L"foobar/", __LINE__); perform_one_autosuggestion_cd_test(L"cd $AUTOSUGGEST_TEST_LOC/0", vars, L"foobar/", __LINE__);
perform_one_autosuggestion_cd_test(L"cd ~/test_autosuggest_suggest_specia", vars, L"l/", perform_one_autosuggestion_cd_test(L"cd ~/test_autosuggest_suggest_specia", vars, L"l/",
__LINE__); __LINE__);
@ -2621,7 +2556,11 @@ static int test_universal_helper(int x) {
for (int j = 0; j < UVARS_PER_THREAD; j++) { for (int j = 0; j < UVARS_PER_THREAD; j++) {
const wcstring key = format_string(L"key_%d_%d", x, j); const wcstring key = format_string(L"key_%d_%d", x, j);
const wcstring val = format_string(L"val_%d_%d", x, j); const wcstring val = format_string(L"val_%d_%d", x, j);
uvars.set(key, val, false); uvars.set(key,
wcstring_list_t({
val,
}),
false);
bool synced = uvars.sync(callbacks); bool synced = uvars.sync(callbacks);
if (!synced) { if (!synced) {
err(L"Failed to sync universal variables after modification"); err(L"Failed to sync universal variables after modification");
@ -2660,17 +2599,15 @@ static void test_universal() {
if (j == 0) { if (j == 0) {
expected_val = missing_var; expected_val = missing_var;
} else { } else {
expected_val = format_string(L"val_%d_%d", i, j); expected_val = env_var_t(L"", format_string(L"val_%d_%d", i, j));
} }
const env_var_t var = uvars.get(key); const env_var_t var = uvars.get(key);
if (j == 0) { if (j == 0) assert(expected_val.missing());
assert(expected_val.missing());
}
if (var != expected_val) { if (var != expected_val) {
const wchar_t *missing_desc = L"<missing>"; const wchar_t *missing_desc = L"<missing>";
err(L"Wrong value for key %ls: expected %ls, got %ls\n", key.c_str(), err(L"Wrong value for key %ls: expected %ls, got %ls\n", key.c_str(),
(expected_val.missing() ? missing_desc : expected_val.c_str()), (expected_val.missing() ? missing_desc : expected_val.as_string().c_str()),
(var.missing() ? missing_desc : var.c_str())); (var.missing() ? missing_desc : var.as_string().c_str()));
} }
} }
} }
@ -2689,27 +2626,75 @@ static void test_universal_callbacks() {
env_universal_t uvars2(UVARS_TEST_PATH); env_universal_t uvars2(UVARS_TEST_PATH);
// Put some variables into both. // Put some variables into both.
uvars1.set(L"alpha", L"1", false); uvars1.set(L"alpha",
uvars1.set(L"beta", L"1", false); wcstring_list_t({
uvars1.set(L"delta", L"1", false); L"1",
uvars1.set(L"epsilon", L"1", false); }),
uvars1.set(L"lambda", L"1", false); false);
uvars1.set(L"kappa", L"1", false); uvars1.set(L"beta",
uvars1.set(L"omicron", L"1", false); wcstring_list_t({
L"1",
}),
false);
uvars1.set(L"delta",
wcstring_list_t({
L"1",
}),
false);
uvars1.set(L"epsilon",
wcstring_list_t({
L"1",
}),
false);
uvars1.set(L"lambda",
wcstring_list_t({
L"1",
}),
false);
uvars1.set(L"kappa",
wcstring_list_t({
L"1",
}),
false);
uvars1.set(L"omicron",
wcstring_list_t({
L"1",
}),
false);
uvars1.sync(callbacks); uvars1.sync(callbacks);
uvars2.sync(callbacks); uvars2.sync(callbacks);
// Change uvars1. // Change uvars1.
uvars1.set(L"alpha", L"2", false); // changes value uvars1.set(L"alpha",
uvars1.set(L"beta", L"1", true); // changes export wcstring_list_t({
uvars1.remove(L"delta"); // erases value L"2",
uvars1.set(L"epsilon", L"1", false); // changes nothing }),
false); // changes value
uvars1.set(L"beta",
wcstring_list_t({
L"1",
}),
true); // changes export
uvars1.remove(L"delta"); // erases value
uvars1.set(L"epsilon",
wcstring_list_t({
L"1",
}),
false); // changes nothing
uvars1.sync(callbacks); uvars1.sync(callbacks);
// Change uvars2. It should treat its value as correct and ignore changes from uvars1. // Change uvars2. It should treat its value as correct and ignore changes from uvars1.
uvars2.set(L"lambda", L"1", false); // same value uvars2.set(L"lambda",
uvars2.set(L"kappa", L"2", false); // different value wcstring_list_t({
L"1",
}),
false); // same value
uvars2.set(L"kappa",
wcstring_list_t({
L"2",
}),
false); // different value
// Now see what uvars2 sees. // Now see what uvars2 sees.
callbacks.clear(); callbacks.clear();
@ -4255,7 +4240,10 @@ long return_timezone_hour(time_t tstamp, const wchar_t *timezone) {
char *str_ptr; char *str_ptr;
size_t n; size_t n;
env_set(L"TZ", ENV_EXPORT, timezone); env_set_one(L"TZ", ENV_EXPORT, timezone);
const env_var_t var = env_get(L"TZ", ENV_DEFAULT);
localtime_r(&tstamp, &ltime); localtime_r(&tstamp, &ltime);
n = strftime(ltime_str, 3, "%H", &ltime); n = strftime(ltime_str, 3, "%H", &ltime);
if (n != 2) { if (n != 2) {

35
src/function.cpp
View file

@ -327,28 +327,35 @@ int function_get_definition_offset(const wcstring &name) {
return func ? func->definition_offset : -1; return func ? func->definition_offset : -1;
} }
// Setup the environment for the function. There are three components of the environment:
// 1. argv
// 2. named arguments
// 3. inherited variables
void function_prepare_environment(const wcstring &name, const wchar_t *const *argv, void function_prepare_environment(const wcstring &name, const wchar_t *const *argv,
const std::map<wcstring, env_var_t> &inherited_vars) { const std::map<wcstring, env_var_t> &inherited_vars) {
// Three components of the environment:
// 1. argv
// 2. named arguments
// 3. inherited variables
env_set_argv(argv); env_set_argv(argv);
const wcstring_list_t named_arguments = function_get_named_arguments(name); const wcstring_list_t named_arguments = function_get_named_arguments(name);
if (!named_arguments.empty()) { if (!named_arguments.empty()) {
const wchar_t *const *arg; const wchar_t *const *arg = argv;
size_t i; for (size_t i = 0; i < named_arguments.size(); i++) {
for (i = 0, arg = argv; i < named_arguments.size(); i++) { if (*arg) {
env_set(named_arguments.at(i).c_str(), ENV_LOCAL | ENV_USER, *arg); env_set_one(named_arguments.at(i), ENV_LOCAL | ENV_USER, *arg);
arg++;
if (*arg) arg++; } else {
env_set_empty(named_arguments.at(i), ENV_LOCAL | ENV_USER);
}
} }
} }
for (std::map<wcstring, env_var_t>::const_iterator it = inherited_vars.begin(), for (auto it = inherited_vars.begin(), end = inherited_vars.end(); it != end; ++it) {
end = inherited_vars.end(); // Note: Prior to my rewrite to address issue #4200 this code did the equivalent of this:
it != end; ++it) { // if (it->second.missing()) {
env_set(it->first, ENV_LOCAL | ENV_USER, it->second.missing() ? NULL : it->second.c_str()); // env_set_empty(it->first, ENV_LOCAL | ENV_USER);
// } else {
// It should be impossible for the var to be missing since we're inheriting it from an outer
// scope. So we now die horribly if it is missing.
assert(!it->second.missing());
env_set(it->first, ENV_LOCAL | ENV_USER, it->second.as_const_list());
} }
} }

5
src/highlight.cpp
View file

@ -222,7 +222,7 @@ static bool is_potential_cd_path(const wcstring &path, const wcstring &working_d
} else { } else {
// Get the CDPATH. // Get the CDPATH.
env_var_t cdpath = env_get(L"CDPATH"); env_var_t cdpath = env_get(L"CDPATH");
if (cdpath.missing_or_empty()) cdpath = env_var_t(L"."); if (cdpath.missing_or_empty()) cdpath = env_var_t(cdpath.get_name(), L".");
// Tokenize it into directories. // Tokenize it into directories.
std::vector<wcstring> pathsv; std::vector<wcstring> pathsv;
@ -359,7 +359,8 @@ bool autosuggest_validate_from_history(const history_item_t &item,
string_prefixes_string(dir, L"--help") || string_prefixes_string(dir, L"-h"); string_prefixes_string(dir, L"--help") || string_prefixes_string(dir, L"-h");
if (!is_help) { if (!is_help) {
wcstring path; wcstring path;
bool can_cd = path_get_cdpath(dir, &path, working_directory.c_str(), vars); env_var_t dir_var(L"n/a", dir);
bool can_cd = path_get_cdpath(dir_var, &path, working_directory.c_str(), vars);
if (can_cd && !paths_are_same_file(working_directory, path)) { if (can_cd && !paths_are_same_file(working_directory, path)) {
suggestionOK = true; suggestionOK = true;
} }

2
src/history.cpp
View file

@ -1266,7 +1266,7 @@ bool history_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
static int create_temporary_file(const wcstring &name_template, wcstring *out_path) { static int create_temporary_file(const wcstring &name_template, wcstring *out_path) {
int out_fd = -1; int out_fd = -1;
for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) { for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) {
char *narrow_str = wcs2str(name_template.c_str()); char *narrow_str = wcs2str(name_template);
out_fd = fish_mkstemp_cloexec(narrow_str); out_fd = fish_mkstemp_cloexec(narrow_str);
if (out_fd >= 0) { if (out_fd >= 0) {
*out_path = str2wcstring(narrow_str); *out_path = str2wcstring(narrow_str);

2
src/input.cpp
View file

@ -211,7 +211,7 @@ void input_set_bind_mode(const wcstring &bm) {
// modes may not be empty - empty is a sentinel value meaning to not change the mode // modes may not be empty - empty is a sentinel value meaning to not change the mode
assert(!bm.empty()); assert(!bm.empty());
if (input_get_bind_mode() != bm.c_str()) { if (input_get_bind_mode() != bm.c_str()) {
env_set(FISH_BIND_MODE_VAR, ENV_GLOBAL, bm.c_str()); env_set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, bm);
} }
} }

4
src/input_common.cpp
View file

@ -164,12 +164,12 @@ void update_wait_on_escape_ms() {
return; return;
} }
long tmp = fish_wcstol(escape_time_ms.c_str()); long tmp = fish_wcstol(escape_time_ms.as_string().c_str());
if (errno || tmp < 10 || tmp >= 5000) { if (errno || tmp < 10 || tmp >= 5000) {
fwprintf(stderr, fwprintf(stderr,
L"ignoring fish_escape_delay_ms: value '%ls' " L"ignoring fish_escape_delay_ms: value '%ls' "
L"is not an integer or is < 10 or >= 5000 ms\n", L"is not an integer or is < 10 or >= 5000 ms\n",
escape_time_ms.c_str()); escape_time_ms.as_string().c_str());
} else { } else {
wait_on_escape_ms = (int)tmp; wait_on_escape_ms = (int)tmp;
} }

2
src/output.cpp
View file

@ -558,6 +558,6 @@ void writembs_check(char *mbs, const char *mbs_name, const char *file, long line
const wchar_t *fmt = const wchar_t *fmt =
_(L"Tried to use terminfo string %s on line %ld of %s, which is " _(L"Tried to use terminfo string %s on line %ld of %s, which is "
L"undefined in terminal of type \"%ls\". Please report this error to %s"); L"undefined in terminal of type \"%ls\". Please report this error to %s");
debug(0, fmt, mbs_name, line, file, term.c_str(), PACKAGE_BUGREPORT); debug(0, fmt, mbs_name, line, file, term.as_string().c_str(), PACKAGE_BUGREPORT);
} }
} }

3
src/output.h
View file

@ -10,9 +10,10 @@
#include <vector> #include <vector>
#include "color.h" #include "color.h"
#include "common.h"
#include "fallback.h" // IWYU pragma: keep #include "fallback.h" // IWYU pragma: keep
class env_var_t;
/// Constants for various colors as used by the set_color function. /// Constants for various colors as used by the set_color function.
enum { enum {
FISH_COLOR_BLACK, // 0 FISH_COLOR_BLACK, // 0

4
src/parse_execution.cpp
View file

@ -473,7 +473,9 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
} }
const wcstring &val = argument_sequence.at(i); const wcstring &val = argument_sequence.at(i);
env_set(for_var_name, ENV_LOCAL, val.c_str()); // This is wrong. It should or in ENV_USER and test if ENV_PERM is returned.
// TODO: Fix this so it correctly handles read-only vars.
env_set_one(for_var_name, ENV_LOCAL, val);
fb->loop_status = LOOP_NORMAL; fb->loop_status = LOOP_NORMAL;
this->run_job_list(block_contents, fb); this->run_job_list(block_contents, fb);

34
src/path.cpp
View file

@ -24,6 +24,13 @@
/// Unexpected error in path_get_path(). /// Unexpected error in path_get_path().
#define MISSING_COMMAND_ERR_MSG _(L"Error while searching for command '%ls'") #define MISSING_COMMAND_ERR_MSG _(L"Error while searching for command '%ls'")
// Note that PREFIX is defined in the `Makefile` and is thus defined when this module is compiled.
// This ensures we always default to "/bin", "/usr/bin" and the bin dir defined for the fish
// programs. Possibly with a duplicate dir if PREFIX is empty, "/", "/usr" or "/usr/". If the PREFIX
// duplicates /bin or /usr/bin that is harmless other than a trivial amount of time testing a path
// we've already tested.
const wcstring_list_t dflt_pathsv({L"/bin", L"/usr/bin", PREFIX L"/bin"});
static bool path_get_path_core(const wcstring &cmd, wcstring *out_path, static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
const env_var_t &bin_path_var) { const env_var_t &bin_path_var) {
debug(3, L"path_get_path( '%ls' )", cmd.c_str()); debug(3, L"path_get_path( '%ls' )", cmd.c_str());
@ -47,20 +54,15 @@ static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
return false; return false;
} }
int err = ENOENT; const wcstring_list_t *pathsv;
wcstring_list_t pathsv;
if (!bin_path_var.missing()) { if (!bin_path_var.missing()) {
bin_path_var.to_list(pathsv); pathsv = &bin_path_var.as_const_list();
} else { } else {
// Note that PREFIX is defined in the `Makefile` and is thus defined when this module is pathsv = &dflt_pathsv;
// compiled. This ensures we always default to "/bin", "/usr/bin" and the bin dir defined
// for the fish programs. Possibly with a duplicate dir if PREFIX is empty, "/", "/usr" or
// "/usr/". If the PREFIX duplicates /bin or /usr/bin that is harmless other than a trivial
// amount of time testing a path we've already tested.
pathsv = wcstring_list_t({L"/bin", L"/usr/bin", PREFIX L"/bin"});
} }
for (auto next_path : pathsv) { int err = ENOENT;
for (auto next_path : *pathsv) {
if (next_path.empty()) continue; if (next_path.empty()) continue;
append_path_component(next_path, cmd); append_path_component(next_path, cmd);
if (waccess(next_path, X_OK) == 0) { if (waccess(next_path, X_OK) == 0) {
@ -164,7 +166,7 @@ bool path_get_cdpath(const env_var_t &dir_var, wcstring *out, const wchar_t *wd,
} else { } else {
// Respect CDPATH. // Respect CDPATH.
env_var_t cdpaths = env_vars.get(L"CDPATH"); env_var_t cdpaths = env_vars.get(L"CDPATH");
if (cdpaths.missing_or_empty()) cdpaths = L"."; if (cdpaths.missing_or_empty()) cdpaths = env_var_t(cdpaths.get_name(), L".");
std::vector<wcstring> cdpathsv; std::vector<wcstring> cdpathsv;
cdpaths.to_list(cdpathsv); cdpaths.to_list(cdpathsv);
@ -214,7 +216,8 @@ bool path_can_be_implicit_cd(const wcstring &path, wcstring *out_path, const wch
exp_path == L"..") { exp_path == L"..") {
// These paths can be implicit cd, so see if you cd to the path. Note that a single period // These paths can be implicit cd, so see if you cd to the path. Note that a single period
// cannot (that's used for sourcing files anyways). // cannot (that's used for sourcing files anyways).
result = path_get_cdpath(exp_path, out_path, wd, vars); env_var_t path_var(L"n/a", exp_path);
result = path_get_cdpath(path_var, out_path, wd, vars);
} }
return result; return result;
} }
@ -257,10 +260,9 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
bool using_xdg, const wcstring &xdg_var, const wcstring &path, bool using_xdg, const wcstring &xdg_var, const wcstring &path,
int saved_errno) { int saved_errno) {
wcstring warning_var_name = L"_FISH_WARNED_" + which_dir; wcstring warning_var_name = L"_FISH_WARNED_" + which_dir;
if (env_exist(warning_var_name.c_str(), ENV_GLOBAL | ENV_EXPORT)) { env_var_t var = env_get(warning_var_name, ENV_GLOBAL | ENV_EXPORT);
return; if (var.missing()) return;
} env_set_one(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
env_set(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
debug(0, custom_error_msg.c_str()); debug(0, custom_error_msg.c_str());
if (path.empty()) { if (path.empty()) {

12
src/reader.cpp
View file

@ -696,7 +696,7 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
for (size_t i = 0; i < lst.size(); i++) { for (size_t i = 0; i < lst.size(); i++) {
fputws(lst.at(i).c_str(), stdout); fputws(lst.at(i).c_str(), stdout);
} }
ignore_result(write(STDOUT_FILENO, "\a", 1)); ignore_result(write(STDOUT_FILENO, "\a", 1));
} }
proc_pop_interactive(); proc_pop_interactive();
@ -766,7 +766,7 @@ void reader_init() {
// Ensure this var is present even before an interactive command is run so that if it is used // Ensure this var is present even before an interactive command is run so that if it is used
// in a function like `fish_prompt` or `fish_right_prompt` it is defined at the time the first // in a function like `fish_prompt` or `fish_right_prompt` it is defined at the time the first
// prompt is written. // prompt is written.
env_set(ENV_CMD_DURATION, ENV_UNEXPORT, L"0"); env_set_one(ENV_CMD_DURATION, ENV_UNEXPORT, L"0");
// Save the initial terminal mode. // Save the initial terminal mode.
tcgetattr(STDIN_FILENO, &terminal_mode_on_startup); tcgetattr(STDIN_FILENO, &terminal_mode_on_startup);
@ -1650,7 +1650,7 @@ static void reader_interactive_init() {
wperror(L"tcsetattr"); wperror(L"tcsetattr");
} }
env_set(L"_", ENV_GLOBAL, L"fish"); env_set_one(L"_", ENV_GLOBAL, L"fish");
} }
/// Destroy data for interactive use. /// Destroy data for interactive use.
@ -1917,7 +1917,7 @@ void set_env_cmd_duration(struct timeval *after, struct timeval *before) {
} }
swprintf(buf, 16, L"%d", (secs * 1000) + (usecs / 1000)); swprintf(buf, 16, L"%d", (secs * 1000) + (usecs / 1000));
env_set(ENV_CMD_DURATION, ENV_UNEXPORT, buf); env_set_one(ENV_CMD_DURATION, ENV_UNEXPORT, buf);
} }
void reader_run_command(parser_t &parser, const wcstring &cmd) { void reader_run_command(parser_t &parser, const wcstring &cmd) {
@ -1925,7 +1925,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
wcstring ft = tok_first(cmd); wcstring ft = tok_first(cmd);
if (!ft.empty()) env_set(L"_", ENV_GLOBAL, ft.c_str()); if (!ft.empty()) env_set_one(L"_", ENV_GLOBAL, ft);
reader_write_title(cmd); reader_write_title(cmd);
@ -1941,7 +1941,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
term_steal(); term_steal();
env_set(L"_", ENV_GLOBAL, program_name); env_set_one(L"_", ENV_GLOBAL, program_name);
#ifdef HAVE__PROC_SELF_STAT #ifdef HAVE__PROC_SELF_STAT
proc_update_jiffies(); proc_update_jiffies();

4
src/wutil.cpp
View file

@ -398,7 +398,7 @@ wchar_t *wrealpath(const wcstring &pathname, wchar_t *resolved_path) {
} }
wcstring wdirname(const wcstring &path) { wcstring wdirname(const wcstring &path) {
char *tmp = wcs2str(path.c_str()); char *tmp = wcs2str(path);
char *narrow_res = dirname(tmp); char *narrow_res = dirname(tmp);
wcstring result = format_string(L"%s", narrow_res); wcstring result = format_string(L"%s", narrow_res);
free(tmp); free(tmp);
@ -406,7 +406,7 @@ wcstring wdirname(const wcstring &path) {
} }
wcstring wbasename(const wcstring &path) { wcstring wbasename(const wcstring &path) {
char *tmp = wcs2str(path.c_str()); char *tmp = wcs2str(path);
char *narrow_res = basename(tmp); char *narrow_res = basename(tmp);
wcstring result = format_string(L"%s", narrow_res); wcstring result = format_string(L"%s", narrow_res);
free(tmp); free(tmp);

4
tests/read.in
View file

@ -91,8 +91,6 @@ echo '' | read -la ary
print_vars ary print_vars ary
set -le IFS set -le IFS
# read -n tests
logmsg read -n tests logmsg read -n tests
echo 'testing' | read -n 3 foo echo 'testing' | read -n 3 foo
echo $foo echo $foo
@ -106,8 +104,6 @@ echo $bar
echo 'test' | read -n 1 foo echo 'test' | read -n 1 foo
echo $foo echo $foo
# read -0 tests
logmsg read -z tests logmsg read -z tests
echo -n 'testing' | read -lz foo echo -n 'testing' | read -lz foo
echo $foo echo $foo

3
tests/test3.in
View file

@ -301,7 +301,8 @@ env DISPLAY="localhost:0.0" ../test/root/bin/fish -c 'echo Elements in DISPLAY:
# We can't use PATH for this because the global configuration will modify PATH # We can't use PATH for this because the global configuration will modify PATH
# based on /etc/paths and /etc/paths.d. # based on /etc/paths and /etc/paths.d.
# Exported arrays should use record separator, with a few exceptions. So we can use an arbitrary variable for this. # Exported arrays should use record separator, with a few exceptions. So we can use an arbitrary variable for this.
env FOO=one\x1etwo\x1ethree\x1efour ../test/root/bin/fish -c 'echo Elements in FOO: (count $FOO)' set -gx FOO one two three four
../test/root/bin/fish -c 'echo Elements in FOO: (count $FOO)'
# some must use colon separators! # some must use colon separators!
set -lx MANPATH man1 man2 man3 ; env | grep '^MANPATH=' set -lx MANPATH man1 man2 man3 ; env | grep '^MANPATH='