- static int already_warned = 0;
- struct file_list *dirlist;
-- char delbuf[MAXPATHLEN];
-- int dlen, i;
-+ char *p, delbuf[MAXPATHLEN];
-+ unsigned remainder;
-+ int dlen, i, restore_dot = 0;
-
- if (!fbuf) {
- change_local_filter_dir(NULL, 0, 0);
-@@ -432,21 +559,28 @@ static void delete_in_dir(char *fbuf, st
- if (verbose > 2)
- rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
-
-+ flags |= DEL_RECURSE;
-+
- if (allowed_lull)
- maybe_send_keepalive();
-
- if (io_error && !ignore_errors) {
-- if (already_warned)
-+ if (!already_warned) {
-+ rprintf(FINFO,
-+ "IO error encountered -- skipping file deletion\n");
-+ already_warned = 1;
-+ }
-+ if (!detect_renamed)
- return;
-- rprintf(FINFO,
-- "IO error encountered -- skipping file deletion\n");
-- already_warned = 1;
-- return;
-+ flags |= DEL_NO_DELETIONS;
- }
-
- dlen = strlen(fbuf);
- change_local_filter_dir(fbuf, dlen, F_DEPTH(file));
-
-+ if (detect_renamed)
-+ unexplored_dirs--;
-+
- if (one_file_system) {
- if (file->flags & FLAG_TOP_DIR)
- filesystem_dev = *fs_dev;
-@@ -456,6 +590,14 @@ static void delete_in_dir(char *fbuf, st
-
- dirlist = get_dirlist(fbuf, dlen, 0);
-
-+ p = fbuf + dlen;
-+ if (dlen == 1 && *fbuf == '.') {
-+ restore_dot = 1;
-+ p = fbuf;
-+ } else if (dlen != 1 || *fbuf != '/')
-+ *p++ = '/';
-+ remainder = MAXPATHLEN - (p - fbuf);
-+
- /* If an item in dirlist is not found in flist, delete it
- * from the filesystem. */
- for (i = dirlist->used; i--; ) {
-@@ -468,16 +610,25 @@ static void delete_in_dir(char *fbuf, st
- f_name(fp, NULL));
- continue;
- }
-+ if (detect_renamed && S_ISREG(fp->mode)) {
-+ strlcpy(p, fp->basename, remainder);
-+ look_for_rename(fp, fbuf);
-+ }
- if (flist_find(cur_flist, fp) < 0) {
- f_name(fp, delbuf);
-- if (delete_during == 2) {
-+ if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) {
- if (!remember_delete(fp, delbuf))
- break;
- } else
-- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
-- }
-+ delete_item(delbuf, fp->mode, NULL, flags);
-+ } else if (detect_renamed && S_ISDIR(fp->mode))
-+ unexplored_dirs++;
- }
-
-+ if (restore_dot)
-+ fbuf[0] = '.';
-+ fbuf[dlen] = '\0';
-+
- flist_free(dirlist);
- }
-
-@@ -507,9 +658,9 @@ static void do_delete_pass(void)
- || !S_ISDIR(st.st_mode))
- continue;
-
-- delete_in_dir(fbuf, file, &st.st_dev);
-+ delete_in_dir(fbuf, file, &st.st_dev, 0);
- }
-- delete_in_dir(NULL, NULL, &dev_zero);
-+ delete_in_dir(NULL, NULL, &dev_zero, 0);
-
- if (do_progress && !am_server)
- rprintf(FINFO, " \r");
-@@ -1101,6 +1252,7 @@ static void list_file_entry(struct file_