X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/dc55d7bdabb5a5d5c8cc97794171b485e4f75f19..08b1b4860f7354916c777fd8ef16caa3f547ec7e:/receiver.c diff --git a/receiver.c b/receiver.c index 7b86938d..124a2808 100644 --- a/receiver.c +++ b/receiver.c @@ -65,10 +65,6 @@ static void delete_one(char *fn, int is_dir) rprintf(FINFO, "deleting %s\n", safe_fname(fn)); } else { if (do_rmdir(fn) != 0) { - if (errno == ENOTDIR && keep_dirlinks) { - delete_one(fn, 0); - return; - } if (errno != ENOTEMPTY && errno != EEXIST) { rsyserr(FERROR, errno, "delete_one: rmdir %s failed", @@ -120,7 +116,7 @@ void delete_files(struct file_list *flist) rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); for (i = local_file_list->count-1; i >= 0; i--) { - if (max_delete && deletion_count > max_delete) + if (max_delete && deletion_count >= max_delete) break; if (!local_file_list->files[i]->basename) continue;