X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2be2fb3ed37af204267e90be65e60250991cb6e1..7e38410e47a05b2b97c58212d08a1d65c8c452b4:/generator.c

diff --git a/generator.c b/generator.c
index 2ffd03f5..4a22581d 100644
--- a/generator.c
+++ b/generator.c
@@ -100,23 +100,6 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 }
 
 
-/*
- * NULL sum_struct means we have no checksums
- */
-void write_sum_head(int f, struct sum_struct *sum)
-{
-	static struct sum_struct null_sum;
-
-	if (sum == NULL)
-		sum = &null_sum;
-
-	write_int(f, sum->count);
-	write_int(f, sum->blength);
-	if (protocol_version >= 27)
-		write_int(f, sum->s2length);
-	write_int(f, sum->remainder);
-}
-
 /*
  * set (initialize) the size entries in the per-file sum_struct
  * calculating dynamic block and checksum sizes.
@@ -146,17 +129,20 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 	else {
 		int32 c;
 		uint64 l;
-		for (c = 1, l = len; l >>= 2; c <<= 1) {
-		    assert(c > 0);
+		int cnt;
+		for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
+		if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
+			blength = MAX_BLOCK_SIZE;
+		else {
+		    blength = 0;
+		    do {
+			    blength |= c;
+			    if (len < (uint64)blength * blength)
+				    blength &= ~c;
+			    c >>= 1;
+		    } while (c >= 8);	/* round to multiple of 8 */
+		    blength = MAX(blength, BLOCK_SIZE);
 		}
-		blength = 0;
-		do {
-			blength |= c;
-			if (len < (uint64)blength * blength)
-				blength &= ~c;
-			c >>= 1;
-		} while (c >= 8);	/* round to multiple of 8 */
-		blength = MAX(blength, BLOCK_SIZE);
 	}
 
 	if (protocol_version < 27) {
@@ -239,7 +225,6 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 }
 
 
-
 /*
  * Acts on file number @p i from @p flist, whose name is @p fname.
  *
@@ -312,12 +297,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		if (dry_run)
 			return; /* TODO: causes inaccuracies -- fix */
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			if (robust_unlink(fname) != 0) {
-				rsyserr(FERROR, errno,
-					"recv_generator: unlink %s to make room for directory",
-					full_fname(fname));
-				return;
-			}
+			delete_file(fname, DEL_TERSE);
 			statret = -1;
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
@@ -343,9 +323,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 
 	if (preserve_links && S_ISLNK(file->mode)) {
 #if SUPPORT_LINKS
-		char lnk[MAXPATHLEN];
-		int l;
-
 		if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
 			if (verbose) {
 				rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
@@ -354,22 +331,25 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 			return;
 		}
 		if (statret == 0) {
-			l = readlink(fname,lnk,MAXPATHLEN-1);
-			if (l > 0) {
-				lnk[l] = 0;
+			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+			char lnk[MAXPATHLEN];
+			int len;
+
+			if (!dflag
+			    && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
+				lnk[len] = 0;
 				/* A link already pointing to the
 				 * right place -- no further action
 				 * required. */
-				if (strcmp(lnk,file->u.link) == 0) {
+				if (strcmp(lnk, file->u.link) == 0) {
 					set_perms(fname, file, &st,
 						  PERMS_REPORT);
 					return;
 				}
 			}
-			/* Not a symlink, so delete whatever's
-			 * already there and put a new symlink
-			 * in place. */
-			delete_file(fname);
+			/* Not the right symlink (or not a symlink), so
+			 * delete it. */
+			delete_file(fname, dflag | DEL_TERSE);
 		}
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
@@ -389,7 +369,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
 		    st.st_rdev != file->u.rdev) {
-			delete_file(fname);
+			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+			delete_file(fname, dflag | DEL_TERSE);
 			if (verbose > 2) {
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
 					safe_fname(fname),
@@ -479,7 +460,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 	}
 
 	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		if (delete_file(fname) != 0)
+		int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+		if (delete_file(fname, dflag | DEL_TERSE) != 0)
 			return;
 		statret = -1;
 		stat_errno = ENOENT;
@@ -593,6 +575,8 @@ prepare_to_open:
 
 notify_others:
 	write_int(f_out, i);
+	if (protocol_version >= 29 && inplace && !read_batch)
+		write_byte(f_out, fnamecmp_type);
 	if (f_out_name >= 0)
 		write_byte(f_out_name, fnamecmp_type);