Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't mangle empty elements in MANPATH

Browse source 
Fixes #4158
This commit is contained in:
Kurtis Rader 2017-06-23 17:29:52 -07:00
parent c31b9f430f
commit 1bee66548a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
- Implemented `string lower` and `string upper` (#4080). - Implemented `string lower` and `string upper` (#4080).
- `help` can now open the tutorial. - `help` can now open the tutorial.
- `echo -h` now correctly echoes `-h` (#4120). - `echo -h` now correctly echoes `-h` (#4120).
- Stop converting empty elements in MANPATH to "." (#4158). The behavior being changed was introduced in fish 2.6.0.
- Added completions for: - Added completions for:
- `as` (#4130). - `as` (#4130).
- `jest` (#4142). - `jest` (#4142).

7
src/env.cpp
View file

@ -99,9 +99,9 @@ static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
/// subsystem. /// subsystem.
static const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"}); static const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
/// List of all "path" like variable names that need special handling. This includes automatic /// List of "path" like variable names that need special handling. This includes automatic
/// splitting and joining on import/export. As well as replacing empty elements, which implicitly /// splitting and joining on import/export. As well as replacing empty elements, which implicitly
/// refer to the CWD, with an explicit '.'. /// refer to the CWD, with an explicit '.' in the case of PATH and CDPATH.
static const wcstring_list_t colon_delimited_variable({L"PATH", L"MANPATH", L"CDPATH"}); static const wcstring_list_t colon_delimited_variable({L"PATH", L"MANPATH", L"CDPATH"});
// Some forward declarations to make it easy to logically group the code. // Some forward declarations to make it easy to logically group the code.
@ -332,6 +332,9 @@ static void handle_timezone(const wchar_t *env_var_name) {
/// Unfortunately that convention causes problems for fish scripts. So this function replaces the /// Unfortunately that convention causes problems for fish scripts. So this function replaces the
/// empty path element with an explicit ".". See issue #3914. /// empty path element with an explicit ".". See issue #3914.
static void fix_colon_delimited_var(const wcstring &var_name) { static void fix_colon_delimited_var(const wcstring &var_name) {
// While we auto split/join MANPATH we do not want to replace empty elements with "." (#4158).
if (var_name == L"MANPATH") return;
const env_var_t paths = env_get_string(var_name); const env_var_t paths = env_get_string(var_name);
if (paths.missing_or_empty()) return; if (paths.missing_or_empty()) return;