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

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index f7f34f6..f775847 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,12 +1,6 @@
 #include <cstdlib>
-#include <cerrno>
-#include <dirent.h>
-#ifdef WIN32
-#include <shlobj.h>
-#else
 #include <unistd.h>
-#include <sys/stat.h>
-#endif
+#include <dirent.h>
 #include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -62,18 +56,6 @@ not_a_directory::not_a_directory(const Path &p):
 { }
 
 
-void mkdir(const Path &path, int mode)
-{
-#ifdef WIN32
-	(void)mode;
-	if(!CreateDirectory(path.str().c_str(), NULL))
-		throw system_error("CreateDirectory");
-#else
-	if(::mkdir(path.str().c_str(), mode)==-1)
-		throw system_error("mkdir");
-#endif
-}
-
 void mkpath(const Path &path, int mode)
 {
 	Path p;
@@ -95,17 +77,6 @@ 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 system_error("rmdir");
-#endif
-}
-
 void rmpath(const Path &path)
 {
 	list<string> files = list_files(path);
@@ -154,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);
@@ -201,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;
 }