X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=util.cc;h=f89569b31483ec06fff1fa998e1f8ec693d0f2f8;hp=a7479fcf3a754428edf39f56f7eebd34838aa0b7;hb=HEAD;hpb=64bff41cb3ccdd60e767a5bb9ed8525d2dda1966

diff --git a/util.cc b/util.cc
index a7479fc..f89569b 100644
--- a/util.cc
+++ b/util.cc
@@ -20,6 +20,7 @@
 /* Utility functions for converting various datatypes to text format (and
  * later, for parsing them back, perhaps). */
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -31,10 +32,31 @@
 #include <string>
 #include <sstream>
 
+#include "util.h"
+
 using std::map;
 using std::ostream;
 using std::string;
 
+/* Like sprintf, but returns the output as an allocated string. */
+string string_printf(const char *fmt, ...)
+{
+    va_list args;
+    char *output = NULL;
+    string result;
+
+    va_start(args, fmt);
+    if (vasprintf(&output, fmt, args) < 0) {
+        /* TODO: Error signalling? */
+        return result;
+    }
+    result = output;
+    va_end(args);
+
+    free(output);
+    return result;
+}
+
 /* Perform URI-style escaping of a string.  Bytes which cannot be represented
  * directly are encoded in the form %xx (where "xx" is a string of two
  * hexadecimal digits). */
@@ -94,20 +116,12 @@ string uri_decode(const string &in)
  * advisory.  For negative numbers, will always use decimal. */
 string encode_int(long long n, int base)
 {
-    char buf[64];
-
-    if (n >= 0 && base == 16) {
-        sprintf(buf, "0x%llx", n);
-        return buf;
-    }
-
-    if (n > 0 && base == 8) {
-        sprintf(buf, "0%llo", n);
-        return buf;
-    }
-
-    sprintf(buf, "%lld", n);
-    return buf;
+    if (n >= 0 && base == 16)
+        return string_printf("0x%llx", n);
+    else if (n > 0 && base == 8)
+        return string_printf("0%llo", n);
+    else
+        return string_printf("%lld", n);
 }
 
 /* Parse the string representation of an integer.  Accepts decimal, octal, and
@@ -134,3 +148,24 @@ void fatal(string msg)
     fprintf(stderr, "FATAL: %s\n", msg.c_str());
     exit(1);
 }
+
+/* Available time formats. */
+const char TimeFormat::FORMAT_FILENAME[] = "%Y%m%dT%H%M%S";
+const char TimeFormat::FORMAT_ISO8601[] = "%Y-%m-%d %H:%M:%S";
+const char TimeFormat::FORMAT_LOCALTIME[] = "%Y-%m-%d %H:%M:%S %z";
+
+static size_t MAX_TIMESTAMP_LENGTH = 1024;
+
+std::string TimeFormat::format(time_t timestamp, const char *format, bool utc)
+{
+    struct tm time_buf;
+
+    if (utc)
+        gmtime_r(&timestamp, &time_buf);
+    else
+        localtime_r(&timestamp, &time_buf);
+
+    char buffer[MAX_TIMESTAMP_LENGTH];
+    strftime(buffer, MAX_TIMESTAMP_LENGTH, format, &time_buf);
+    return string(buffer);
+}