X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/97cb8dc29b9e6a4f46f9b7162d410fdab0f7d8af..f7632fc60d69c8dabed600ede87f0b91319a3b7f:/log.c

diff --git a/log.c b/log.c
index d09094c6..732a96b7 100644
--- a/log.c
+++ b/log.c
@@ -26,33 +26,11 @@
 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 [%d] %s", 
-			timestring(), (int)getpid(), buf);
+			timestring(time(NULL)), (int)getpid(), buf);
 		fflush(logfile);
 	} else {
 		syslog(priority, "%s", buf);
@@ -69,9 +47,19 @@ void log_open(void)
 	if (initialised) return;
 	initialised = 1;
 
+	/* 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);
+
+	/* optionally use a log file instead of syslog */
 	logf = lp_log_file();
 	if (logf && *logf) {
+		extern int orig_umask;
+		int old_umask = umask(022 | orig_umask);
 		logfile = fopen(logf, "a");
+		umask(old_umask);
 		return;
 	}
 
@@ -88,12 +76,6 @@ void log_open(void)
 #ifndef LOG_NDELAY
 	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);
 }