fixed a problem with rsync buffering the debug output when redirected

to a file.

diff --git a/main.c b/main.c
index b40c693..1717c53 100644 (file)
--- a/main.c
+++ b/main.c
@@ -63,29 +63,29 @@ static void report(int f)
        }
 
        if (do_stats) {
-               printf("\nNumber of files: %d\n", stats.num_files);
-               printf("Number of files transferred: %d\n", 
+               rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
+               rprintf(FINFO,"Number of files transferred: %d\n", 
                       stats.num_transferred_files);
-               printf("Total file size: %.0f bytes\n", 
+               rprintf(FINFO,"Total file size: %.0f bytes\n", 
                       (double)stats.total_size);
-               printf("Total transferred file size: %.0f bytes\n", 
+               rprintf(FINFO,"Total transferred file size: %.0f bytes\n", 
                       (double)stats.total_transferred_size);
-               printf("Literal data: %.0f bytes\n", 
+               rprintf(FINFO,"Literal data: %.0f bytes\n", 
                       (double)stats.literal_data);
-               printf("Matched data: %.0f bytes\n", 
+               rprintf(FINFO,"Matched data: %.0f bytes\n", 
                       (double)stats.matched_data);
-               printf("File list size: %d\n", stats.flist_size);
-               printf("Total bytes written: %.0f\n", 
+               rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+               rprintf(FINFO,"Total bytes written: %.0f\n", 
                       (double)stats.total_written);
-               printf("Total bytes read: %.0f\n\n", 
+               rprintf(FINFO,"Total bytes read: %.0f\n\n", 
                       (double)stats.total_read);
        }
        
-       printf("wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
+       rprintf(FINFO,"wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
               (double)stats.total_written,
               (double)stats.total_read,
               (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
-       printf("total size is %.0f  speedup is %.2f\n",
+       rprintf(FINFO,"total size is %.0f  speedup is %.2f\n",
               (double)stats.total_size,
               (1.0*stats.total_size)/(stats.total_written+stats.total_read));
 

diff --git a/options.c b/options.c
index 0c99395..02434d5 100644 (file)
--- a/options.c
+++ b/options.c
@@ -204,9 +204,9 @@ void parse_arguments(int argc, char *argv[])
       switch (opt) 
        {
        case OPT_VERSION:
-         printf("rsync version %s  protocol version %d\n\n",
+         rprintf(FINFO,"rsync version %s  protocol version %d\n\n",
                 VERSION,PROTOCOL_VERSION);
-         printf("Written by Andrew Tridgell and Paul Mackerras\n");
+         rprintf(FINFO,"Written by Andrew Tridgell and Paul Mackerras\n");
          exit_cleanup(0);
 
        case OPT_SUFFIX:

diff --git a/rsync.c b/rsync.c
index dfe7d1f..f3f2314 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -917,7 +917,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
                if (dry_run) {
                        if (!am_server && verbose)
-                               printf("%s\n",fname);
+                               rprintf(FINFO,"%s\n",fname);
                        continue;
                }
 
@@ -989,7 +989,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
                cleanup_file = file;
 
                if (!am_server && verbose)
-                       printf("%s\n",fname);
+                       rprintf(FINFO,"%s\n",fname);
                
                /* recv file data */
                recv_ok = receive_data(f_in,buf,fd2,fname,file->length);
@@ -1100,7 +1100,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
          
          if (dry_run) {        
                  if (!am_server && verbose)
-                         printf("%s\n",fname);
+                         rprintf(FINFO,"%s\n",fname);
                  write_int(f_out,i);
                  continue;
          }
@@ -1150,7 +1150,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                  rprintf(FINFO,"calling match_sums %s\n",fname);
          
          if (!am_server && verbose)
-                 printf("%s\n",fname+offset);
+                 rprintf(FINFO,"%s\n",fname+offset);
          
          match_sums(f_out,s,buf,st.st_size);