bugfixes from lalonde

[chiark-utils.git] / backup / checkallused

diff --git a/backup/checkallused b/backup/checkallused
index 953f136f8e8dee3b6de996eafe7dc222b96550ca..c4856d052ff2f399684d0d0878a125924e74e7f3 100755 (executable)
--- 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;