diff options
| author |  Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-12 04:21:11 +0530 |
|---|---|---|
| committer | Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-12 04:21:11 +0530 |
| commit | 9b56b67c0e1bbd7f043ca6d17715427ab6d40e9f (patch) | |
| tree | e6006ce2940141675ffc84d0f60ee3165f7d257c /expand.cpp | |
| parent | 48655e882ef02efe50e1b5a05e1b0ae653861c3d (diff) | |
Revert "Modified expand.cpp and exec.cpp to use env_get_string()"
This reverts commit 48655e882ef02efe50e1b5a05e1b0ae653861c3d.
Diffstat (limited to 'expand.cpp')
| -rw-r--r-- | expand.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -176,11 +176,11 @@ int expand_is_clean( const wchar_t *in ) /** Return the environment variable value for the string starting at \c in. */ -static wcstring expand_var( wchar_t *in ) +static wchar_t *expand_var( wchar_t *in ) { if( !in ) return 0; - return env_get_string( in ); + return env_get( in ); } /** @@ -958,8 +958,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) int start_pos = i+1; int stop_pos; int var_len, new_len; - const wchar_t * var_val; - wcstring var_val_wstr; + wchar_t * var_val; wchar_t * new_in; int is_single = (c==VARIABLE_EXPAND_SINGLE); int var_name_stop_pos; @@ -992,8 +991,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) sb_append_substring( var_tmp, &in[start_pos], var_len ); - var_val_wstr = expand_var( (wchar_t *)var_tmp->buff ); - var_val = var_val_wstr.empty()?NULL:var_val_wstr.c_str(); + var_val = expand_var( (wchar_t *)var_tmp->buff ); if( var_val ) { |