single host copies should not create a host directory structure

1 files changed, 30 insertions, 21 deletions

diff --git a/src/cssh.c b/src/cssh.c
index 8ad2b09..5197d0b 100644
--- a/src/cssh.c
+++ b/src/cssh.c
@@ -1100,34 +1100,43 @@ int main( int argc, char *argv[] )
 				}
 				
 				rc = push_dir_stack( &dir_stack[i], pwd );
-				
-				size_t len = strlen( pwd ) + 2 + strlen( host[i] );
-				char *full_path = (char *)malloc( len );
-				if( full_path == NULL ) {
-					fprintf( stderr, "ERROR: Memory allocation failed for full path of basse directory for host '%s'\n",
+				if( rc < 0 ) {
+					fprintf( stderr, "ERROR: failed to push current directory to stack for host '%s'\n",
 						host[i] );
 					free( pwd );
 					cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
 					exit( EXIT_FAILURE );
 				}
-				snprintf( full_path, len, "%s/%s", pwd, host[i] );
-				rc = push_dir_stack( &dir_stack[i], full_path );
 				
-				if( rc < 0 ) {
-					fprintf( stderr, "ERROR: failed remember initial base directory '%s' in directory stack\n",
-						pwd );
+				if( nof_sessions > 1 ) {
+					size_t len = strlen( pwd ) + 2 + strlen( host[i] );
+					char *full_path = (char *)malloc( len );
+					if( full_path == NULL ) {
+						fprintf( stderr, "ERROR: Memory allocation failed for full path of base directory for host '%s'\n",
+							host[i] );
+						free( pwd );
+						cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
+						exit( EXIT_FAILURE );
+					}
+					snprintf( full_path, len, "%s/%s", pwd, host[i] );
+					rc = push_dir_stack( &dir_stack[i], full_path );
+					
+					if( rc < 0 ) {
+						fprintf( stderr, "ERROR: failed remember initial base directory '%s' in directory stack\n",
+							pwd );
+						free( pwd );
+						cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
+						exit( EXIT_FAILURE );
+					}										
 					free( pwd );
-					cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
-					exit( EXIT_FAILURE );
-				}										
-				free( pwd );
-				
-				rc = mkdir( full_path, 0750 );
-				if( rc < 0 ) {
-					fprintf( stderr, "ERROR: failed to create base directory '%s' for host '%s': %s\n",
-						full_path, host[i], strerror( errno ) );
-					cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
-					exit( EXIT_FAILURE );
+					
+					rc = mkdir( full_path, 0750 );
+					if( rc < 0 ) {
+						fprintf( stderr, "ERROR: failed to create base directory '%s' for host '%s': %s\n",
+							full_path, host[i], strerror( errno ) );
+						cleanup_sessions( &session, NULL, &scp, &read_state, &buf, &dir_stack, host, port, nof_sessions, args_info.verbose_given > 0 );
+						exit( EXIT_FAILURE );
+					}
 				}
 			}