h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 23:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Join variables by their delimiter in quoted expansion

Browse Source 
This switches quoted expansion like "$foo" to use foo's delimiter instead of
space. The delimiter is space for normal variables and colonf or path variables.
Expansions like "$PATH" will now expand using ':'.
This commit is contained in:
ridiculousfish
2018-09-30 19:34:01 -04:00
parent 3f3b3a7006
commit 5947aa0171
9 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/env.cpp
View File

@@ -1302,10 +1302,13 @@ int env_remove(const wcstring &key, int var_mode) {
const wcstring_list_t &env_var_t::as_list() const { return vals; }
wchar_t env_var_t::get_delimiter() const {
return is_pathvar() ? PATH_ARRAY_SEP : NONPATH_ARRAY_SEP;
}
/// Return a string representation of the var.
wcstring env_var_t::as_string() const {
wchar_t sep = is_pathvar() ? PATH_ARRAY_SEP : NONPATH_ARRAY_SEP;
return join_strings(vals, sep);
return join_strings(vals, get_delimiter());
}
void env_var_t::to_list(wcstring_list_t &out) const {