Exception rework for fs components

[libs/core.git] / source / fs / dir.cpp

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index bc7a8fec1b7fd9374c51dfa69165637341aad758..c53c156fec68b6e2df51c2afdb09396281ae92bd 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -5,7 +5,7 @@
 #ifdef WIN32
 #include <shlobj.h>
 #endif
-#include <msp/core/except.h>
+#include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
 #include "dir.h"
@@ -21,10 +21,8 @@ namespace FS {
 namespace
 {
 
-/**
-Helper function to determine the location of the program's executable.  Caches
-the last result to cut down filesystem access with repeated calls.
-*/
+/** Helper function to determine the location of the program's executable.
+Caches the last result to cut down filesystem access with repeated calls. */
 const Path &get_bin_dir(const string &argv0)
 {
        static string last_argv0;
@@ -56,6 +54,12 @@ const Path &get_bin_dir(const string &argv0)
 
 }
 
+
+not_a_directory::not_a_directory(const Path &p):
+       runtime_error(p.str())
+{ }
+
+
 void mkdir(const Path &path, int mode)
 {
        int err;
@@ -68,7 +72,7 @@ void mkdir(const Path &path, int mode)
 #endif
 
        if(err==-1)
-               throw SystemError("mkdir failed", errno);
+               throw system_error("mkdir");
 }
 
 void mkpath(const Path &path, int mode)
@@ -86,11 +90,11 @@ void mkpath(const Path &path, int mode)
                if(err==0)
                {
                        if(!S_ISDIR(st.st_mode))
-                               throw Exception("A component exists and is not a directory");
+                               throw not_a_directory(p);
                        continue;
                }
                else if(errno!=ENOENT)
-                       throw SystemError("stat failed", errno);
+                       throw system_error("mkpath:stat");
                else
                        mkdir(p, mode);
        }
@@ -99,7 +103,7 @@ void mkpath(const Path &path, int mode)
 void rmdir(const Path &path)
 {
        if(::rmdir(path.str().c_str())==-1)
-               throw SystemError("rmdir failed", errno);
+               throw system_error("rmdir");
 }
 
 void rmdirs(const Path &path)
@@ -215,7 +219,7 @@ Path get_sys_lib_dir(const string &argv0, const string &appname)
 void chdir(const Path &path)
 {
        if(::chdir(path.str().c_str())==-1)
-               throw SystemError("chdir failed", errno);
+               throw system_error("chdir");
 }
 
 } // namespace FS