Changeset 3447 in MondoRescue for branches/3.2/MondoRescue/lib/MondoRescue/File.pm

Timestamp:

Aug 30, 2015, 2:33:49 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Adds a mr-device-mounted binary to MondoRescue (replaces the code of the C function is_this_device_mounted) and the corresponding perl function (mr_device_mounted) to handle cases where a mounted device has a different name than the one seen on mount (e.g. /dev/rhel/root and /dev/mapper/rhel-root)
• Adds perl function mr_file_copy_and_erase_hash to empty the hash generated in mr_file_read_all_link and thus avoid filling the hash it generates, which is useful for a recursive function, but not when called multiple times from another perl script. To be improved later on.
• Adapt build procedure to the new binary (tested on Mageia 5 and RHEL7)

File:

• branches/3.2/MondoRescue/lib/MondoRescue/File.pm (modified) (3 diffs)

branches/3.2/MondoRescue/lib/MondoRescue/File.pm

@@ -26 +26 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd mr_file_normalize);
+our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd mr_file_normalize mr_file_copy_and_erase_hash);
 
 =pod
@@ -85 +85 @@
 =over 4
 
+=item B<mr_file_erase_hash>
+
+This function erases all elements in the hash passed in parameter (such as the one created in mr_file_read_all_link)
+Takes as param the hash to delete and returns a new fresh one
+
+=cut
+
+sub mr_file_copy_and_erase_hash {
+
+my $files = shift;
+my %h;
+
+foreach my $i (keys %$files) {
+    $h{$i} = $files->{$i};
+    delete $files->{$i};
+}
+return(\%h);
+}
+
+=over 4
+
 =item B<mr_file_read_all_link>
 
 This function returns all the links found for a given file passed as parameter
 Example: mr_file_read_all_link(/lib64) returns (/lib64,/usr/lib64) on a system having a link from /lib64 to /usr/lib64
-The return value is a hash of all input files pointing to hash of links
+The return value is a hash of all input files pointing to the hash of their links
+That hash needs to be cleaned up after usage
 
 =cut
@@ -96 +118 @@
 
 # TODO: Can be parallelized
+# use "our" to keep info between recursive calls
 our $files;
+
 
 foreach my $f (@_) {