From 94abb30f94a3ea9279d25dbc83989e9a0c454ab2 Mon Sep 17 00:00:00 2001 From: axel Date: Thu, 11 May 2006 21:57:58 +1000 Subject: [PATCH] Do not try to read init files if the cd to the proper directory fails darcs-hash:20060511115758-ac50b-94661cb36c5a55bc78ddfe576d1cd40fada5f065.gz --- main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index d24263085..c2d9de391 100644 --- a/main.c +++ b/main.c @@ -80,9 +80,9 @@ static int read_init() env_set( L"__fish_help_dir", DOCDIR, 0); - eval( L"builtin cd " DATADIR L"/fish 2>/dev/null; . fish 2>/dev/null", 0, TOP ); - eval( L"builtin cd " SYSCONFDIR L" 2>/dev/null; . fish 2>/dev/null", 0, TOP ); - eval( L"builtin cd 2>/dev/null;. .fish 2>/dev/null", 0, TOP ); + eval( L"builtin cd " DATADIR L"/fish 2>/dev/null; and . fish 2>/dev/null", 0, TOP ); + eval( L"builtin cd " SYSCONFDIR L" 2>/dev/null; and . fish 2>/dev/null", 0, TOP ); + eval( L"builtin cd 2>/dev/null; and . .fish 2>/dev/null", 0, TOP ); if( chdir( cwd ) == -1 ) { @@ -336,7 +336,7 @@ int main( int argc, char **argv ) } } } - + proc_fire_event( L"PROCESS_EXIT", EVENT_EXIT, getpid(), res ); history_destroy();