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

diff --git a/source/utils.cpp b/source/utils.cpp
index 5c8c8d4..22fe1ac 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -15,6 +15,7 @@ Distributed under the LGPL
 #include <msp/strings/utils.h>
 #include "dir.h"
 #include "path.h"
+#include "stat.h"
 #include "utils.h"
 
 using namespace std;
@@ -22,11 +23,36 @@ using namespace std;
 namespace Msp {
 namespace FS {
 
-/**
-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.
-*/
+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);
+}
+
 Path fix_case(const Path &path)
 {
 	bool found=true;
@@ -59,31 +85,64 @@ Path fix_case(const Path &path)
 	return result;
 }
 
-void unlink(const Path &path)
-{
-	if(::unlink(path.str().c_str())==-1)
-		throw SystemError("unlink failed", errno);
-}
-
-Filename splitext(const string &fn)
+Path readlink(const Path &link)
 {
-	Filename result;
-	unsigned dot=fn.rfind('.');
-	result.base=fn.substr(0, dot);
-	if(dot!=string::npos)
-		result.ext=fn.substr(dot);
-	return result;
+#ifdef WIN32
+	(void)link;
+	throw Exception("No symbolic links on win32");
+#else
+	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
 }
 
-int fnmatch(const string &pat, const Path &fn)
+Path realpath(const Path &path)
 {
 #ifdef WIN32
-	return globcasematch(pat, fn.str());
+	if(path.is_absolute())
+		return path;
+	else
+		return getcwd()/path;
 #else
-	return ::fnmatch(pat.c_str(), fn.str().c_str(), FNM_PATHNAME);
+	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();
+
+		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);
+			queue.insert(queue.begin(), link.begin(), link.end());
+		}
+		else
+			real=next;
+	}
+
+	return real;
 #endif
 }
 
+void unlink(const Path &path)
+{
+	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();
@@ -99,18 +158,5 @@ Path relative(const Path &path, const Path &base)
 	return result;
 }
 
-/**
-Extracts the basename from the given path.  Same thing as Path::Path(p)[-1],
-but faster.
-*/
-string basename(const std::string &p)
-{
-	unsigned slash=p.rfind(DIRCHAR);
-	if(slash==string::npos)
-		return p;
-	else
-		return p.substr(slash+1);
-}
-
 } // namespace FS
 } // namespace Msp