X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Futils.cpp;h=a2fe40be72ee6f39eef6909e576c5703fe9787da;hp=9a9802524399e53c8b21e723764f939a6fd9f8c1;hb=817e584903996a041692640720a5a272d847a3c7;hpb=7264384ae4dc1adaf861750516030826a8c91645

diff --git a/source/fs/utils.cpp b/source/fs/utils.cpp
index 9a98025..a2fe40b 100644
--- a/source/fs/utils.cpp
+++ b/source/fs/utils.cpp
@@ -1,14 +1,5 @@
-#include <cstdio>
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-#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;
@@ -18,11 +9,13 @@ namespace FS {
 
 string basename(const Path &p)
 {
-	return p[-1];
+	return p.empty() ? string() : p[-1];
 }
 
 Path dirname(const Path &p)
 {
+	if(p.empty())
+		return p;
 	if(p.size()==1)
 	{
 		if(p.is_absolute())
@@ -52,7 +45,7 @@ Path fix_case(const Path &path)
 	Path result;
 	for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
 	{
-		if(!found || *i=="/")
+		if(!found || (result.empty() && (*i=="/" || *i==".")))
 			result /= *i;
 		else
 		{
@@ -78,81 +71,11 @@ 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)
-{
-#ifdef WIN32
-	if(!MoveFileEx(from.c_str(), to.c_str(), MOVEFILE_REPLACE_EXISTING))
-		throw system_error("MoveFileEx");
-#else
-	if(::rename(from.str().c_str(), to.str().c_str())==-1)
-		throw system_error("rename");
-#endif
-}
-
-void unlink(const Path &path)
-{
-#ifdef WIN32
-	if(!DeleteFile(path.c_str()))
-		throw system_error("DeleteFile");
-#else
-	if(::unlink(path.str().c_str())==-1)
-		throw system_error("unlink");
-#endif
-}
-
 Path relative(const Path &path, const Path &base)
 {
+	if(path.is_absolute()!=base.is_absolute())
+		throw invalid_argument("FS::relative");
+
 	Path::Iterator i = path.begin();
 	Path::Iterator j = base.begin();
 	for(; (i!=path.end() && j!=base.end() && *i==*j); ++i, ++j) ;
@@ -178,6 +101,9 @@ Path common_ancestor(const Path &path1, const Path &path2)
 
 int descendant_depth(const Path &path, const Path &parent)
 {
+	if(path.is_absolute()!=parent.is_absolute())
+		throw invalid_argument("FS::descendant_depth");
+
 	Path::Iterator i = path.begin();
 	Path::Iterator j = parent.begin();
 	for(; (i!=path.end() && j!=parent.end() && *i==*j); ++i, ++j) ;