From bcf5b1335d6e5183f9545eb1b23e16185264e311 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 2 Jul 1998 10:57:20 +0000 Subject: [PATCH] - use explicit flushes instead of setlinebuf. I've had reports of verbose info not being line buffered to files. - add a call to localtime() in open_log() in order to prime the C libraries timezone cache before the chroot(). This should fix the problem of rsyncd log entries being in GMT time. --- configure.in | 2 +- log.c | 9 ++++++++- main.c | 5 ----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 007f1d6f..2a0f59bd 100644 --- a/configure.in +++ b/configure.in @@ -41,7 +41,7 @@ AC_FUNC_MEMCMP AC_FUNC_UTIME_NULL AC_CHECK_FUNCS(mmap munmap waitpid getcwd strdup strerror chown chmod mknod) AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes) -AC_CHECK_FUNCS(memmove getopt_long lchown setlinebuf vsnprintf setsid glob strpbrk) +AC_CHECK_FUNCS(memmove getopt_long lchown vsnprintf setsid glob strpbrk) echo $ac_n "checking for working fnmatch... $ac_c" AC_TRY_RUN([#include diff --git a/log.c b/log.c index 2454088e..04975218 100644 --- a/log.c +++ b/log.c @@ -28,6 +28,7 @@ void log_open(void) { static int initialised; int options = LOG_PID; + time_t t; if (initialised) return; initialised = 1; @@ -45,6 +46,12 @@ void log_open(void) #ifndef LOG_NDELAY syslog(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); } @@ -102,7 +109,7 @@ void rprintf(int fd, const char *format, ...) if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1); - if (buf[len-1] == '\r') fflush(f); + if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f); depth--; } diff --git a/main.c b/main.c index 3e39a857..548e0166 100644 --- a/main.c +++ b/main.c @@ -518,11 +518,6 @@ static int start_client(int argc, char *argv[]) pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); -#if HAVE_SETLINEBUF - setlinebuf(stdout); - setlinebuf(stderr); -#endif - ret = client_run(f_in, f_out, pid, argc, argv); fflush(stdout); -- 2.34.1