Merge pull request #1 from meeb/meeb

[irc/quakenet/newserv.git] / chanserv / q9snprintf.c

diff --git a/chanserv/q9snprintf.c b/chanserv/q9snprintf.c
index c1e6ab8507d2626a044aa292ad6aa98df25f36cb..78219469917affecf4310f410569425007d75d52 100644 (file)
--- a/chanserv/q9snprintf.c
+++ b/chanserv/q9snprintf.c
@@ -2,19 +2,29 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <time.h>
 #include "../lib/sstring.h"
 #include "../lib/stringbuf.h"
+#include "../lib/ccassert.h"
 #include "../core/error.h"
+#include "chanserv_messages.h"
 
 #define MAXARGS 10
 #define CONVBUF 512
 
+void q9strftime(char *buf, size_t size, time_t t) {
+  strftime(buf, size, Q9_FORMAT_TIME, gmtime(&t));
+}
+
 void q9vsnprintf(char *buf, size_t size, const char *format, const char *args, va_list ap) {
   StringBuf b;
   const char *p;
   char *c;
+
   char convbuf[MAXARGS][CONVBUF];
 
+  CCASSERT(CONVBUF > TIMELEN);
+
   if(size == 0)
     return;
 
@@ -25,6 +35,7 @@ void q9vsnprintf(char *buf, size_t size, const char *format, const char *args, v
     char *s;
     double g;
     unsigned int u;
+    time_t t;
 
     for(i=0;i<MAXARGS;i++)
       convbuf[i][0] = '\0';
@@ -49,6 +60,10 @@ void q9vsnprintf(char *buf, size_t size, const char *format, const char *args, v
           g = va_arg(ap, double);
           snprintf(cb, CONVBUF, "%.1f", g);
           break;
+        case 'T':
+          t = va_arg(ap, time_t);
+          q9strftime(cb, CONVBUF, t);
+          break;
         default:
           /* calls exit(0) */
           Error("chanserv", ERR_STOP, "Bad format specifier '%c' supplied in q9vsnprintf, format: '%s'", *args, format);
@@ -56,9 +71,7 @@ void q9vsnprintf(char *buf, size_t size, const char *format, const char *args, v
     }
   }
 
-  b.buf = buf;
-  b.capacity = size;
-  b.len = 0;
+  sbinit(&b, buf, size);
 
   for(p=format;*p;p++) {
     if(*p != '$') {