bugfixes

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

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index 26a8533d1150e85ee3e2fa7079f742ddf2df5647..279cbd6ec0e782c2355df1693d841aa2794bf497 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+require IO::File;
+
 sub printdate () {
     print scalar(localtime),"\n";
 }
@@ -49,6 +51,29 @@ sub startprocess ($$$) {
     exec $c; die "$c: $!";
 }
 
+sub rewind_raw () {
+    system "mt -f $tape rewind"; $? and die $?;
+}
+
+sub readtapeid_raw () {
+    open T, ">>TAPEID" or die $!; close T;
+    unlink 'TAPEID' or die $!;
+    rewind_raw();
+    system "mt -f $tape setblk $blocksizebytes"; $? and die $?;
+    system "dd if=$tape bs=${blocksize}b count=10 ".
+          "| tar -b$blocksize -vvxf - TAPEID";
+}
+
+sub writetapeid ($$) {
+    open T, ">TAPEID" or die $!;
+    print T "$_[0]\n$_[1]\n" or die $!;
+    close T or die $!;
+
+    system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
+    system "dd if=TAPEID.tar of=$ntape bs=${blocksize}b count=10";
+    $? and die $?;
+}
+
 sub endprocesses () {
     while (keys %processes) {
        $p= waitpid(-1,0) or die "wait: $!";
@@ -93,14 +118,15 @@ sub readfsysfile ($) {
         } elsif (m/^exclude\s+(\S.*\S)$/) {
             push @excl,$1;
        } elsif (m/^include\s+(\S.*\S)$/) {
+           $sfn = $1;
            $sfn =~ s/^\./fsys./;
-           $sfn = "$etc/$sfn" if $sfn !~ m,^/,;
+           $sfn = "$etc/$sfn" unless $sfn =~ m,^/,;
            readfsysfile($sfn);
         } else {
            push @fsys,$_;
        }
     }
-    close $fn or die $!;
+    close $fh or die $!;
 }
 
 sub readfsys ($) {
@@ -114,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";
+       }
     }
 }