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

Excised some halloc

Browse Source
This commit is contained in:
ridiculousfish
2012-02-07 21:23:12 -08:00
parent 399c78fbf7
commit c0e783eb6e
6 changed files with 39 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
env.cpp
View File

@@ -769,15 +769,12 @@ int env_set( const wchar_t *key,
if( val && contains( key, L"PWD", L"HOME" ) )
{
void *context = halloc( 0, 0 );
const wchar_t *val_canonical = path_make_canonical( context, val );
if( wcscmp( val_canonical, val ) )
{
int res = env_set( key, val_canonical, var_mode );
halloc_free( context );
return res;
}
halloc_free( context );
/* Canoncalize our path; if it changes, recurse and try again. */
wcstring val_canonical = val;
path_make_canonical(val_canonical);
if (val != val_canonical) {
return env_set( key, val_canonical.c_str(), var_mode );
}
}
if( (var_mode & ENV_USER ) && is_read_only(key) )