Revision
79857
Author
afb@macports.org
Date
2011-06-28 03:11:18 -0700 (Tue, 28 Jun 2011)

Log Message

merge r79772 from trunk:
 fix tails with trailing slash, on other platforms

Modified Paths

Property Changed

Diff

Property changes: branches/release_2_0/base

Modified: svn:mergeinfo

/branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771,79774,79782,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79772,79774,79782,79787 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/src/pextlib1.0/fs-traverse.c (79856 => 79857)


--- branches/release_2_0/base/src/pextlib1.0/fs-traverse.c	2011-06-28 10:08:28 UTC (rev 79856)
+++ branches/release_2_0/base/src/pextlib1.0/fs-traverse.c	2011-06-28 10:11:18 UTC (rev 79857)
@@ -146,6 +146,8 @@
             xpath = ".";
         } else if (*(xpath + tlen) == '/') {
             xpath += tlen + 1;
+        } else if (*(target + tlen - 1) == '/') {
+            xpath += tlen;
         }
     }