X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Futils.cpp;h=2bfd1bf3ff4c63d9152084fe1ffdc0b802223aa5;hp=b66b82dd70c90c1ed96b6f0cd13a27087ad4ebf5;hb=609c9a508cfdc7b42c46c4f21d17639204165a00;hpb=e240e074ce15c17d644e378067c2941aefcd5611

diff --git a/source/fs/utils.cpp b/source/fs/utils.cpp
index b66b82d..2bfd1bf 100644
--- a/source/fs/utils.cpp
+++ b/source/fs/utils.cpp
@@ -1,9 +1,5 @@
-#include <cstdio>
-#include <msp/core/systemerror.h>
 #include <msp/strings/utils.h>
 #include "dir.h"
-#include "path.h"
-#include "stat.h"
 #include "utils.h"
 
 using namespace std;
@@ -73,69 +69,6 @@ Path fix_case(const Path &path)
 	return result;
 }
 
-Path readlink(const Path &link)
-{
-#ifdef WIN32
-	(void)link;
-	throw logic_error("no symbolic links on win32");
-#else
-	char buf[4096];
-	int len = ::readlink(link.str().c_str(), buf, sizeof(buf));
-	if(len==-1)
-		throw system_error("readlink");
-	return string(buf, len);
-#endif
-}
-
-Path realpath(const Path &path)
-{
-#ifdef WIN32
-	if(path.is_absolute())
-		return path;
-	else
-		return getcwd()/path;
-#else
-	list<string> queue(path.begin(), path.end());
-	if(!path.is_absolute())
-	{
-		Path cwd = getcwd();
-		queue.insert(queue.begin(), cwd.begin(), cwd.end());
-	}
-
-	Path real;
-	unsigned n_links = 0;
-	while(!queue.empty())
-	{
-		Path next = real/queue.front();
-		queue.pop_front();
-
-		if(is_link(next))
-		{
-			if(++n_links>64)
-				throw runtime_error("too many symbolic links");
-			Path link = readlink(next);
-			queue.insert(queue.begin(), link.begin(), link.end());
-		}
-		else
-			real = next;
-	}
-
-	return real;
-#endif
-}
-
-void rename(const Path &from, const Path &to)
-{
-	if(::rename(from.str().c_str(), to.str().c_str())==-1)
-		throw system_error("rename");
-}
-
-void unlink(const Path &path)
-{
-	if(::unlink(path.str().c_str())==-1)
-		throw system_error("unlink");
-}
-
 Path relative(const Path &path, const Path &base)
 {
 	Path::Iterator i = path.begin();
@@ -151,6 +84,16 @@ Path relative(const Path &path, const Path &base)
 	return result;
 }
 
+Path common_ancestor(const Path &path1, const Path &path2)
+{
+	Path::Iterator i = path1.begin();
+	Path::Iterator j = path2.begin();
+	Path result;
+	for(; (i!=path1.end() && j!=path2.end() && *i==*j); ++i, ++j)
+		result /= *i;
+	return result;
+}
+
 int descendant_depth(const Path &path, const Path &parent)
 {
 	Path::Iterator i = path.begin();