Changeset 14993 for trunk/Mars

Timestamp:

03/08/13 15:59:39 (12 years ago)

Author:

tbretz

Message:

Changed Next() in a way that it is not self-referencing anymore.... caused stack overflows with long lists.

File:

• trunk/Mars/mbase/MDirIter.cc (modified) (2 diffs)

trunk/Mars/mbase/MDirIter.cc

@@ -348 +348 @@
     // Check for rread perissions
     return !gSystem->AccessPathName(fqp, kReadPermission);
-
 }
 
@@ -374 +373 @@
 TString MDirIter::Next(Bool_t nocheck)
 {
-    fDirPtr = Open();
-    if (!fDirPtr)
-        return "";
-
-    // Get next entry in dir, if existing check validity
-    const char *n = gSystem->GetDirEntry(fDirPtr);
-    if (n)
-        return nocheck || CheckEntry(n) ? ConcatFileName(fCurrentPath->GetName(), n) : Next();
-
-    // Otherwise close directory and try to get next entry
-    Close();
-    return Next();
+    while (1)
+    {
+        fDirPtr = Open();
+        if (!fDirPtr)
+            break;
+
+        // Get next entry in dir, if existing check validity
+        const char *n = gSystem->GetDirEntry(fDirPtr);
+        if (!n)
+        {
+            // Otherwise close directory and try to get next entry
+            Close();
+            continue;
+        }
+
+        if (nocheck || CheckEntry(n))
+            return ConcatFileName(fCurrentPath->GetName(), n);
+    }
+
+    return "";
 }