Ticket #97: innfeed-ctime.patch

doc/man/innfeed.conf.5

@@ -190 +190 @@
  a positive value for ``\fBdebug-value\fP'', is used). This corresponds to
  the ``\fI\-l\fP'' command-line option. A relative pathname is relative to
  the ``\fBbacklog-directory\fP'' value.
+.TP
+.B log-time-format
+This key requires a format string suitable for strftime(3). It is used for
+messages sent via syslog(3) and to the \fBstatus-file\fP. Default value
+is "%a %b %d %H:%M:%S %Y".
  .\" .TP
  .\" .B initial-sleep
  .\" This key requires a positive integer value. It specifies how many seconds

innfeed/connection.c

@@ -4461 +4461 @@
        free (PointersFreedOnExit) ;
        freeTimeoutQueue () ;
 
-      strlcpy (dateString,ctime (&now), sizeof(dateString)) ;
+      timeToString (now, dateString, sizeof(dateString)) ;
+      notice ("ME finishing at %s\n", dateString) ;
 
-      notice ("ME finishing at %s", dateString) ;
-
        exit (0) ;
      }
  }

innfeed/misc.h

@@ -42 +42 @@
  /* debugging information */
  extern unsigned int loggingLevel ;     /* if 0 then d_printf is a no-op */
 
+/* used by timeToString with strftime(3) */
+extern char *timeToStringFormat ;
+
  /* the current count of file desccriptors */
  extern unsigned int openfds ;
 
@@ -114 +117 @@
  /* converts val into a printable string */
  const char *boolToString (bool val) ;
 
+/* strftime with "%a %b %d %H:%M:%S %Y" (like ctime without linefeed) */
+char* timeToString (time_t time, char* buffer, size_t size) ;
+
  /* memory leak checker helper. */
  void addPointerFreedOnExit (char *pointerToFree) ;
 

innfeed/imap_connection.c

@@ -4170 +4170 @@
        time_t now = theTime () ;
        char dateString [30] ;
 
-      strlcpy (dateString,ctime (&now),sizeof (dateString)) ;
-      dateString [24] = '\0' ;
-
+      timeToString (now, dateString, sizeof (dateString)) ;
        notice ("ME finishing at %s", dateString) ;
 
        exit (0) ;

innfeed/host.c

@@ -332 +332 @@
 
  static unsigned int hostHighwater = HOST_HIGHWATER ;
  static time_t start ;
-static char startTime [30] ;    /* for ctime(3) */
+static char startTime [30] ;    /* for timeToString */
  static pid_t myPid ;
 
  static char *statusFile = NULL ;
@@ -396 +396 @@
    else
      iv = DNS_EXPIRE_PERIOD ;
    dnsExpPeriod = (unsigned int) iv ;
-
+
    if (getBool (topScope,"gen-html",&bval,NO_INHERIT))
      genHtml = (bval ? true : false) ;
    else
@@ -410 +410 @@
    else
      hostSetStatusFile (INNFEED_STATUS) ;
 
-
    if (getBool (topScope,"connection-stats",&bval,NO_INHERIT))
      logConnectionStats = (bval ? true : false) ;
    else
      logConnectionStats = (LOG_CONNECTION_STATS ? true : false) ;
 
