h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 11:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Switch to more uses of wcstokenizer from wcstok()

Browse Source 
Work towards cleaning up path_get_path
This commit is contained in:
ridiculousfish
2012-07-20 15:01:56 -07:00
parent 966bbd476f
commit b290fd33b9
3 changed files with 41 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
complete.cpp
View File

@@ -1056,12 +1056,8 @@ void completer_t::complete_cmd( const wcstring &str_cmd, bool use_function, bool
if (str_cmd.empty())
return;
wchar_t *path_cpy;
wchar_t *nxt_path;
wchar_t *state;
std::vector<completion_t> possible_comp;
env_var_t cdpath = env_get_string(L"CDPATH");
if (cdpath.missing_or_empty())
cdpath = L".";
@@ -1090,14 +1086,10 @@ void completer_t::complete_cmd( const wcstring &str_cmd, bool use_function, bool
const env_var_t path = env_get_string(L"PATH");
if( !path.missing() )
{
path_cpy = wcsdup( path.c_str() );
for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state );
nxt_path != 0;
nxt_path = wcstok( 0, ARRAY_SEP_STR, &state) )
wcstring base_path;
wcstokenizer tokenizer(path, ARRAY_SEP_STR);
while (tokenizer.next(base_path))
{
wcstring base_path = nxt_path;
if (base_path.empty())
continue;
@@ -1125,7 +1117,6 @@ void completer_t::complete_cmd( const wcstring &str_cmd, bool use_function, bool
}
}
}
free( path_cpy );
if (wants_description)
this->complete_cmd_desc( str_cmd );
}