izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect SHELL environment variable if set

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2014-01-29 19:27:35 -05:00
committed by John Hood
parent 8a91e78349
commit 9019f62bf6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/mosh-server.cc
+9 -5
View File
@@ -247,13 +247,17 @@ int main( int argc, char *argv[] )
string shell_name; string shell_name;
if ( !command_argv ) { if ( !command_argv ) {
/* get shell name */ /* get shell name */
struct passwd *pw = getpwuid( geteuid() ); const char *shell = getenv( "SHELL" );
if ( pw == NULL ) { if ( shell == NULL ) {
perror( "getpwuid" ); struct passwd *pw = getpwuid( geteuid() );
exit( 1 ); if ( pw == NULL ) {
perror( "getpwuid" );
exit( 1 );
}
shell = pw->pw_shell;
} }
string shell_path( pw->pw_shell ); string shell_path( shell );
if ( shell_path.empty() ) { /* empty shell means Bourne shell */ if ( shell_path.empty() ) { /* empty shell means Bourne shell */
shell_path = _PATH_BSHELL; shell_path = _PATH_BSHELL;
} }