Changeset 10 for trunk/lib/Directory.cc

Timestamp:

Dec 30, 2005, 12:57:57 PM (18 years ago)

Author:

Jari Häkkinen

Message:

Reading directory structure.

File:

• trunk/lib/Directory.cc (modified) (2 diffs)

trunk/lib/Directory.cc

@@ -2 +2 @@
 
 #include "Directory.h"
+#include "File.h"
 #include "Node.h"
 
@@ -16 +17 @@
     : Node(path)
   {
+    using namespace std;
     DIR* directory=opendir(path.c_str());
     if (!directory) {
       // Jari, throw exception
-      std::cerr << "ERROR: opendir() failed; terminating" << std::endl;
+      cerr << "ERROR: opendir() failed; terminating" << endl;
       exit(1);
     }
+    vector<string> entries;
     struct dirent* entry;
-    errno=0;
-    std::vector<std::string> entries;
+    errno=0;  // Global variable used by C to track errors.
     while ((entry=readdir(directory)))
-      entries.push_back(std::string(entry->d_name)); // Jari, push backing
+      entries.push_back(string(entry->d_name)); // Jari, push backing
     if (errno) {
       // Jari, throw exception
-      std::cerr << "ERROR: readdir() failure; terminating" << std::endl;
+      cerr << "ERROR: readdir() failure; terminating" << endl;
       exit(1);
     }
     closedir(directory);
 
-    copy(entries.begin(),entries.end(),
-         std::ostream_iterator<std::string>(std::cout,"\n"));
+    // Jari, change this to some STL algo?
+    for (vector<string>::iterator i=entries.begin(); i!=entries.end(); i++)
+      if ((*i)!=string(".") && (*i)!=string("..")) {
+        /// Jari, should test if directory in some other way
+        DIR* dirtest=opendir(i->c_str());
+        if (!dirtest)
+          daughters_.push_back(new File(*i));
+        else
+          daughters_.push_back(new Directory(*i));
+      }
   }
+
+
+  Directory::~Directory(void)
+  {
+    // Jari, change this to some STL algo?
+    for (std::vector<Node*>::iterator i=daughters_.begin();
+         i!=daughters_.end(); i++)
+      delete *i;
+  }
+
 
   bool Directory::parse(void)
   {
     // Jari, where is the include for for_each?
-    for_each(nn_.begin(),nn_.end(), std::mem_fun(&Node::parse));
+    for_each(daughters_.begin(),daughters_.end(), std::mem_fun(&Node::parse));
     return true;
   }
 
+
+  void Directory::print(void) {
+    // Jari, temporary using this to print directory tree
+    std::cout << "-------------- Directory '" << path_ << "'" << std::endl;
+    for_each(daughters_.begin(),daughters_.end(), std::mem_fun(&Node::print));
+  }
+
 }} // end of namespace svnstat and namespace theplu