X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/112d728f4858fef5c75e0b25bf6f02af8aa5b83c..4f47fec04d2a98427d9f9783a073a5f1856ef342:/log.c diff --git a/log.c b/log.c index 6bc831ca..8fe47444 100644 --- 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); @@ -744,9 +744,8 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing, void log_delete(const char *fname, int mode) { static struct { - union flist_extras ex[4]; /* just in case... */ + union file_extras ex[4]; /* just in case... */ struct file_struct file; - char basename[1]; } x; int len = strlen(fname); const char *fmt;