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

Fix broken sort on printing of variable names in set builtin

Browse Source 
darcs-hash:20050920224640-ac50b-cfa316f9a6168e582d3a6057bdda414ce5b56851.gz
This commit is contained in:
axel
2005-09-21 08:46:40 +10:00
parent 8173c736cc
commit 3a60fc5206
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin_set.c
View File

@@ -226,22 +226,19 @@ static void print_variables(int include_values, int escape, int scope)
array_list_t names; array_list_t names;
wchar_t **names_arr; wchar_t **names_arr;
int i; int i;
al_init( &names ); al_init( &names );
env_get_names( &names, scope ); env_get_names( &names, scope );
names_arr = list_to_char_arr( &names );
qsort( names_arr, sort_list( &names );
al_get_count( &names ),
sizeof(wchar_t *),
(int (*)(const void *, const void *))&wcsfilecmp );
for( i = 0; i < al_get_count(&names); i++ ) for( i = 0; i < al_get_count(&names); i++ )
{ {
wchar_t *key = names_arr[i]; wchar_t *key = al_get( &names, i );
/* Why does expand_escape free its argument ?! */ /* Why does expand_escape free its argument ?! */
wchar_t *e_key = escape ? expand_escape(wcsdup(key), 1) : wcsdup(key); wchar_t *e_key = escape ? expand_escape(wcsdup(key), 1) : wcsdup(key);
sb_append(sb_out, e_key); sb_append(sb_out, e_key);
if( include_values ) if( include_values )
{ {
wchar_t *value = env_get(key); wchar_t *value = env_get(key);
@@ -249,13 +246,11 @@ static void print_variables(int include_values, int escape, int scope)
sb_append2(sb_out, L" ", e_value, 0); sb_append2(sb_out, L" ", e_value, 0);
free(e_value); free(e_value);
} }
sb_append(sb_out, L"\n"); sb_append(sb_out, L"\n");
free(e_key); free(e_key);
} }
al_destroy(&names);
free(names_arr);
al_destroy(&names);
} }
/** /**