From 9d39a3de85ddde5d3271b17e793291fcecc88cff Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 12 Sep 2015 11:21:09 +0200 Subject: respecting -v now in scp mode, added -P for progressbars --- src/cssh.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/cssh.c b/src/cssh.c index 7b99c6e..b9b1917 100644 --- a/src/cssh.c +++ b/src/cssh.c @@ -1183,8 +1183,10 @@ int main( int argc, char *argv[] ) const char *filename = ssh_scp_request_get_filename( scp_data[i].scp ); int mode = ssh_scp_request_get_permissions( scp_data[i].scp ); - fprintf( stderr, "Receiving directory '%s' with permissions '0%o'\n", - filename, mode ); + if( args_info.verbose_given ) { + fprintf( stderr, "Receiving directory '%s' with permissions '0%o'\n", + filename, mode ); + } rc = ssh_scp_accept_request( scp_data[i].scp ); if( rc != SSH_OK ) { fprintf( stderr, "ERROR: accepting request for directory '%s' failed: %s\n", @@ -1238,8 +1240,10 @@ int main( int argc, char *argv[] ) const char *filename = ssh_scp_request_get_filename( scp_data[i].scp ); int mode = ssh_scp_request_get_permissions( scp_data[i].scp ); scp_data[i].size = ssh_scp_request_get_size64( scp_data[i].scp ); - fprintf( stderr, "Receiving file '%s' with permissions '0%o' of size '%"PRIu64"'\n", + if( args_info.verbose_given ) { + fprintf( stderr, "Receiving file '%s' with permissions '0%o' of size '%"PRIu64"'\n", filename, mode, scp_data[i].size ); + } rc = ssh_scp_accept_request( scp_data[i].scp ); if( rc != SSH_OK ) { fprintf( stderr, "ERROR: accepting request for file '%s' failed: %s\n", @@ -1340,7 +1344,7 @@ int main( int argc, char *argv[] ) exit( EXIT_FAILURE ); } } - if( args_info.verbose_given > 0 ) { + if( args_info.progress_bar_given > 0 ) { set_value_of_progressbar( &scp_data[i].progressbar, scp_data[i].bytesReceived ); } } else { @@ -1363,8 +1367,10 @@ int main( int argc, char *argv[] ) case CSSH_SCP_READ_STATE_EOF: break; } - } - redraw_progressbars( &progressbars ); + } + if( args_info.progress_bar_given ) { + redraw_progressbars( &progressbars ); + } } break; } } -- cgit v1.2.3-54-g00ecf