X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/63ecee4d1ae76134d3ebd6272d2157f059b2cab6..2b1366635dc416420ed2617260aafe17d259ae0f:/log.c?ds=sidebyside diff --git a/log.c b/log.c index 6d969193..a25d8b8c 100644 --- a/log.c +++ b/log.c @@ -375,7 +375,7 @@ static void log_formatted(enum logcode code, case 'o': n = op; break; case 'f': pathjoin(buf2, sizeof buf2, - file->basedir ? file->basedir : "", + file->dir.root ? file->dir.root : "", f_name(file)); clean_fname(buf2, 0); n = buf2; @@ -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); }