X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futils.cpp;h=5c8c8d4cdd08e899336b2bf8d15b3f0170a5be2b;hp=ca6d6f346469c6f4f980e601f6339fd9f587083f;hb=f91f1df3e0b00b3a270e571d4b2c8251da4d1226;hpb=e6fec68039fb5212993d687d352c540e407e6d96

diff --git a/source/utils.cpp b/source/utils.cpp
index ca6d6f3..5c8c8d4 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -5,9 +5,7 @@ Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <dirent.h>
 #include <cerrno>
-#include <cstdlib>
 #include <msp/core/except.h>
 #ifndef WIN32
 #include <fnmatch.h>
@@ -15,12 +13,14 @@ Distributed under the LGPL
 #include <msp/strings/glob.h>
 #endif
 #include <msp/strings/utils.h>
+#include "dir.h"
 #include "path.h"
 #include "utils.h"
 
 using namespace std;
 
 namespace Msp {
+namespace FS {
 
 /**
 Fixes the case of the given path to match files / directories on the
@@ -59,114 +59,12 @@ Path fix_case(const Path &path)
 	return result;
 }
 
-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);
-}
-
-/**
-Creates a directory and any parent directories if needed.
-
-@param   path  The path to create
-@param   mode  Access mode for new directories
-
-@return  0 on success, -1 on error
-*/
-void mkpath(const Path &path, int mode)
-{
-	Path p;
-	for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
-	{
-		p/=*i;
-#ifdef WIN32
-		if(p.size()==1 && is_windows_drive(*i))
-			continue;
-#endif
-		struct stat st;
-		int err=stat(p, st);
-		if(err==0)
-		{
-			if(!S_ISDIR(st.st_mode))
-				throw Exception("A component exists and is not a directory");
-			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)
-{
-	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);
-		else
-			unlink(p);
-	}
-
-	rmdir(path);
-}
-
 void unlink(const Path &path)
 {
 	if(::unlink(path.str().c_str())==-1)
 		throw SystemError("unlink failed", errno);
 }
 
-list<string> list_files(const Path &path)
-{
-	list<string> result;
-	DIR *dir=opendir(path.str().c_str());
-	if(dir)
-	{
-		while(dirent *de=readdir(dir))
-		{
-			const char *fn=de->d_name;
-			if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
-				continue;
-			result.push_back(fn);
-		}
-		closedir(dir);
-	}
-
-	return result;
-}
-
-bool exists(const Path &path)
-{
-	return access(path.str().c_str(), F_OK)==0;
-}
-
-bool is_dir(const Path &path)
-{
-	struct stat st;
-	if(stat(path, st)==0)
-		return S_ISDIR(st.st_mode);
-	return false;
-}
-
 Filename splitext(const string &fn)
 {
 	Filename result;
@@ -214,41 +112,5 @@ string basename(const std::string &p)
 		return p.substr(slash+1);
 }
 
-int stat(const Path &fn, struct stat &st)
-{
-	return ::stat(fn.str().c_str(), &st);
-}
-
-struct stat stat(const Path &fn)
-{
-	struct stat st;
-	if(stat(fn, st)==-1)
-		throw SystemError("stat failed", errno);
-	return st;
-}
-
-Path getcwd()
-{
-	char buf[1024];
-	return ::getcwd(buf, sizeof(buf));
-}
-
-Path get_home_dir()
-{
-#ifndef WIN32
-	const char *home=getenv("HOME");
-	if(home)
-		return home;
-	return ".";
-#else
-	return ".";
-#endif
-}
-
-void chdir(const Path &path)
-{
-	if(::chdir(path.str().c_str())==-1)
-		throw SystemError("chdir failed", errno);
-}
-
+} // namespace FS
 } // namespace Msp