X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=contrib%2Frestore.pl;h=0af9dea33e7ed8a82e18c9247f74b877f911713e;hb=9181f284453bf0471ffd06bd8ef16408758e108f;hp=96cf4b47442d8efc2f56e630431f566dca3c01f0;hpb=d3c10b747ecec0acc14863fc12db9661c3f88128;p=cumulus.git

diff --git a/contrib/restore.pl b/contrib/restore.pl
index 96cf4b4..0af9dea 100755
--- a/contrib/restore.pl
+++ b/contrib/restore.pl
@@ -88,8 +88,8 @@ sub load_ref {
     my $ref_str = shift;
 
     # Check for special objects before attempting general parsing.
-    if ($ref_str =~ m/^zero\[(\d+)\+(\d+)\]$/) {
-        return "\0" x ($2 + 0);
+    if ($ref_str =~ m/^zero\[((\d+)\+)?(\d+)\]$/) {
+        return "\0" x ($3 + 0);
     }
 
     # Try to parse the object reference string into constituent pieces.  The
@@ -122,12 +122,21 @@ 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+)\]$/) {
+        my $object_size = length $contents;
+        my ($start, $length);
+
+        if ($range =~ m/^\[=(\d+)\]$/) {
+            die "Object size incorrect (ref $ref_str, actual size $object_size"
+                if $object_size != $1;
+            ($start, $length) = (0, $1 + 0);
+        } elsif ($range =~ m/^\[(\d+)\]$/) {
+            ($start, $length) = (0, $3 + 0);
+        } elsif ($range =~ m/^\[(\d+)\+(\d+)\]$/) {
+            ($start, $length) = ($1 + 0, $2 + 0);
+        } else {
             die "Malformed object range: $range";
         }
 
-        my $object_size = length $contents;
-        my ($start, $length) = ($1 + 0, $2 + 0);
         if ($start >= $object_size || $start + $length > $object_size) {
             die "Object range $range falls outside object bounds "
                 . "(actual size $object_size)";
@@ -354,7 +363,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) {
@@ -404,7 +413,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) {