Changeset 497

Timestamp:

08/11/09 09:56:48 (15 years ago)

Author:

vbarta

Message:

moved cross-platform directory scanning support from tests to core (osutils)

Location:

library

Files:

• bdm/dirent.c (moved) (moved from library/tests/dirent.c)
• bdm/dirent.h (moved) (moved from library/tests/dirent.h)
• bdm/osutils.cpp (modified) (2 diffs)
• bdm/osutils.h (modified) (1 diff)
• tests/test_util.cpp (modified) (2 diffs)
• tests/test_util.h (modified) (1 diff)

library/bdm/osutils.cpp

@@ -13 +13 @@
 #include "osutils.h"
 #include <iostream>
+#include <stdexcept>
+#include <string>
 
 #ifdef WIN32
+#include "dirent.h"
 #include <direct.h>
+#define rmdir _rmdir
+#define unlink _unlink
 #else
+#include <dirent.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -44 +51 @@
         }
 }
+
+bool remove_all ( const char *path ) {
+        DIR *dir;
+        dirent *de;
+
+        bool rv = true;
+        if ( ( dir = opendir ( path ) ) != 0 ) {
+                try {
+                        std::string top ( path );
+                        top += "/";
+
+                        while ( ( de = readdir ( dir ) ) != 0 ) {
+                                if ( strcmp ( de->d_name, "." ) && strcmp ( de->d_name, ".." ) ) {
+                                        std::string subpath ( top );
+                                        subpath += de->d_name;
+                                        remove_all ( subpath.c_str() );
+                                }
+                        }
+                } catch ( ... ) {
+                        closedir ( dir );
+                        throw;
+                }
+
+                closedir ( dir );
+
+                if ( rmdir ( path ) ) {
+                        std::string msg = "can't remove dir ";
+                        msg += path;
+                        throw std::runtime_error ( msg );
+                }
+        } else {
+                if ( ( errno == ENOTDIR ) || // Linux 
+                     ( errno == EINVAL ) ) { // Windows
+                        if ( unlink ( path ) ) {
+                                std::string msg = "can't remove file ";
+                                msg += path;
+                                throw std::runtime_error ( msg );
+                        }
+                } else {
+                        if ( errno != ENOENT ) {
+                                std::string msg = "can't remove ";
+                                msg += path;
+                                throw std::runtime_error ( msg );
+                        } else {
+                                // it wasn't there in the first place
+                                rv = false;
+                        }
+                }
+        }
+
+        return rv;
+}

library/bdm/osutils.h

@@ -27 +27 @@
 */
 void makedir ( string &dirname, bool rewrite = true );
+
+/*! @brief Recursively removes directories and files.
+
+@param path the name (absolute or relative) of the file or directory to
+be removed (must not be empty).
+
+Returns true on success, false when path couldn't be removed because
+it didn't exist, throws an exception otherwise.
+*/
+bool remove_all ( const char *path );
+

library/tests/test_util.cpp

@@ -2 +2 @@
 #include "stat/exp_family.h"
 #include <fstream>
-#include <stdexcept>
-#include <string>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#ifdef WIN32
-#include "dirent.h"
-#include <direct.h>
-#define rmdir _rmdir
-#define unlink _unlink
-#else
-#include <dirent.h>
-#include <unistd.h>
-#endif
 
 namespace bdm {
@@ -32 +14 @@
         src.read ( buffer, sizeof ( buffer ) - 1 );
         return std::string ( buffer );
-}
-
-bool remove_all ( const char *path ) {
-        DIR *dir;
-        dirent *de;
-
-        bool rv = true;
-        if ( ( dir = opendir ( path ) ) != 0 ) {
-                try {
-                        std::string top ( path );
-                        top += "/";
-
-                        while ( ( de = readdir ( dir ) ) != 0 ) {
-                                if ( strcmp ( de->d_name, "." ) && strcmp ( de->d_name, ".." ) ) {
-                                        std::string subpath ( top );
-                                        subpath += de->d_name;
-                                        remove_all ( subpath.c_str() );
-                                }
-                        }
-                } catch ( ... ) {
-                        closedir ( dir );
-                        throw;
-                }
-
-                closedir ( dir );
-
-                if ( rmdir ( path ) ) {
-                        std::string msg = "can't remove dir ";
-                        msg += path;
-                        throw std::runtime_error ( msg );
-                }
-        } else {
-                if ( ( errno == ENOTDIR ) || // Linux 
-                     ( errno == EINVAL ) ) { // Windows
-                        if ( unlink ( path ) ) {
-                                std::string msg = "can't remove file ";
-                                msg += path;
-                                throw std::runtime_error ( msg );
-                        }
-                } else {
-                        if ( errno != ENOENT ) {
-                                std::string msg = "can't remove ";
-                                msg += path;
-                                throw std::runtime_error ( msg );
-                        } else {
-                                // it wasn't there in the first place
-                                rv = false;
-                        }
-                }
-        }
-
-        return rv;
 }
 

library/tests/test_util.h

@@ -28 +28 @@
 std::string load_test_file ( const char *fname );
 
-/*! \brief Recursively removes directories and files.
-
-  path is the name (absolute or relative) of the file or directory to
-  be removed (must not be empty). Returns true on success, false when
-  path couldn't be removed because it didn't exist, throws an
-  exception otherwise.
-*/
-bool remove_all ( const char *path );
-
 double normcoef ( const epdf *ep, const itpp::vec &xb, const itpp::vec &yb,
                   int xn = 100, int yn = 100 );