From: ianmdlvl <ianmdlvl>
Date: Sun, 11 May 2003 19:29:18 +0000 (+0000)
Subject: bugfixes from lalonde
X-Git-Tag: branchpoint-trivsoundd~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=6e9e36a3b3f4176c2b2ac9584d4deea6f1f5c55d

bugfixes from lalonde
---

diff --git a/TODO b/TODO
index 2643e5a..caa5dd4 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,9 @@ BACKUP
 
 would be nice someday
 ---------------------
-gz increms only
+record file number
+record bytes written
+increms after fulls
 replace loaded with idformat
 read/writebuffer setuid --mlock
 whatsthis no cloneandhack
diff --git a/backup/checkallused b/backup/checkallused
index 953f136..c4856d0 100755
--- a/backup/checkallused
+++ b/backup/checkallused
@@ -56,8 +56,9 @@ while (!defined $tapedone{$tape}) {
     $tape= $next;
 }
 
-proc checkdevspec ($$$) {
-    my ($atf,$devspec,$why);
+sub checkdevspec ($$$) {
+    my ($atf,$devspec,$why) = @_;
+    print STDERR "checkdevspec >$atf|$devspec|$why<\n";
     push @{ $devspec{$atf}{$devspec} }, $why;
 }
 
@@ -105,7 +106,7 @@ for $pfx ('', sort keys %prefix) {
 	next if m,^procfs\s,;
 	m,^/dev/(\S+)\s.*\s(/\S*)\s*$, or die "$_ ?";
 	($dev,$mp) = ($1,$2);
-	checkdevspec("$pcstr$imp","$pcstr/dev/$dev","df");
+	checkdevspec("$pcstr$mp","$pcstr/dev/$dev","df");
 	$mounted{"$pcstr$mp"}="$pcstr$dev"; print " $1-$2";
 	if (defined($backto= $backed{"$pcstr$mp"})) {
 	    if (m,^/dev/\S+\s+\d+\s+(\d+)\s,) {
@@ -124,10 +125,11 @@ foreach $fsg (keys %usedkb) {
     print "filesystem group $fsg: $usedkb{$fsg} 1K-blocks$unkkb{$fsg}\n";
 }
 
-foreach $dsk (keys $devspec) {
-    if (@{ $devspec{$dsk} } != 1) {
-	foreach $devspec @{ $devspec{$dsk} } {
-	    &e("inconsistent devices for $dsk: $devspec");
+foreach $dsk (keys %devspec) {
+    if (keys %{ $devspec{$dsk} } != 1) {
+	foreach $devspec (keys %{ $devspec{$dsk} }) {
+	    &e("inconsistent devices for $dsk: $devspec (".
+               join(', ', @{ $devspec{$dsk}{$devspec} }).")");
 	}
     }
 }
@@ -167,9 +169,7 @@ for (;;) {
     
 for $fs (sort keys %backed) { length($mounted{$fs}) || &e("dumped ($backed{$fs}), not a mount point: $fs"); }
 for $fs (sort keys %incrd) { length($mounted{$fs}) || &e("increm'd ($incrd{$fs}), not a mount point: $fs"); }
-for $fs (sort keys %mounted) {
-    next if $backed{$fs} 
-    length($backed{$fs}) || &e("mount point ($mounted{$fs}), not dumped: $fs"); }
+for $fs (sort keys %mounted) { length($backed{$fs}) || &e("mount point ($mounted{$fs}), not dumped: $fs"); }
 for $fs (sort keys %mounted) { length($incrd{$fs}) || &e("mount point ($mounted{$fs}), not increm'd: $fs"); }
 
 $emsg.= "configuration ok\n" unless $e;