Replace boost::scoped_ptr with std::unique_ptr.

[cumulus.git] / ref.cc

diff --git a/ref.cc b/ref.cc
index bed4daf..2a45781 100644 (file)
--- a/ref.cc
+++ b/ref.cc
@@ -1,7 +1,6 @@
-/* Cumulus: Smart Filesystem Backup to Dumb Servers
- *
- * Copyright (C) 2007  The Regents of the University of California
- * Written by Michael Vrable <mvrable@cs.ucsd.edu>
+/* Cumulus: Efficient Filesystem Backup to the Cloud
+ * Copyright (C) 2007-2008 The Cumulus Developers
+ * See the AUTHORS file for a list of contributors.
  *
  * 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
@@ -25,6 +24,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <uuid/uuid.h>
@@ -97,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);
@@ -159,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++;
@@ -171,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());
@@ -208,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;
 }
@@ -238,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;