From d8cf4dd43ecd37c371acf9bc6c17998b65d42ba4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Jan 2014 21:15:50 +0100
Subject: treat non-existing files as success on delete

---
 _test/tests/inc/io_rmdir.test.php | 60 +++++++++++++++++++++++++++++++++++++++
 inc/io.php                        |  1 +
 2 files changed, 61 insertions(+)

diff --git a/_test/tests/inc/io_rmdir.test.php b/_test/tests/inc/io_rmdir.test.php
index 9a122d111..3de57fa86 100644
--- a/_test/tests/inc/io_rmdir.test.php
+++ b/_test/tests/inc/io_rmdir.test.php
@@ -2,6 +2,66 @@
 
 class io_rmdir_test extends DokuWikiTest {
 
+    function test_nopes(){
+        // set up test dir
+        $dir = io_mktmpdir();
+        $top = dirname($dir);
+        $this->assertTrue($dir !== false);
+        $this->assertTrue(is_dir($dir));
+
+        // switch into it
+        $this->assertTrue(chdir($dir));
+        $this->assertEquals($dir, getcwd());
+
+
+        $this->assertFalse(io_rmdir('', false));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir('', true));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(null, false));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(null, true));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(false, false));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(false, true));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(array(), false));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFalse(io_rmdir(array(), true));
+        clearstatcache();
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+
+        $this->assertFileNotExists("$dir/this/does/not/exist");
+        $this->assertTrue(io_rmdir("$dir/this/does/not/exist"));
+        clearstatcache();
+        $this->assertFileNotExists("$dir/this/does/not/exist");
+        $this->assertTrue(is_dir($dir));
+        $this->assertTrue(is_dir($top));
+    }
+
 
     function test_empty_single(){
         // set up test dir
diff --git a/inc/io.php b/inc/io.php
index 30f34ad3c..892f93759 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -410,6 +410,7 @@ function io_mkdir_p($target){
  */
 function io_rmdir($path, $removefiles = false) {
     if(!is_string($path) || $path == "") return false;
+    if(!file_exists($path)) return true; // it's already gone or was never there, count as success
 
     if(is_dir($path) && !is_link($path)) {
         $dirs  = array();
-- 
cgit v1.2.3