ecere/gui/Window: Prevent uninitialized values if base Window methods not overridden...

[sdk] / extras / FileSystemIterator.ec

diff --git a/extras/FileSystemIterator.ec b/extras/FileSystemIterator.ec
index 16f7307..ba65bb8 100644 (file)
--- a/extras/FileSystemIterator.ec
+++ b/extras/FileSystemIterator.ec
@@ -15,28 +15,24 @@ public:
    Array<StackFrame> stack { };
 
    char * extensions;
-   property char * extensions { set { delete extensions; if(value) extensions = CopyString(value); } }
+   property const char * extensions { set { delete extensions; if(value) extensions = CopyString(value); } }
 
    ~NormalFileSystemIterator()
    {
       delete extensions;
    }
 
-   void Iterate(char * startPath)
+   void Iterate(const char * startPath)
    {
       StackFrame frame;
 
-      if(OnInit(startPath))
-      {
-         frame = stack.firstIterator.data;
-      }
-      else
-      {
-         frame = StackFrame { };
-         stack.Add(frame);
-         frame.path = CopyString(startPath);
-         frame.listing = FileListing { startPath, extensions = extensions };  // there should be a sorted = true/false
-      }
+      if(!OnInit(startPath))
+         return;
+
+      frame = StackFrame { };
+      stack.Add(frame);
+      frame.path = CopyString(startPath);
+      frame.listing = FileListing { startPath, extensions = extensions };  // there should be a sorted = true/false
 
       if(iterateStartPath)
       {
@@ -54,13 +50,11 @@ public:
       {
          if(frame.listing.Find())
          {
-            char * name = frame.listing.name;
-            bool isDirectory = frame.listing.stats.attribs.isDirectory;
             bool peek = frame.listing.stats.attribs.isDirectory && OnFolder(frame.listing.path);
             if(!frame.listing.stats.attribs.isDirectory)
             {
-               char * path = frame.listing.path;
-               OnFile(frame.listing.path);
+               const char * path = frame.listing.path;
+               OnFile(path);
             }
             else if(peek)
             {
@@ -76,6 +70,7 @@ public:
             StackFrame parentFrame = stack.count > 1 ? stack[stack.count - 2] : null;
             OutFolder(parentFrame ? parentFrame.listing.path : startPath, !parentFrame);
             stack.lastIterator.Remove();
+            delete frame;
             if(stack.count)
                frame = stack.lastIterator.data;
             else
@@ -90,31 +85,31 @@ public class FileSystemIterator
 public:
    bool iterateStartPath;
 
-   virtual bool OnInit(char * startPath)
+   virtual bool OnInit(const char * startPath)
    {
-      return false;
+      return true;
    }
 
-   virtual bool OnFile(char * filePath)
+   virtual bool OnFile(const char * filePath)
    {
       return true;
    }
 
-   virtual bool OnFolder(char * folderPath)
+   virtual bool OnFolder(const char * folderPath)
    {
       return true;
    }
 
-   virtual bool OnVolume(char * volumePath)
+   virtual bool OnVolume(const char * volumePath)
    {
       return true;
    }
 
-   virtual void OutFolder(char * folderPath, bool isRoot)
+   virtual void OutFolder(const char * folderPath, bool isRoot)
    {
    }
 }
-
+/*
 static class IteratorThread : Thread
 {
    void Temp()
@@ -122,7 +117,7 @@ static class IteratorThread : Thread
       //listing = FileListing { dir, extensions = filter.extensions };  // there should be a sorted = true/false
    }
 }
-
+*/
 public class StackFrame
 {
    int tag;
@@ -135,4 +130,3 @@ public class StackFrame
       //delete listing;
    }
 };
-