Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed connection error to fishd server in env.cpp

Browse source
This commit is contained in:
Siteshwar Vashisht 2012-01-12 21:58:42 +05:30
parent ee687ee433
commit 9cc2217a26
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
env.cpp
View file

@ -656,8 +656,11 @@ void env_init()
env_set( L"version", version, ENV_GLOBAL ); env_set( L"version", version, ENV_GLOBAL );
free( version ); free( version );
wchar_t * fishd_dir = const_cast<wchar_t*>(env_get_string( L"FISHD_SOCKET_DIR").c_str()); const wcstring fishd_dir_wstr = env_get_string( L"FISHD_SOCKET_DIR");
wchar_t * user_dir = const_cast<wchar_t*>(env_get_string( L"USER" ).c_str()); const wcstring user_dir_wstr = env_get_string( L"USER" );
wchar_t * fishd_dir = fishd_dir_wstr.empty()?NULL:const_cast<wchar_t*>(fishd_dir_wstr.c_str());
wchar_t * user_dir = user_dir_wstr.empty()?NULL:const_cast<wchar_t*>(user_dir_wstr.c_str());
env_universal_init(fishd_dir , user_dir , env_universal_init(fishd_dir , user_dir ,
&start_fishd, &start_fishd,