CHANGE: DELETE returning false if called on not existing file or …

…directory

resolves: Oldes/Rebol-issues#2447

src/core/p-dir.c

@@ -251,8 +251,11 @@
 		// !!! add recursive delete (?)
 		result = OS_DO_DEVICE(&dir, RDC_DELETE);
 		///OS_FREE(dir.file.path);
-		if (result < 0) Trap1(RE_NO_DELETE, path);
-		return R_ARG2;
+		if (result >=  0) return R_ARG2;
+		if (result == -2) return R_FALSE;
+		// else...
+		Trap1(RE_NO_DELETE, path);
+		break;
 
 	case A_OPEN:
 		// !! If open fails, what if user does a READ w/o checking for error?

src/core/p-file.c

@@ -416,6 +416,7 @@ REBINT Mode_Syms[] = {
 	REBREQ *file = 0;
 	REBCNT args = 0;
 	REBCNT len;
+	REBINT result;
 	REBOOL opened = FALSE;	// had to be opened (shortcut case)
 
 	//Print("FILE ACTION: %r", Get_Action_Word(action));
@@ -542,9 +543,13 @@ REBINT Mode_Syms[] = {
 		break;
 
 	case A_DELETE:
-		if (IS_OPEN(file)) Trap1(RE_NO_DELETE, path);
+		if (IS_OPEN(file)) Trap1(RE_NO_DELETE, path); // it's not allowed to delete opened file port
 		Setup_File(file, 0, path);
-		if (OS_DO_DEVICE(file, RDC_DELETE) < 0 ) Trap1(RE_NO_DELETE, path);
+		result = OS_DO_DEVICE(file, RDC_DELETE);
+		if (result >=  0) return R_RET;   // returns port so it can be used in chained evaluation 
+		if (result == -2) return R_FALSE;
+		// else...
+		Trap1(RE_NO_DELETE, path);
 		break;
 
 	case A_RENAME:

src/os/host-device.c

@@ -337,6 +337,11 @@ static int Poll_Default(REBDEV *dev)
 			Signal_Device(req, EVT_ERROR);
 		}
 	}
+	else if (result < 0) {
+		result = req->error;
+		// make sure that we are consistent and error is always negative...
+		if (result > 0) result = -result;
+	}
 
 	return result;
 }

src/os/posix/dev-file.c

@@ -568,8 +568,6 @@ static int Get_File_Info(REBREQ *file)
 
 	file->error = errno;
 	return DR_ERROR;
-
-	return 0;
 }
 
 

src/tests/units/port-test.r3

@@ -135,6 +135,10 @@ Rebol [
 			not error?      delete-dir %units/temp-dir/
 			not exists? %units/temp-dir/
 		]
+		;@@ https://github.com/Oldes/Rebol-issues/issues/2447
+		--assert false? try [delete %not-exists/]
+		--assert error? try [delete %/]
+
 	--test-- "CHANGE-DIR"
 		;@@ https://github.com/Oldes/Rebol-issues/issues/2446
 		--assert what-dir = change-dir %.
@@ -330,6 +334,19 @@ if system/platform = 'Windows [
 			"test" = read/string %issue-446.txt
 			not error? try [delete %issue-446.txt]
 		]
+	--test-- "DELETE file"
+		;@@ https://github.com/Oldes/Rebol-issues/issues/2447
+		--assert false? try [delete %not-exists]
+		; create locked file...
+		p: open %issue-2447
+		; should not be possible to delete it..
+		--assert error? try [delete %issue-2447]
+		; close the file handle...
+		close p
+		; now it may be deleted..
+		--assert  port? try [delete %issue-2447]
+		; validate...
+		--assert not exists? %issue-2447
 
 ===end-group===