*/
#include "rsync.h"
+static FILE *logfile;
+
+
+/****************************************************************************
+ return the date and time as a string
+****************************************************************************/
+static char *timestring(void )
+{
+ static char TimeBuf[200];
+ time_t t = time(NULL);
+ struct tm *tm = localtime(&t);
+
+#ifdef HAVE_STRFTIME
+ strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %T",tm);
+#else
+ strlcpy(TimeBuf, asctime(tm), sizeof(TimeBuf)-1);
+#endif
+
+ if (TimeBuf[strlen(TimeBuf)-1] == '\n') {
+ TimeBuf[strlen(TimeBuf)-1] = 0;
+ }
+
+ return(TimeBuf);
+}
+
+static void logit(int priority, char *buf)
+{
+ if (logfile) {
+ fprintf(logfile,"%s %s", timestring(), buf);
+ fflush(logfile);
+ } else {
+ syslog(priority, "%s", buf);
+ }
+}
void log_open(void)
{
static int initialised;
int options = LOG_PID;
+ time_t t;
if (initialised) return;
initialised = 1;
+ if (lp_log_file()) {
+ logfile = fopen(lp_log_file(), "a");
+ return;
+ }
+
#ifdef LOG_NDELAY
options |= LOG_NDELAY;
#endif
#endif
#ifndef LOG_NDELAY
- syslog(LOG_INFO,"rsyncd started\n");
+ logit(LOG_INFO,"rsyncd started\n");
#endif
+
+ /* this looks pointless, but it is needed in order for the
+ C library on some systems to fetch the timezone info
+ before the chroot */
+ t = time(NULL);
+ localtime(&t);
}
int len;
FILE *f=NULL;
extern int am_daemon;
+ /* recursion can happen with certain fatal conditions */
+ static int depth;
+
+ if (depth) return;
+
+ depth++;
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
if (fd == FERROR) priority = LOG_WARNING;
log_open();
- syslog(priority, "%s", buf);
+ if (!io_multiplex_write(fd, buf, strlen(buf))) {
+ logit(priority, buf);
+ }
+
+ depth--;
return;
}
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+ if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
+ depth--;
}
void rflush(int fd)