The "ndx" variable now holds the unique, over-the-wire value, not

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index fedeacd..8fe4744 100644 (file)
--- a/log.c
+++ b/log.c
@@ -516,16 +516,16 @@ 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 && file->dir.root) {
+                       if (am_sender && F_ROOTDIR(file)) {
                                pathjoin(buf2, sizeof buf2,
-                                        file->dir.root, c);
+                                        F_ROOTDIR(file), c);
                                clean_fname(buf2, 0);
                                if (fmt[1]) {
                                        strlcpy(c, buf2, MAXPATHLEN);
                                        n = c;
                                } else
                                        n = buf2;
-                       } else if (*c != '/') {
+                       } else if (am_daemon && *c != '/') {
                                pathjoin(buf2, sizeof buf2,
                                         curr_dir + module_dirlen, c);
                                clean_fname(buf2, 0);