[25065] branches/dp2mp-move/base/src/pextlib1.0

[source_changes at macosforge.org]

Revision: 25065
          http://trac.macosforge.org/projects/macports/changeset/25065
Author:   jmpp at macports.org
Date:     2007-05-12 23:40:26 -0700 (Sat, 12 May 2007)

Log Message:
-----------
Merge Eridius' r25003: fs-traverse no longer follows symlinks specified as a root path (fixes #11862).

Modified Paths:
--------------
    branches/dp2mp-move/base/src/pextlib1.0/fs-traverse.c
    branches/dp2mp-move/base/src/pextlib1.0/tests/fs-traverse.tcl

Modified: branches/dp2mp-move/base/src/pextlib1.0/fs-traverse.c
===================================================================
--- branches/dp2mp-move/base/src/pextlib1.0/fs-traverse.c	2007-05-13 03:25:16 UTC (rev 25064)
+++ branches/dp2mp-move/base/src/pextlib1.0/fs-traverse.c	2007-05-13 06:40:26 UTC (rev 25065)
@@ -133,7 +133,7 @@
     FTS *root_fts;
     FTSENT *ent;
     
-    root_fts = fts_open(targets, FTS_PHYSICAL | FTS_COMFOLLOW | FTS_NOCHDIR | FTS_XDEV, NULL);
+    root_fts = fts_open(targets, FTS_PHYSICAL /*| FTS_COMFOLLOW */| FTS_NOCHDIR | FTS_XDEV, NULL);
     
     while ((ent = fts_read(root_fts)) != NULL) {
         switch (ent->fts_info) {

Modified: branches/dp2mp-move/base/src/pextlib1.0/tests/fs-traverse.tcl
===================================================================
--- branches/dp2mp-move/base/src/pextlib1.0/tests/fs-traverse.tcl	2007-05-13 03:25:16 UTC (rev 25064)
+++ branches/dp2mp-move/base/src/pextlib1.0/tests/fs-traverse.tcl	2007-05-13 06:40:26 UTC (rev 25065)
@@ -33,6 +33,13 @@
         }
         check_output $output $trees(sub1)
         
+        # Test starting with a slash-ended symlink
+        set output [list]
+        fs-traverse file $root/a/c/a/ {
+            lappend output $file
+        }
+        check_output $output $trees(sub2)
+        
         # Test -depth
         set output [list]
         fs-traverse -depth file $root {
@@ -226,12 +233,16 @@
     
     set trees(sub1) "
         $root/a/c/a     {link ../d}
-        $root/a/c/a/a   file
-        $root/a/c/a/b   {link ../../b/a}
-        $root/a/c/a/c   directory
-        $root/a/c/a/d   file
     "
     
+    set trees(sub2) "
+        $root/a/c/a/     {link ../d}
+        $root/a/c/a//a   file
+        $root/a/c/a//b   {link ../../b/a}
+        $root/a/c/a//c   directory
+        $root/a/c/a//d   file
+    "
+    
     set trees(2) "
         $root/a/a       file
         $root/a/b       file

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070512/a11d42d3/attachment.html