From: Wayne Davison <wayned@samba.org>
Date: Tue, 1 Feb 2005 09:45:09 +0000 (+0000)
Subject: Changed who_am_i() to output "server" or "client" when am_sender
X-Git-Tag: v2.6.4pre1~251
X-Git-Url: http://git.samba.org/samba.git/?p=rsync.git;a=commitdiff_plain;h=794b0a037f41169402126d94fd12a4ba2a34d5f4

Changed who_am_i() to output "server" or "client" when am_sender
is negative.  This will only occur during the startup phase
before we know if we're the sender or not (e.g. when parsing
client-side --filter/--exclude/--include options).
---

diff --git a/rsync.c b/rsync.c
index acb260cc..537df0a1 100644
--- a/rsync.c
+++ b/rsync.c
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int preserve_times;
 extern int omit_dir_times;
 extern int am_root;
+extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;
@@ -299,5 +300,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 const char *who_am_i(void)
 {
+	if (am_sender < 0)
+		return am_server ? "server" : "client";
 	return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }