X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a3ce973c370322251a5f402b80a02457efa682d..3b22184d4c61e6dc77ec15f93bb760046c40533e:/generator.c

diff --git a/generator.c b/generator.c
index bec5c176..b12087fc 100644
--- a/generator.c
+++ b/generator.c
@@ -567,6 +567,12 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 	int s2length;
 	int64 l;
 
+	if (len < 0) {
+		/* The file length overflowed our int64 var, so we can't process this file. */
+		sum->count = -1; /* indicate overflow error */
+		return;
+	}
+
 	if (block_size)
 		blength = block_size;
 	else if (len <= BLOCK_SIZE * BLOCK_SIZE)
@@ -1032,7 +1038,7 @@ static void list_file_entry(struct file_struct *f)
 #ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(f->mode)) {
 		rprintf(FINFO, "%s %*s %s %s -> %s\n",
-			permbuf, colwidth, comma_num(len),
+			permbuf, colwidth, human_num(len),
 			timestring(f->modtime), f_name(f, NULL),
 			F_SYMLINK(f));
 	} else
@@ -1043,7 +1049,7 @@ static void list_file_entry(struct file_struct *f)
 			f_name(f, NULL));
 	} else {
 		rprintf(FINFO, "%s %*s %s %s\n",
-			permbuf, colwidth, comma_num(len),
+			permbuf, colwidth, human_num(len),
 			timestring(f->modtime), f_name(f, NULL));
 	}
 }
@@ -1119,6 +1125,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		skip_dir = NULL;
 	}
 
+	init_stat_x(&sx);
 	if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
 		if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
 			if (is_dir < 0)
@@ -1136,7 +1143,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 	}
 
-	init_stat_x(&sx);
 	if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
 	  parent_is_dry_missing:
 		if (fuzzy_dirlist) {
@@ -1354,10 +1360,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		const char *sl = F_SYMLINK(file);
 		if (safe_symlinks && unsafe_symlink(sl, fname)) {
 			if (INFO_GTE(NAME, 1)) {
-				if (solo_file)
+				if (solo_file) {
 					/* fname contains the destination path, but we
 					 * want to report the source path. */
 					fname = f_name(file, NULL);
+				}
 				rprintf(FINFO,
 					"ignoring unsafe symlink \"%s\" -> \"%s\"\n",
 					fname, sl);