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 );
}
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 );
}
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 ) ||