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

Timestamp:

Apr 20, 2014, 11:24:46 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Change interface of mr_file_read_all_link to returning a hash of hash.
• When recursing with a hash used, declare it with our so it's available correctly at all levels.
• mr_file_read_all_link now really returns all the links neeed

File:

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

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

@@ -89 +89 @@
 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 arrays of links
+The return value is a hash of all input files pointing to hash of links
 
 =cut
@@ -96 +96 @@
 
 # TODO: Can be parallelized
-my $files;
+our $files;
 
 foreach my $f (@_) {
@@ -114 +114 @@
             $link = mr_file_normalize($link,"$curdir/$dir");
             # It's a real symlink so handle it
-            push @{$files->{$f}},"$curdir/$dir";
+            $files->{$f}->{"$curdir/$dir"} = 1;
             if (substr($link,0,1) eq "/") {
                 $curdir = $link;
@@ -124 +124 @@
             if ((-e $curdir) && ((! -d $curdir) || (-l $curdir))) {
                 my $h = mr_file_read_all_link($curdir);
-                pb_log(2,"File: $curdir - Return:\n".Dumper($h)."\n");
+                pb_log(2,"After Return h:\n".Dumper($h)."\n");
                 foreach my $k (keys %$h) {
-                    # At that point there is only one key 
-                    # as there was one param passed to the function.
                     foreach my $l (keys %$k) {
-                        push @{$files->{$f}},$k->{$l};
+                        # Use $f as key as we affects all the files 
+                        # found in recursion to the current managed file
+                        $files->{$f}->{$l} = 1;
                     }
                 }
+                pb_log(2,"After Return files:\n".Dumper($files)."\n");
             }
         } else {
@@ -138 +139 @@
     }
     pb_log(2,"curdir is now: $curdir**\n");
-    push @{$files->{$f}},$curdir if (-e $curdir);
-}
+    $files->{$f}->{$curdir} = 1 if (-e $curdir);
+}
+pb_log(1,"mr_file_read_all_link returns:\n".Dumper($files)."\n");
 return($files);
 }