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

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index 50cc70a..174dc81 100644
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -54,7 +54,7 @@ sub startprocess ($$$) {
 }
 
 sub rewind_raw () {
-    system "mt -f $tape rewind"; $? and die $?;
+    runsystem("mt -f $tape rewind");
 }
 
 sub readtapeid_raw () {
@@ -66,11 +66,34 @@ sub readtapeid_raw () {
 	   "| tar -b$blocksize -vvxf - TAPEID";
 }
 
+sub runsystem ($) {
+    pboth("    $_[0]\n");
+    system $_[0];
+    $? and die $?;
+}
+
+sub pboth ($) {
+    my ($str) = @_;
+    print LOG $str or die $!;
+    print $str or die $!;
+}
+
+sub nexttapefile ($) {
+    my ($what) = @_;
+    $currenttapefilenumber++;
+    $currenttapefilename= $what;
+    pboth(sprintf "writing tape file #%d (mt fsf %d): %s\n",
+	  $currenttapefilenumber, $currenttapefilenumber-1, $what);
+}
+
 sub writetapeid ($$) {
     open T, ">TAPEID" or die $!;
     print T "$_[0]\n$_[1]\n" or die $!;
     close T or die $!;
 
+    $currenttapefilenumber= 0;
+    nexttapefile('TAPEID');
+
     system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
     system "dd if=TAPEID.tar of=$ntape bs=${blocksize}b count=10";
     $? and die $?;
@@ -84,8 +107,7 @@ sub endprocesses () {
 	delete $processes{$p};
 	$? && die "error: command gave code $?: $c\n";
     }
-    print LOG "  ok\n" or die $!;
-    print "  ok\n" or die $!;
+    pboth("  ok\n");
 }
 
 sub killprocesses {