X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6902ed178ba54c8e1c410519f7ee576ddb42554c..7df0935a5124dbe1ce81f3b462645464bd17aa9d:/sender.c

diff --git a/sender.c b/sender.c
index 39bb2797..ee34bc9e 100644
--- a/sender.c
+++ b/sender.c
@@ -83,9 +83,9 @@ static struct sum_struct *receive_sums(int f)
 
 void send_files(struct file_list *flist,int f_out,int f_in)
 { 
-	int fd;
+	int fd = -1;
 	struct sum_struct *s;
-	struct map_struct *buf;
+	struct map_struct *buf = NULL;
 	STRUCT_STAT st;
 	char fname[MAXPATHLEN];  
 	int i;
@@ -94,7 +94,6 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	extern struct stats stats;		
 	struct stats initial_stats;
 	extern int write_batch;   /* dw */
-	int negative_one;  /* dw */
 	extern int read_batch;    /* dw */
 	int checksums_match;   /* dw */
 	int buff_len;  /* dw */
@@ -169,44 +168,42 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		}
 	  
 		if (!read_batch) {
-		fd = do_open(fname, O_RDONLY, 0);
-		if (fd == -1) {
-			io_error = 1;
-			rprintf(FERROR,"send_files failed to open %s: %s\n",
-				fname,strerror(errno));
-			free_sums(s);
-			continue;
-		}
+			fd = do_open(fname, O_RDONLY, 0);
+			if (fd == -1) {
+				io_error = 1;
+				rprintf(FERROR,"send_files failed to open %s: %s\n",
+					fname,strerror(errno));
+				free_sums(s);
+				continue;
+			}
 	  
-		/* map the local file */
-		if (do_fstat(fd,&st) != 0) {
-			io_error = 1;
-			rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
-			free_sums(s);
-			close(fd);
-			return;
-		}
+			/* map the local file */
+			if (do_fstat(fd,&st) != 0) {
+				io_error = 1;
+				rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+				free_sums(s);
+				close(fd);
+				return;
+			}
 	  
-		if (st.st_size > 0) {
-			buf = map_file(fd,st.st_size);
-		} else {
-			buf = NULL;
-		}
+			if (st.st_size > 0) {
+				buf = map_file(fd,st.st_size);
+			} else {
+				buf = NULL;
+			}
 	  
-		if (verbose > 2)
-			rprintf(FINFO,"send_files mapped %s of size %.0f\n",
-				fname,(double)st.st_size);
-		}
+			if (verbose > 2)
+				rprintf(FINFO,"send_files mapped %s of size %.0f\n",
+					fname,(double)st.st_size);
 
-		if (!read_batch) { /* dw */
-		    write_int(f_out,i);
+			write_int(f_out,i);
 	  
-		    if (write_batch)
-			write_batch_delta_file((char *)&i,sizeof(i));
+			if (write_batch)
+				write_batch_delta_file((char *)&i,sizeof(i));
 
-		    write_int(f_out,s->count);
-		    write_int(f_out,s->n);
-		    write_int(f_out,s->remainder);
+			write_int(f_out,s->count);
+			write_int(f_out,s->n);
+			write_int(f_out,s->remainder);
 		}
 	  
 		if (verbose > 2)
@@ -255,8 +252,9 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
                        }  /* j=i */
                    } else {  /* not checksum match */
-                      rprintf(FINFO,"readbatch & checksums don't match\n");
-                      rprintf(FINFO,"filename=%s is being skipped\n");
+                      rprintf (FINFO,"readbatch & checksums don't match\n");
+                      rprintf (FINFO,"filename=%s is being skipped\n",
+			       fname);
                       continue;
                    }
                 } else  {