`pkg-config --cflags $(PACKAGES)` -DLBS_VERSION=`cat version`
LDFLAGS=$(DEBUG) -ltar `pkg-config --libs $(PACKAGES)`
-SRCS=format.cc localdb.cc ref.cc scandir.cc sha1.cc statcache.cc store.cc
+SRCS=localdb.cc ref.cc scandir.cc sha1.cc statcache.cc store.cc util.cc
OBJS=$(SRCS:.cc=.o)
lbs : $(OBJS)
+++ /dev/null
-/* LBS: An LFS-inspired filesystem backup system
- * Copyright (C) 2007 Michael Vrable
- *
- * Utility functions for converting various datatypes to text format (and
- * later, for parsing them back, perhaps).
- */
-
-#include <stdio.h>
-#include <uuid/uuid.h>
-
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-using std::map;
-using std::ostream;
-using std::string;
-
-/* 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). */
-string uri_encode(const string &in)
-{
- string out;
-
- for (size_t i = 0; i < in.length(); i++) {
- unsigned char c = in[i];
-
- if (c >= '+' && c < 0x7f) {
- out += c;
- } else {
- char buf[4];
- sprintf(buf, "%%%02x", c);
- out += buf;
- }
- }
-
- return out;
-}
-
-/* Decoding of strings produced by uri_encode. */
-string uri_decode(const string &in)
-{
- char *buf = new char[in.size() + 1];
-
- const char *input = in.c_str();
- char *output = buf;
-
- while (*input != '\0') {
- if (*input == '%') {
- char hexbuf[4];
- if (isxdigit(input[1]) && isxdigit(input[2])) {
- hexbuf[0] = input[1];
- hexbuf[1] = input[2];
- hexbuf[2] = '\0';
- *output++ = strtol(hexbuf, NULL, 16);
- input += 3;
- } else {
- input++;
- }
- } else {
- *output++ = *input++;
- }
- }
-
- *output = '\0';
-
- string result(buf);
- delete buf;
- return result;
-}
-
-/* Return the string representation of an integer. */
-string encode_int(long long n)
-{
- char buf[64];
- sprintf(buf, "%lld", n);
- return buf;
-}
-
-/* Return the string representation of an integer. */
-long long parse_int(const string &s)
-{
- return strtoll(s.c_str(), NULL, 10);
-}
-
-/* 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, map<string, string> dict)
-{
- for (map<string, string>::const_iterator i = dict.begin();
- i != dict.end(); ++i) {
- o << i->first << ": " << i->second << "\n";
- }
-}
+++ /dev/null
-/* LBS: An LFS-inspired filesystem backup system
- * Copyright (C) 2006 Michael Vrable
- *
- * Utility functions for converting various datatypes to text format (and
- * later, for parsing them back, perhaps).
- */
-
-#ifndef _LBS_FORMAT_H
-#define _LBS_FORMAT_H
-
-#include <iostream>
-#include <map>
-#include <string>
-
-std::string uri_encode(const std::string &in);
-std::string uri_decode(const std::string &in);
-std::string encode_int(long long n);
-void dict_output(std::ostream &o, std::map<std::string, std::string> dict);
-
-long long parse_int(const std::string &s);
-
-#endif // _LBS_TARSTORE_H
#include <string>
#include <vector>
-#include "format.h"
#include "localdb.h"
#include "store.h"
#include "sha1.h"
#include "statcache.h"
+#include "util.h"
using std::list;
using std::string;
#include <map>
#include <string>
-#include "format.h"
#include "ref.h"
#include "statcache.h"
+#include "util.h"
using std::list;
using std::map;
--- /dev/null
+/* LBS: An LFS-inspired filesystem backup system
+ * Copyright (C) 2007 Michael Vrable
+ *
+ * Utility functions for converting various datatypes to text format (and
+ * later, for parsing them back, perhaps).
+ */
+
+#include <stdio.h>
+#include <uuid/uuid.h>
+
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+using std::map;
+using std::ostream;
+using std::string;
+
+/* 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). */
+string uri_encode(const string &in)
+{
+ string out;
+
+ for (size_t i = 0; i < in.length(); i++) {
+ unsigned char c = in[i];
+
+ if (c >= '+' && c < 0x7f) {
+ out += c;
+ } else {
+ char buf[4];
+ sprintf(buf, "%%%02x", c);
+ out += buf;
+ }
+ }
+
+ return out;
+}
+
+/* Decoding of strings produced by uri_encode. */
+string uri_decode(const string &in)
+{
+ char *buf = new char[in.size() + 1];
+
+ const char *input = in.c_str();
+ char *output = buf;
+
+ while (*input != '\0') {
+ if (*input == '%') {
+ char hexbuf[4];
+ if (isxdigit(input[1]) && isxdigit(input[2])) {
+ hexbuf[0] = input[1];
+ hexbuf[1] = input[2];
+ hexbuf[2] = '\0';
+ *output++ = strtol(hexbuf, NULL, 16);
+ input += 3;
+ } else {
+ input++;
+ }
+ } else {
+ *output++ = *input++;
+ }
+ }
+
+ *output = '\0';
+
+ string result(buf);
+ delete buf;
+ return result;
+}
+
+/* Return the string representation of an integer. */
+string encode_int(long long n)
+{
+ char buf[64];
+ sprintf(buf, "%lld", n);
+ return buf;
+}
+
+/* Return the string representation of an integer. */
+long long parse_int(const string &s)
+{
+ return strtoll(s.c_str(), NULL, 10);
+}
+
+/* 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, map<string, string> dict)
+{
+ for (map<string, string>::const_iterator i = dict.begin();
+ i != dict.end(); ++i) {
+ o << i->first << ": " << i->second << "\n";
+ }
+}
--- /dev/null
+/* LBS: An LFS-inspired filesystem backup system
+ * Copyright (C) 2006 Michael Vrable
+ *
+ * Utility functions for converting various datatypes to text format (and
+ * later, for parsing them back, perhaps).
+ */
+
+#ifndef _LBS_FORMAT_H
+#define _LBS_FORMAT_H
+
+#include <iostream>
+#include <map>
+#include <string>
+
+std::string uri_encode(const std::string &in);
+std::string uri_decode(const std::string &in);
+std::string encode_int(long long n);
+void dict_output(std::ostream &o, std::map<std::string, std::string> dict);
+
+long long parse_int(const std::string &s);
+
+#endif // _LBS_TARSTORE_H
projects / cumulus.git / commitdiff