X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2ad3c71777c90aa65813f89e57ac6412e73b36db..3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47:/flist.c

diff --git a/flist.c b/flist.c
index 429238ad..0b4c4e2f 100644
--- a/flist.c
+++ b/flist.c
@@ -63,11 +63,10 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
+extern int need_unsorted_flist;
+extern int unsort_ndx;
 extern struct stats stats;
 extern char *filesfrom_host;
-#ifdef ICONV_OPTION
-extern char *iconv_opt;
-#endif
 
 extern char curr_dir[MAXPATHLEN];
 
@@ -77,9 +76,7 @@ extern struct filter_list_struct filter_list;
 extern struct filter_list_struct server_filter_list;
 
 #ifdef ICONV_OPTION
-extern int ic_ndx;
 extern int filesfrom_convert;
-extern int need_unsorted_flist;
 extern iconv_t ic_send, ic_recv;
 #endif
 
@@ -674,7 +671,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	clean_fname(thisname, 0);
 
 	if (sanitize_paths)
-		sanitize_path(thisname, thisname, "", 0, NULL);
+		sanitize_path(thisname, thisname, "", 0);
 
 	if ((basename = strrchr(thisname, '/')) != NULL) {
 		int len = basename++ - thisname;
@@ -729,7 +726,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 			modtime = read_varlong(f, 4);
 #if SIZEOF_TIME_T < SIZEOF_INT64
 			if ((modtime > INT_MAX || modtime < INT_MIN) && !am_generator) {
-				rprintf(FERROR,
+				rprintf(FERROR_XFER,
 				    "Time value of %s truncated on receiver.\n",
 				    lastname);
 			}
@@ -867,10 +864,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		F_GROUP(file) = gid;
 		file->flags |= gid_flags;
 	}
-#ifdef ICONV_OPTION
-	if (ic_ndx)
+	if (unsort_ndx)
 		F_NDX(file) = flist->used + flist->ndx_start;
-#endif
 
 	if (basename != thisname) {
 		file->dirname = lastdir;
@@ -922,7 +917,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		} else
 			read_sbuf(f, bp, linkname_len - 1);
 		if (sanitize_paths)
-			sanitize_path(bp, bp, "", lastdir_depth, NULL);
+			sanitize_path(bp, bp, "", lastdir_depth);
 	}
 #endif
 
@@ -1013,7 +1008,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	}
 	clean_fname(thisname, 0);
 	if (sanitize_paths)
-		sanitize_path(thisname, thisname, "", 0, NULL);
+		sanitize_path(thisname, thisname, "", 0);
 
 	if (stp && S_ISDIR(stp->st_mode)) {
 		st = *stp; /* Needed for "symlink/." with --relative. */
@@ -1034,20 +1029,20 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			if (copy_links && x_lstat(thisname, &st, NULL) == 0
 			    && S_ISLNK(st.st_mode)) {
 				io_error |= IOERR_GENERAL;
-				rprintf(FERROR, "symlink has no referent: %s\n",
+				rprintf(FERROR_XFER, "symlink has no referent: %s\n",
 					full_fname(thisname));
 			} else
 #endif
 			{
 				enum logcode c = am_daemon && protocol_version < 28
-				    ? FERROR : FINFO;
+					       ? FERROR : FWARNING;
 				io_error |= IOERR_VANISHED;
 				rprintf(c, "file has vanished: %s\n",
 					full_fname(thisname));
 			}
 		} else {
 			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR, save_errno, "readlink %s failed",
+			rsyserr(FERROR_XFER, save_errno, "readlink %s failed",
 				full_fname(thisname));
 		}
 		return NULL;
@@ -1229,10 +1224,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	if (basename_len == 0+1)
 		return NULL;
 
-#ifdef ICONV_OPTION
-	if (ic_ndx)
+	if (unsort_ndx)
 		F_NDX(file) = dir_count - 1;
-#endif
 
 	return file;
 }
@@ -1317,7 +1310,7 @@ static void send_if_directory(int f, struct file_list *flist,
 			fbuf[--len] = '\0';
 		if (len >= MAXPATHLEN - 1) {
 			io_error |= IOERR_GENERAL;
-			rprintf(FERROR, "skipping long-named directory: %s\n",
+			rprintf(FERROR_XFER, "skipping long-named directory: %s\n",
 				full_fname(fbuf));
 			return;
 		}
@@ -1456,7 +1449,7 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 
 	if (!(d = opendir(fbuf))) {
 		io_error |= IOERR_GENERAL;
-		rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf));
+		rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf));
 		return;
 	}
 
@@ -1493,7 +1486,7 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 
 	if (errno) {
 		io_error |= IOERR_GENERAL;
-		rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf));
+		rsyserr(FERROR_XFER, errno, "readdir(%s)", full_fname(fbuf));
 	}
 
 	closedir(d);
@@ -1603,7 +1596,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 			STRUCT_STAT st;
 			if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
 				io_error |= IOERR_GENERAL;
-				rsyserr(FERROR, errno, "link_stat %s failed",
+				rsyserr(FERROR_XFER, errno, "link_stat %s failed",
 					full_fname(fbuf));
 				return;
 			}
