Changeset 22

Timestamp:

Jan 2, 2006, 1:44:17 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixed check of symbolic links by checking if a node is an explicit directory.

Location:

trunk/lib

Files:

• Directory.cc (modified) (7 diffs)
• Directory.h (modified) (2 diffs)

trunk/lib/Directory.cc

@@ -12 +12 @@
 #include <errno.h>  // Needed to check error state below.
 #include <dirent.h>
+#include <sys/stat.h>
 
 namespace theplu{
@@ -20 +21 @@
   {
     using namespace std;
-    DIR* directory=opendir(path.c_str());
+    DIR* directory=opendir(path.c_str());    // C API from dirent.h
     if (!directory) {
       // Jari, throw exception
@@ -28 +29 @@
     list<string> entries;
     struct dirent* entry;
-    errno=0;  // Global variable used by C to track errors.
-    while ((entry=readdir(directory)))
-      entries.push_back(string(entry->d_name)); // Jari, push backing
+    errno=0;  // Global variable used by C to track errors, from errno.h
+    while ((entry=readdir(directory)))       // C API from dirent.h
+      entries.push_back(string(entry->d_name));
     if (errno) {
       // Jari, throw exception
@@ -41 +42 @@
     for (list<string>::iterator i=entries.begin(); i!=entries.end(); i++)
       if ((*i)!=string(".") && (*i)!=string("..") && (*i)!=string(".svn")) {
-        /// Jari, should test if directory in some other way
         string fullpath(path_+'/'+(*i));
-        DIR* dirtest=opendir(fullpath.c_str());
-        if (!dirtest)
+        struct stat nodestat;                // C api from sys/stat.h
+        lstat(fullpath.c_str(),&nodestat);   // C api from sys/stat.h
+        if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
+          daughters_.push_back(new Directory(fullpath));
+        else
           daughters_.push_back(new File(fullpath));
-        else
-          daughters_.push_back(new Directory(fullpath));
       }
   }
@@ -54 +55 @@
   Directory::~Directory(void)
   {
-    // Jari, change this to some STL algo?
-    for (std::list<Node*>::iterator i=daughters_.begin();
-         i!=daughters_.end(); i++)
+    for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); i++)
       delete *i;
   }
@@ -65 +64 @@
     stats_.reset();
 
-    for (std::list<Node*>::iterator i=daughters_.begin();
-         i!=daughters_.end(); i++)
+    for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); i++)
       stats_ += (*i)->parse();
     return stats_;
@@ -79 +77 @@
 
   void Directory::purge(void) {
-    for (std::list<Node*>::iterator i=daughters_.begin(); i!=daughters_.end(); )
+    for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); )
       if (!((*i)->subversion_controlled())) {
         delete *i;

trunk/lib/Directory.h

@@ -21 +21 @@
     /// @brief Constructor
     ///
-    /// Recursively create a directory tree starting from \a
-    /// path. Nodes named '.', '..', and '.svn' are ignored and not
+    /// Recursively create a directory tree starting from \a path. All
+    /// entries except explicit directories are treated as File nodes,
+    /// i.e. symbolic links to directories are treated as File
+    /// nodes. This will ensure that the directory structure is a tree
+    /// and double counting of branches is avoided.
+    ///
+    /// @note Nodes named '.', '..', and '.svn' are ignored and not
     /// traversed.
     ///
@@ -44 +49 @@
     Directory(const Directory&);
 
+    typedef std::list<Node*>::iterator NodeIterator;
     std::list<Node*> daughters_;
   };