X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Futils.cpp;h=4036225a0f2af593584931d1205fe64aeab82199;hb=0875a4cbef5e6d664488d8af2c37b3b252856750;hp=a0c2486f17402593b2e48199fc9d689923098809;hpb=1834fcf2465c77c387bc92df5529d8631abaffa5;p=libs%2Fcore.git

diff --git a/source/utils.cpp b/source/utils.cpp
index a0c2486..4036225 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <cerrno>
+#include <cstdio>
 #include <msp/core/except.h>
 #ifndef WIN32
 #include <fnmatch.h>
@@ -30,6 +31,12 @@ string basename(const Path &p)
 
 Path dirname(const Path &p)
 {
+	if(p.size()==1)
+	{
+		if(p.is_absolute())
+			return p;
+		return ".";
+	}
 	return p.subpath(0, p.size()-1);
 }
 
@@ -41,7 +48,7 @@ string basepart(const string &fn)
 
 string extpart(const string &fn)
 {
-	unsigned dot=fn.rfind('.');
+	string::size_type dot=fn.rfind('.');
 	if(dot==string::npos)
 		return string();
 	return fn.substr(dot);
@@ -82,6 +89,7 @@ Path fix_case(const Path &path)
 Path readlink(const Path &link)
 {
 #ifdef WIN32
+	(void)link;
 	throw Exception("No symbolic links on win32");
 #else
 	char buf[4096];
@@ -130,6 +138,12 @@ Path realpath(const Path &path)
 #endif
 }
 
+void rename(const Path &from, const Path &to)
+{
+	if(::rename(from.str().c_str(), to.str().c_str())==-1)
+		throw SystemError("rename failed", errno);
+}
+
 void unlink(const Path &path)
 {
 	if(::unlink(path.str().c_str())==-1)
@@ -151,5 +165,21 @@ Path relative(const Path &path, const Path &base)
 	return result;
 }
 
+int descendant_depth(const Path &path, const Path &parent)
+{
+	Path::Iterator i=path.begin();
+	Path::Iterator j=parent.begin();
+	for(; (i!=path.end() && j!=parent.end() && *i==*j); ++i, ++j) ;
+
+	if(j!=parent.end())
+		return -1;
+	
+	int result = 0;
+	for(; i!=path.end(); ++i)
+		++result;
+
+	return result;
+}
+
 } // namespace FS
 } // namespace Msp