X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=2ae5122e63768492f54274a7b7062e861445a094;hp=bc7a8fec1b7fd9374c51dfa69165637341aad758;hb=f2fbac3ccb4960c4a3d057f641c28dba10ebf799;hpb=7563bb650aa11207a7c128ba44468cf5ad2897c7

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index bc7a8fe..2ae5122 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,11 +1,7 @@
 #include <cstdlib>
-#include <cerrno>
+#include <unistd.h>
 #include <dirent.h>
-#include <sys/stat.h>
-#ifdef WIN32
-#include <shlobj.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"
@@ -21,10 +17,8 @@ namespace FS {
 namespace
 {
 
-/**
-Helper function to determine the location of the program's executable.  Caches
-the last result to cut down filesystem access with repeated calls.
-*/
+/** Helper function to determine the location of the program's executable.
+Caches the last result to cut down filesystem access with repeated calls. */
 const Path &get_bin_dir(const string &argv0)
 {
 	static string last_argv0;
@@ -56,20 +50,11 @@ const Path &get_bin_dir(const string &argv0)
 
 }
 
-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());
-#else
-	err = ::mkdir(path.str().c_str(), mode);
-#endif
 
-	if(err==-1)
-		throw SystemError("mkdir failed", errno);
-}
+not_a_directory::not_a_directory(const Path &p):
+	runtime_error(p.str())
+{ }
+
 
 void mkpath(const Path &path, int mode)
 {
@@ -81,36 +66,25 @@ 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);
 	}
 }
 
-void rmdir(const Path &path)
-{
-	if(::rmdir(path.str().c_str())==-1)
-		throw SystemError("rmdir failed", errno);
-}
-
-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);
 	}
@@ -129,18 +103,18 @@ list<string> list_filtered(const Path &path, const string &filter)
 
 	list<string> result;
 	DIR *dir = opendir(path.str().c_str());
-	if(dir)
+	if(!dir)
+		throw system_error("opendir");
+
+	while(dirent *de = readdir(dir))
 	{
-		while(dirent *de = readdir(dir))
-		{
-			const char *fn = de->d_name;
-			if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
-				continue;
-			if(r_filter.match(fn))
-				result.push_back(fn);
-		}
-		closedir(dir);
+		const char *fn = de->d_name;
+		if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
+			continue;
+		if(r_filter.match(fn))
+			result.push_back(fn);
 	}
+	closedir(dir);
 
 	return result;
 }
@@ -151,32 +125,6 @@ Path getcwd()
 	return ::getcwd(buf, sizeof(buf));
 }
 
-Path get_home_dir()
-{
-#ifdef WIN32
-	char home[MAX_PATH];
-	if(SHGetFolderPath(0, CSIDL_PERSONAL, 0, 0, home)==S_OK)
-		return home;
-#else
-	const char *home = getenv("HOME");
-	if(home)
-		return home;
-#endif
-	return ".";
-}
-
-Path get_user_data_dir(const string &appname)
-{
-#ifdef WIN32
-	char datadir[MAX_PATH];
-	if(SHGetFolderPath(0, CSIDL_LOCAL_APPDATA, 0, 0, datadir)==S_OK)
-		return Path(datadir)/appname;
-	return ".";
-#else
-	return get_home_dir()/("."+appname);
-#endif
-}
-
 Path get_sys_conf_dir(const string &argv0)
 {
 	Path dir = get_bin_dir(argv0);
@@ -198,6 +146,8 @@ Path get_sys_data_dir(const string &argv0, const string &appname)
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
 		return dir/".."/"share"/appname;
+	else if(dir[-1]=="MacOS")
+		return dir/".."/"Resources";
 	else
 		return dir;
 }
@@ -215,7 +165,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