X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=098020328342db2edf93d4b2b425555405ab5f00;hp=99de180d20ed026812e7fcb2e371dc843a0c333f;hb=44da9fc9afb6b7e49c1558c5572213a1e6f401e8;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8 diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp index 99de180..0980203 100644 --- a/source/fs/dir.cpp +++ b/source/fs/dir.cpp @@ -101,16 +101,16 @@ void rmpath(const Path &path) rmdir(path); } -list list_files(const Path &path) +vector list_files(const Path &path) { return list_filtered(path, string()); } -list list_filtered(const Path &path, const string &filter) +vector list_filtered(const Path &path, const string &filter) { Regex r_filter(filter); - list result; + vector result; DIR *dir = opendir(path.str().c_str()); if(!dir) throw system_error("opendir"); @@ -177,7 +177,7 @@ Path get_sys_lib_dir() return dir; } -Path path_lookup(const string &name, const list &paths) +Path path_lookup(const string &name, const vector &paths) { for(const Path &p: paths) { @@ -192,8 +192,8 @@ Path path_lookup(const string &name, const list &paths) Path path_lookup(const string &name) { const char *path = getenv("PATH"); - list dirs = split(path, ITEMSEP); - return path_lookup(name, list(dirs.begin(), dirs.end())); + vector dirs = split(path, ITEMSEP); + return path_lookup(name, vector(dirs.begin(), dirs.end())); } } // namespace FS