- Complain about an exclude that was too long and then dump it

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 3f8fd53..f7e124f 100644 (file)
--- a/log.c
+++ b/log.c
@@ -182,7 +182,8 @@ void rwrite(enum logcode code, char *buf, int len)
                        send_msg((enum msgcode)code, buf, len);
                        return;
                }
-               if (io_multiplex_write((enum msgcode)code, buf, len))
+               if (!am_daemon
+                   && io_multiplex_write((enum msgcode)code, buf, len))
                        return;
        }
 
@@ -385,8 +386,8 @@ static void log_formatted(enum logcode code,
                        break;
                case 'o': n = op; break;
                case 'f':
-                       snprintf(buf2, sizeof(buf2), "%s/%s",
-                                file->basedir?file->basedir:"",
+                       pathjoin(buf2, sizeof buf2,
+                                file->basedir ? file->basedir : "",
                                 f_name(file));
                        clean_fname(buf2);
                        n = buf2;