@@ -1640,7 +1633,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 			STRUCT_STAT st;
 			if (link_stat(fbuf, &st, 1) != 0) {
 				io_error |= IOERR_GENERAL;
-				rsyserr(FERROR, errno, "link_stat %s failed",
+				rsyserr(FERROR_XFER, errno, "link_stat %s failed",
 					full_fname(fbuf));
 				continue;
 			}
@@ -1657,19 +1650,17 @@ void send_extra_file_list(int f, int at_least)
 	struct file_list *flist;
 	int64 start_write;
 	uint16 prev_flags;
-	int future_cnt, save_io_error = io_error;
+	int old_cnt, save_io_error = io_error;
 
 	if (flist_eof)
 		return;
 
 	/* Keep sending data until we have the requested number of
 	 * files in the upcoming file-lists. */
-	if (cur_flist->next) {
-		flist = first_flist->prev; /* the newest flist */
-		future_cnt = flist->ndx_end - cur_flist->next->ndx_start + 1;
-	} else
-		future_cnt = 0;
-	while (future_cnt < at_least) {
+	old_cnt = cur_flist->used;
+	for (flist = first_flist; flist != cur_flist; flist = flist->next)
+		old_cnt += flist->used;
+	while (file_total - old_cnt < at_least) {
 		struct file_struct *file = dir_flist->sorted[send_dir_ndx];
 		int dir_ndx, dstart = dir_count;
 		const char *pathname = F_PATHNAME(file);
@@ -1678,11 +1669,9 @@ void send_extra_file_list(int f, int at_least)
 		flist = flist_new(0, "send_extra_file_list");
 		start_write = stats.total_written;
 
-#ifdef ICONV_OPTION
-		if (ic_ndx)
+		if (unsort_ndx)
 			dir_ndx = F_NDX(file);
 		else
-#endif
 			dir_ndx = send_dir_ndx;
 		write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
 		flist->parent_ndx = dir_ndx;
@@ -1708,29 +1697,24 @@ void send_extra_file_list(int f, int at_least)
 
 		write_byte(f, 0);
 
-#ifdef ICONV_OPTION
 		if (need_unsorted_flist) {
 			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
 				out_of_memory("send_extra_file_list");
 			memcpy(flist->sorted, flist->files,
 			       flist->used * sizeof (struct file_struct*));
 		} else
-#endif
 			flist->sorted = flist->files;
 
 		clean_flist(flist, 0);
 
 		flist->ndx_end = flist->ndx_start + flist->used - 1;
-#ifdef ICONV_OPTION
-		if (!iconv_opt)
-#endif
+		if (!need_unsorted_flist)
 			flist->ndx_end -= (dir_count - dstart);
 
 		add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
 		flist_done_allocating(flist);
 
 		file_total += flist->used;
-		future_cnt += flist->used;
 		stats.flist_size += stats.total_written - start_write;
 		stats.num_files += flist->used;
 		if (verbose > 3)
@@ -1807,7 +1791,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	disable_buffering = io_start_buffering_out(f);
 	if (filesfrom_fd >= 0) {
 		if (argv[0] && !push_dir(argv[0], 0)) {
-			rsyserr(FERROR, errno, "push_dir %s failed in %s",
+			rsyserr(FERROR_XFER, errno, "push_dir %s failed in %s",
 				full_fname(argv[0]), curr_dir);
 			exit_cleanup(RERR_FILESELECT);
 		}
@@ -1820,13 +1804,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (use_ff_fd) {
 			if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0)
 				break;
-			sanitize_path(fbuf, fbuf, "", 0, NULL);
+			sanitize_path(fbuf, fbuf, "", 0);
 		} else {
 			if (argc-- == 0)
 				break;
 			strlcpy(fbuf, *argv++, MAXPATHLEN);
 			if (sanitize_paths)
-				sanitize_path(fbuf, fbuf, "", 0, NULL);
+				sanitize_path(fbuf, fbuf, "", 0);
 		}
 
 		len = strlen(fbuf);
@@ -1934,7 +1918,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 		if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0) {
 			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR, errno, "link_stat %s failed",
+			rsyserr(FERROR_XFER, errno, "link_stat %s failed",
 				full_fname(fbuf));
 			continue;
 		}
@@ -2022,7 +2006,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	 * receiving side to ask for whatever name it kept.  For incremental
 	 * recursion mode, the sender marks duplicate dirs so that it can
 	 * send them together in a single file-list. */
-#ifdef ICONV_OPTION
 	if (need_unsorted_flist) {
 		if (inc_recurse) {
 			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
@@ -2035,9 +2018,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			flist->low = 0;
 			flist->high = flist->used - 1;
 		}
-	} else
-#endif
-	{
+	} else {
 		flist->sorted = flist->files;
 		clean_flist(flist, 0);
 	}
@@ -2146,11 +2127,7 @@ struct file_list *recv_file_list(int f)
 	file_total += flist->used;
 
 	flist->ndx_end = flist->ndx_start + flist->used - 1;
-	if (inc_recurse
-#ifdef ICONV_OPTION
-	 && !iconv_opt
-#endif
-	 && flist->ndx_start > 1)
+	if (inc_recurse && !need_unsorted_flist && flist->ndx_start > 1)
 		flist->ndx_end -= dir_flist->used - dstart;
 
 	if (verbose > 2)
@@ -2159,7 +2136,6 @@ struct file_list *recv_file_list(int f)
 	if (show_filelist_p())
 		finish_filelist_progress(flist);
 
-#ifdef ICONV_OPTION
 	if (need_unsorted_flist) {
 		/* Create an extra array of index pointers that we can sort for
 		 * the generator's use (for wading through the files in sorted
@@ -2178,9 +2154,7 @@ struct file_list *recv_file_list(int f)
 			       (dir_flist->used - dstart) * sizeof (struct file_struct*));
 			fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
 		}
-	} else
-#endif
-	{
+	} else {
 		flist->sorted = flist->files;
 		if (inc_recurse && dir_flist->used > dstart) {
 			dir_flist->sorted = dir_flist->files;