Replace boost::scoped_ptr with std::unique_ptr.

[cumulus.git] / util.cc

diff --git a/util.cc b/util.cc
index 1f922df..f89569b 100644 (file)
--- a/util.cc
+++ b/util.cc
@@ -1,11 +1,30 @@
-/* LBS: An LFS-inspired filesystem backup system
- * Copyright (C) 2007  Michael Vrable
+/* Cumulus: Efficient Filesystem Backup to the Cloud
+ * Copyright (C) 2007-2008 The Cumulus Developers
+ * See the AUTHORS file for a list of contributors.
  *
- * Utility functions for converting various datatypes to text format (and
- * later, for parsing them back, perhaps).
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* 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>
+#include <unistd.h>
 #include <uuid/uuid.h>
 
 #include <iostream>
@@ -13,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). */
@@ -76,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
@@ -99,21 +131,41 @@ long long parse_int(const string &s)
     return strtoll(s.c_str(), NULL, 0);
 }
 
-/* Encode a dictionary of string key/value pairs into a sequence of lines of
- * the form "key: value". */
-string encode_dict(const map<string, string>& dict)
+/* Mark a file descriptor as close-on-exec. */
+void cloexec(int fd)
 {
-    string result;
-    for (map<string, string>::const_iterator i = dict.begin();
-         i != dict.end(); ++i) {
-        result += i->first + ": " + i->second + "\n";
-    }
-    return result;
+    long flags = fcntl(fd, F_GETFD);
+
+    if (flags < 0)
+        return;
+
+    fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
 }
 
-/* Output a dictionary of string key/value pairs to the given output stream.
- * The format is a sequence of lines of the form "key: value". */
-void dict_output(ostream &o, const map<string, string>& dict)
+/* Report a fatal error and exit. */
+void fatal(string msg)
 {
-    o << encode_dict(dict);
+    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);
 }