X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9fdb334e8518d80914aa33282d718d9ee6809b30..f57b2e6150af146c87e7d51a45e98118c60a510b:/flist.c

diff --git a/flist.c b/flist.c
index bd7ad16f..b1a35381 100644
--- a/flist.c
+++ b/flist.c
@@ -989,7 +989,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
 		    < MAXPATHLEN - offset) {
 			add_exclude_file(&local_exclude_list, fname,
-					 XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+					 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 		} else {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
@@ -1517,11 +1517,17 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	if (!(c1 = (uchar*)f1->dirname)) {
 		state1 = fnc_BASE;
 		c1 = (uchar*)f1->basename;
+	} else if (!*c1) {
+		state1 = fnc_SLASH;
+		c1 = (uchar*)"/";
 	} else
 		state1 = fnc_DIR;
 	if (!(c2 = (uchar*)f2->dirname)) {
 		state2 = fnc_BASE;
 		c2 = (uchar*)f2->basename;
+	} else if (!*c2) {
+		state2 = fnc_SLASH;
+		c2 = (uchar*)"/";
 	} else
 		state2 = fnc_DIR;