[29412] trunk/base

source_changes at macosforge.org source_changes at macosforge.org
Sun Sep 23 02:27:30 PDT 2007


Revision: 29412
          http://trac.macosforge.org/projects/macports/changeset/29412
Author:   eridius at macports.org
Date:     2007-09-23 02:27:29 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
Explicitly sort fs-traverse (#12622)

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/pextlib1.0/fs-traverse.c

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2007-09-23 09:00:04 UTC (rev 29411)
+++ trunk/base/ChangeLog	2007-09-23 09:27:29 UTC (rev 29412)
@@ -6,6 +6,8 @@
 
 Unreleased:
 
+    - Explicitly sort fs-traverse so it behaves predictable on linux systems (#12622, eridius in r29412).
+
     - add configure.objc/objcflags for Objective-C
 
     - add optional build.nice (0) and build.jobs (1) modifiers (afb in r28634 & r28673)

Modified: trunk/base/src/pextlib1.0/fs-traverse.c
===================================================================
--- trunk/base/src/pextlib1.0/fs-traverse.c	2007-09-23 09:00:04 UTC (rev 29411)
+++ trunk/base/src/pextlib1.0/fs-traverse.c	2007-09-23 09:27:29 UTC (rev 29412)
@@ -128,13 +128,19 @@
 }
 
 static int
+do_compare(const FTSENT **a, const FTSENT **b)
+{
+    return strcmp((*a)->fts_name, (*b)->fts_name);
+}
+
+static int
 do_traverse(Tcl_Interp *interp, int flags, char * CONST *targets, Tcl_Obj *varname, Tcl_Obj *body)
 {
     int rval = TCL_OK;
     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, &do_compare);
     
     while ((ent = fts_read(root_fts)) != NULL) {
         switch (ent->fts_info) {

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


More information about the macports-changes mailing list