X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Ftod.c;h=e7123f9eb90d89a22ec07fee07b01dc1f1079045;hb=b3317cfaabe29c73478125e14f58236b2229da4b;hp=dac8b27f3d1a23cb13640fc3cf807e8166fea5ac;hpb=571b27158aa468eda77b1a20ed80bed1f342e15d;p=exim.git

diff --git a/src/src/tod.c b/src/src/tod.c
index dac8b27f3..e7123f9eb 100644
--- a/src/src/tod.c
+++ b/src/src/tod.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2014 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* A function for returning the time of day in various formats */
@@ -54,7 +54,6 @@ tod_stamp(int type)
 {
 struct timeval now;
 struct tm * t;
-int off = 0;
 
 gettimeofday(&now, NULL);
 
@@ -63,19 +62,19 @@ gettimeofday(&now, NULL);
 switch(type)
   {
   case tod_epoch:
-    (void) sprintf(CS timebuf, TIME_T_FMT, now.tv_sec);  /* Unix epoch format */
+    (void) snprintf(CS timebuf, sizeof(timebuf), TIME_T_FMT, now.tv_sec);  /* Unix epoch format */
     return timebuf;	/* NB the above will be wrong if time_t is FP */
 
   case tod_epoch_l:
     /* Unix epoch/usec format */
-    (void) sprintf(CS timebuf, TIME_T_FMT "%06ld", now.tv_sec, (long) now.tv_usec );
+    (void) snprintf(CS timebuf, sizeof(timebuf), TIME_T_FMT "%06ld", now.tv_sec, (long) now.tv_usec );
     return timebuf;
 
   case tod_zulu:
     t = gmtime(&now.tv_sec);
-    (void) sprintf(CS timebuf, "%04d%02d%02d%02d%02d%02dZ",
-      1900 + t->tm_year, 1 + t->tm_mon, t->tm_mday, t->tm_hour, t->tm_min,
-      t->tm_sec);
+    (void) snprintf(CS timebuf, sizeof(timebuf), "%04u%02u%02u%02u%02u%02uZ",
+      1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon, (uint)t->tm_mday, (uint)t->tm_hour, (uint)t->tm_min,
+      (uint)t->tm_sec);
     return timebuf;
   }
 
@@ -85,14 +84,23 @@ if (type == tod_log) type = log_timezone ? tod_log_zone : tod_log_bare;
 
 /* Convert to local time or UTC */
 
-t = timestamps_utc ? gmtime(&now.tv_sec) : localtime(&now.tv_sec);
+t = f.timestamps_utc ? gmtime(&now.tv_sec) : localtime(&now.tv_sec);
 
 switch(type)
   {
   case tod_log_bare:          /* Format used in logging without timezone */
-    off = sprintf(CS timebuf, "%04d-%02d-%02d %02d:%02d:%02d",
-      1900 + t->tm_year, 1 + t->tm_mon, t->tm_mday,
-      t->tm_hour, t->tm_min, t->tm_sec);
+#ifndef COMPILE_UTILITY
+    if (LOGGING(millisec))
+      snprintf(CS timebuf, sizeof(timebuf), "%04u-%02u-%02u %02u:%02u:%02u.%03u",
+	1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon, (uint)t->tm_mday,
+	(uint)t->tm_hour, (uint)t->tm_min, (uint)t->tm_sec,
+	(uint)(now.tv_usec/1000));
+    else
+#endif
+      snprintf(CS timebuf, sizeof(timebuf), "%04u-%02u-%02u %02u:%02u:%02u",
+	1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon, (uint)t->tm_mday,
+	(uint)t->tm_hour, (uint)t->tm_min, (uint)t->tm_sec);
+
     break;
 
     /* Format used as suffix of log file name when 'log_datestamp' is active. For
@@ -101,19 +109,22 @@ switch(type)
 #ifdef TESTING_LOG_DATESTAMP
   case tod_log_datestamp_daily:
   case tod_log_datestamp_monthly:
-    off = sprintf(CS timebuf, "%04d%02d%02d%02d%02d",
-      1900 + t->tm_year, 1 + t->tm_mon, t->tm_mday, t->tm_hour, t->tm_min);
+    snprintf(CS timebuf, sizeof(timebuf), "%04u%02u%02u%02u%02u",
+      1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon, (uint)t->tm_mday,
+      (uint)t->tm_hour, (uint)t->tm_min);
     break;
 
 #else
   case tod_log_datestamp_daily:
-    off = sprintf(CS timebuf, "%04d%02d%02d",
-      1900 + t->tm_year, 1 + t->tm_mon, t->tm_mday);
+    snprintf(CS timebuf, sizeof(timebuf), "%04u%02u%02u",
+      1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon, (uint)t->tm_mday);
     break;
 
   case tod_log_datestamp_monthly:
-    off = sprintf(CS timebuf, "%04d%02d",
-      1900 + t->tm_year, 1 + t->tm_mon);
+#ifndef COMPILE_UTILITY
+    snprintf(CS timebuf, sizeof(timebuf), "%04u%02u",
+      1900 + (uint)t->tm_year, 1 + (uint)t->tm_mon);
+#endif
     break;
 #endif
 
@@ -139,7 +150,7 @@ switch(type)
       struct tm local;
       memcpy(&local, t, sizeof(struct tm));
 
-      if (timestamps_utc)
+      if (f.timestamps_utc)
 	diff_hour = diff_min = 0;
       else
 	{
@@ -159,22 +170,22 @@ switch(type)
 	case tod_log_zone:          /* Format used in logging with timezone */
 #ifndef COMPILE_UTILITY
 	  if (LOGGING(millisec))
-	    (void) sprintf(CS timebuf,
-	      "%04d-%02d-%02d %02d:%02d:%02d.%03d %+03d%02d",
-	      1900 + local.tm_year, 1 + local.tm_mon, local.tm_mday,
-	      local.tm_hour, local.tm_min, local.tm_sec, now.tv_usec/1000,
+	    (void) snprintf(CS timebuf, sizeof(timebuf),
+	      "%04u-%02u-%02u %02u:%02u:%02u.%03u %+03d%02d",
+	      1900 + (uint)local.tm_year, 1 + (uint)local.tm_mon, (uint)local.tm_mday,
+	      (uint)local.tm_hour, (uint)local.tm_min, (uint)local.tm_sec, (uint)(now.tv_usec/1000),
 	      diff_hour, diff_min);
 	  else
 #endif
-	    (void) sprintf(CS timebuf,
-	      "%04d-%02d-%02d %02d:%02d:%02d %+03d%02d",
-	      1900 + local.tm_year, 1 + local.tm_mon, local.tm_mday,
-	      local.tm_hour, local.tm_min, local.tm_sec,
+	    (void) snprintf(CS timebuf, sizeof(timebuf),
+	      "%04u-%02u-%02u %02u:%02u:%02u %+03d%02d",
+	      1900 + (uint)local.tm_year, 1 + (uint)local.tm_mon, (uint)local.tm_mday,
+	      (uint)local.tm_hour, (uint)local.tm_min, (uint)local.tm_sec,
 	      diff_hour, diff_min);
 	  break;
 
 	case tod_zone:              /* Just the timezone offset */
-	  (void) sprintf(CS timebuf, "%+03d%02d", diff_hour, diff_min);
+	  (void) snprintf(CS timebuf, sizeof(timebuf), "%+03d%02d", diff_hour, diff_min);
 	  break;
 
 	/* tod_mbx: format used in MBX mailboxes - subtly different to tod_full */
@@ -183,11 +194,11 @@ switch(type)
 	case tod_mbx:
 	    {
 	    int len;
-	    (void) sprintf(CS timebuf, "%02d-", local.tm_mday);
+	    (void) snprintf(CS timebuf, sizeof(timebuf), "%02u-", (uint)local.tm_mday);
 	    len = Ustrlen(timebuf);
 	    len += Ustrftime(timebuf + len, sizeof(timebuf) - len, "%b-%Y %H:%M:%S",
 	      &local);
-	    (void) sprintf(CS timebuf + len, " %+03d%02d", diff_hour, diff_min);
+	    (void) snprintf(CS timebuf + len, sizeof(timebuf)-len, " %+03d%02d", diff_hour, diff_min);
 	    }
 	  break;
 	  #endif
@@ -198,11 +209,11 @@ switch(type)
 	default:
 	    {
 	    int len = Ustrftime(timebuf, sizeof(timebuf), "%a, ", &local);
-	    (void) sprintf(CS timebuf + len, "%02d ", local.tm_mday);
+	    (void) snprintf(CS timebuf + len, sizeof(timebuf)-len, "%02u ", (uint)local.tm_mday);
 	    len += Ustrlen(timebuf + len);
 	    len += Ustrftime(timebuf + len, sizeof(timebuf) - len, "%b %Y %H:%M:%S",
 	      &local);
-	    (void) sprintf(CS timebuf + len, " %+03d%02d", diff_hour, diff_min);
+	    (void) snprintf(CS timebuf + len, sizeof(timebuf)-len, " %+03d%02d", diff_hour, diff_min);
 	    }
 	  break;
 	}
@@ -210,11 +221,6 @@ switch(type)
     break;
   }
 
-#ifndef COMPILE_UTILITY
-if (LOGGING(millisec) && off > 0)
-  (void) sprintf(CS timebuf + off, ".%03d", now.tv_usec/1000);
-#endif
-
 return timebuf;
 }