require IO::File;
+$nice='nice ' if !defined $nice;
+
sub printdate () {
print scalar(localtime),"\n";
}
"| 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 $?;
# 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{$`}= $';
+ } elsif (length $dopt) {
+ die "unknown option $dopt (in $dopts $tf)";
+ }
+ }
+
+ if ($dopt{'gz'} eq 'y') {
+ $gz= '1';
+ } elsif ($dopt{'gz'} =~ m/^\d$/) {
+ $gz= $dopt{'gz'};
+ } elsif (defined $dopt{'gz'}) {
+ die "$tf bad gz";
+ } else {
+ $gz= 0;
}
}