From 2b1366635dc416420ed2617260aafe17d259ae0f Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 1 Feb 2005 09:21:28 +0000
Subject: [PATCH] Refer to the old basedir variable as dir.root.

---
 batch.c  | 9 +++++----
 log.c    | 2 +-
 sender.c | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/batch.c b/batch.c
index 8a394d23..5df7b787 100644
--- a/batch.c
+++ b/batch.c
@@ -8,7 +8,7 @@
 #include "rsync.h"
 #include <time.h>
 
-extern char *batch_name;
+extern int am_sender;
 extern int eol_nulls;
 extern int recurse;
 extern int preserve_links;
@@ -18,6 +18,7 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int always_checksum;
 extern int protocol_version;
+extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
@@ -198,9 +199,9 @@ void show_flist(int index, struct file_struct **fptr)
 		if (fptr[i]->dirname)
 			rprintf(FINFO, "flist->dirname=%s\n",
 				fptr[i]->dirname);
-		if (fptr[i]->basedir)
-			rprintf(FINFO, "flist->basedir=%s\n",
-				fptr[i]->basedir);
+		if (am_sender && fptr[i]->dir.root)
+			rprintf(FINFO, "flist->dir.root=%s\n",
+				fptr[i]->dir.root);
 	}
 }
 
diff --git a/log.c b/log.c
index 43f490f9..a25d8b8c 100644
--- a/log.c
+++ b/log.c
@@ -375,7 +375,7 @@ static void log_formatted(enum logcode code,
 		case 'o': n = op; break;
 		case 'f':
 			pathjoin(buf2, sizeof buf2,
-				 file->basedir ? file->basedir : "",
+				 file->dir.root ? file->dir.root : "",
 				 f_name(file));
 			clean_fname(buf2, 0);
 			n = buf2;
diff --git a/sender.c b/sender.c
index 10ea2fa9..a964e086 100644
--- a/sender.c
+++ b/sender.c
@@ -150,9 +150,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		stats.num_transferred_files++;
 		stats.total_transferred_size += file->length;
 
-		if (file->basedir) {
+		if (file->dir.root) {
 			/* N.B. We're sure that this fits, so offset is OK. */
-			offset = strlcpy(fname, file->basedir, sizeof fname);
+			offset = strlcpy(fname, file->dir.root, sizeof fname);
 			if (!offset || fname[offset-1] != '/')
 				fname[offset++] = '/';
 		} else
-- 
2.34.1