github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-17 03:52:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for zero element arrays

Browse Source 
darcs-hash:20050926144703-ac50b-3ed14d14b02908862d69aec08aab35b6d0188bba.gz
This commit is contained in:
axel 2005-09-27 00:47:03 +10:00
parent 6a3e73f87c
commit 0ef22a5577
4 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-26 Axel Liljencrantz <axel@liljencrantz.se>
* configure.ac, init/fish.in, main.c: Make ~/etc/fish the system configuration file on installations under ~
* env.c, builtin_set.c (env_exist, env_get, env_set, builtin_set): Add support for zero element arrays
2005-09-25 Axel Liljencrantz <axel@liljencrantz.se>
* parser.c: (parse_job, parser_skip_arguemnts, paresr_Test): No semicolon required after else and begin

2
builtin_set.c
View File

@ -421,7 +421,7 @@ int builtin_set( wchar_t **argv )
int i;
for( i=woptind; i<argc; i++ )
{
if( env_get( argv[i] )==0 )
if( !env_exist( argv[i] ) )
retcode++;
}

67
env.c
View File

@ -38,12 +38,15 @@
#include "reader.h"
#include "parser.h"
#include "env_universal.h"
#include "input_common.h"
/**
Command used to start fishd
*/
#define FISHD_CMD L"fishd ^/tmp/fish.%s.log"
#define ENV_NULL L"\x1d"
/**
At init, we read all the environment variables from this array
*/
@ -329,7 +332,6 @@ void env_set( const wchar_t *key,
int has_changed_new = 0;
var_entry_t *e=0;
if( (var_mode & ENV_USER ) &&
hash_get( &env_read_only, key ) )
{
@ -340,6 +342,14 @@ void env_set( const wchar_t *key,
{
fish_setlocale(LC_ALL,val);
}
/*
Zero element arrays are internaly not coded as null but as this placeholder string
*/
if( !val && (var_mode & ENV_USER))
{
val = ENV_NULL;
}
if( var_mode & ENV_UNIVERSAL )
{
@ -511,7 +521,8 @@ wchar_t *env_get( const wchar_t *key )
{
var_entry_t *res;
env_node_t *env = top;
wchar_t *item;
if( wcscmp( key, L"history" ) == 0 )
{
wchar_t *current;
@ -548,7 +559,12 @@ wchar_t *env_get( const wchar_t *key )
key );
if( res != 0 )
{
return res->val;
if( wcscmp( res->val, ENV_NULL )==0)
{
return 0;
}
else
return res->val;
}
if( env->new_scope )
@ -558,7 +574,46 @@ wchar_t *env_get( const wchar_t *key )
}
if( !proc_had_barrier)
env_universal_barrier();
return env_universal_get( key );
item = env_universal_get( key );
if( !item || (wcscmp( item, ENV_NULL )==0))
{
return 0;
}
else
return item;
}
int env_exist( const wchar_t *key )
{
var_entry_t *res;
env_node_t *env = top;
wchar_t *item;
if( wcscmp( key, L"history" ) == 0 )
{
return 1;
}
while( env != 0 )
{
res = (var_entry_t *) hash_get( &env->env,
key );
if( res != 0 )
{
return 1;
}
if( env->new_scope )
env = global_env;
else
env = env->next;
}
if( !proc_had_barrier)
env_universal_barrier();
item = env_universal_get( key );
return item != 0;
}
static int local_scope_exports( env_node_t *n )
@ -769,8 +824,6 @@ char **env_export_arr( int recalc)
if( recalc && !proc_had_barrier)
env_universal_barrier();
// debug( 1, L"env_export_arr() %d %d", has_changed, env_universal_update );
if( has_changed || env_universal_update )
{
array_list_t uni;
@ -780,7 +833,7 @@ char **env_export_arr( int recalc)
int pos=0;
int i;
// debug( 1, L"env_export_arr() recalc" );
debug( 4, L"env_export_arr() recalc" );
hash_init( &vals, &hash_wcs_func, &hash_wcs_cmp );

6
env.h
View File

@ -68,6 +68,12 @@ void env_set( const wchar_t *key,
*/
wchar_t *env_get( const wchar_t *key );
/**
Returns 1 if the specified key exists. This can't be reliable done
using env_get, since env_get returns null for 0-element arrays
*/
int env_exist( const wchar_t *key );
/**
Remove environemnt variable