Remove deprecated things

[libs/core.git] / source / fs / utils.cpp

diff --git a/source/fs/utils.cpp b/source/fs/utils.cpp
index 694a8f12a6c6c67b4f77dd89e0e9a8168d1fcf1e..a2fe40be72ee6f39eef6909e576c5703fe9787da 100644 (file)
--- a/source/fs/utils.cpp
+++ b/source/fs/utils.cpp
@@ -1,22 +1,5 @@
-/* $Id$
-
-This file is part of libmspfs
-Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <cerrno>
-#include <cstdio>
-#include <msp/core/except.h>
-#ifndef WIN32
-#include <fnmatch.h>
-#else
-#include <msp/strings/glob.h>
-#endif
 #include <msp/strings/utils.h>
 #include "dir.h"
-#include "path.h"
-#include "stat.h"
 #include "utils.h"
 
 using namespace std;
@@ -26,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())
@@ -60,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
                {
@@ -86,72 +71,11 @@ Path fix_case(const Path &path)
        return result;
 }
 
-Path readlink(const Path &link)
-{
-#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
-}
-
-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();
-
-               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 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)
-               throw SystemError("unlink failed", errno);
-}
-
 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) ;
@@ -165,8 +89,21 @@ 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)
 {
+       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) ;