Adding more calls to safe_fname().

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 6d96919..256e70e 100644 (file)
--- a/log.c
+++ b/log.c
@@ -375,8 +375,8 @@ static void log_formatted(enum logcode code,
                case 'o': n = op; break;
                case 'f':
                        pathjoin(buf2, sizeof buf2,
-                                file->basedir ? file->basedir : "",
-                                f_name(file));
+                           am_sender && file->dir.root ? file->dir.root : "",
+                           safe_fname(f_name(file)));
                        clean_fname(buf2, 0);
                        n = buf2;
                        if (*n == '/') n++;
@@ -418,7 +418,7 @@ static void log_formatted(enum logcode code,
                l = strlen(n);
 
                if (l + ((int)(s - &buf[0])) >= sizeof(buf)) {
-                       rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
+                       rprintf(FERROR,"buffer overflow expanding %%%c -- exiting\n",
                                p[0]);
                        exit_cleanup(RERR_MESSAGEIO);
                }