X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=contrib%2Frestore.pl;h=98ae277d17e2203879149f9b19c3f436f8eb4a74;hb=9d3cca72ea3c0f912c7250d84e12357346e59fe2;hp=0c7ee21e408bdf8196304303c1e6f12d57ad3dc6;hpb=020917702127ad12881c8868bb649a685c561def;p=cumulus.git

diff --git a/contrib/restore.pl b/contrib/restore.pl
index 0c7ee21..98ae277 100755
--- a/contrib/restore.pl
+++ b/contrib/restore.pl
@@ -85,11 +85,16 @@ sub verifier_check {
 # necessary integrity checks (if a checksum is included), and return the object
 # data.
 sub load_ref {
-    # First, try to parse the object reference string into constituent pieces.
-    # The format is segment/object(checksum)[range].  Both the checksum and
-    # range are optional.
     my $ref_str = shift;
 
+    # Check for special objects before attempting general parsing.
+    if ($ref_str =~ m/^zero\[((\d+)\+)?(\d+)\]$/) {
+        return "\0" x ($3 + 0);
+    }
+
+    # Try to parse the object reference string into constituent pieces.  The
+    # format is segment/object(checksum)[range].  Both the checksum and range
+    # are optional.
     if ($ref_str !~ m/^([-0-9a-f]+)\/([0-9a-f]+)(\(\S+\))?(\[\S+\])?$/) {
         die "Malformed object reference: $ref_str";
     }
@@ -117,12 +122,17 @@ sub load_ref {
     # If a range was specified, then only a subset of the bytes of the object
     # are desired.  Extract just the desired bytes.
     if ($range) {
-        if ($range !~ m/^\[(\d+)\+(\d+)\]$/) {
+        if ($range !~ m/^\[((\d+)\+)?(\d+)\]$/) {
             die "Malformed object range: $range";
         }
 
         my $object_size = length $contents;
-        my ($start, $length) = ($1 + 0, $2 + 0);
+        my ($start, $length);
+        if (defined($1)) {
+            ($start, $length) = ($2 + 0, $3 + 0);
+        } else {
+            ($start, $length) = (0, $3 + 0);
+        }
         if ($start >= $object_size || $start + $length > $object_size) {
             die "Object range $range falls outside object bounds "
                 . "(actual size $object_size)";
@@ -349,7 +359,7 @@ sub process_metadata {
         # Try to parse the data as "key: value" pairs of file metadata.  Also
         # handle continuation lines, which start with whitespace and continue
         # the previous "key: value" pair.
-        if ($line =~ m/^(\w+):\s*(.*)$/) {
+        if ($line =~ m/^([-\w]+):\s*(.*)$/) {
             $info{$1} = $2;
             $last_key = $1;
         } elsif ($line =~/^\s/ && defined $last_key) {
@@ -399,7 +409,7 @@ while (defined($line = <DESCRIPTOR>)) {
     # lines.
     chomp $line;
 
-    if ($line =~ m/^(\w+):\s*(.*)$/) {
+    if ($line =~ m/^([-\w]+):\s*(.*)$/) {
         $descriptor{$1} = $2;
         $last_key = $1;
     } elsif ($line =~/^\s/ && defined $last_key) {