added stderr handling

2 files changed, 56 insertions, 4 deletions

diff --git a/src/cssh.c b/src/cssh.c
index 85b5b00..9a4f386 100644
--- a/src/cssh.c
+++ b/src/cssh.c
@@ -332,6 +332,7 @@ int main( int argc, char *argv[] )
 	
 	while( ssh_channel_is_open( channel ) && !ssh_channel_is_eof( channel ) ) {
 		char buffer[256];
+		bool must_sleep = false;
 		
 		rc = ssh_channel_poll( channel, 0 );
 		if( rc == SSH_ERROR ) {
@@ -383,6 +384,57 @@ int main( int argc, char *argv[] )
 				}
 			}
 		}
+
+		rc = ssh_channel_poll( channel, 1 );
+		if( rc == SSH_ERROR ) {
+			fprintf( stderr, "ERROR: ssh_channel_poll on stderr failed: %s\n",
+				ssh_get_error( session ) );
+			ssh_channel_close( channel );
+			ssh_channel_free( channel );
+			ssh_disconnect( session );
+			ssh_free( session );
+			exit( EXIT_FAILURE );
+		}
+				
+		if( rc > 0 ) {
+			unsigned int nread = ssh_channel_read_nonblocking( channel, buffer, sizeof( buffer ), 1 );
+			if( nread == SSH_ERROR ) {
+				fprintf( stderr, "ERROR: ssh_channel_read_nonblocking on stderr failed: %s\n",
+					ssh_get_error( session ) );
+				ssh_channel_close( channel );
+				ssh_channel_free( channel );
+				ssh_disconnect( session );
+				ssh_free( session );
+				exit( EXIT_FAILURE );
+			}
+
+			if( nread > 0 ) {
+				size_t wrc = fwrite( buffer, 1, nread, stderr );
+				if( wrc < 0 ) {
+					fprintf( stderr, "ERROR: while writting to stderr: %s\n",
+						strerror( errno ) );
+					ssh_channel_close( channel );
+					ssh_channel_free( channel );
+					ssh_disconnect( session );
+					ssh_free( session );
+					exit( EXIT_FAILURE );
+				}
+
+				if( wrc != nread ) {
+					fprintf( stderr, "ERROR: Write mismatch on stderr (%zu != %d)\n",
+						wrc, nread );
+					ssh_channel_close( channel );
+					ssh_channel_free( channel );
+					ssh_disconnect( session );
+					ssh_free( session );
+					exit( EXIT_FAILURE );
+				}
+			}
+		}
+
+		if( must_sleep ) {
+			cssh_msleep( 10 );
+		}
 	}
 	
 	ssh_channel_send_eof( channel );
diff --git a/src/cssh_options.ggo b/src/cssh_options.ggo
index 0a06621..3090e57 100644
--- a/src/cssh_options.ggo
+++ b/src/cssh_options.ggo
@@ -22,8 +22,8 @@ section "Main Options"
 		int typestr="port"
 		optional
 		
-	option "hosts" H
-		"List of hosts to use in parallel"
-		string typestr="host"
-		multiple optional
+	option "hosts-file" H
+		"List of hosts to use in parallel (listed one per line in a file)"
+		string typestr="hosts-file"
+		optional