aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-11-01 23:31:27 +0300
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:37 +0200
commitb741291c708e5c2088680a0d9d3c75efd98db421 (patch)
tree5a21d56b272ddf0895cd0c221aaa9630927e9d21
parent675d243e0ddeb627c0881b03e7cd5be746a5a7d3 (diff)
Make rmdir_r() to call entry_exists(path) rather than exists(dir_path)
-rw-r--r--build2/filesystem10
-rw-r--r--build2/filesystem.cxx16
-rw-r--r--build2/test/script/runner.cxx11
-rw-r--r--tests/test/script/runner/cleanup.test8
4 files changed, 31 insertions, 14 deletions
diff --git a/build2/filesystem b/build2/filesystem
index 325d28d..6a730c5 100644
--- a/build2/filesystem
+++ b/build2/filesystem
@@ -83,8 +83,8 @@ namespace build2
fs_status<rmdir_status>
rmdir_r (const dir_path&, bool dir = true, uint16_t verbosity = 1);
- // Check for a file or directory existence. Print the diagnostics and fail on
- // system error.
+ // Check for a file, directory or filesystem entry existence. Print the
+ // diagnostics and fail on system error.
//
bool
exists (const path&, bool follow_symlinks = true);
@@ -93,6 +93,12 @@ namespace build2
exists (const dir_path&);
bool
+ entry_exists (const path&, bool follow_symlinks = false);
+
+ // Check for a directory emptiness. Print the diagnostics and fail on system
+ // error.
+ //
+ bool
empty (const dir_path&);
}
diff --git a/build2/filesystem.cxx b/build2/filesystem.cxx
index be4cad8..c71d2da 100644
--- a/build2/filesystem.cxx
+++ b/build2/filesystem.cxx
@@ -79,7 +79,7 @@ namespace build2
if (work.sub (d)) // Don't try to remove working directory.
return rmdir_status::not_empty;
- if (!exists (d))
+ if (!build2::entry_exists (d))
return rmdir_status::not_exist;
if (verb >= v)
@@ -126,6 +126,20 @@ namespace build2
}
bool
+ entry_exists (const path& p, bool fs)
+ {
+ try
+ {
+ return butl::entry_exists (p, fs);
+ }
+ catch (const system_error& e)
+ {
+ error << "unable to stat path " << p << ": " << e.what ();
+ throw failed ();
+ }
+ }
+
+ bool
empty (const dir_path& d)
{
try
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 2af5865..79201b2 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -254,17 +254,6 @@ namespace build2
// Recursive removal of non-existing directory is not an error for
// 'maybe' cleanup type.
//
- // Note that if some file system entry of non-directory type exists
- // with such a name it is not removed but the operation still
- // succeeds for 'maybe' cleanup type. The removal of this entry can
- // be handled at the time of the containing directory cleanup.
- //
- // @@ The behavior in the situation described differes for &?a/***
- // and &?a/ due to build2::rmdir_r() implementation details which
- // checks for directory existence before trying to remove it.
- // Shouldn't rmdir_r() behave the same way as rmdir() in regards
- // to non-directory removal?
- //
if (p.leaf ().string () == "***")
{
verify (p.directory (), p, "wildcard");
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index 599bb5c..bb65c27 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -133,6 +133,14 @@ $b 2>>EOE != 0
testscript:1: error: registered for cleanup wildcard test/a/*** is out of working directory test/1/
EOE
+: wildcard-not-dir
+: Test cleanup of file as a wildcard
+:
+$c <"$* -f a &a/***";
+$b 2>>EOE != 0
+error: unable to remove directory test/1/a/: Not a directory
+EOE
+
: implicit-overwrite
: Test implicit cleanup being overwritten with an explicit one
: