Changeset 3108 for trunk/gsdl

Timestamp:

2002-04-29T13:11:51+12:00 (22 years ago)

Author:

jrm21

Message:

Don't recursive into directories if they are symbolic links and point to
a parent directory. Doesn't seem to work with windows shortcuts and
activeperl, but works on unix.

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -245 +245 @@
     next if ($subfile =~ /^\.\.?$/);
     next if ($read_metadata_files && $subfile =~ /metadata\.xml$/);
+
+    # check for a symlink pointing back to a leading directory
+    if (-d "$dirname/$subfile" && -l "$dirname/$subfile") {
+        # readlink gives a "fatal error" on systems that don't implement
+        # symlinks. This assumes the the -l test above would fail on those.
+        my $linkdest=readlink "$dirname/$subfile";
+        if (!defined ($linkdest)) {
+        # system error - file not found?
+        warn "RecPlug: symlink problem - $!";
+        } else {
+        # see if link points to current or a parent directory
+        if ($linkdest =~ m@^[\./\\]+$@ ||
+            index($dirname, $linkdest) != -1) {
+            warn "RecPlug: Ignoring recursive symlink ($dirname/$subfile -> $linkdest)\n";
+            next;
+            ;
+        }
+        }
+    }
+
     print $outhandle "RecPlug: preparing metadata for $subfile\n" if ($verbosity > 2);