X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5fb543d5879ec3ad8f3e68a92b1766ece1b8326a..6ba9279fb2c52280cedaaca94783caf44ae9d324:/rsync.c

diff --git a/rsync.c b/rsync.c
index 3b4ff1ba..82035f5d 100644
--- a/rsync.c
+++ b/rsync.c
@@ -49,6 +49,8 @@ extern int delete_mode;
 extern int cvs_exclude;
 extern int am_root;
 extern int relative_paths;
+extern int io_timeout;
+extern int io_error;
 
 /*
   free a sums struct
@@ -181,7 +183,7 @@ static struct sum_struct *generate_sums(struct map_struct *buf,off_t len,int n)
   }
 
   if (verbose > 3)
-    fprintf(FERROR,"count=%d rem=%d n=%d flength=%d\n",
+    fprintf(FINFO,"count=%d rem=%d n=%d flength=%d\n",
 	    s->count,s->remainder,s->n,(int)s->flength);
 
   s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
@@ -199,7 +201,7 @@ static struct sum_struct *generate_sums(struct map_struct *buf,off_t len,int n)
     s->sums[i].i = i;
 
     if (verbose > 3)
-      fprintf(FERROR,"chunk[%d] offset=%d len=%d sum1=%08x\n",
+      fprintf(FINFO,"chunk[%d] offset=%d len=%d sum1=%08x\n",
 	      i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
 
     len -= n1;
@@ -228,7 +230,7 @@ static struct sum_struct *receive_sums(int f)
   s->sums = NULL;
 
   if (verbose > 3)
-    fprintf(FERROR,"count=%d n=%d rem=%d\n",
+    fprintf(FINFO,"count=%d n=%d rem=%d\n",
 	    s->count,s->n,s->remainder);
 
   if (s->count == 0) 
@@ -252,7 +254,7 @@ static struct sum_struct *receive_sums(int f)
     offset += s->sums[i].len;
 
     if (verbose > 3)
-      fprintf(FERROR,"chunk[%d] len=%d offset=%d sum1=%08x\n",
+      fprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
 	      i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
   }
 
@@ -369,7 +371,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   struct file_struct *file = flist->files[i];
 
   if (verbose > 2)
-    fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
+    fprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
 
   statret = link_stat(fname,&st);
 
@@ -430,7 +432,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	st.st_rdev != file->rdev) {	
       delete_file(fname);
       if (verbose > 2)
-	fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
+	fprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
 		fname,(int)file->mode,(int)file->rdev);
       if (do_mknod(fname,file->mode,file->rdev) != 0) {
 	fprintf(FERROR,"mknod %s : %s\n",fname,strerror(errno));
@@ -453,7 +455,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   }
 
   if (!S_ISREG(file->mode)) {
-    fprintf(FERROR,"skipping non-regular file %s\n",fname);
+    fprintf(FINFO,"skipping non-regular file %s\n",fname);
     return;
   }
 
@@ -481,7 +483,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
   if (update_only && st.st_mtime > file->modtime) {
     if (verbose > 1)
-      fprintf(FERROR,"%s is newer\n",fname);
+      fprintf(FINFO,"%s is newer\n",fname);
     return;
   }
 
@@ -517,12 +519,12 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
   }
 
   if (verbose > 3)
-    fprintf(FERROR,"gen mapped %s of size %d\n",fname,(int)st.st_size);
+    fprintf(FINFO,"gen mapped %s of size %d\n",fname,(int)st.st_size);
 
   s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size));
 
   if (verbose > 2)
-    fprintf(FERROR,"sending sums for %d\n",i);
+    fprintf(FINFO,"sending sums for %d\n",i);
 
   write_int(f_out,i);
   send_sums(s,f_out);
@@ -555,7 +557,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
   for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
     if (i > 0) {
       if (verbose > 3)
-	fprintf(FERROR,"data recv %d at %d\n",i,(int)offset);
+	fprintf(FINFO,"data recv %d at %d\n",i,(int)offset);
 
       sum_update(data,i);
 
@@ -572,7 +574,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
 	len = remainder;
 
       if (verbose > 3)
-	fprintf(FERROR,"chunk[%d] of size %d at %d offset=%d\n",
+	fprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n",
 		i,len,(int)offset2,(int)offset);
 
       map = map_ptr(buf,offset2,len);
@@ -598,7 +600,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
   if (remote_version >= 14) {
     read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
     if (verbose > 2)
-      fprintf(FERROR,"got file_sum\n");
+      fprintf(FINFO,"got file_sum\n");
     if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
       return 0;
   }
@@ -612,14 +614,14 @@ static void delete_one(struct file_struct *f)
     if (do_unlink(f_name(f)) != 0) {
       fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
-      fprintf(FERROR,"deleting %s\n",f_name(f));
+      fprintf(FINFO,"deleting %s\n",f_name(f));
     }
   } else {    
     if (do_rmdir(f_name(f)) != 0) {
       if (errno != ENOTEMPTY)
 	fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
     } else if (verbose) {
-      fprintf(FERROR,"deleting directory %s\n",f_name(f));      
+      fprintf(FINFO,"deleting directory %s\n",f_name(f));      
     }
   }
 }
@@ -691,6 +693,11 @@ static void delete_files(struct file_list *flist)
   if (cvs_exclude)
     add_cvs_excludes();
 
+  if (io_error) {
+	  fprintf(FINFO,"IO error encountered - skipping file deletion\n");
+	  return;
+  }
+
   for (j=0;j<flist->count;j++) {
 	  char *name = f_name(flist->files[j]);
 
@@ -746,7 +753,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
   int recv_ok;
 
   if (verbose > 2) {
-    fprintf(FERROR,"recv_files(%d) starting\n",flist->count);
+    fprintf(FINFO,"recv_files(%d) starting\n",flist->count);
   }
 
   if (recurse && delete_mode && !local_name && flist->count>0) {
@@ -761,7 +768,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 	  phase++;
 	  csum_length = SUM_LENGTH;
 	  if (verbose > 2)
-	    fprintf(FERROR,"recv_files phase=%d\n",phase);
+	    fprintf(FINFO,"recv_files phase=%d\n",phase);
 	  write_int(f_gen,-1);
 	  write_flush(f_gen);
 	  continue;
@@ -782,7 +789,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       }
 
       if (verbose > 2)
-	fprintf(FERROR,"recv_files(%s)\n",fname);
+	fprintf(FINFO,"recv_files(%s)\n",fname);
 
       /* open the file */  
       fd1 = open(fname,O_RDONLY);
