X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=bd9eaa59fe06ad933209f5331b12e86a0ae6a0a5;hp=00385e0d52d5602251719da1f3dc61859ccaecec;hb=f46cd5456db31f69477bdbb6eec8200151bd42ae;hpb=60260b5701bab73f8de093147de03947c7f264c8 diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp index 00385e0..bd9eaa5 100644 --- a/source/fs/dir.cpp +++ b/source/fs/dir.cpp @@ -20,7 +20,7 @@ namespace enum { -#ifdef WIN32 +#ifdef _WIN32 ITEMSEP = ';' #else ITEMSEP = ':' @@ -73,7 +73,7 @@ void mkpath(const Path &path, int mode) for(Path::Iterator i=path.begin(); i!=path.end(); ++i) { p /= *i; -#ifdef WIN32 +#ifdef _WIN32 if(p.size()==1 && p.is_absolute()) continue; #endif @@ -130,18 +130,12 @@ list list_filtered(const Path &path, const string &filter) return result; } -Path getcwd() -{ - char buf[1024]; - return ::getcwd(buf, sizeof(buf)); -} - Path get_user_data_dir() { const string &name = Application::get_name(); if(name.empty()) throw logic_error("application name not known"); - return get_user_data_dir(); + return get_user_data_dir(name); } Path get_sys_conf_dir(const string &argv0) @@ -196,7 +190,7 @@ Path get_sys_data_dir() Path get_sys_lib_dir(const string &argv0, const string &appname) { if(argv0.empty() || appname.empty()) - throw invalid_argument("get_sys_data_dir"); + throw invalid_argument("get_sys_lib_dir"); Path dir = get_bin_dir(argv0); @@ -214,12 +208,6 @@ Path get_sys_lib_dir() return get_sys_lib_dir(argv0, Application::get_name()); } -void chdir(const Path &path) -{ - if(::chdir(path.str().c_str())==-1) - throw system_error("chdir"); -} - Path path_lookup(const string &name, const list &paths) { for(list::const_iterator i=paths.begin(); i!=paths.end(); ++i)