X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=ref.cc;h=2a45781c4570f941691066ca222c20fd018cf18c;hp=3019c20e7721555a2deb6d3e60cc3c4ce7d2af0f;hb=HEAD;hpb=ca9a4006c4ffc86a24d653d1b1b68bec4a6fbfdf diff --git a/ref.cc b/ref.cc index 3019c20..2a45781 100644 --- a/ref.cc +++ b/ref.cc @@ -1,13 +1,32 @@ -/* 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. * - * Backups are structured as a collection of objects, which may refer to other + * 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. + */ + +/* Backups are structured as a collection of objects, which may refer to other * objects. Object references are used to name other objects or parts of them. * This file defines the class for representing object references and the * textual representation of these references. */ #include #include +#include +#include +#include #include #include @@ -29,12 +48,21 @@ string generate_uuid() } ObjectReference::ObjectReference() - : segment(""), object("") + : type(REF_NULL), segment(""), object("") +{ + clear_checksum(); + clear_range(); +} + +ObjectReference::ObjectReference(RefType t) + : type(t), segment(""), object("") { + clear_checksum(); + clear_range(); } ObjectReference::ObjectReference(const std::string& segment, int sequence) - : segment(segment) + : type(REF_NORMAL), segment(segment) { char seq_buf[64]; sprintf(seq_buf, "%08x", sequence); @@ -46,7 +74,7 @@ ObjectReference::ObjectReference(const std::string& segment, int sequence) ObjectReference::ObjectReference(const std::string& segment, const std::string& sequence) - : segment(segment), object(sequence) + : type(REF_NORMAL), segment(segment), object(sequence) { clear_checksum(); clear_range(); @@ -54,17 +82,26 @@ ObjectReference::ObjectReference(const std::string& segment, string ObjectReference::to_string() const { - if (is_null()) - return "/"; + if (type == REF_NULL) + return "null"; - string result = segment + "/" + object; + string result; + if (type == REF_ZERO) { + result = "zero"; + } else if (type == REF_NORMAL) { + result = segment + "/" + object; - if (checksum_valid) - result += "(" + checksum + ")"; + if (checksum_valid) + result += "(" + checksum + ")"; + } if (range_valid) { char buf[64]; - sprintf(buf, "[%zu+%zu]", range_start, range_length); + if (range_exact || type == REF_ZERO) { + sprintf(buf, "[%zu]", range_length); + } else { + sprintf(buf, "[%zu+%zu]", range_start, range_length); + } result += buf; } @@ -78,22 +115,34 @@ ObjectReference ObjectReference::parse(const std::string& str) { const char *s = str.c_str(); const char *t; + ObjectReference::RefType type = ObjectReference::REF_NORMAL; + + // Special case: explicit zero objects + if (strncmp(s, "zero", 4) == 0) { + type = ObjectReference::REF_ZERO; + s += 4; + } // Segment t = s; - while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f') || (*t == '-')) - t++; - if (*t != '/') - return ObjectReference(); + if (type == ObjectReference::REF_NORMAL) { + while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f') + || (*t == '-')) + t++; + if (*t != '/') + return ObjectReference(); + } string segment(s, t - s); // Object sequence number - t++; - s = t; - while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f')) + if (type == ObjectReference::REF_NORMAL) { t++; - if (*t != '\0' && *t != '(' && *t != '[') - return ObjectReference(); + s = t; + while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f')) + t++; + if (*t != '\0' && *t != '(' && *t != '[') + return ObjectReference(); + } string object(s, t - s); // Checksum @@ -110,38 +159,68 @@ ObjectReference ObjectReference::parse(const std::string& str) } // Range - bool have_range = false; - int64_t range1, range2; + bool have_range = false, range_exact = false; + int64_t range1 = 0, range2 = 0; if (*t == '[') { t++; + + // An equal sign was once used for a length assertion but is now + // deprecated. Skip it if present, and mark that we are expecting a + // length-only reference. + if (*t == '=') { + range_exact = true; + t++; + } + s = t; while (*t >= '0' && *t <= '9') t++; - if (*t != '+') - return ObjectReference(); - string val(s, t - s); - range1 = atoll(val.c_str()); + // Abbreviated-length only range? + if (*t == ']') { + string val(s, t - s); + range2 = atoll(val.c_str()); + range_exact = true; + } else { + if (*t != '+') + return ObjectReference(); + if (range_exact) + return ObjectReference(); + + string val(s, t - s); + range1 = atoll(val.c_str()); - t++; - s = t; - while (*t >= '0' && *t <= '9') t++; - if (*t != ']') - return ObjectReference(); + s = t; + while (*t >= '0' && *t <= '9') + t++; + if (*t != ']') + return ObjectReference(); - val = string(s, t - s); - range2 = atoll(val.c_str()); + val = string(s, t - s); + range2 = atoll(val.c_str()); + } have_range = true; } - ObjectReference ref(segment, object); + ObjectReference ref; + switch (type) { + case ObjectReference::REF_ZERO: + ref = ObjectReference(ObjectReference::REF_ZERO); + break; + case ObjectReference::REF_NORMAL: + ref = ObjectReference(segment, object); + break; + default: + return ObjectReference(); + } + if (checksum.size() > 0) ref.set_checksum(checksum); if (have_range) - ref.set_range(range1, range2); + ref.set_range(range1, range2, range_exact); return ref; } @@ -171,6 +250,9 @@ bool ObjectReference::merge(ObjectReference ref) if (!range_valid || !ref.range_valid) return false; + if (range_exact || ref.range_exact) + return false; + if (range_start + range_length == ref.range_start) { range_length += ref.range_length; return true;