diff options
Diffstat (limited to 'perl-install/resize_fat/dir_entry.pm')
-rw-r--r-- | perl-install/resize_fat/dir_entry.pm | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/perl-install/resize_fat/dir_entry.pm b/perl-install/resize_fat/dir_entry.pm index d944c04ac..fa5ebb344 100644 --- a/perl-install/resize_fat/dir_entry.pm +++ b/perl-install/resize_fat/dir_entry.pm @@ -5,10 +5,6 @@ use strict; my $DELETED_FLAG = 0xe5; - -my $READ_ONLY_ATTR = 0x01; -my $HIDDEN_ATTR = 0x02; -my $SYSTEM_ATTR = 0x04; my $VOLUME_LABEL_ATTR = 0x08; my $VFAT_ATTR = 0x0f; my $DIRECTORY_ATTR = 0x10; @@ -17,7 +13,7 @@ my $DIRECTORY_ATTR = 0x10; sub get_cluster($) { my ($entry) = @_; - $entry->{first_cluster} + ($resize_fat::isFAT32 ? $entry->{first_cluster_high} * (1 << 16) : 0); + $entry->{first_cluster} + ($resize_fat::isFAT32 ? $entry->{first_cluster_high} * 65536 : 0); } sub set_cluster($$) { my ($entry, $val) = @_; @@ -25,14 +21,14 @@ sub set_cluster($$) { $entry->{first_cluster_high} = $val >> 16 if $resize_fat::isFAT32; } -sub is_unmoveable($) { +sub is_directory_raw($) { my ($entry) = @_; - $entry->{attributes} & $HIDDEN_ATTR || $entry->{attributes} & $SYSTEM_ATTR; + !is_special_entry($entry) && $entry->{attributes} & $DIRECTORY_ATTR; } sub is_directory($) { my ($entry) = @_; - $entry->{attributes} & $DIRECTORY_ATTR && $entry->{name} !~ /^\.\.? / && !is_special_entry($entry); + is_directory_raw($entry) && $entry->{name} !~ /^\.\.? /; } sub is_volume($) { @@ -50,7 +46,7 @@ sub is_special_entry($) { my ($entry) = @_; my ($c) = unpack "C", $entry->{name}; - #- skip empty slots, deleted files, and 0xF6?? (taken from kernel) + # skip empty slots, deleted files, and 0xF6?? (taken from kernel) $c == 0 || $c == $DELETED_FLAG || $c == 0xF6 and return 1; $entry->{attributes} == $VFAT_ATTR and return 1; @@ -58,19 +54,18 @@ sub is_special_entry($) { } -#- return true if entry has been modified -#- curr_dir_name is added to contains current directory name, "" for root. +# return true if entry has been modified sub remap { - my ($curr_dir_name, $entry) = @_; - + my ($fat_remap, $entry) = @_; + is_special_entry($entry) and return; my $cluster = get_cluster($entry); - my $new_cluster = resize_fat::c_rewritten::fat_remap($cluster); + my $new_cluster = $fat_remap->[$cluster]; - #-print "remapping cluster ", get_cluster($entry), " to $new_cluster"; + #print "remapping cluster ", get_first_cluster($fs, $entry), " to $new_cluster"; - $new_cluster == $cluster and return; #- no need to modify + $new_cluster == $cluster and return; # no need to modify set_cluster($entry, $new_cluster); 1; |