1 files changed, 13 insertions, 16 deletions
diff --git a/perl-install/resize_fat/io.pm b/perl-install/resize_fat/io.pm
index 8ffaa8355..7643a0953 100644
--- a/perl-install/resize_fat/io.pm
+++ b/perl-install/resize_fat/io.pm
@@ -1,16 +1,18 @@
-package resize_fat::io;
+package resize_fat::io; # $Id$
 
 use diagnostics;
 use strict;
 
 use resize_fat::fat;
+use c;
 
 1;
 
 
 sub read($$$) {
     my ($fs, $pos, $size) = @_;
-    my $buf;
+    print "reading $size bytes at $pos\n";
+    my $buf = "\0" x $size;
     sysseek $fs->{fd}, $pos, 0 or die "seeking to byte #$pos failed on device $fs->{fs_name}";
     sysread $fs->{fd}, $buf, $size or die "reading at byte #$pos failed on device $fs->{fs_name}";
     $buf;
@@ -18,36 +20,31 @@ sub read($$$) {
 sub write($$$$) {
     my ($fs, $pos, $size, $buf) = @_;
     sysseek $fs->{fd}, $pos, 0 or die "seeking to byte #$pos failed on device $fs->{fs_name}";
-    syswrite $fs->{fd}, $buf, $size or die "writing at byte #$pos failed on device $fs->{fs_name}";
+    syswrite $fs->{fd}, $buf or die "writing at byte #$pos failed on device $fs->{fs_name}";
 }
 
 sub read_cluster($$) {
     my ($fs, $cluster) = @_;
     my $buf;
+    my $pos = $fs->{cluster_offset} / 512 + $cluster * ($fs->{cluster_size} / 512);
 
-    eval {
-	$buf = &read($fs, 
-		     $fs->{cluster_offset} + $cluster * $fs->{cluster_size},
-		     $fs->{cluster_size});
-    }; @$ and die "reading cluster #$cluster failed on device $fs->{fs_name}";
+    c::lseek_sector(fileno $fs->{fd}, $pos, 0) or die "seeking to sector #$pos failed on device $fs->{fs_name}";
+    sysread $fs->{fd}, $buf, $fs->{cluster_size} or die "reading at sector #$pos failed on device $fs->{fs_name}";
     $buf;
 }
 sub write_cluster($$$) {
     my ($fs, $cluster, $buf) = @_;
+    my $pos = $fs->{cluster_offset} / 512 + $cluster * ($fs->{cluster_size} / 512);
 
-    eval {
-    &write($fs, 
-	   $fs->{cluster_offset} + $cluster * $fs->{cluster_size},
-	   $fs->{cluster_size}, 
-	   $buf);
-    }; @$ and die "writing cluster #$cluster failed on device $fs->{fs_name}";
+    c::lseek_sector(fileno $fs->{fd}, $pos, 0) or die "seeking to sector #$pos failed on device $fs->{fs_name}";
+    syswrite $fs->{fd}, $buf or die "writing at sector #$pos failed on device $fs->{fs_name}";
 }
 
 sub read_file($$) {
     my ($fs, $cluster) = @_;
     my $buf = '';
 
-    for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next($fs, $cluster)) {
+    for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next ($fs, $cluster)) {
 	$cluster == 0 and die "Bad FAT: unterminated chain\n";
 	$buf .= read_cluster($fs, $cluster);
     }
@@ -70,5 +67,5 @@ sub open($) {
     check_mounted($fs->{device});
 
     sysopen F, $fs->{fs_name}, 2 or sysopen F, $fs->{fs_name}, 0 or die "error opening device $fs->{fs_name} for writing\n";
-    $fs->{fd} = \*F;
+    $fs->{fd} = *F;
 }