X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futils.cpp;h=22fe1acab7f1a2bd2293204cbcd0d70152366c77;hp=d9522a3c6551d264ccf9896ef780b340220a99ef;hb=d3c9b9abb9e3c69aeecbca1044b43e7ec83f3b8c;hpb=59db379f143f9accda21b831e0243d02f27c1c70 diff --git a/source/utils.cpp b/source/utils.cpp index d9522a3..22fe1ac 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -1,12 +1,11 @@ /* $Id$ -This file is part of libmsppath -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +This file is part of libmspfs +Copyright © 2006-2008 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ -#include -#include +#include #include #ifndef WIN32 #include @@ -14,18 +13,46 @@ Distributed under the LGPL #include #endif #include +#include "dir.h" #include "path.h" +#include "stat.h" #include "utils.h" using namespace std; namespace Msp { +namespace FS { + +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); +} -/** -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. -*/ Path fix_case(const Path &path) { bool found=true; @@ -58,74 +85,56 @@ Path fix_case(const Path &path) return result; } -void mkdir(const Path &path, int mode) +Path readlink(const Path &link) { - int err; #ifdef WIN32 - // The win32 version of this function doesn't take the mode argument. Go figure. - (void)mode; - err=::mkdir(path.str().c_str()); + (void)link; + throw Exception("No symbolic links on win32"); #else - err=::mkdir(path.str().c_str(), mode); + 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 - - if(err==-1) - throw SystemError("mkdir failed", errno); } -/** -Creates a directory and any parent directories if needed. - -@param path The path to create -@param mode Access mode for new directories - -@return 0 on success, -1 on error -*/ -void mkpath(const Path &path, int mode) +Path realpath(const Path &path) { - Path p; - for(Path::Iterator i=path.begin(); i!=path.end(); ++i) - { - p/=*i; #ifdef WIN32 - if(p.size()==1 && is_windows_drive(*i)) - continue; -#endif - struct stat st; - int err=stat(p, st); - if(err==0) - { - if(!S_ISDIR(st.st_mode)) - throw Exception("A component exists and is not a directory"); - continue; - } - else if(errno!=ENOENT) - throw SystemError("stat failed", errno); - else - mkdir(p, mode); + if(path.is_absolute()) + return path; + else + return getcwd()/path; +#else + list queue(path.begin(), path.end()); + if(!path.is_absolute()) + { + Path cwd=getcwd(); + queue.insert(queue.begin(), cwd.begin(), cwd.end()); } -} - -void rmdir(const Path &path) -{ - if(::rmdir(path.str().c_str())==-1) - throw SystemError("rmdir failed", errno); -} -void rmdirs(const Path &path) -{ - list files=list_files(path); - for(list::iterator i=files.begin(); i!=files.end(); ++i) + Path real; + unsigned n_links=0; + while(!queue.empty()) { - Path p=path / *i; - struct stat st=stat(p.str().c_str()); - if(S_ISDIR(st.st_mode)) - rmdirs(p); + 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 - unlink(p); + real=next; } - rmdir(path); + return real; +#endif } void unlink(const Path &path) @@ -134,62 +143,11 @@ void unlink(const Path &path) throw SystemError("unlink failed", errno); } -list list_files(const Path &path) -{ - list result; - DIR *dir=opendir(path.str().c_str()); - if(dir) - { - while(dirent *de=readdir(dir)) - { - const char *fn=de->d_name; - if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) - continue; - result.push_back(fn); - } - closedir(dir); - } - - return result; -} - -bool exists(const Path &path) -{ - return access(path.str().c_str(), F_OK)==0; -} - -bool is_dir(const Path &path) -{ - struct stat st; - if(stat(path, st)==0) - return S_ISDIR(st.st_mode); - return false; -} - -Filename splitext(const string &fn) -{ - Filename result; - unsigned dot=fn.rfind('.'); - result.base=fn.substr(0, dot); - if(dot!=string::npos) - result.ext=fn.substr(dot); - return result; -} - -int fnmatch(const string &pat, const Path &fn) -{ -#ifdef WIN32 - return globcasematch(pat, fn.str()); -#else - return ::fnmatch(pat.c_str(), fn.str().c_str(), FNM_PATHNAME); -#endif -} - Path relative(const Path &path, const Path &base) { Path::Iterator i=path.begin(); Path::Iterator j=base.begin(); - for(; (i!=path.end() && j!=base.end() && *i==*j); ++i,++j); + for(; (i!=path.end() && j!=base.end() && *i==*j); ++i, ++j) ; Path result; for(; j!=base.end(); ++j) @@ -200,54 +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); -} - -int stat(const Path &fn, struct stat &st) -{ - return ::stat(fn.str().c_str(), &st); -} - -struct stat stat(const Path &fn) -{ - struct stat st; - if(stat(fn, st)==-1) - throw SystemError("stat failed", errno); - return st; -} - -Path getcwd() -{ - char buf[1024]; - return ::getcwd(buf, sizeof(buf)); -} - -Path get_home_dir() -{ -#ifndef WIN32 - const char *home=getenv("HOME"); - if(home) - return home; - return "."; -#else - return "."; -#endif -} - -void chdir(const Path &path) -{ - if(::chdir(path.str().c_str())==-1) - throw SystemError("chdir failed", errno); -} - +} // namespace FS } // namespace Msp