diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2018-04-28 18:02:23 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-04-28 18:02:23 +0200 |
commit | 4790f24757cf9a038d7cd37b370bac1807fb2d8c (patch) | |
tree | 19ae0399df13ab340068f6041a41c77156f6eb96 /libbutl/filesystem.cxx | |
parent | 085493111005770ed33beeba07d317b6eba0c851 (diff) |
Improve rmsymlink() interface
Diffstat (limited to 'libbutl/filesystem.cxx')
-rw-r--r-- | libbutl/filesystem.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libbutl/filesystem.cxx b/libbutl/filesystem.cxx index 7ee4c2c..28412d6 100644 --- a/libbutl/filesystem.cxx +++ b/libbutl/filesystem.cxx @@ -363,9 +363,9 @@ namespace butl } rmfile_status - rmsymlink (const path& link, bool) + try_rmsymlink (const path& link, bool, bool io) { - return try_rmfile (link); + return try_rmfile (link, io); } void @@ -503,20 +503,19 @@ namespace butl } rmfile_status - rmsymlink (const path& link, bool dir) + try_rmsymlink (const path& link, bool dir, bool io) { if (!dir) throw_generic_error (ENOSYS, "file symlinks not supported"); - switch (try_rmdir (path_cast<dir_path> (link))) + switch (try_rmdir (path_cast<dir_path> (link, io))) { case rmdir_status::success: return rmfile_status::success; case rmdir_status::not_exist: return rmfile_status::not_exist; - case rmdir_status::not_empty: throw_generic_error (ENOTEMPTY); + case rmdir_status::not_empty: if (io) return rmfile_status::success; } - assert (false); // Can't be here. - return rmfile_status::success; + throw_generic_error (ENOTEMPTY); } void |