@@ -804,7 +811,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       if (fd1 != -1 && st.st_size > 0) {
 	buf = map_file(fd1,st.st_size);
 	if (verbose > 2)
-	  fprintf(FERROR,"recv mapped %s of size %d\n",fname,(int)st.st_size);
+	  fprintf(FINFO,"recv mapped %s of size %d\n",fname,(int)st.st_size);
       } else {
 	buf = NULL;
       }
@@ -862,7 +869,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
       close(fd2);
 
       if (verbose > 2)
-	fprintf(FERROR,"renaming %s to %s\n",fnametmp,fname);
+	fprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
 
       if (make_backups) {
 	char fnamebak[MAXPATHLEN];
@@ -907,7 +914,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 			      fname);
 	      } else {
 		      if (verbose > 1)
-			      fprintf(FERROR,"redoing %s(%d)\n",fname,i);
+			      fprintf(FINFO,"redoing %s(%d)\n",fname,i);
 		      write_int(f_gen,i);
 	      }
       }
@@ -925,7 +932,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
   }
 
   if (verbose > 2)
-    fprintf(FERROR,"recv_files finished\n");
+    fprintf(FINFO,"recv_files finished\n");
   
   return 0;
 }
@@ -945,7 +952,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
   int offset=0;
 
   if (verbose > 2)
-    fprintf(FERROR,"send_files starting\n");
+    fprintf(FINFO,"send_files starting\n");
 
   setup_nonblocking(f_in,f_out);
 
@@ -958,7 +965,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 			  write_int(f_out,-1);
 			  write_flush(f_out);
 			  if (verbose > 2)
