sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mosh: Fix C++ mosh wrapper color counting

Browse Source 
See https://github.com/mobile-shell/mosh/pull/96#issuecomment-7804069
This commit is contained in:
Fredrik Fornwall 2016-05-27 08:49:57 +02:00
parent f55a1d8b00
commit 1f87518b8c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/mosh/mosh.cc
View File

@ -315,9 +315,7 @@ 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 );
shutdown( sockfd, 0 );
@ -340,15 +338,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 );