X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fbackuplib.pl;h=50cc70a745f9aa070ed6778f12e3455c3df1303a;hp=e80f779ca0a6d77d8988d5ce85800c589a1a1626;hb=823a4f1c9ec99daf48228dff056d54db62c3a849;hpb=411308a50c3cbc923513c18f876bf88909bd7786;ds=sidebyside

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index e80f779..50cc70a 100644
--- 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";
 }
@@ -64,9 +66,9 @@ sub readtapeid_raw () {
 	   "| tar -b$blocksize -vvxf - TAPEID";
 }
 
-sub writetapeid ($) {
+sub writetapeid ($$) {
     open T, ">TAPEID" or die $!;
-    print T "$_[0]\n" or die $!;
+    print T "$_[0]\n$_[1]\n" or die $!;
     close T or die $!;
 
     system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
@@ -140,22 +142,55 @@ 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 '[/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+)\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 '[/device:]/file/system dumptype[,options] prefix'
+        # (used for remote backups)
 	$atf= $1;
 	$tm= $2;
-	$prefix= $3;
+	$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 {
+	    $$gzo= '';
+	}
     }
 }