X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5e7dbaca50e00e6f418a4e8ae6ccfcf4ccb926f8..37c817eb8159366539d4a9c69bd78e74d4941c06:/exclude.c

diff --git a/exclude.c b/exclude.c
index e3457266..ee8016fd 100644
--- a/exclude.c
+++ b/exclude.c
@@ -102,7 +102,7 @@ void free_exclude_list(struct exclude_struct ***listp)
 	struct exclude_struct **list = *listp;
 
 	if (verbose > 2)
-		rprintf(FINFO,"clearing exclude list\n");
+		rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
 
 	if (!list)
 		return;
@@ -132,8 +132,7 @@ static int check_one_exclude(char *name, struct exclude_struct *ex,
 		static char full_name[MAXPATHLEN];
 		extern char curr_dir[];
 		int plus = curr_dir[1] == '\0'? 1 : 0;
-		snprintf(full_name, sizeof full_name,
-			 "%s/%s", curr_dir+plus, name);
+		pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
 		name = full_name;
 	}
 
@@ -204,12 +203,14 @@ static void report_exclude_result(char const *name,
 	 * then it is stripped out by make_exclude.  So as a special
 	 * case we add it back in here. */
 
-	if (verbose >= 2)
-		rprintf(FINFO, "%s %s %s because of pattern %s%s\n",
+	if (verbose >= 2) {
+		rprintf(FINFO, "[%s] %s %s %s because of pattern %s%s\n",
+			who_am_i(),
 			ent->include ? "including" : "excluding",
 			name_is_dir ? "directory" : "file",
 			name, ent->pattern,
 			ent->directory ? "/" : "");
+	}
 }
 
 
@@ -251,7 +252,8 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
 		out_of_memory("add_exclude");
 
 	if (verbose > 2) {
-		rprintf(FINFO,"add_exclude(%s,%s)\n",pattern,
+		rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
+			who_am_i(), pattern,
 			include ? "include" : "exclude");
 	}
 
@@ -316,7 +318,6 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 void send_exclude_list(int f)
 {
 	int i;
-	extern int protocol_version;
 	extern int list_only, recurse;
 
 	/* This is a complete hack - blame Rusty.
@@ -341,10 +342,6 @@ void send_exclude_list(int f)
 		l = strlen(pattern);
 		if (l == 0) continue;
 		if (exclude_list[i]->include) {
-			if (protocol_version < 19) {
-				rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
-				exit_cleanup(RERR_UNSUPPORTED);
-			}
 			write_int(f,l+2);
 			write_buf(f,"+ ",2);
 		} else {
@@ -448,10 +445,9 @@ void add_cvs_excludes(void)
 	for (i=0; cvs_ignore_list[i]; i++)
 		add_exclude(&exclude_list, cvs_ignore_list[i], ADD_EXCLUDE);
 
-	if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
-		snprintf(fname,sizeof(fname), "%s/.cvsignore",p);
-		add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-	}
+	if ((p = getenv("HOME"))
+	    && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname)
+		add_exclude_file(&exclude_list, fname, MISSING_OK, ADD_EXCLUDE);
 
 	add_exclude_line(&exclude_list, getenv("CVSIGNORE"), ADD_EXCLUDE);
 }