first cut of gz support

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

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index f8d7349bdec683fa4db009933e3ad33db3f7670d..c2c7e811ff6ab82e8b2ead83769d681de42d3db7 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -140,22 +140,37 @@ sub readfsys ($) {
 # Parse a line from a filesystem definition file. We expect the line
 # to be in $tf.
 sub parsefsys () {
-    if ($tf =~ m,^(/\S*)\s+(\w+)$,) {
-        # Line of form '/file/system   dumptype'
+    my ($dopts,$dopt);
+    if ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)$,) {
+        # Line of form '/file/system   dumptype[,options]'
        $atf= $1;
        $tm= $2;
+       $dopts= $3;
        $prefix= '<local>';
        stat $atf or die "stat $atf: $!";
        -d _ or die "not a dir: $atf";
        $rstr= '';
-    } elsif ($tf =~ m,^(/\S*)\s+(\w+)\s+(\w+)$,) {
-        # Line of form '/file/system dumptype prefix'
-        # (used for remote backups, I think)
+    } elsif ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)\s+(\w+)$,) {
+        # Line of form '/file/system dumptype[,options] prefix'
+        # (used for remote backups)
        $atf= $1;
        $tm= $2;
-       $prefix= $3;
+       $dopts= $3;
+       $prefix= $4;
        defined($prefix{$prefix}) or die "prefix $prefix in $tf ?\n";
        $rstr= $prefix{$prefix}.' ';
+    } else {
+       die "fsys $tf ?";
+    }
+    undef %dopt;
+    foreach $dopt (split /\,/,$dopts) {
+       if (grep { $dopt eq $_ } qw(gz)) {
+           $dopt{$dopt}= 'y';
+       } elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz)) {
+           $dopt{$`}= $';
+       } else {
+           die "unknown option $dopt";
+       }
     }
 }