From 902ee53ea44f661414202ccce775e846f514a2bd Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 1 Aug 2008 19:03:59 -0700 Subject: [PATCH] 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. --- flist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.34.1