mosh: "Fix hang when remote closes the connection"

[termux-packages] / packages / mosh / mosh.cc

diff --git a/packages/mosh/mosh.cc b/packages/mosh/mosh.cc
index 9f0352e..02b475d 100644 (file)
--- a/packages/mosh/mosh.cc
+++ b/packages/mosh/mosh.cc
@@ -315,17 +315,18 @@ int main( int argc, char *argv[] )
     freeaddrinfo( servinfo ); // all done with this structure
 
     int pid = fork();
-    if ( pid == -1 ) {
-      die( "%s: fork: %d", argv[0], errno );
-    }
+    if ( pid == -1 ) die( "%s: fork: %d", argv[0], errno );
     if ( pid == 0 ) {
-      cat( sockfd, 1 );
+      close( STDIN_FILENO );
+      cat( sockfd, STDOUT_FILENO );
       shutdown( sockfd, 0 );
       exit( 0 );
     }
     signal( SIGHUP, SIG_IGN );
-    cat( 0, sockfd );
-    shutdown( sockfd, 1 );
+    close( STDOUT_FILENO );
+    cat( STDIN_FILENO, sockfd );
+    shutdown( sockfd, SHUT_WR /* = 1 */ );
+    close( STDIN_FILENO );
     waitpid( pid, NULL, 0 );
     exit( 0 );
   }
@@ -340,15 +341,15 @@ int main( int argc, char *argv[] )
 
   string color_invocation = client + " -c";
   FILE *color_file = popen( color_invocation.c_str(), "r" );
-  if ( !color_file ) {
-    die( "%s: popen: %d", argv[0], errno );
-  }
+  if ( !color_file ) die( "%s: popen: %d", argv[0], errno );
   char *buf = NULL;
   size_t buf_sz = 0;
   ssize_t n;
   if ( ( n = getline( &buf, &buf_sz, color_file ) ) < 0 ) {
     die( "%s: Can't count colors: %d", argv[0], errno );
   }
+  // Chomp the trailing newline:
+  if ( n > 0 && buf[n - 1] == '\n' ) n--;
   string colors = string( buf, n );
   pclose( color_file );
 
@@ -369,9 +370,7 @@ int main( int argc, char *argv[] )
   }
 
   int pid = fork();
-  if ( pid == -1 ) {
-    die( "%s: fork: %d", argv[0], errno );
-  }
+  if ( pid == -1 ) die( "%s: fork: %d", argv[0], errno );
   if ( pid == 0 ) {
     close( pty );
     if ( -1 == dup2( pty_slave, 1 ) ||
@@ -389,6 +388,19 @@ int main( int argc, char *argv[] )
       server_args.push_back( "-p" );
       server_args.push_back( port_request );
     }
+
+    for (char const* env_name : {
+        "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC",
+        "LC_TIME", "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
+        "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
+        "LC_IDENTIFICATION", "LC_ALL" }) {
+      char* env_value = getenv(env_name);
+      if (env_value) {
+        server_args.push_back("-l");
+        server_args.push_back(string(env_name) + "=" + env_value);
+      }
+    }
+
     if ( commands ) {
       server_args.insert( server_args.end(), command, command + commands );
     }