Changed F_ROOTDIR() to F_PATHNAME().

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 83375a7..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);
@@ -624,8 +624,10 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-                       c[8] = '.';
-                       c[9] = '\0';
+                       c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
+                       c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+                       c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+                       c[11] = '\0';
 
                        if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
                                char ch = iflags & ITEM_IS_NEW ? '+' : '?';