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

Renamed env_vars to env_vars_snapshot_t

Browse Source 
Cleanup of non-wcstring version of path_get_path
This commit is contained in:
ridiculousfish
2012-07-20 20:39:31 -07:00
parent b290fd33b9
commit b08fb86637
19 changed files with 95 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
env.cpp
View File

@@ -1535,7 +1535,7 @@ void env_export_arr(bool recalc, null_terminated_array_t<char> &output)
output = export_array;
}
env_vars::env_vars(const wchar_t * const *keys)
env_vars_snapshot_t::env_vars_snapshot_t(const wchar_t * const *keys)
{
ASSERT_IS_MAIN_THREAD();
for (size_t i=0; keys[i]; i++) {
@@ -1546,13 +1546,19 @@ env_vars::env_vars(const wchar_t * const *keys)
}
}
env_vars::env_vars() { }
env_vars_snapshot_t::env_vars_snapshot_t() { }
const wchar_t *env_vars::get(const wchar_t *key) const
const wchar_t *env_vars_snapshot_t::get(const wchar_t *key) const
{
std::map<wcstring, wcstring>::const_iterator iter = vars.find(key);
return (iter == vars.end() ? NULL : iter->second.c_str());
}
const wchar_t * const env_vars::highlighting_keys[] = {L"PATH", L"CDPATH", L"HIGHLIGHT_DELAY", L"fish_function_path", NULL};
env_var_t env_vars_snapshot_t::get(const wcstring &key) const
{
std::map<wcstring, wcstring>::const_iterator iter = vars.find(key);
return (iter == vars.end() ? env_var_t::missing_var() : env_var_t(iter->second));
}
const wchar_t * const env_vars_snapshot_t::highlighting_keys[] = {L"PATH", L"CDPATH", L"HIGHLIGHT_DELAY", L"fish_function_path", NULL};