-				  fprintf(FERROR,"send_files phase=%d\n",phase);
+				  fprintf(FINFO,"send_files phase=%d\n",phase);
 			  continue;
 		  }
 		  break;
@@ -971,6 +978,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		  strncpy(fname,file->basedir,MAXPATHLEN-1);
 		  fname[MAXPATHLEN-1] = 0;
 		  if (strlen(fname) == MAXPATHLEN-1) {
+			  io_error = 1;
 			  fprintf(FERROR, "send_files failed on long-named directory %s\n",
 				  fname);
 			  return;
@@ -981,7 +989,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
 	  
 	  if (verbose > 2) 
-		  fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
+		  fprintf(FINFO,"send_files(%d,%s)\n",i,fname);
 	  
 	  if (dry_run) {	
 		  if (!am_server && verbose)
@@ -992,12 +1000,14 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
 	  s = receive_sums(f_in);
 	  if (!s) {
+		  io_error = 1;
 		  fprintf(FERROR,"receive_sums failed\n");
 		  return;
 	  }
 	  
 	  fd = open(fname,O_RDONLY);
 	  if (fd == -1) {
+		  io_error = 1;
 		  fprintf(FERROR,"send_files failed to open %s: %s\n",
 			  fname,strerror(errno));
 		  free_sums(s);
@@ -1006,6 +1016,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  
 	  /* map the local file */
 	  if (fstat(fd,&st) != 0) {
+		  io_error = 1;
 		  fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
 		  free_sums(s);
 		  close(fd);
@@ -1019,7 +1030,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  }
 	  
 	  if (verbose > 2)
-		  fprintf(FERROR,"send_files mapped %s of size %d\n",
+		  fprintf(FINFO,"send_files mapped %s of size %d\n",
 			  fname,(int)st.st_size);
 	  
 	  write_int(f_out,i);
@@ -1029,7 +1040,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  write_int(f_out,s->remainder);
 	  
 	  if (verbose > 2)
-		  fprintf(FERROR,"calling match_sums %s\n",fname);
+		  fprintf(FINFO,"calling match_sums %s\n",fname);
 	  
 	  if (!am_server && verbose)
 		  printf("%s\n",fname+offset);
@@ -1043,11 +1054,11 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  free_sums(s);
 	  
 	  if (verbose > 2)
-		  fprintf(FERROR,"sender finished %s\n",fname);
+		  fprintf(FINFO,"sender finished %s\n",fname);
   }
 
   if (verbose > 2)
-	  fprintf(FERROR,"send files finished\n");
+	  fprintf(FINFO,"send files finished\n");
 
   match_report();
 
@@ -1063,7 +1074,7 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
   int phase=0;
 
   if (verbose > 2)
-    fprintf(FERROR,"generator starting pid=%d count=%d\n",
+    fprintf(FINFO,"generator starting pid=%d count=%d\n",
 	    (int)getpid(),flist->count);
 
   for (i = 0; i < flist->count; i++) {
@@ -1089,11 +1100,15 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
   ignore_times=1;
 
   if (verbose > 2)
-    fprintf(FERROR,"generate_files phase=%d\n",phase);
+    fprintf(FINFO,"generate_files phase=%d\n",phase);
 
   write_int(f,-1);
   write_flush(f);
 
+  /* we expect to just sit around now, so don't exit on a timeout. If we
+     really get a timeout then the other process should exit */
+  io_timeout = 0;
+
   if (remote_version >= 13) {
     /* in newer versions of the protocol the files can cycle through
        the system more than once to catch initial checksum errors */
@@ -1105,7 +1120,7 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 
     phase++;
     if (verbose > 2)
-      fprintf(FERROR,"generate_files phase=%d\n",phase);
+      fprintf(FINFO,"generate_files phase=%d\n",phase);
 
     write_int(f,-1);
     write_flush(f);
@@ -1113,7 +1128,7 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 
 
   if (verbose > 2)
-    fprintf(FERROR,"generator wrote %ld\n",(long)write_total());
+    fprintf(FINFO,"generator wrote %ld\n",(long)write_total());
 }