X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.h;h=89d86ed9383c0f99661d80d1b169d82c87a2a585;hp=5544a3179b912e9d7f14a4687095aaeabd7a547d;hb=2d608d773f3494e84cb154bdbb07954e87d9af86;hpb=7563bb650aa11207a7c128ba44468cf5ad2897c7

diff --git a/source/fs/dir.h b/source/fs/dir.h
index 5544a31..89d86ed 100644
--- a/source/fs/dir.h
+++ b/source/fs/dir.h
@@ -2,12 +2,21 @@
 #define MSP_FS_DIR_H_
 
 #include <list>
+#include <stdexcept>
 #include <string>
+#include <msp/core/attributes.h>
 #include "path.h"
 
 namespace Msp {
 namespace FS {
 
+class not_a_directory: public std::runtime_error
+{
+public:
+	not_a_directory(const Path &);
+	virtual ~not_a_directory() throw() { }
+};
+
 /// Creates a directory
 void mkdir(const Path &path, int mode);
 
@@ -29,23 +38,42 @@ std::list<std::string> list_filtered(const Path &path, const std::string &filter
 /// Returns the current working directory
 Path getcwd();
 
+/// Changes the current working directory
+void chdir(const Path &);
+
 /// Returns the user's home directory
 Path get_home_dir();
 
-/// Returns a directory suitable for storing user-specific data
-Path get_user_data_dir(const std::string &appname);
+/// Deprecated.  Use the argument-less version instead.
+DEPRECATED Path get_user_data_dir(const std::string &appname);
 
-/// Returns a directory containing system-wide configuration
-Path get_sys_conf_dir(const std::string &argv0);
+/// Returns a directory suitable for storing user-specific data.
+Path get_user_data_dir();
 
-/// Returns a directory containing immutable system-wide data
-Path get_sys_data_dir(const std::string &argv0, const std::string &appname);
+/// Deprecated.  Use the argument-less version instead.
+DEPRECATED Path get_sys_conf_dir(const std::string &argv0);
 
-/// 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 configuration.
+Path get_sys_conf_dir();
 
-/// Changes the current working directory
-void chdir(const Path &);
+/// Deprecated.  Use the argument-less version instead.
+DEPRECATED Path get_sys_data_dir(const std::string &argv0, const std::string &appname);
+
+/// Returns a directory containing immutable system-wide data.
+Path get_sys_data_dir();
+
+/// Deprecated.  Use the argument-less version instead.
+DEPRECATED Path get_sys_lib_dir(const std::string &argv0, const std::string &appname);
+
+/// Returns a directory containing system-wide architecture-specific files.
+Path get_sys_lib_dir();
+
+/** 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. */
+Path path_lookup(const std::string &, const std::list<Path> &);
+
+/** Looks for a file using the PATH environment variable. */
+Path path_lookup(const std::string &);
 
 } // namespace FS
 } // namespace Msp