X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7cd72c79ec1c7f803ca6859f53cf8d9a78d6abf2..6fcedb7dbe10667f4e8287c8416174c2859c4279:/exclude.c

diff --git a/exclude.c b/exclude.c
index d02c462c..3b05d888 100644
--- a/exclude.c
+++ b/exclude.c
@@ -115,10 +115,13 @@ void clear_exclude_list(struct exclude_list_struct *listp)
 static int check_one_exclude(char *name, struct exclude_struct *ex,
                              int name_is_dir)
 {
-	char *p;
+	char *p, full_name[MAXPATHLEN];
 	int match_start = 0;
 	char *pattern = ex->pattern;
 
+	if (!*name)
+		return 0;
+
 	/* If the pattern does not have any slashes AND it does not have
 	 * a "**" (which could match a slash), then we just match the
 	 * name portion of the path. */
@@ -126,15 +129,12 @@ static int check_one_exclude(char *name, struct exclude_struct *ex,
 		if ((p = strrchr(name,'/')) != NULL)
 			name = p+1;
 	}
-	else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/') {
-		static char full_name[MAXPATHLEN];
-		int plus = curr_dir[1] == '\0'? 1 : 0;
-		pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
+	else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/'
+	    && curr_dir[1]) {
+		pathjoin(full_name, sizeof full_name, curr_dir + 1, name);
 		name = full_name;
 	}
 
-	if (!name[0]) return 0;
-
 	if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
 		return 0;
 
@@ -261,6 +261,8 @@ static const char *get_exclude_tok(const char *p, unsigned int *len_ptr,
 		s += 2;
 	} else if (xflags & XFLG_DEF_INCLUDE)
 		mflags |= MATCHFLG_INCLUDE;
+	if (xflags & XFLG_DIRECTORY)
+		mflags |= MATCHFLG_DIRECTORY;
 
 	if (xflags & XFLG_WORD_SPLIT) {
 		const unsigned char *cp = s;