This commit was manufactured by cvs2svn to create branch

'unlabeled-1.1.1'.

1 files changed, 57 insertions, 28 deletions

diff --git a/perl-install/resize_fat/fat.pm b/perl-install/resize_fat/fat.pm
index 0d8a32dfa..2b64bd6f7 100644
--- a/perl-install/resize_fat/fat.pm
+++ b/perl-install/resize_fat/fat.pm
@@ -5,17 +5,30 @@ use strict;
 
 use resize_fat::any;
 use resize_fat::io;
-use resize_fat::c_rewritten;
 
 1;
 
 sub read($) {
     my ($fs) = @_;
 
-    resize_fat::c_rewritten::read_fat(fileno $fs->{fd}, $fs->{fat_offset}, $fs->{fat_size}, $fs->{media});
+    @{$fs->{fats}} = map {
+	my $fat = eval { resize_fat::io::read($fs, $fs->{fat_offset} + $_ * $fs->{fat_size}, $fs->{fat_size}) };
+	$@ and die "reading fat #$_ failed";
+	vec($fat, 0, 8) == $fs->{media} or die "FAT $_ has invalid signature";
+	$fat;
+    } (0 .. $fs->{nb_fats} - 1);
 
-    @{$fs->{clusters}{count}}{qw(free bad used)} =
-      resize_fat::c_rewritten::scan_fat($fs->{nb_clusters}, $fs->{fs_type_size});
+    $fs->{fat} = $fs->{fats}->[0];
+
+    my ($free, $bad, $used) = (0, 0, 0);
+
+    for (my $i = 2; $i < $fs->{nb_clusters} + 2; $i++) {
+	my $cluster = &next($fs, $i);
+	if ($cluster == 0) { $free++; }
+	elsif ($cluster == $resize_fat::bad_cluster_value) { $bad++; }
+	else { $used++; }
+    }
+    @{$fs->{clusters}->{count}}{qw(free bad used)} = ($free, $bad, $used);
 }
 
 sub write($) {
@@ -23,34 +36,32 @@ sub write($) {
 
     sysseek $fs->{fd}, $fs->{fat_offset}, 0 or die "write_fat: seek failed";
     foreach (1..$fs->{nb_fats}) {
-	resize_fat::c_rewritten::write_fat(fileno $fs->{fd}, $fs->{fat_size});
+	syswrite $fs->{fd}, $fs->{fat}, $fs->{fat_size} or die "write_fat: write failed";
     }
 }
 
 
 
-#- allocates where all the clusters will be moved to. Clusters before cut_point
-#- remain in the same position, however cluster that are part of a directory are
-#- moved regardless (this is a mechanism to prevent data loss) (cut_point is the
-#- first cluster that won't occur in the new fs)
+# allocates where all the clusters will be moved to. Clusters before cut_point
+# remain in the same position, however cluster that are part of a directory are
+# moved regardless (this is a mechanism to prevent data loss) (cut_point is the
+# first cluster that won't occur in the new fs)
 sub allocate_remap {
     my ($fs, $cut_point) = @_;
     my ($cluster, $new_cluster);
-    my $remap = sub { resize_fat::c_rewritten::set_fat_remap($cluster, $new_cluster) };
+    my $remap = sub { $fs->{fat_remap}->[$cluster] = $new_cluster; };
     my $get_new = sub {
 	$new_cluster = get_free($fs);
 	0 < $new_cluster && $new_cluster < $cut_point or die "no free clusters";
-	set_eof($fs, $new_cluster); #- mark as used
-	#-log::ld("resize_fat: [$cluster,", &next($fs, $cluster), "...]->$new_cluster...");
+	set_eof($fs, $new_cluster); # mark as used
+	#log::ld("resize_fat: [$cluster,", &next($fs, $cluster), "...]->$new_cluster...");
     };
 
-    #- this must call allocate_fat_remap that zeroes the buffer allocated.
-    resize_fat::c_rewritten::allocate_fat_remap($fs->{nb_clusters} + 2);
-
+    $fs->{fat_remap}->[0] = 0;
     $fs->{last_free_cluster} = 2;
     for ($cluster = 2; $cluster < $fs->{nb_clusters} + 2; $cluster++) {
 	if ($cluster < $cut_point) {
-	    if (resize_fat::c_rewritten::flag($cluster) == $resize_fat::any::DIRECTORY) {
+	    if ($fs->{fat_flag_map}->[$cluster] == $resize_fat::any::DIRECTORY) {
 		&$get_new();
 	    } else {
 		$new_cluster = $cluster;
@@ -64,26 +75,36 @@ sub allocate_remap {
 }
 
 
-#- updates the fat for the resized filesystem
+# updates the fat for the resized filesystem
 sub update {
     my ($fs) = @_;
 
     for (my $cluster = 2; $cluster < $fs->{nb_clusters} + 2; $cluster++) {
-	 if (resize_fat::c_rewritten::flag($cluster)) {
+	 if ($fs->{fat_flag_map}->[$cluster]) {
 	     my $old_next = &next($fs, $cluster);
-	     my $new      = resize_fat::c_rewritten::fat_remap($cluster);
-	     my $new_next = resize_fat::c_rewritten::fat_remap($old_next);
+	     my $new      = $fs->{fat_remap}->[$cluster];
+	     my $new_next = $fs->{fat_remap}->[$old_next];
 
 	     set_available($fs, $cluster);
 
 	     is_eof($old_next) ?
 		 set_eof($fs, $new) :
-		 set_next ($fs, $new, $new_next);
+		 set_next($fs, $new, $new_next);
 	 }
     }
 }
 
 
+# - compares the two FATs (one's a backup that should match) - skips first entry
+# - its just a signature (already checked above) NOTE: checks for cross-linking
+# are done in count.c
+sub check($) {
+    my ($fs) = @_;
+    foreach (@{$fs->{fats}}) {
+	$_ eq $fs->{fats}->[0] or die "FAT tables do not match";
+    }
+}
+
 sub endianness16($) { (($_[0] & 0xff) << 8) + ($_[0] >> 8); }
 sub endianness($$) {
     my ($val, $nb_bits) = @_;
@@ -97,9 +118,17 @@ sub endianness($$) {
     $r;
 }
 
-*next = \&resize_fat::c_rewritten::next;
-*set_next = \&resize_fat::c_rewritten::set_next;
+sub next($$) {
+    my ($fs, $cluster) = @_;
+    $cluster > $fs->{nb_clusters} + 2 and die "fat::next: cluster $cluster outside filesystem";
+    endianness(vec($fs->{fat}, $cluster, $fs->{fs_type_size}), $fs->{fs_type_size});
 
+}
+sub set_next($$$) { 
+    my ($fs, $cluster, $new_v) = @_;
+    $cluster > $fs->{nb_clusters} + 2 and die "fat::set_next: cluster $cluster outside filesystem";
+    vec($fs->{fat}, $cluster, $fs->{fs_type_size}) = endianness($new_v, $fs->{fs_type_size});
+}
 
 
 sub get_free($) {
@@ -111,28 +140,28 @@ sub get_free($) {
     die "no free clusters";
 }
 
-#-    returns true if <cluster> represents an EOF marker
+#    returns true if <cluster> represents an EOF marker
 sub is_eof($) {
     my ($cluster) = @_;
     $cluster >= $resize_fat::bad_cluster_value;
 }
 sub set_eof($$) {
     my ($fs, $cluster) = @_;
-    set_next ($fs, $cluster, $resize_fat::bad_cluster_value + 1);
+    set_next($fs, $cluster, $resize_fat::bad_cluster_value + 1);
 }
 
-#-    returns true if <cluster> is empty.  Note that this includes bad clusters.
+#    returns true if <cluster> is empty.  Note that this includes bad clusters.
 sub is_empty($) {
     my ($cluster) = @_;
     $cluster == 0 || $cluster == $resize_fat::bad_cluster_value;
 }
 
-#-    returns true if <cluster> is available.
+#    returns true if <cluster> is available.
 sub is_available($) {
     my ($cluster) = @_;
     $cluster == 0;
 }
 sub set_available($$) {
     my ($fs, $cluster) = @_;
-    set_next ($fs, $cluster, 0);
+    set_next($fs, $cluster, 0);
 }