Removed test_binary_compatibility() from ctdlvisor.c because we don't do it that...

[citadel.git] / citadel / genstamp.c

diff --git a/citadel/genstamp.c b/citadel/genstamp.c
index cfbb8bbb6c7ef16a378ba042e9a1d0d37c097b7e..e8d5dd86bc3f3b4c4c3a64168e4bc00add8b8d9b 100644 (file)
--- a/citadel/genstamp.c
+++ b/citadel/genstamp.c
@@ -1,35 +1,15 @@
 /*
- * $Id$
- *
  * Function to generate RFC822-compliant textual time/date stamp
- *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
-#define timezonevar 1
-
+#include "sysdep.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include "genstamp.h"
 
-
 static char *months[] = {
        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
@@ -39,61 +19,64 @@ static char *weekdays[] = {
        "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-
 /*
  * Supplied with a unix timestamp, generate an RFC822-compliant textual
  * time and date stamp.
  */
-void datestring(char *buf, time_t xtime, int which_format) {
-       struct tm *t;
+long datestring(char *buf, size_t n, time_t xtime, int which_format) {
+       struct tm t;
 
        long offset;
        char offsign;
 
-       t = localtime(&xtime);
+       localtime_r(&xtime, &t);
 
        /* Convert "seconds west of GMT" to "hours/minutes offset" */
 #ifdef HAVE_STRUCT_TM_TM_GMTOFF
-       offset = t->tm_gmtoff;
+       offset = t.tm_gmtoff;
 #else
        offset = timezone;
 #endif
        if (offset > 0) {
-               offsign = '-';
+               offsign = '+';
        }
        else {
                offset = 0L - offset;
-               offsign = '+';
+               offsign = '-';
        }
        offset = ( (offset / 3600) * 100 ) + ( offset % 60 );
 
        switch(which_format) {
 
                case DATESTRING_RFC822:
-                       sprintf(buf, "%s, %02d %s %04d %02d:%02d:%02d %c%04ld",
-                               weekdays[t->tm_wday],
-                               t->tm_mday,
-                               months[t->tm_mon],
-                               t->tm_year + 1900,
-                               t->tm_hour,
-                               t->tm_min,
-                               t->tm_sec,
+                       return snprintf(
+                               buf, n,
+                               "%s, %02d %s %04d %02d:%02d:%02d %c%04ld",
+                               weekdays[t.tm_wday],
+                               t.tm_mday,
+                               months[t.tm_mon],
+                               t.tm_year + 1900,
+                               t.tm_hour,
+                               t.tm_min,
+                               t.tm_sec,
                                offsign, offset
                                );
                break;
 
                case DATESTRING_IMAP:
-                       sprintf(buf, "%02d-%s-%04d %02d:%02d:%02d %c%04ld",
-                               t->tm_mday,
-                               months[t->tm_mon],
-                               t->tm_year + 1900,
-                               t->tm_hour,
-                               t->tm_min,
-                               t->tm_sec,
+                       return snprintf(
+                               buf, n,
+                               "%02d-%s-%04d %02d:%02d:%02d %c%04ld",
+                               t.tm_mday,
+                               months[t.tm_mon],
+                               t.tm_year + 1900,
+                               t.tm_hour,
+                               t.tm_min,
+                               t.tm_sec,
                                offsign, offset
                                );
                break;
 
        }
+       return 0;
 }
-