diff options
| author |  Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-12 21:39:00 +0530 |
|---|---|---|
| committer | Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-12 21:39:00 +0530 |
| commit | ee687ee433c30ad5f6f02229f4bccc078d60ad57 (patch) | |
| tree | 53694792337ca647de89e8939ca5a5c6e3ee5c38 /expand.cpp | |
| parent | 9b56b67c0e1bbd7f043ca6d17715427ab6d40e9f (diff) | |
Modified exec.cpp to use env_get_string(); rolled back changes to expand.cpp in last commit, because pressing ^D results into an error with the changes
Diffstat (limited to 'expand.cpp')
| -rw-r--r-- | expand.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -176,7 +176,7 @@ int expand_is_clean( const wchar_t *in ) /** Return the environment variable value for the string starting at \c in. */ -static wchar_t *expand_var( wchar_t *in ) +static const wchar_t* expand_var( wchar_t *in ) { if( !in ) return 0; @@ -958,7 +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; - wchar_t * var_val; + const wchar_t * var_val; wchar_t * new_in; int is_single = (c==VARIABLE_EXPAND_SINGLE); int var_name_stop_pos; @@ -990,7 +990,6 @@ 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 = expand_var( (wchar_t *)var_tmp->buff ); if( var_val ) |