@@ -3,6 +3,7 @@

[chiark-utils.git] / backup / backuplib.pl

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index c2c7e811ff6ab82e8b2ead83769d681de42d3db7..50cc70a745f9aa070ed6778f12e3455c3df1303a 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -23,6 +23,8 @@
 
 require IO::File;
 
+$nice='nice ' if !defined $nice;
+
 sub printdate () {
     print scalar(localtime),"\n";
 }
@@ -141,35 +143,53 @@ sub readfsys ($) {
 # to be in $tf.
 sub parsefsys () {
     my ($dopts,$dopt);
-    if ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)$,) {
-        # Line of form '/file/system   dumptype[,options]'
+    if ($tf =~ m#^(/\S*)\s+(\w+)([,=0-9a-z]*)$#) {
+        # Line of form '[/device:]/file/system dumptype[,options]'
        $atf= $1;
        $tm= $2;
        $dopts= $3;
        $prefix= '<local>';
+       $pcstr= '';
        stat $atf or die "stat $atf: $!";
        -d _ or die "not a dir: $atf";
        $rstr= '';
-    } elsif ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)\s+(\w+)$,) {
-        # Line of form '/file/system dumptype[,options] prefix'
+    } elsif ($tf =~ m#^(/\S*)\s+(\w+)([,=0-9a-z]*)\s+(\w+)$#) {
+        # Line of form '[/device:]/file/system dumptype[,options] prefix'
         # (used for remote backups)
        $atf= $1;
        $tm= $2;
        $dopts= $3;
        $prefix= $4;
+       $pcstr= "$prefix:";
        defined($prefix{$prefix}) or die "prefix $prefix in $tf ?\n";
        $rstr= $prefix{$prefix}.' ';
     } else {
        die "fsys $tf ?";
     }
+
+    $dev = $atf =~ s,^(.*)\:,, ? $1 : '';
+
     undef %dopt;
     foreach $dopt (split /\,/,$dopts) {
        if (grep { $dopt eq $_ } qw(gz)) {
            $dopt{$dopt}= 'y';
        } elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz)) {
            $dopt{$`}= $';
+       } elsif (length $dopt) {
+           die "unknown option $dopt (in $dopts $tf)";
+       }
+    }
+
+    my ($gzo);
+    foreach $gzo (qw(gz gzi)) {
+       if ($dopt{$gzo} eq 'y') {
+           $$gzo= '1';
+       } elsif ($dopt{$gzo} =~ m/^\d$/) {
+           $$gzo= $dopt{$gzo};
+       } elsif (defined $dopt{$gzo}) {
+           die "$tf bad $gzo";
        } else {
-           die "unknown option $dopt";
+           $$gzo= '';
        }
     }
 }