X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bceec82f357618356fd209578dfccbbd6b52efba..32f761755e2cfee243a1513c9ea9871586463fa6:/generator.c

diff --git a/generator.c b/generator.c
index da2feac1..7a939aff 100644
--- a/generator.c
+++ b/generator.c
@@ -144,9 +144,7 @@ static BOOL disable_deltas_p(void)
 
 	assert(whole_file == 0 || whole_file == 1);
 
-	/* OK, we don't explicitly handle both whole_file and
-	 * no_whole_file; perhaps somebody will care to add an
-	 * error. */
+	/* whole_file and no_whole_file are never both on at the same time */
 
 	if (whole_file)
 		return True;
@@ -159,56 +157,65 @@ static BOOL disable_deltas_p(void)
 }
 
 
-/*
-  generate a stream of signatures/checksums that describe a buffer
-
-  generate approximately one checksum every n bytes
-  */
-static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
+/**
+ * Generate a stream of signatures/checksums that describe a buffer.
+ *
+ * Generate approximately one checksum every @p n bytes.
+ *
+ * @return Newly-allocated sum_struct
+ **/
+static struct sum_struct *generate_sums(struct map_struct *buf, OFF_T len,
+					int n)
 {
 	int i;
 	struct sum_struct *s;
 	int count;
 	int block_len = n;
-	int remainder = (len%block_len);
+	int remainder = (len % block_len);
 	OFF_T offset = 0;
 
-	count = (len+(block_len-1))/block_len;
+	count = (len + (block_len - 1)) / block_len;
 
-	s = (struct sum_struct *)malloc(sizeof(*s));
-	if (!s) out_of_memory("generate_sums");
+	s = (struct sum_struct *) malloc(sizeof(*s));
+	if (!s)
+		out_of_memory("generate_sums");
 
 	s->count = count;
 	s->remainder = remainder;
 	s->n = n;
 	s->flength = len;
 
-	if (count==0) {
+	if (count == 0) {
 		s->sums = NULL;
 		return s;
 	}
 
-	if (verbose > 3)
-		rprintf(FINFO,"count=%d rem=%d n=%d flength=%.0f\n",
-			s->count,s->remainder,s->n,(double)s->flength);
+	if (verbose > 3) {
+		rprintf(FINFO, "count=%ld rem=%ld n=%ld flength=%.0f\n",
+			(long) s->count, (long) s->remainder,
+			(long) s->n, (double) s->flength);
+	}
+
+	s->sums = (struct sum_buf *) malloc(sizeof(s->sums[0]) * s->count);
+	if (!s->sums)
+		out_of_memory("generate_sums");
 
-	s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
-	if (!s->sums) out_of_memory("generate_sums");
-  
-	for (i=0;i<count;i++) {
-		int n1 = MIN(len,n);
-		char *map = map_ptr(buf,offset,n1);
+	for (i = 0; i < count; i++) {
+		int n1 = MIN(len, n);
+		char *map = map_ptr(buf, offset, n1);
 
-		s->sums[i].sum1 = get_checksum1(map,n1);
-		get_checksum2(map,n1,s->sums[i].sum2);
+		s->sums[i].sum1 = get_checksum1(map, n1);
+		get_checksum2(map, n1, s->sums[i].sum2);
 
 		s->sums[i].offset = offset;
 		s->sums[i].len = n1;
 		s->sums[i].i = i;
 
 		if (verbose > 3)
-			rprintf(FINFO,"chunk[%d] offset=%.0f len=%d sum1=%08x\n",
-				i,(double)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1);
+			rprintf(FINFO,
+				"chunk[%d] offset=%.0f len=%d sum1=%08x\n",
+				i, (double) s->sums[i].offset,
+				s->sums[i].len, s->sums[i].sum1);
 
 		len -= n1;
 		offset += n1;
@@ -219,15 +226,15 @@ static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
 
 
 
-/*
- * Acts on file number I from FLIST, whose name is fname.
+/**
+ * Acts on file number @p i from @p flist, whose name is @p fname.
  *
  * First fixes up permissions, then generates checksums for the file.
  *
- * (This comment was added later by mbp who was trying to work it out;
- * it might be wrong.)
- */ 
-void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
+ * @note This comment was added later by mbp who was trying to work it
+ * out.  It might be wrong.
+ **/ 
+void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
 {  
 	int fd;
 	STRUCT_STAT st;
@@ -241,6 +248,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	extern int list_only;
 	extern int preserve_perms;
 	extern int only_existing;
+	extern int orig_umask;
 
 	if (list_only) return;
 
@@ -283,7 +291,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
 			if (!(relative_paths && errno==ENOENT && 
-			      create_directory_path(fname)==0 && 
+			      create_directory_path(fname, orig_umask)==0 && 
 			      do_mkdir(fname,file->mode)==0)) {
 				rprintf(FERROR, RSYNC_NAME ": recv_generator: mkdir \"%s\": %s (2)\n",
 					fname,strerror(errno));
@@ -364,7 +372,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
 	if (preserve_hard_links && check_hard_link(file)) {
 		if (verbose > 1)
-			rprintf(FINFO, "\"%s\" is a hard link\n",f_name(file));
+			rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",f_name(file));
 		return;
 	}
 
@@ -486,6 +494,13 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 		rprintf(FINFO,"generator starting pid=%d count=%d\n",
 			(int)getpid(),flist->count);
 
+	if (verbose >= 2) {
+		rprintf(FINFO,
+			disable_deltas_p() 
+			? "delta-transmission disabled for local transfer or --whole-file\n"
+			: "delta transmission enabled\n");
+	}
+	
 	/* 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 */