win corrections, ReDirectory::deleteTree()

diff --git a/base/ReByteBuffer.cpp b/base/ReByteBuffer.cpp
index 65a01f0c037a5d062f715b413c84927c36a80fe7..f12c8d290f698cf6cf1e1dd79d25f97c2f51b462 100644 (file)
--- a/base/ReByteBuffer.cpp
+++ b/base/ReByteBuffer.cpp
@@ -461,10 +461,12 @@ int ReByteBuffer::count(const char* toCount, size_t lengthToCount){
  */
 bool ReByteBuffer::endsWith(const Byte* tail, size_t tailLength,
                        bool ignoreCase) const {
-       bool rc;
-       if (tailLength == (size_t)-1)
-               tailLength = strlen(tail);
-       rc = indexOf(tail, tailLength, m_length - tailLength, m_length, ignoreCase) >= 0;
+       bool rc = tail != NULL;
+       if (rc){
+               if (tailLength == (size_t)-1)
+                       tailLength = strlen(tail);
+               rc = indexOf(tail, tailLength, m_length - tailLength, m_length, ignoreCase) >= 0;
+       }
        return rc;
 }
 
@@ -785,10 +787,12 @@ bool ReByteBuffer::splice(size_t ix, size_t replacedLength,
  *                                             <code>false</code>: otherwise
  */
 bool ReByteBuffer::startsWith(const Byte* head, size_t headLength, const bool ignoreCase) const{
-       bool rc;
-       if (headLength == (size_t) -1)
-               headLength = strlen(head);
-       rc = indexOf(head, headLength, 0, headLength, ignoreCase) == 0;
+       bool rc = head != NULL;
+       if (rc){
+               if (headLength == (size_t) -1)
+                       headLength = strlen(head);
+               rc = indexOf(head, headLength, 0, headLength, ignoreCase) == 0;
+       }
        return rc;
 }
 

diff --git a/base/ReDirectory.cpp b/base/ReDirectory.cpp
index 784f0375f133c8461b9d1a440bfe8734517250b4..1982c94b0a048769f6abc131cbd2a8f64fecc9a9 100644 (file)
--- a/base/ReDirectory.cpp
+++ b/base/ReDirectory.cpp
@@ -67,55 +67,55 @@ ReDirectory::~ReDirectory(){
 #elif defined __WIN32__
 #endif
 }
-/** @brief Sets the directory.
+/** @brief Returns the name of the current file found by the last <code>findFirst()</code>
+ * or <code>findNext()</code>.
+ *
+ * @return NULL: No current file exists. Otherwise: The name of the current file.
  *
- * @param path         The name of the directory.
  */
-void ReDirectory::setDir(const char* path){
-       m_path.set(path, -1);
+const char* ReDirectory::currentFile(){
 #if defined __linux__
-       if (m_dir != NULL){
-               closedir(m_dir);
-               m_dir = NULL;
-       }
-       m_entry = NULL;
-       m_dir = opendir(path);
-       m_valid = m_dir != NULL;
-       if (m_valid){
-               if (m_path.at(m_path.length() - 1) != OS_SEPARATOR_CHAR)
-                       m_path.append(OS_SEPARATOR, 1);
-       }
+       const char* rc = m_entry == NULL ? NULL : m_entry->d_name;
 #elif defined __WIN32__
-    struct stat info;
-    ReByteBuffer thePath(m_path);
-    if (m_path.endsWith(OS_SEPARATOR))
-        thePath.setLength(thePath.length() - 1);
-    m_valid = stat(thePath.str(), &info) == 0 && S_ISDIR(info.st_mode);
+   const char* rc = m_data.cFileName;
 #endif
-}
-/** @brief Returns the name of the directory.
- *
- * @return The name of the directory.
- */
-const char* ReDirectory::getDir(void) const {
-       return m_path.buffer();
+   return rc;
 }
 
-/** @brief Tests whether the directory state is valid.
+/**
+ * Deletes a directory tree.
  *
- * @return true: The instance is OK. false: Some error has occurred.
+ * @param base                 the name of the directory
+ * @param deleteBaseToo        true: the directory itself will be deleted
+ *                                             false: only the files and subdirs in the dir will be deleted
  */
-bool ReDirectory::isValid(){
-       return m_valid;
+void ReDirectory::deleteTree(const char* base, bool deleteBaseToo){
+       ReDirectory dir(base);
+       if (dir.findFirst("*", false)){
+               ReByteBuffer full;
+               do {
+                       struct stat info;
+                       const char* node = dir.currentFile();
+                       if (! (node[0] == '.' && (node[1] == '\0' || node[1] == '.' && node[2] == '\0'))
+                                       && stat(dir.fullpath(full).str(), &info) == 0){
+                               if (S_ISDIR(info.st_mode))
+                                       deleteTree(full.str(), true);
+                               else
+                                       _unlink(full.str());
+                       }
+               } while(dir.findNext());
+       }
+       if (deleteBaseToo){
+               _rmdir(base);
+       }
 }
-/** @brief Sets the flags of the regular expression handling.
+
+/** @brief Returns the name of the directory.
  *
- * @param flags                Usefull flags are: REG_ICASE: ignore case.
+ * @return The name of the directory.
  */
-void ReDirectory::setRegExprFlags(int flags){
-#if defined __linux__
-       m_regExprFlags = flags;
-#endif
+const char* ReDirectory::getDir(void) const {
+       return m_path.buffer();
 }
 
 /** @brief Find the first file with a given filename pattern.
@@ -160,7 +160,8 @@ bool ReDirectory::findFirst(const char* pattern, bool isRegExpr){
 }
 /** @brief Find the next file with the pattern defined with the last <code>findFirst()</code> call.
  *
- * @return true: A file has been found. false: The directory contains no more file with the given pattern.
+ * @return     true: a file has been found<br>
+ *                     false: the directory contains no more file with the given pattern
  */
 bool ReDirectory::findNext(){
        bool rc = false;
@@ -235,20 +236,7 @@ bool ReDirectory::findYoungest(ReByteBuffer& filename){
 #endif
        return rc;
 }
-/** @brief Returns the name of the current file found by the last <code>findFirst()</code>
- * or <code>findNext()</code>.
- *
- * @return NULL: No current file exists. Otherwise: The name of the current file.
- *
- */
-const char* ReDirectory::currentFile(){
-#if defined __linux__
-       const char* rc = m_entry == NULL ? NULL : m_entry->d_name;
-#elif defined __WIN32__
-   const char* rc = m_data.cFileName;
-#endif
-   return rc;
-}
+
 /** @brief Returns the full path of the current file or a given node.
  *
  * The current file is the file found by the last call of <code>findFirst()</code> or <code>findNext()</code>.
@@ -279,10 +267,46 @@ ReByteBuffer& ReDirectory::fullpath(ReByteBuffer& path, const char* name){
        return path;
 }
 
-/** @brief Find the first file matching a given filename pattern.
+/** @brief Tests whether the directory state is valid.
+ *
+ * @return true: The instance is OK. false: Some error has occurred.
+ */
+bool ReDirectory::isValid(){
+       return m_valid;
+}
+
+/** @brief Sets the directory.
+ *
+ * @param path         The name of the directory.
+ */
+void ReDirectory::setDir(const char* path){
+       m_path.set(path, -1);
+#if defined __linux__
+       if (m_dir != NULL){
+               closedir(m_dir);
+               m_dir = NULL;
+       }
+       m_entry = NULL;
+       m_dir = opendir(path);
+       m_valid = m_dir != NULL;
+#elif defined __WIN32__
+    struct stat info;
+    ReByteBuffer thePath(m_path);
+    if (m_path.endsWith(OS_SEPARATOR))
+        thePath.setLength(thePath.length() - 1);
+    m_valid = stat(thePath.str(), &info) == 0 && S_ISDIR(info.st_mode);
+#endif
+       if (m_path.at(m_path.length() - 1) != OS_SEPARATOR_CHAR)
+               m_path.append(OS_SEPARATOR, 1);
+}
+
+/** @brief Sets the flags of the regular expression handling.
  *
- * @param dir                  The directory handle.
- * @param pattern              The pattern for the searched files. May contain wildcards.
- * @param useRegExpr   True: <code>pattern</code> is a regular expression.
+ * @param flags                Usefull flags are: REG_ICASE: ignore case.
  */
+void ReDirectory::setRegExprFlags(int flags){
+#if defined __linux__
+       m_regExprFlags = flags;
+#endif
+}
 

diff --git a/base/ReDirectory.hpp b/base/ReDirectory.hpp
index f51df7ccda4f6451224ccfea4421813af44f2ceb..0739faca675f5837e5f2125a5a1e158463ef6af7 100644 (file)
--- a/base/ReDirectory.hpp
+++ b/base/ReDirectory.hpp
@@ -17,15 +17,17 @@ public:
        ReDirectory(const char* path);
        ~ReDirectory();
 public:
-       void setDir(const char* path);
-       const char* getDir(void) const;
-       bool isValid();
-       void setRegExprFlags(int flags);
+       const char* currentFile();
        bool findFirst(const char* pattern, bool isRegExpr);
        bool findNext();
        bool findYoungest(ReByteBuffer& filename);
-       const char* currentFile();
        ReByteBuffer& fullpath(ReByteBuffer& path, const char* name = NULL);
+       const char* getDir(void) const;
+       bool isValid();
+       void setDir(const char* path);
+       void setRegExprFlags(int flags);
+public:
+       static void deleteTree(const char* base, bool deleteBaseToo = false);
 private:
                //@ true: The directory is ok. false: The directory is undefined.
        bool m_valid;

diff --git a/base/ReStringList.cpp b/base/ReStringList.cpp
index 96a45cde8f0c55c93d3743bb1d9ea235092cceb8..a8b7c6d39dd7bd19fb3d44320e692c5972218246 100644 (file)
--- a/base/ReStringList.cpp
+++ b/base/ReStringList.cpp
@@ -298,7 +298,7 @@ ReSeqArray::Index ReStringList::nextStartingWith(Index start,
 void ReStringList::split(const char* list, char separator, bool append){
        if (! append)
                clear();
-       const char* end = strchr(list, separator);
+       const char* end = list == NULL ? NULL : strchr(list, separator);
        const char* end2;
        ReByteBuffer item;
        while(end != NULL){
@@ -316,7 +316,7 @@ void ReStringList::split(const char* list, char separator, bool append){
                        list++;
                end = strchr(list, separator);
        }
-       if (list[0] != '\0')
+       if (list != NULL && list[0] != '\0')
                add(-1, list, strlen(list) + 1);
 }
 /** @brief Joins all string members into a string.

diff --git a/base/ReTestUnit.cpp b/base/ReTestUnit.cpp
index 7323c6c1055cbf12fc06a4556856d1abf990e92a..9d89d5c78bace29efe8dafed9a30fd1bd3f7f823 100644 (file)
--- a/base/ReTestUnit.cpp
+++ b/base/ReTestUnit.cpp
@@ -122,6 +122,8 @@ void ReTestUnit::assertEqual(unsigned int expected, unsigned int current, int li
  * @param lineNo               the line number of the test (for the error message)
  */
 void ReTestUnit::assertEqual(const char* expected, const char* current, int lineNo){
+       if (expected == NULL)
+               expected = "";
        if (current == NULL || strcmp(expected, current) != 0){
                logF(true, i18n("%s-%d: expected / current: length: %d / %d\n%.512s\n%.512s"),
                        m_sourceFile.str(), lineNo, strlen(expected), current == NULL ? 0 : strlen(current),

diff --git a/cunit/cuReDirTools.cpp b/cunit/cuReDirTools.cpp
index d2d89946107338237b56d8a910a3579876d79741..5c295915c768cfb3fe240cf33a8d0d4ed8b4b499 100644 (file)
--- a/cunit/cuReDirTools.cpp
+++ b/cunit/cuReDirTools.cpp
@@ -16,6 +16,7 @@ class TestReDirTools : public ReTestUnit {
 public:
        TestReDirTools() : ReTestUnit("ReTraverser", __FILE__){
         m_base = testDir();
+               ReDirectory::deleteTree(m_base.str());
         m_base.append("traverser").append(OS_SEPARATOR, -1);
         _mkdir(m_base.str(), ALLPERMS);
                run();
@@ -252,9 +253,14 @@ private:
                ReStringList cols;
                for (size_t ix = 0; ix < current.count(); ix++){
                        line.setLength(0).append(current.strOf(ix), -1);
+#if defined __WIN32__
+                       line.replaceAll(OS_SEPARATOR, 1, "/", 1);
+#endif
                        cols.split(expected.strOf(ix), '*');
-                       checkT(line.startsWith(cols.strOf(0)));
-                       checkT(line.endsWith(cols.strOf(1)));
+                       if (! line.startsWith(cols.strOf(0)))
+                               checkEqu(cols.strOf(0), line.str());
+                       if (! line.endsWith(cols.strOf(1)))
+                               checkEqu(cols.strOf(1), line.str());
                }
     }
     void testTouch(){
@@ -271,7 +277,8 @@ private:
                        "2015.03.28 10:21:31 *traverser/1.txt\n"
                        "2015.03.28 10:21:31 *traverser/dir1/dir1_2/dir1_2_1/x1.txt\n"
                        "2015.03.28 10:21:31 *traverser/dir1/dir1_2/dir1_2_1/x2.txt\n"
-                       "===        3 file(s)     0.000059 MByte       0 dirs(s) * sec");
+                       "=== filtered:        3 file(s)     0.000059 MByte       0 dirs(s) * sec\n"
+                       "===    total:        4 file(s)     0.000067 MByte       6 dirs(s) * sec");
 
                const char* argv2[] = { "dt", "list", "-P;*;-cache", "-tr", "-p;*.txt",
                        optOutput.str(), m_base.str(), NULL };

diff --git a/os/ReDirTools.cpp b/os/ReDirTools.cpp
index 232b230ec1efcb7707c92eb5620096db3c4a846a..32b34b6b108d79ead4631f947edf5729b893a7d8 100644 (file)
--- a/os/ReDirTools.cpp
+++ b/os/ReDirTools.cpp
@@ -699,11 +699,11 @@ void ReTool::run(int argc, const char** argv){
  */\r
 void ReTool::processFileArguments(){\r
        int max = m_programArgs.getArgCount() - m_reservedLast;\r
-       struct stat info;\r
        // Test whether the arguments are files or directories:\r
+       ReByteBuffer arg;\r
        for (int ii = m_reservedFirst; ii < max; ii++){\r
-               const char* arg = m_programArgs.getArg(ii);\r
-               if (stat(arg, &info) != 0)\r
+               arg = m_programArgs.getArg(ii);\r
+               if (! exists(arg) != 0)\r
                        m_programArgs.help(\r
                                ReByteBuffer(i18n("not a file or a directory: ")).append(arg).str(),\r
                                false, stderr);\r
@@ -711,7 +711,7 @@ void ReTool::processFileArguments(){
        // process the files:\r
        for (int ii = m_reservedFirst; ii < max; ii++){\r
                const char* arg = m_programArgs.getArg(ii);\r
-               if (S_ISDIR(info.st_mode))\r
+               if (S_ISDIR(m_statInfo.st_mode))\r
                        processTree(arg);\r
                else\r
                        processSingleFile(arg);\r
@@ -794,14 +794,21 @@ void ReTool::processFile(ReDirStatus_t* entry){
 }\r
 /**\r
  * Issues a summary message if verbose level allows this.\r
+ * \r
+ * @param prefix               NULL or a line prefix\r
  */\r
-void ReTool::printSummary(){\r
+void ReTool::printSummary(const char* prefix){\r
        if (m_verboseLevel >= V_SUMMARY){\r
                int duration = int(time(NULL) - m_start);\r
                ReByteBuffer line;\r
+               ReByteBuffer line2;\r
                statisticAsString(line);\r
-               line.append(" ", 1).appendTime(duration).append(" ", 1).append(i18n("sec"));\r
-               fprintf(m_output, "=== %s\n", line.str());\r
+               double rate = duration == 0 ? 0.0 : (m_files + m_directories) / duration;\r
+               line.append(rate, " %.1f").append(i18n("/sec"), -1);\r
+               m_traverser.statisticAsString(line2);\r
+               line2.append(" ", 1).appendTime(duration).append(" ", 1).append(i18n("sec"));\r
+               fprintf(m_output, "%s=== filtered: %s\n", prefix == NULL ? "" : prefix, line.str());\r
+               fprintf(m_output, "%s===    total: %s\n", prefix == NULL ? "" : prefix, line2.str());\r
        }\r
 \r
 }\r
@@ -1296,15 +1303,14 @@ void ReDirTouch::processDir(ReDirStatus_t* entry){
 }\r
 \r
 static bool isAbsoluteTime(ReFileTime_t& time){\r
+#if defined __linux__\r
        static struct tm year1980 = { 0, 0, 0, 1, 1 - 1, 1980-1900 };\r
        static time_t time1980 = mktime(&year1980);\r
-#if defined __linux__\r
        return time.tv_sec >= time1980;\r
 #elif defined __WIN32__\r
-       static ReFileTime_t time2 = { 0, 0 };\r
-       if (time2.dwHighDateTime == 0 && time2.dwLowDateTime == 0)\r
-               ReDirStatus_t::timeToFiletime(time1980, time2);\r
-       return time2 > time;\r
+       static ReFileTime_t filetime1980 = { 2148603904, 27846551 };\r
+       bool rc = time > filetime1980;\r
+       return rc;\r
 #endif\r
 }\r
 static void addRelativeTime(ReFileTime_t& absTime, const ReFileTime_t& relTime){\r
@@ -1461,11 +1467,7 @@ void ReDirTools::usage(const char* msg, const char* msg2){
  */\r
 void ReDirSync::makeDirWithParents(ReByteBuffer& path, int minWidth,\r
                        ReTraverser& traverser){\r
-    struct stat info;\r
-       bool endsWithSlash = path.str()[path.length() - 1] == OS_SEPARATOR_CHAR;\r
-       if (endsWithSlash)\r
-               path.setLength(path.length() - 1);\r
-       if (stat(path.str(), &info) != 0){\r
+       if (! exists(path)){\r
                ReFileProperties_t* props = NULL;\r
 #if defined __linux__\r
                ReDirStatus_t* entry = traverser.topOfStack();\r
@@ -1473,8 +1475,6 @@ void ReDirSync::makeDirWithParents(ReByteBuffer& path, int minWidth,
 #endif\r
                makeDirectory(path.str(), minWidth, props, ReLogger::globalLogger());\r
        }\r
-       if (endsWithSlash)\r
-               path.append(OS_SEPARATOR, 1);\r
 }\r
 /**\r
  * Constructor.\r
@@ -1711,14 +1711,13 @@ bool ReDirSync::makeDirectory(const char* directory, int minLength,
 void ReDirSync::doIt(){\r
     ReDirEntryFilter_t filter;\r
     const char* sep = OS_SEPARATOR;\r
-    struct stat info;\r
        ReByteBuffer buffer;\r
        ReByteBuffer target(m_programArgs.getArg(m_programArgs.getArgCount() - 1));\r
-       if (target.endsWith(sep, 1))\r
-                       target.setLength(target.length() - 1);\r
-       if (stat(target.str(), &info) != 0)\r
+       if (target.endsWith(OS_SEPARATOR))\r
+               target.setLength(target.length() - 1);\r
+       if (! exists(target))\r
                help(i18n("target does not exist: $1"), target.str());\r
-       else if (! S_ISDIR(info.st_mode))\r
+       else if (! S_ISDIR(m_statInfo.st_mode))\r
                help(i18n("target is not a directory: $1"), target.str());\r
        size_t lengthTargetBase = target.length();\r
        bool addOnly = m_programArgs.getBool("add");\r
@@ -1739,9 +1738,9 @@ void ReDirSync::doIt(){
                bool endsWithSlash = source.endsWith(sep, 1);\r
                if (endsWithSlash)\r
                        source.setLength(source.length() - 1);\r
-               if (stat(source.str(), &info) != 0)\r
+               if (! exists(source))\r
                        help(i18n("source does not exist: $1"), source.str());\r
-               else if (! S_ISDIR(info.st_mode))\r
+               else if (! S_ISDIR(m_statInfo.st_mode))\r
                        help(i18n("source is not a directory: $1"), source.str());\r
                if (! endsWithSlash){\r
                        // the basename of the source will be appended to the target:\r
@@ -1763,30 +1762,30 @@ void ReDirSync::doIt(){
                        // append the new relative path from source to target:\r
                        target.setLength(ixTargetRelative);\r
                        target.append(entry->m_path.str() + ixSourceRelative, -1);\r
-                       if (stat(target.str(), &info) != 0)\r
+                       if (! exists(target))\r
                                makeDirWithParents(target, ixTargetRelative, traverser);\r
                        targetFile.set(target).append(entry->node(), -1);\r
                        const char* targetRelativePath = targetFile.str() + ixTargetRelative + 1;\r
-                       bool exists = stat(targetFile.str(), &info) == 0;\r
-                       if (! exists && mustExist){\r
+                       bool targetExists = exists(targetFile);\r
+                       if (! targetExists && mustExist){\r
                                if (m_verboseLevel == V_CHATTER)\r
                                        fprintf(m_output, "-ignored: %s does not exist\n", targetRelativePath);\r
                                continue;\r
                        }\r
-                       if (exists){\r
+                       if (targetExists){\r
                                if (addOnly){\r
                                        if (m_verboseLevel >= V_CHATTER)\r
                                                fprintf(m_output, "~ignored: %s exists\n", targetRelativePath);\r
                                        continue;\r
                                }\r
-                               if (ignoreDate && entry->fileSize() == info.st_size){\r
+                               if (ignoreDate && entry->fileSize() == m_statInfo.st_size){\r
                                        if (m_verboseLevel >= V_CHATTER)\r
                                                fprintf(m_output, "_ignored: %s same size\n", targetRelativePath);\r
                                        continue;\r
                                }\r
                                // target younger than source?\r
-                               int diff = int(info.st_mtime - entry->filetimeToTime(entry->modified()));\r
-                               if (! ignoreDate && info.st_mtime - entry->filetimeToTime(entry->modified())\r
+                               int diff = int(m_statInfo.st_mtime - entry->filetimeToTime(entry->modified()));\r
+                               if (! ignoreDate && m_statInfo.st_mtime - entry->filetimeToTime(entry->modified())\r
                                                <= maxFileTimeDiff) {\r
                                        if (m_verboseLevel >= V_CHATTER)\r
                                                fprintf(m_output, "=ignored: %s same time\n", targetRelativePath);\r
@@ -1796,7 +1795,7 @@ void ReDirSync::doIt(){
                        files++;\r
                        sumSizes += entry->fileSize();\r
                        if (m_verboseLevel >= V_NORMAL)\r
-                               fprintf(m_output, "%c%s%s\n", exists ? '!' : '+', targetRelativePath,\r
+                               fprintf(m_output, "%c%s%s\n", targetExists ? '!' : '+', targetRelativePath,\r
                                        dry ? " would be copied" : "");\r
                        if (! dry)\r
                                copyFile(entry, targetFile.str());\r
@@ -1809,7 +1808,7 @@ void ReDirSync::doIt(){
                int duration = int(time(NULL) - m_start);\r
                fprintf(m_output, i18n(\r
                        "=== copied:    %02d:%02d sec  %7d file(s) %12.6f MByte (%.3f MB/sec).\n"\r
-                       "=== tree  :  %5d dir(s) %7d file(s) %12.6f MByte\n"),\r
+                       "===   tree:  %5d dir(s) %7d file(s) %12.6f MByte\n"),\r
                        duration / 60, duration % 60, files, sumSizes / 1E6,\r
                        sumSizes / 1E6 / (duration == 0 ? 1 : duration),\r
                        treeDirs, treeFiles, treeSumSizes / 1E6);\r

diff --git a/os/ReDirTools.hpp b/os/ReDirTools.hpp
index c539d583a7aae77a4749ea7d409b183749a2633c..2fcf836537ecbb6c068b199991a22caaa7184040 100644 (file)
--- a/os/ReDirTools.hpp
+++ b/os/ReDirTools.hpp
@@ -89,12 +89,32 @@ protected:
         * Normally it calls <code>processFileArguments()</code> after some initializations.
         */
        virtual void doIt() = 0;
-       void printSummary();
+       void printSummary(const char* prefix = NULL);
        virtual void processDir(ReDirStatus_t* status);
        virtual void processFile(ReDirStatus_t* status);
        void processFileArguments();
        virtual void processSingleFile(const char* filename);
        virtual void processTree(const char* filename);
+       /** Tests whether a file or directory exists:
+        @param name    can be changed and recovered!
+        @return                <code>true</code>: a file with the given name exists
+        */
+       inline bool exists(ReByteBuffer& name){
+#if defined __linux__
+               // linux ignores a trailing slash:
+               return stat(name.str(), &m_statInfo) == 0;
+#elif defined __WIN32__
+               int ix = name.length() - 1;
+               if (ix >= 0 && name.str()[ix] != OS_SEPARATOR_CHAR)
+                       ix = -1;
+               else
+                       name.setLength(ix);
+               bool rc = stat(name.str(), &m_statInfo) == 0;
+               if (ix >= 0)
+                       name.append(OS_SEPARATOR_CHAR);
+               return rc;
+#endif
+       }
 protected:
        int m_minArguments;
        int m_reservedFirst;
@@ -103,6 +123,7 @@ protected:
        ReTraverser m_traverser;
        ReDirEntryFilter_t m_filter;
        int64_t m_start;
+       struct stat m_statInfo;
 };
 
 class ReDirBatch : public ReTool {

diff --git a/os/ReTraverser.cpp b/os/ReTraverser.cpp
index 30004cf15b6bc13fac7a62c7238da623d13f4368..20e8d140925703877db3efdc4fcb0dda6c0d70d4 100644 (file)
--- a/os/ReTraverser.cpp
+++ b/os/ReTraverser.cpp
@@ -312,7 +312,7 @@ time_t ReDirStatus_t::filetimeToTime(const ReFileTime_t* filetime){
 #ifdef __linux__\r
     return filetime->tv_sec;\r
 #elif defined __WIN32__\r
-    // takes the last modified date\r
+    // 64-bit arithmetic:\r
     LARGE_INTEGER date, adjust;\r
     date.HighPart = filetime->dwHighDateTime;\r
     date.LowPart = filetime->dwLowDateTime;\r
@@ -321,7 +321,8 @@ time_t ReDirStatus_t::filetimeToTime(const ReFileTime_t* filetime){
     // removes the diff between 1970 and 1601\r
     date.QuadPart -= adjust.QuadPart;\r
     // converts back from 100-nanoseconds to seconds\r
-    return (time_t) (date.QuadPart / 10000000);\r
+    time_t rc = (time_t) (date.QuadPart / 10000000);\r
+       return rc;\r
 #endif\r
 }\r
 /**\r