X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futils.cpp;h=22fe1acab7f1a2bd2293204cbcd0d70152366c77;hp=204f33bfdedcf841e6b4b4e0e090d9caa1824d67;hb=d3c9b9abb9e3c69aeecbca1044b43e7ec83f3b8c;hpb=bfbb7edfb2ae76d23f26e0b22787617ff621747d

diff --git a/source/utils.cpp b/source/utils.cpp
index 204f33b..22fe1ac 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -1,33 +1,63 @@
-/*
-This file is part of libmsppath
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+/* $Id$
+
+This file is part of libmspfs
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#include <dirent.h>
-#include <sys/stat.h>
-#include <errno.h>
+
+#include <cerrno>
+#include <msp/core/except.h>
 #ifndef WIN32
 #include <fnmatch.h>
+#else
+#include <msp/strings/glob.h>
 #endif
-#include <msp/strutils.h>
+#include <msp/strings/utils.h>
+#include "dir.h"
 #include "path.h"
+#include "stat.h"
 #include "utils.h"
 
 using namespace std;
 
 namespace Msp {
-namespace Path {
+namespace FS {
+
+string basename(const Path &p)
+{
+	return p[-1];
+}
+
+Path dirname(const Path &p)
+{
+	if(p.size()==1)
+	{
+		if(p.is_absolute())
+			return p;
+		return ".";
+	}
+	return p.subpath(0, p.size()-1);
+}
+
+string basepart(const string &fn)
+{
+	unsigned dot=fn.rfind('.');
+	return fn.substr(0, dot);
+}
+
+string extpart(const string &fn)
+{
+	string::size_type dot=fn.rfind('.');
+	if(dot==string::npos)
+		return string();
+	return fn.substr(dot);
+}
 
-/**
-Fixes the case of the given path to match files / directories on the
-filesystem.  Intended to be used in programs that need to interact with
-emulated Windows programs.
-*/
 Path fix_case(const Path &path)
 {
 	bool found=true;
 	Path result;
-	for(Path::iterator i=path.begin(); i!=path.end(); ++i)
+	for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
 	{
 		if(!found || *i=="/")
 			result/=*i;
@@ -55,114 +85,69 @@ Path fix_case(const Path &path)
 	return result;
 }
 
-int mkpath(const Path &path, int mode)
+Path readlink(const Path &link)
 {
-	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.str().c_str(),&st);
-		if(err==0)
-		{
-			if(!S_ISDIR(st.st_mode))
-			{
-				errno=EEXIST;
-				return -1;
-			}
-			continue;
-		}
-		else if(errno!=ENOENT)
-			return -1;
-		else
-		{
 #ifdef WIN32
-			// The win32 version of this function doesn't take the mode argument.  Go figure.
-			err=mkdir(p.str().c_str());
+	(void)link;
+	throw Exception("No symbolic links on win32");
 #else
-			err=mkdir(p.str().c_str(),mode);
+	char buf[4096];
+	int len=::readlink(link.str().c_str(), buf, sizeof(buf));
+	if(len==-1)
+		throw SystemError("readlink failed", errno);
+	return string(buf, len);
 #endif
-			if(err==-1) return -1;
-		}
-	}
-
-	return 0;
 }
 
-int rmdir(const Path &path, bool recursive)
+Path realpath(const Path &path)
 {
-	if(recursive)
+#ifdef WIN32
+	if(path.is_absolute())
+		return path;
+	else
+		return getcwd()/path;
+#else
+	list<string> queue(path.begin(), path.end());
+	if(!path.is_absolute())
 	{
-		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(),&st);
-			int err=0;
-			if(S_ISDIR(st.st_mode))
-				err=rmdir(p,true);
-			else
-				err=unlink(p.str().c_str());
-			if(err) return err;
-		}
+		Path cwd=getcwd();
+		queue.insert(queue.begin(), cwd.begin(), cwd.end());
 	}
-	return rmdir(path.str().c_str());
-}
 
-/**
-Lists all files in a directory except the implied . and .. entries.
-*/
-list<string> list_files(const Path &path)
-{
-	list<string> result;
-	DIR *dir=opendir(path.str().c_str());
-	if(dir)
+	Path real;
+	unsigned n_links=0;
+	while(!queue.empty())
 	{
-		while(dirent *de=readdir(dir))
+		Path next=real/queue.front();
+		queue.pop_front();
+
+		struct stat st=lstat(next);
+		if(S_ISLNK(st.st_mode))
 		{
-			const char *fn=de->d_name;
-			if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) continue;
-			result.push_back(fn);
+			if(++n_links>64)
+				throw Exception("Ludicrous amount of symlinks detected in realpath, giving up");
+			Path link=readlink(next);
+			queue.insert(queue.begin(), link.begin(), link.end());
 		}
-		closedir(dir);
+		else
+			real=next;
 	}
-	return result;
-}
-
-bool exists(const Path &path)
-{
-	struct stat st;
-	return !stat(path.str().c_str(),&st);
-}
 
-Filename splitext(const string &fn)
-{
-	Filename result;
-	unsigned dot=fn.rfind('.');
-	result.base=fn.substr(0,dot);
-	if(dot!=string::npos)
-		result.ext=fn.substr(dot);
-	return result;
+	return real;
+#endif
 }
 
-int fnmatch(const string &pat, const Path &fn)
+void unlink(const Path &path)
 {
-#ifdef WIN32
-	return -1;
-#else
-	return ::fnmatch(pat.c_str(), fn.str().c_str(), FNM_PATHNAME);
-#endif
+	if(::unlink(path.str().c_str())==-1)
+		throw SystemError("unlink failed", errno);
 }
 
 Path relative(const Path &path, const Path &base)
 {
-	Path::iterator i=path.begin();
-	Path::iterator j=base.begin();
-	for(; (i!=path.end() && j!=base.end() && *i==*j); ++i,++j);
+	Path::Iterator i=path.begin();
+	Path::Iterator j=base.begin();
+	for(; (i!=path.end() && j!=base.end() && *i==*j); ++i, ++j) ;
 
 	Path result;
 	for(; j!=base.end(); ++j)
@@ -173,5 +158,5 @@ Path relative(const Path &path, const Path &base)
 	return result;
 }
 
-} // namespace Path
+} // namespace FS
 } // namespace Msp