X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=f7f34f668492383087c78ddb4f2627a4e551e38e;hp=08328548440ae6a18fdf8668d7db2aaeda182c87;hb=c8af8a2167685dc52c6e77951f3fa6ee53d67654;hpb=eeb6ed7b20d56578ff8c68f3c94e887d5ac768ee

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 0832854..f7f34f6 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,11 +1,13 @@
 #include <cstdlib>
 #include <cerrno>
 #include <dirent.h>
-#include <sys/stat.h>
 #ifdef WIN32
 #include <shlobj.h>
+#else
+#include <unistd.h>
+#include <sys/stat.h>
 #endif
-#include <msp/core/except.h>
+#include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
 #include "dir.h"
@@ -54,19 +56,22 @@ const Path &get_bin_dir(const string &argv0)
 
 }
 
+
+not_a_directory::not_a_directory(const Path &p):
+	runtime_error(p.str())
+{ }
+
+
 void mkdir(const Path &path, int mode)
 {
-	int err;
 #ifdef WIN32
-	// The win32 version of this function doesn't take the mode argument.  Go figure.
 	(void)mode;
-	err = ::mkdir(path.str().c_str());
+	if(!CreateDirectory(path.str().c_str(), NULL))
+		throw system_error("CreateDirectory");
 #else
-	err = ::mkdir(path.str().c_str(), mode);
+	if(::mkdir(path.str().c_str(), mode)==-1)
+		throw system_error("mkdir");
 #endif
-
-	if(err==-1)
-		throw SystemError("mkdir failed", errno);
 }
 
 void mkpath(const Path &path, int mode)
@@ -79,16 +84,12 @@ void mkpath(const Path &path, int mode)
 		if(p.size()==1 && p.is_absolute())
 			continue;
 #endif
-		struct stat st;
-		int err = stat(p, st);
-		if(err==0)
+		if(FS::Stat st = stat(p))
 		{
-			if(!S_ISDIR(st.st_mode))
-				throw Exception("A component exists and is not a directory");
+			if(!st.is_directory())
+				throw not_a_directory(p);
 			continue;
 		}
-		else if(errno!=ENOENT)
-			throw SystemError("stat failed", errno);
 		else
 			mkdir(p, mode);
 	}
@@ -96,19 +97,23 @@ void mkpath(const Path &path, int mode)
 
 void rmdir(const Path &path)
 {
+#ifdef WIN32
+	if(!RemoveDirectory(path.str().c_str()))
+		throw system_error("RemoveDirectory");
+#else
 	if(::rmdir(path.str().c_str())==-1)
-		throw SystemError("rmdir failed", errno);
+		throw system_error("rmdir");
+#endif
 }
 
-void rmdirs(const Path &path)
+void rmpath(const Path &path)
 {
 	list<string> files = list_files(path);
 	for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
 	{
 		Path p = path / *i;
-		struct stat st = stat(p.str().c_str());
-		if(S_ISDIR(st.st_mode))
-			rmdirs(p);
+		if(is_dir(p))
+			rmpath(p);
 		else
 			unlink(p);
 	}
@@ -213,7 +218,7 @@ Path get_sys_lib_dir(const string &argv0, const string &appname)
 void chdir(const Path &path)
 {
 	if(::chdir(path.str().c_str())==-1)
-		throw SystemError("chdir failed", errno);
+		throw system_error("chdir");
 }
 
 } // namespace FS