X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8950ac03f8fd0fb645c7d2374195ea884d091f72..fcb69e5cdcfdfd0bdcea2127e5f4c9133a2282b9:/exclude.c

diff --git a/exclude.c b/exclude.c
index 5351c30e..55c48a1a 100644
--- a/exclude.c
+++ b/exclude.c
@@ -167,7 +167,7 @@ int check_exclude(char *name, struct exclude_struct **local_exclude_list,
 
 	if (local_exclude_list) {
 		for (n=0; local_exclude_list[n]; n++) {
-                        ent = exclude_list[n];
+                        ent = local_exclude_list[n];
 			if (check_one_exclude(name, ent, st)) {
                                 report_exclude_result(name, ent, st);
 				return !ent->include;
@@ -201,9 +201,11 @@ void add_exclude_list(const char *pattern, struct exclude_struct ***list, int in
 	if (!*list || !((*list)[len] = make_exclude(pattern, include)))
 		out_of_memory("add_exclude");
 	
-	if (verbose > 2)
-		rprintf(FINFO,"add_exclude(%s)\n",pattern);
-	
+	if (verbose > 2) {
+		rprintf(FINFO,"add_exclude(%s,%s)\n",pattern,
+			      include ? "include" : "exclude");
+	}
+
 	(*list)[len+1] = NULL;
 }
 
@@ -260,7 +262,10 @@ void send_exclude_list(int f)
 	extern int remote_version;
 	extern int list_only, recurse;
 
-	/* this is a complete hack - blame Rusty */
+	/* This is a complete hack - blame Rusty.
+	 *
+	 * FIXME: This pattern shows up in the output of
+	 * report_exclude_result(), which is not ideal. */
 	if (list_only && !recurse) {
 		add_exclude("/*/*", 0);
 	}
@@ -299,7 +304,8 @@ void send_exclude_list(int f)
 void recv_exclude_list(int f)
 {
 	char line[MAXPATHLEN];
-	int l;
+	unsigned int l;
+
 	while ((l=read_int(f))) {
 		if (l >= MAXPATHLEN) overflow("recv_exclude_list");
 		read_sbuf(f,line,l);