Changed F_ROOTDIR() to F_PATHNAME().

diff --git a/log.c b/log.c
index a2da787..0dc029c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -515,9 +515,9 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                                strlcpy(c, fname, MAXPATHLEN);
                        } else
                                c = f_name(file, NULL);
-                       if (am_sender && F_ROOTDIR(file)) {
+                       if (am_sender && F_PATHNAME(file)) {
                                pathjoin(buf2, sizeof buf2,
-                                        F_ROOTDIR(file), c);
+                                        F_PATHNAME(file), c);
                                clean_fname(buf2, 0);
                                if (fmt[1]) {
                                        strlcpy(c, buf2, MAXPATHLEN);

diff --git a/rsync.h b/rsync.h
index 53989bd..c3ab588 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -599,7 +599,7 @@ extern int preserve_xattrs;
 #define F_SYMLINK(f) ((f)->basename + strlen((f)->basename) + 1)
 
 /* The sending side always has this available: */
-#define F_ROOTDIR(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN))
+#define F_PATHNAME(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN))
 
 /* The receiving side always has this available: */
 #define F_DEPTH(f) REQ_EXTRA(f, 1)->num

diff --git a/sender.c b/sender.c
index 8a3a7d5..b2ca39c 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -135,7 +135,7 @@ void successful_send(int ndx)
        }
 
        file = flist->files[ndx - flist->ndx_start];
-       if (!push_flist_dir(F_ROOTDIR(file), -1))
+       if (!push_pathname(F_PATHNAME(file), -1))
                return;
        f_name(file, fname);
 
@@ -212,13 +212,13 @@ void send_files(int f_in, int f_out)
                        send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
 
                file = cur_flist->files[ndx - cur_flist->ndx_start];
-               if (F_ROOTDIR(file)) {
-                       path = F_ROOTDIR(file);
+               if (F_PATHNAME(file)) {
+                       path = F_PATHNAME(file);
                        slash = "/";
                } else {
                        path = slash = "";
                }
-               if (!push_flist_dir(F_ROOTDIR(file), -1))
+               if (!push_pathname(F_PATHNAME(file), -1))
                        continue;
                f_name(file, fname);