-
    if (getInteger (topScope,"host-queue-highwater", &iv,NO_INHERIT))
      {
        if (iv < 0)
@@ -1111 +1109 @@
    if (maxIpNameLen == 0)
      {
        start = theTime() ;
-      strlcpy (startTime,ctime (&start),sizeof (startTime)) ;
+      timeToString (start, startTime, sizeof (startTime)) ;
        myPid = getpid() ;
      }
 
@@ -1258 +1256 @@
 
  void printHostInfo (Host host, FILE *fp, unsigned int indentAmt)
  {
+  char dateString [30] ;
    char indent [INDENT_BUFFER_SIZE] ;
    unsigned int i ;
    ProcQElem qe ;
@@ -1404 +1403 @@
             100.0 * host->blFull / cnt) ;
    fprintf (fp,"%s      number of samples : %u\n", indent, host->blCount) ;
 
-  fprintf (fp,"%s    firstConnectTime : %s",indent,
-           ctime (&host->firstConnectTime));
-  fprintf (fp,"%s    connectTime : %s",indent,ctime (&host->connectTime));
-  fprintf (fp,"%s    spoolTime : %s",indent,ctime (&host->spoolTime)) ;
-  fprintf (fp,"%s    last-spool-time : %s",indent,
-           ctime (&host->lastSpoolTime)) ;
+  timeToString (host->firstConnectTime, dateString, sizeof (dateString));
+  fprintf (fp, "%s    firstConnectTime : %s\n", indent, dateString);
+
+  timeToString (host->connectTime, dateString, sizeof (dateString));
+  fprintf (fp, "%s    connectTime : %s\n", indent, dateString);
+
+  timeToString (host->spoolTime, dateString, sizeof (dateString));
+  fprintf (fp, "%s    spoolTime : %s\n", indent, dateString);
+
+  timeToString (host->lastSpoolTime, dateString, sizeof (dateString));
+  fprintf (fp, "%s    last-spool-time : %s\n", indent, dateString);
 
  #if 0
    fprintf (fp,"%s    tape {\n",indent) ;
@@ -3160 +3164 @@
 
        now = time (NULL) ;
        sec = (long) (now - start) ;
-      strlcpy (timeString,ctime (&now),sizeof (timeString)) ;
+      timeToString (now, timeString, sizeof (timeString)) ;
 
        if (genHtml)
          {
@@ -3173 +3177 @@
    fprintf (fp, "<PRE>\n");
  }
 
-      fprintf (fp,"innfeed from %s\npid %d started %s\nUpdated: %s",
+      fprintf (fp,"innfeed from %s\npid %d started %s\n\nUpdated: %s\n",
                 INN_VERSION_STRING,(int) myPid,startTime,timeString) ;
        fprintf (fp,"(peers: %d active-cxns: %d sleeping-cxns: %d idle-cxns: %d)\n\n",
                 peerNum, actConn, slpConn,(maxcon - (actConn + slpConn))) ;

innfeed/endpoint.c

@@ -1495 +1495 @@
  static void printDate (TimeoutId tid, void *data) ;
  static void printDate (TimeoutId tid, void *data)
  {
-  time_t t ;
+  char dateString[30];
+  const time_t t = theTime() ;
 
-  t = theTime() ;
-
-  d_printf (1,"Timeout (%d) time now is %ld %s",
-           (int) tid,(long) t,ctime(&t)) ;
+  timeToString (t, dateString, sizeof (dateString)) ;
+  d_printf (1,"Timeout (%d) time now is %ld %s\n",
+           (int) tid, (long) t, dateString) ;
 
    if (timeoutQueue == NULL)
      {
@@ -1518 +1518 @@
    static int seeded ;
    static int howMany ;
    static int i ;
-  time_t t = theTime() ;
+  char dateString[30];
+  const time_t t = theTime() ;
 
    if ( !seeded )
      {
@@ -1526 +1527 @@
        seeded = 1 ;
      }
 
-  d_printf (1,"Timeout (%d) time now is %ld %s",
-           (int) tid, (long) t,ctime(&t)) ;
+  timeToString (t, dateString, sizeof (dateString)) ;
+  d_printf (1,"Timeout (%d) time now is %ld %s\n",
+           (int) tid, (long) t, dateString) ;
 
    if (timeoutQueue != NULL && timeoutQueue->next != NULL)
      d_printf (1,"%s timeout id %d\n",

innfeed/main.c

@@ -120 +120 @@
    bool checkConfig = false ;
    bool val;
 
-  strlcpy (dateString,ctime(&now),sizeof (dateString)) ;
+  timeToString (now, dateString, sizeof (dateString)) ;
 
    message_program_name = strrchr (argv [0],'/');
    if (message_program_name == NULL)
@@ -289 +289 @@
 
    if ( !checkConfig )
      {
-      notice ("ME starting at %s (%s)", dateString, INN_VERSION_STRING);
+      notice ("ME starting at %s\n (%s)", dateString, INN_VERSION_STRING);
      }
 
    val = true;
@@ -671 +671 @@
  {
    char *snapshotFile;
    FILE *fp;
+  char nowString[30];
    time_t now = theTime() ;
 
    snapshotFile = concatpath(innconf->pathlog, SNAPSHOT_FILE);
@@ -689 +690 @@
    setbuf (fp, NULL) ;
  #endif
 
-  fprintf (fp,"----------------------------System snaphot taken at: %s\n",
-           ctime (&now)) ;
+  timeToString (now, nowString, sizeof (nowString)) ;
+  fprintf (fp,"----------------------------System snaphot taken at: %s\n\n",
+           nowString) ;
    gPrintListenerInfo (fp,0) ;
    fprintf (fp,"\n\n\n\n") ;
    gPrintHostInfo (fp,0) ;
@@ -770 +772 @@
        free (p) ;
      }
 
+  if (getString (topScope,"log-time-format",&p,NO_INHERIT))
+    {
+      free(timeToStringFormat);
+      timeToStringFormat = p;
+    }
+
     /* For imap/lmtp delivering */
    if (getString (topScope,"deliver-username",&p, NO_INHERIT))
      {

innfeed/innlistener.c

@@ -230 +230 @@
        char dateString [30] ;
 
        gHostStats();
-      strlcpy (dateString,ctime (&now),sizeof (dateString)) ;
-      dateString [24] = '\0' ;
+      timeToString (now, dateString, sizeof (dateString)) ;
 
        if (fastExit)
          notice ("ME finishing (quickly) at %s", dateString) ;

innfeed/misc.c

@@ -40 +40 @@
  unsigned int loggingLevel ;
  char **PointersFreedOnExit ;
 
+char *timeToStringFormat = 0;
  bool debuggingDump = true ;
  extern void (*gPrintInfo) (void) ;
  void (*gCleanUp) (void) = 0 ;
@@ -115 +116 @@
    static pid_t myPid ;
    char timeString [30] ;
    time_t now ;
+  struct tm *tm ;
    va_list ap ;
 
    if (myPid == 0)
@@ -124 +126 @@
      return ;
 
    now = theTime() ;
-  /* strip off leading day name */
-  strlcpy (timeString, ctime (&now) + 4, sizeof (timeString)) ;
-  timeString [15] = '\0' ;      /* strip off trailing year and newline */
+  tm = localtime (&now);
+  strftime (timeString, sizeof(timeString), "%b %d %H:%M:%S", tm);
 
    va_start (ap, fmt) ;
    fprintf (stderr, "%s %s[%ld]: ",timeString,
@@ -591 +592 @@
    return val ? "true" : "false" ;
  }
 
+char* timeToString(time_t t, char* buffer, size_t size)
+{
+  static const char defaultFormat[] = "%a %b %d %H:%M:%S %Y" ;
+  const struct tm *const tm = localtime(&t);
+  strftime (buffer, size,
+    timeToStringFormat == 0 ? defaultFormat : timeToStringFormat, tm);
+  return buffer;
+}
+
  void addPointerFreedOnExit (char *pointerToFree)
  {
    static int totalPointers = 0 ;