From: Wayne Davison <wayned@samba.org>
Date: Sat, 2 Aug 2008 02:03:59 +0000 (-0700)
Subject: Fixed a problem with checking for the '.' dir in the first file
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/902ee53ea44f661414202ccce775e846f514a2bd

Fixed a problem with checking for the '.' dir in the first file
list that is transferred.  This fixes a glitch where a failed
--iconv conversion on the receiving side could prevent deletions
from happening in the root-dir of the transfer.
---

diff --git a/flist.c b/flist.c
index fe6d0b91..c1898247 100644
--- a/flist.c
+++ b/flist.c
@@ -2193,7 +2193,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	if (inc_recurse) {
 		send_dir_depth = 1;
 		add_dirs_to_tree(-1, flist, dir_count);
-		if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0)
+		if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0)
 			flist->parent_ndx = -1;
 		flist_done_allocating(flist);
 		if (send_dir_ndx < 0) {
@@ -2318,7 +2318,7 @@ struct file_list *recv_file_list(int f)
 		else
 			io_error |= read_int(f);
 	} else if (inc_recurse && flist->ndx_start == 1) {
-		if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0)
+		if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0)
 			flist->parent_ndx = -1;
 	}