X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=ref.cc;h=2a45781c4570f941691066ca222c20fd018cf18c;hp=8ed747ddaa59b0c992442e56abfe4a3275d5b2ac;hb=HEAD;hpb=ab51d5778a1f19c204c935de231737df2e62c20c

diff --git a/ref.cc b/ref.cc
index 8ed747d..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 <assert.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include <uuid/uuid.h>
 
 #include <string>
@@ -78,7 +97,7 @@ string ObjectReference::to_string() const
 
     if (range_valid) {
         char buf[64];
-        if (range_start == 0) {
+        if (range_exact || type == REF_ZERO) {
             sprintf(buf, "[%zu]", range_length);
         } else {
             sprintf(buf, "[%zu+%zu]", range_start, range_length);
@@ -140,10 +159,19 @@ ObjectReference ObjectReference::parse(const std::string& str)
     }
 
     // Range
-    bool have_range = false;
+    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++;
@@ -152,9 +180,12 @@ ObjectReference ObjectReference::parse(const std::string& str)
         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());
@@ -189,7 +220,7 @@ ObjectReference ObjectReference::parse(const std::string& str)
         ref.set_checksum(checksum);
 
     if (have_range)
-        ref.set_range(range1, range2);
+        ref.set_range(range1, range2, range_exact);
 
     return ref;
 }
@@ -219,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;