X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futils.cpp;h=694a8f12a6c6c67b4f77dd89e0e9a8168d1fcf1e;hp=8f06757bda2227f69aa075acc045f1046dba1ce6;hb=fa77438b62207466c48620604c8cc34931080936;hpb=aa31c2bbb399ded6493f7edc419b1a500ed25895

diff --git a/source/utils.cpp b/source/utils.cpp
index 8f06757..694a8f1 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -42,13 +42,13 @@ Path dirname(const Path &p)
 
 string basepart(const string &fn)
 {
-	unsigned dot=fn.rfind('.');
+	unsigned dot = fn.rfind('.');
 	return fn.substr(0, dot);
 }
 
 string extpart(const string &fn)
 {
-	string::size_type dot=fn.rfind('.');
+	string::size_type dot = fn.rfind('.');
 	if(dot==string::npos)
 		return string();
 	return fn.substr(dot);
@@ -56,30 +56,30 @@ string extpart(const string &fn)
 
 Path fix_case(const Path &path)
 {
-	bool found=true;
+	bool found = true;
 	Path result;
 	for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
 	{
 		if(!found || *i=="/")
-			result/=*i;
+			result /= *i;
 		else
 		{
 			list<string> files;
 			if(result.size())
-				files=list_files(result);
+				files = list_files(result);
 			else
-				files=list_files(".");
+				files = list_files(".");
 
-			found=false;
+			found = false;
 			for(list<string>::iterator j=files.begin(); (j!=files.end() && !found); ++j)
 				if(!strcasecmp(*j,*i))
 				{
-					result/=*j;
-					found=true;
+					result /= *j;
+					found = true;
 				}
 
 			if(!found)
-				result/=*i;
+				result /= *i;
 		}
 	}
 
@@ -93,7 +93,7 @@ Path readlink(const Path &link)
 	throw Exception("No symbolic links on win32");
 #else
 	char buf[4096];
-	int len=::readlink(link.str().c_str(), buf, sizeof(buf));
+	int len = ::readlink(link.str().c_str(), buf, sizeof(buf));
 	if(len==-1)
 		throw SystemError("readlink failed", errno);
 	return string(buf, len);
@@ -111,27 +111,27 @@ Path realpath(const Path &path)
 	list<string> queue(path.begin(), path.end());
 	if(!path.is_absolute())
 	{
-		Path cwd=getcwd();
+		Path cwd = getcwd();
 		queue.insert(queue.begin(), cwd.begin(), cwd.end());
 	}
 
 	Path real;
-	unsigned n_links=0;
+	unsigned n_links = 0;
 	while(!queue.empty())
 	{
-		Path next=real/queue.front();
+		Path next = real/queue.front();
 		queue.pop_front();
 
-		struct stat st=lstat(next);
+		struct stat st = lstat(next);
 		if(S_ISLNK(st.st_mode))
 		{
 			if(++n_links>64)
 				throw Exception("Ludicrous amount of symlinks detected in realpath, giving up");
-			Path link=readlink(next);
+			Path link = readlink(next);
 			queue.insert(queue.begin(), link.begin(), link.end());
 		}
 		else
-			real=next;
+			real = next;
 	}
 
 	return real;
@@ -152,15 +152,31 @@ void unlink(const Path &path)
 
 Path relative(const Path &path, const Path &base)
 {
-	Path::Iterator i=path.begin();
-	Path::Iterator j=base.begin();
+	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)
-		result/="..";
+		result /= "..";
 	for(; i!=path.end(); ++i)
-		result/=*i;
+		result /= *i;
+
+	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;
 }