From: Wayne Davison <wayned@samba.org>
Date: Sat, 15 Sep 2007 15:27:56 +0000 (+0000)
Subject: Got rid of duplicate error when push_pathname() fails.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/3b7bcaaf3477be6a50fde54e06b80c9a5e698bd9?hp=4abe379c053f78a4f16ab80afa75a0f9be3b319b

Got rid of duplicate error when push_pathname() fails.
---

diff --git a/flist.c b/flist.c
index 688117c9..de5f2929 100644
--- a/flist.c
+++ b/flist.c
@@ -1791,16 +1791,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		dirlen = dir ? strlen(dir) : 0;
 		if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
 			if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
-				goto push_error;
+				continue;
 			lastdir = pathname;
 			lastdir_len = pathname_len;
-		} else if (!push_pathname(lastdir, lastdir_len)) {
-		  push_error:
-			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR, errno, "push_dir %s failed in %s",
-				full_fname(dir), curr_dir);
+		} else if (!push_pathname(lastdir, lastdir_len))
 			continue;
-		}
 
 		if (fn != fbuf)
 			memmove(fbuf, fn, len + 1);