From: Wayne Davison <wayned@samba.org>
Date: Sat, 27 Dec 2008 19:07:57 +0000 (-0800)
Subject: Allow opendir() in send_directory() to fail with ENOENT.
X-Git-Tag: v3.0.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9938bad34ab9570ba8404396612e84217a087cf5;p=thirdparty%2Frsync.git

Allow opendir() in send_directory() to fail with ENOENT.
---

diff --git a/NEWS b/NEWS
index cf19e293..e7140951 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,9 @@ Changes since 3.0.4:
     - Fixed a bug when using --sparse on a sparse file that has over 2GB of
       consecutive sparse data.
 
+    - Fixed a problem with --delete-delay reporting an error when it was ready
+      to remove a directory that was now gone.
+
     - Got rid of a bunch of "warn_unused_result" compiler warnings.
 
     - If an ftruncate() on a received file fails, it now causes a partial-
diff --git a/flist.c b/flist.c
index d105422e..83ce237c 100644
--- a/flist.c
+++ b/flist.c
@@ -1597,6 +1597,8 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 	assert(flist != NULL);
 
 	if (!(d = opendir(fbuf))) {
+		if (errno == ENOENT)
+			return;
 		io_error |= IOERR_GENERAL;
 		rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf));
 		return;