Adding more calls to safe_fname().

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 51cacd3..256e70e 100644 (file)
--- a/log.c
+++ b/log.c
@@ -61,7 +61,7 @@ struct {
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
        { RERR_PARTIAL    , "some files could not be transferred" },
-       { RERR_VANISHED   , "some files vanished before they could be transfered" },
+       { RERR_VANISHED   , "some files vanished before they could be transferred" },
        { RERR_TIMEOUT    , "timeout in data send/receive" },
        { RERR_CMD_FAILED , "remote shell failed" },
        { RERR_CMD_KILLED , "remote shell killed" },
@@ -85,6 +85,20 @@ static char const *rerr_name(int code)
        return NULL;
 }
 
+static void log_open(void)
+{
+       if (logfname && !logfile) {
+               extern int orig_umask;
+               int old_umask = umask(022 | orig_umask);
+               logfile = fopen(logfname, "a");
+               umask(old_umask);
+               if (!logfile) {
+                       am_daemon = 0; /* avoid trying to log again */
+                       rsyserr(FERROR, errno, "fopen() of log-file failed");
+                       exit_cleanup(RERR_FILESELECT);
+               }
+       }
+}
 
 static void logit(int priority, char *buf)
 {
@@ -104,7 +118,8 @@ void log_init(void)
        int options = LOG_PID;
        time_t t;
 
-       if (log_initialised) return;
+       if (log_initialised)
+               return;
        log_initialised = 1;
 
        /* this looks pointless, but it is needed in order for the
@@ -138,16 +153,6 @@ void log_init(void)
 #endif
 }
 
-void log_open(void)
-{
-       if (logfname && !logfile) {
-               extern int orig_umask;
-               int old_umask = umask(022 | orig_umask);
-               logfile = fopen(logfname, "a");
-               umask(old_umask);
-       }
-}
-
 void log_close(void)
 {
        if (logfile) {
@@ -171,45 +176,39 @@ void rwrite(enum logcode code, char *buf, int len)
 
        buf[len] = 0;
 
-       if (code == FLOG) {
-               if (am_daemon) logit(LOG_INFO, buf);
+       if (am_server && msg_fd_out >= 0) {
+               /* Pass the message to our sibling. */
+               send_msg((enum msgcode)code, buf, len);
                return;
        }
 
-       if (am_server) {
-               /* Pass it to non-server side, perhaps through our sibling. */
-               if (msg_fd_out >= 0) {
-                       send_msg((enum msgcode)code, buf, len);
+       if (am_daemon) {
+               static int in_block;
+               char msg[2048];
+               int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
+
+               if (in_block)
                        return;
-               }
-               if (!am_daemon
-                   && io_multiplex_write((enum msgcode)code, buf, len))
+               in_block = 1;
+               if (!log_initialised)
+                       log_init();
+               strlcpy(msg, buf, MIN((int)sizeof msg, len + 1));
+               logit(priority, msg);
+               in_block = 0;
+
+               if (code == FLOG || !am_server)
                        return;
-       }
-
-       /* otherwise, if in daemon mode and either we are not a server
-        *  (that is, we are not running --daemon over a remote shell) or
-        *  the log has already been initialised, log the message on this
-        *  side because we don't want the client to see most errors for
-        *  security reasons.  We do want early messages when running daemon
-        *  mode over a remote shell to go to the remote side; those will
-        *  fall through to the next case.
-        * Note that this is only for the time before multiplexing is enabled.
-        */
-       if (am_daemon && (!am_server || log_initialised)) {
-               static int depth;
-               int priority = LOG_INFO;
-               if (code == FERROR) priority = LOG_WARNING;
-
-               if (depth) return;
-
-               depth++;
-
-               log_init();
-               logit(priority, buf);
-
-               depth--;
+       } else if (code == FLOG)
                return;
+
+       if (am_server) {
+               /* Pass the message to the non-server side. */
+               if (io_multiplex_write((enum msgcode)code, buf, len))
+                       return;
+               if (am_daemon) {
+                       /* TODO: can we send the error to the user somehow? */
+                       return;
+               }
        }
 
        if (code == FERROR) {
@@ -217,18 +216,17 @@ void rwrite(enum logcode code, char *buf, int len)
                f = stderr;
        }
 
-       if (code == FINFO) {
-               if (am_server)
-                       f = stderr;
-               else
-                       f = stdout;
-       }
+       if (code == FINFO)
+               f = am_server ? stderr : stdout;
 
-       if (!f) exit_cleanup(RERR_MESSAGEIO);
+       if (!f)
+               exit_cleanup(RERR_MESSAGEIO);
 
-       if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO);
+       if (fwrite(buf, len, 1, f) != 1)
+               exit_cleanup(RERR_MESSAGEIO);
 
-       if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+       if (buf[len-1] == '\r' || buf[len-1] == '\n')
+               fflush(f);
 }
                
 
@@ -377,9 +375,9 @@ 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));
-                       clean_fname(buf2);
+                           am_sender && file->dir.root ? file->dir.root : "",
+                           safe_fname(f_name(file)));
+                       clean_fname(buf2, 0);
                        n = buf2;
                        if (*n == '/') n++;
                        break;
@@ -420,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);
                }