cunit test clean

diff --git a/os/ReDirTools.cpp b/os/ReDirTools.cpp
index 0a3b11774fd7be2b7f4c37792cbebe1c92a6349a..ed3223de55511ae6fc4e7938659ec4a405f617f0 100644 (file)
--- a/os/ReDirTools.cpp
+++ b/os/ReDirTools.cpp
@@ -608,6 +608,10 @@ const ReStringList& ReDirStatistic::calculate(const char* base, int level,
        ReByteBuffer line;
     int traceCount = 0;
        while( (entry = traverser.rawNextFile(currentDepth))){
+               //@todo
+               ReByteBuffer dummy(entry->m_path); dummy.append(entry->node());
+               int passNo = entry->m_passNo;
+               const char* dummyStr = dummy.str();
                if (currentDepth <= level && ! entry->m_path.equals(current->m_path)){
                        if (currentDepth <= topOfStack){
                                // close the entries of the stack above the new top level:
@@ -630,9 +634,6 @@ const ReStringList& ReDirStatistic::calculate(const char* base, int level,
                                // set up a new stack entry:
                                if (currentDepth != topOfStack + 1)
                                        assert(currentDepth == topOfStack + 1);
-                               //@todo
-                               if (strstr("dir2", entry->node()) != NULL || strstr("dir2", entry->m_path.str()))
-                                       ReByteBuffer breaker;
 
                                topOfStack++;
                                if (dataStack[topOfStack] == NULL)

diff --git a/os/ReTraverser.cpp b/os/ReTraverser.cpp
index e690258dd37c884394f721793a7303f2a9d8f9a4..3d4d6d1dfd3827dc982fe0aa6332717be21b96d7 100644 (file)
--- a/os/ReTraverser.cpp
+++ b/os/ReTraverser.cpp
@@ -126,6 +126,7 @@ bool ReDirStatus_t::findFirst(){
                closedir(m_handle);\r
        m_handle = opendir(m_path.str());\r
        rc = m_handle != NULL && (m_data = readdir(m_handle)) != NULL;\r
+       m_status.st_ino = 0;\r
 #elif defined __WIN32__\r
        if (m_handle != INVALID_HANDLE_VALUE)\r
                FindClose(m_handle);\r
@@ -145,6 +146,7 @@ bool ReDirStatus_t::findFirst(){
 bool ReDirStatus_t::findNext(){\r
 #if defined __linux__\r
        bool rc = m_handle != NULL && (m_data = readdir(m_handle)) != NULL;\r
+       m_status.st_ino = 0;\r
 #elif defined __WIN32__\r
        bool rc = m_handle != INVALID_HANDLE_VALUE && FindNextFileA(m_handle, &m_data);\r
 #endif\r
@@ -191,7 +193,8 @@ ReDirStatus_t::Type_t ReDirStatus_t::type(){
  */\r
 bool ReDirStatus_t::isDirectory() {\r
 #ifdef __linux__\r
-    return (m_data->d_type != DT_UNKNOWN && m_data->d_type == DT_DIR) || S_ISDIR(getStatus()->st_mode);\r
+    return m_data->d_type == DT_DIR\r
+               || (m_data->d_type == DT_UNKNOWN && S_ISDIR(getStatus()->st_mode));\r
 #elif defined __WIN32__\r
     return 0 != (m_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);\r
 #endif\r
@@ -206,7 +209,8 @@ bool ReDirStatus_t::isDirectory() {
 bool ReDirStatus_t::isLink() {\r
        bool rc;\r
 #ifdef __linux__\r
-    rc = (m_data->d_type != DT_UNKNOWN && m_data->d_type == DT_LNK) || S_ISLNK(getStatus()->st_mode);\r
+    rc = m_data->d_type == DT_LNK\r
+               || (m_data->d_type == DT_UNKNOWN && S_ISLNK(getStatus()->st_mode));\r
 #elif defined __WIN32__\r
     rc = 0 != (m_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT);\r
 #endif\r
@@ -219,7 +223,8 @@ bool ReDirStatus_t::isLink() {
  */\r
 bool ReDirStatus_t::isRegular() {\r
 #ifdef __linux__\r
-    return (m_data->d_type != DT_UNKNOWN && m_data->d_type == DT_REG) || S_ISREG(getStatus()->st_mode);\r
+    return m_data->d_type == DT_REG\r
+               || (m_data->d_type == DT_UNKNOWN  && S_ISREG(getStatus()->st_mode));\r
 #elif defined __WIN32__\r
     return 0 == (m_data.dwFileAttributes & (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE));\r
 #endif\r