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

accumulate SHLVL env variable at startup

Browse Source
This commit is contained in:
Grissiom
2010-10-08 08:35:22 +08:00
parent 6654fff377
commit 1e27024d75
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
env.c
View File

@@ -527,6 +527,7 @@ void env_init()
struct passwd *pw; struct passwd *pw;
wchar_t *uname; wchar_t *uname;
wchar_t *version; wchar_t *version;
wchar_t *shlvl;
sb_init( &dyn_var ); sb_init( &dyn_var );
b_init( &export_buffer ); b_init( &export_buffer );
@@ -543,6 +544,7 @@ void env_init()
hash_put( &env_read_only, L"LINES", L"" ); hash_put( &env_read_only, L"LINES", L"" );
hash_put( &env_read_only, L"COLUMNS", L"" ); hash_put( &env_read_only, L"COLUMNS", L"" );
hash_put( &env_read_only, L"PWD", L"" ); hash_put( &env_read_only, L"PWD", L"" );
hash_put( &env_read_only, L"SHLVL", L"" );
/* /*
Names of all dynamically calculated variables Names of all dynamically calculated variables
@@ -644,6 +646,34 @@ void env_init()
&start_fishd, &start_fishd,
&universal_callback ); &universal_callback );
/*
Set up SHLVL variable
*/
shlvl = env_get( L"SHLVL" );
if ( shlvl )
{
wchar_t *nshlvl, **end_nshlvl;
/* add an extra space for digit dump (9+1=10) */
size_t i = wcslen( shlvl ) + 2;
nshlvl = malloc(i);
end_nshlvl = calloc( 1, sizeof(nshlvl) );
if ( nshlvl && swprintf( nshlvl, i,
L"%ld", wcstoul( shlvl, end_nshlvl, 10 )+1 ) != -1 )
{
env_set( L"SHLVL",
nshlvl,
ENV_GLOBAL | ENV_EXPORT );
}
free( end_nshlvl );
free( nshlvl );
}
else
{
env_set( L"SHLVL",
L"1",
ENV_GLOBAL | ENV_EXPORT );
}
/* /*
Set correct defaults for e.g. USER and HOME variables Set correct defaults for e.g. USER and HOME variables
*/ */