Changeset 3228 in MondoRescue

Timestamp:

Dec 30, 2013, 10:46:39 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Add a test file for MondoRescue::File for the mr_read_all_link function which is a critical one
• Function now work as expected including normalization

Location:

branches/3.2/MondoRescue

Files:

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

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

@@ -8 +8 @@
 #
 use strict;
+use Data::Dumper;
 use MondoRescue::File;
 
@@ -56 +57 @@
 my $file = mr_file_read_all_link(@ARGV) if (defined $ARGV[0]);
 
+#print Dumper($file);
+
 foreach my $f (sort keys %$file) {
-    print "$f: $file->{$f}\n";
+    print "$f\n";
+    print "--\n";
+    #print Dumper($f);
+    foreach my $l (@{$file->{$f}}) {
+        print "$l\n";
+    }
+    print "--\n";
 }

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

@@ -13 +13 @@
 use Data::Dumper;
 use English;
-#use File::Basename;
+use Cwd;
+use File::Basename;
+use ProjectBuilder::Base;
 use lib qw (lib);
 
@@ -24 +26 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd);
+our @EXPORT = qw(mr_file_read_all_link mr_file_process_ldd mr_file_normalize);
 
 =pod
@@ -37 +39 @@
 
 =head1 USAGE
+
+=over 4
+
+=item B<mr_file_normalize>
+
+This function normalize a path by removing .., . or // in paths given as parameters
+
+=cut
+
+$pbdebug = 2;
+
+sub mr_file_normalize {
+
+my $f = shift;
+my $dir = shift || undef;
+
+# We modify based on the current dir, 
+# except when we're asked to use another one (case of a target link)
+my $newpath = cwd;
+$newpath = $dir if (defined $dir);
+
+return($f) if (not defined $f);
+
+pb_log(0,"mr_file_normalize file: **$f**\n");
+pb_log(0,"mr_file_normalize dir : **$dir**\n") if (defined $dir);
+
+# Handle case of . at the start in path
+if ($f =~ /^\.\//) {
+    $f =~ s/^\.\//$newpath\//;
+}
+# Handle case of .. at the start in path
+if ($f =~ /^\.\.\//) {
+    my $dn = dirname(dirname($newpath));
+    $f =~ s/^\.\.\//$dn\//;
+}
+# Now handles .. and . in the middle
+$f =~ s|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g;
+$f =~ s|([^/]*)/([^/]+)/\./([^/]+)|$1/$2/$3|g;
+# Handle double /
+$f =~ s|//|/|g;
+
+return($f);
+}
 
 =over 4
@@ -44 +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
 
 =cut
@@ -50 +96 @@
 
 # TODO: Can be parallelized
-my %files;
+my $files;
 
 foreach my $f (@_) {
-    print "Processing $f**\n";
-    # Normalize the path if with .. in it or //
-    $f =~ s|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g;
-    $f =~ s|//|/|g;
+    pb_log(2,"mr_file_read_all_link: **$f**\n");
+    # Normalize the path if with .. or . or // in it 
+    $f = mr_file_normalize($f);
+
     my @fullpath = split(/\//,$f);
     my $curdir = "";
     while (@fullpath) {
         my $dir = shift @fullpath;
-        print "curdir is now: $curdir** and dir: $dir**\n";
-        next if (($dir eq ".") || ($dir eq ""));
+        pb_log(2,"curdir is now: $curdir** and dir: $dir**\n");
+        next if ($dir eq "");
+        
         my $link = readlink("$curdir/$dir");
         if (defined $link) {
+            $link = mr_file_normalize($link,"$curdir/$dir");
             # It's a real symlink so handle it
-            if (defined $files{$f}) {
-                $files{$f} .= "$curdir/$dir|";
-            } else {
-                $files{$f} = "$curdir/$dir|";
-            }
+            push @{$files->{$f}},"$curdir/$dir";
             if (substr($link,0,1) eq "/") {
                 $curdir = $link;
@@ -78 +122 @@
                 $curdir = "$dn/$link";
             }
-            if ((! -d $curdir) || (-l $curdir)) {
+            if ((-e $curdir) && ((! -d $curdir) || (-l $curdir))) {
                 my $h = mr_file_read_all_link($curdir);
-                print "File: $curdir - Return:\n".Dumper($h)."\n";
+                pb_log(2,"File: $curdir - Return:\n".Dumper($h)."\n");
                 foreach my $k (keys %$h) {
-                    $files{$f} .= $h->{$k}."|";
+                    # 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};
+                    }
                 }
             }
@@ -89 +137 @@
         }
     }
-    $files{$f} .= "$curdir";
-}
-return(\%files);
+    pb_log(2,"curdir is now: $curdir**\n");
+    push @{$files->{$f}},$curdir if (-e $curdir);
+}
+return($files);
 }
 
@@ -105 +154 @@
 sub mr_file_process_ldd {
 
-my %files;
+my $files;
 
 foreach my $f (@_) {
+    pb_log(2,"mr_file_process_ldd: **$f**\n");
     open(CMD,"ldd $f 2> /dev/null |") || die "You need ldd for mindi support";
     # Format is something like this:
@@ -121 +171 @@
         $answer = $orig if ($orig =~ /^\//);
         $answer = $dest if ((defined $dest) && ($dest =~ /^\//));
-        $files{$answer} = $answer if (defined $answer);
+        $files->{$answer} = $answer if (defined $answer);
     }
 }
 close(CMD);
 
-return(\%files);
+return($files);
 }