X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.h;h=bef89c6d72e1e160072be098450c8641bb0ec00a;hp=74d2d2cd6339b0118747779b9c660f03e06361e3;hb=HEAD;hpb=427991f60b200fe4a6517e6fb1fe1980ab14983b

diff --git a/source/fs/dir.h b/source/fs/dir.h
index 74d2d2c..960be2e 100644
--- a/source/fs/dir.h
+++ b/source/fs/dir.h
@@ -1,59 +1,67 @@
 #ifndef MSP_FS_DIR_H_
 #define MSP_FS_DIR_H_
 
-#include <list>
 #include <stdexcept>
 #include <string>
+#include <vector>
+#include <msp/core/mspcore_api.h>
 #include "path.h"
 
 namespace Msp {
 namespace FS {
 
-class not_a_directory: public std::runtime_error
+class MSPCORE_API not_a_directory: public std::runtime_error
 {
 public:
 	not_a_directory(const Path &);
-	virtual ~not_a_directory() throw() { }
+	~not_a_directory() throw() override = default;
 };
 
 /// Creates a directory
-void mkdir(const Path &path, int mode);
+MSPCORE_API void mkdir(const Path &path, int mode);
 
 /// Creates a directory and any required parent directories
-void mkpath(const Path &path, int mode);
+MSPCORE_API void mkpath(const Path &path, int mode);
 
 /// Removes a directory, which must be empty
-void rmdir(const Path &path);
+MSPCORE_API void rmdir(const Path &path);
 
 /// Removes a directory and anything it contains
-void rmpath(const Path &path);
+MSPCORE_API void rmpath(const Path &path);
 
 /// Lists the contents of a directory
-std::list<std::string> list_files(const Path &path);
+MSPCORE_API std::vector<std::string> list_files(const Path &path);
 
 /// Lists the contents of a directory, filtered with a regex
-std::list<std::string> list_filtered(const Path &path, const std::string &filter);
+MSPCORE_API std::vector<std::string> list_filtered(const Path &path, const std::string &filter);
 
 /// Returns the current working directory
-Path getcwd();
+MSPCORE_API Path getcwd();
+
+/// Changes the current working directory
+MSPCORE_API void chdir(const Path &);
 
 /// Returns the user's home directory
-Path get_home_dir();
+MSPCORE_API Path get_home_dir();
 
-/// Returns a directory suitable for storing user-specific data
-Path get_user_data_dir(const std::string &appname);
+/// Returns a directory suitable for storing user-specific data.
+MSPCORE_API Path get_user_data_dir();
 
-/// Returns a directory containing system-wide configuration
-Path get_sys_conf_dir(const std::string &argv0);
+/// Returns a directory containing system-wide configuration.
+MSPCORE_API Path get_sys_conf_dir();
 
-/// Returns a directory containing immutable system-wide data
-Path get_sys_data_dir(const std::string &argv0, const std::string &appname);
+/// Returns a directory containing immutable system-wide data.
+MSPCORE_API Path get_sys_data_dir();
 
-/// Returns a directory containing system-wide architecture-specific files
-Path get_sys_lib_dir(const std::string &argv0, const std::string &appname);
+/// Returns a directory containing system-wide architecture-specific files.
+MSPCORE_API Path get_sys_lib_dir();
 
-/// Changes the current working directory
-void chdir(const Path &);
+/** Looks for a file in a list of paths.  Returns the absolute path to the
+first existing location, or an empty Path if the file is not found at all. */
+MSPCORE_API Path path_lookup(const std::string &, const std::vector<Path> &);
+
+/** Looks for a file using the PATH environment variable. */
+MSPCORE_API Path path_lookup(const std::string &);
 
 } // namespace FS
 } // namespace Msp