Changeset 3262 in MondoRescue for branches/3.2/MondoRescue

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

Location:

branches/3.2/MondoRescue

Files:

• bin/mr-read-all-link (modified) (2 diffs)
• lib/MondoRescue/File.pm (modified) (5 diffs)
• t/01-read-all-link.t (modified) (1 diff)

branches/3.2/MondoRescue/bin/mr-read-all-link

@@ -10 +10 @@
 use Data::Dumper;
 use MondoRescue::File;
+# For pbdebug
+use ProjectBuilder::Base;
 
 =pod
@@ -54 +56 @@
 =cut
 
+$pbdebug = 2 if ((defined $ARGV[0]) && ($ARGV[0] eq "-v"));
 
 my $file = mr_file_read_all_link(@ARGV) if (defined $ARGV[0]);
-
-my $verbose = undef;
-$verbose = 1 if ((defined $ARGV[0]) && ($ARGV[0] eq "-v"));
+my %h;
 
 #print Dumper($file);
 
 foreach my $f (sort keys %$file) {
-    print "$f\n" if (defined $verbose);
-    print "--\n" if (defined $verbose);
+    print "$f\n" if ($pbdebug >= 1);
+    print "--\n" if ($pbdebug >= 1);
     #print Dumper($f);
-    foreach my $l (@{$file->{$f}}) {
-        print "$l\n";
+    foreach my $l (sort keys $file->{$f}) {
+        print "==" if ($pbdebug >= 1);
+        print "$l\n" if ($pbdebug >= 1);
+        $h{$l} = 1;
     }
-    print "--\n" if (defined $verbose);
+    print "--\n" if ($pbdebug >= 1);
 }
+
+foreach my $l (sort keys %h) {
+    print "$l\n";
+}

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);
 }

branches/3.2/MondoRescue/t/01-read-all-link.t

@@ -73 +73 @@
 }
     # Got, expected, comment
-myis(@{$h->{"$bd/usr/bin/toto"}}[0], "$bd/usr/bin/toto", "File link in same dir to itself");
-myis(@{$h->{"$bd/usr/bin/toto"}}[1], "$bd/usr/bin/perl", "File link in same dir to link");
-myis(@{$h->{"$bd/var/truc"}}[0], "$bd/var/truc", "File link in another absolute dir to itself");
-myis(@{$h->{"$bd/var/truc"}}[1], "$bd/usr/bin/perl", "File link in another absolute dir to link");
-myis(@{$h->{"$bd/var/spool/toto"}}[0], "$bd/var/spool/toto", "File link in another relative dir to itself");
-myis(@{$h->{"$bd/var/spool/toto"}}[1], "$bd/usr/bin/perl", "File link in another relative dir to link");
-myis(@{$h->{"$bd/var/spool/titi"}}[0], "$bd/var/spool/titi", "Directory link in same dir to itself");
-myis(@{$h->{"$bd/var/spool/titi"}}[1], "$bd/var/spool/mail", "Directory link in same dir to link");
-myis(@{$h->{"$bd/var/lib/titi"}}[0], "$bd/var/lib/titi", "Directory link in another relative dir to itself");
-myis(@{$h->{"$bd/var/lib/titi"}}[1], "$bd/var/spool/mail", "Directory link in another relative dir to link");
-myis(@{$h->{"$bd/var/tutu"}}[0], "$bd/var/tutu", "Directory link in another absolute dir to itself");
-myis(@{$h->{"$bd/var/tutu"}}[1], "$bd/var/spool/mail", "Directory link in another absolute dir to link");
+myis($h->{"$bd/usr/bin/toto"}->{"$bd/usr/bin/toto"}, 1, "File link in same dir to itself");
+myis($h->{"$bd/usr/bin/toto"}->{"$bd/usr/bin/perl"}, 1, "File link in same dir to link");
+myis($h->{"$bd/var/truc"}->{"$bd/var/truc"}, 1, "File link in another absolute dir to itself");
+myis($h->{"$bd/var/truc"}->{"$bd/usr/bin/perl"}, 1, "File link in another absolute dir to link");
+myis($h->{"$bd/var/spool/toto"}->{"$bd/var/spool/toto"}, 1, "File link in another relative dir to itself");
+myis($h->{"$bd/var/spool/toto"}->{"$bd/usr/bin/perl"}, 1, "File link in another relative dir to link");
+myis($h->{"$bd/var/spool/titi"}->{"$bd/var/spool/titi"}, 1, "Directory link in same dir to itself");
+myis($h->{"$bd/var/spool/titi"}->{"$bd/var/spool/mail"}, 1, "Directory link in same dir to link");
+myis($h->{"$bd/var/lib/titi"}->{"$bd/var/lib/titi"}, 1, "Directory link in another relative dir to itself");
+myis($h->{"$bd/var/lib/titi"}->{"$bd/var/spool/mail"}, 1, "Directory link in another relative dir to link");
+myis($h->{"$bd/var/tutu"}->{"$bd/var/tutu"}, 1, "Directory link in another absolute dir to itself");
+myis($h->{"$bd/var/tutu"}->{"$bd/var/spool/mail"}, 1, "Directory link in another absolute dir to link");
 chdir "/tmp";
 exit(0);