From: Alan Cox <alan@linux.intel.com>
Date: Thu, 22 Sep 2016 21:49:52 +0000 (+0100)
Subject: syscall_other: fix up various rename problems
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=55aab568e80dd3072fcfe357e8d77901d78b6ef9;p=FUZIX.git

syscall_other: fix up various rename problems
---

diff --git a/Kernel/syscall_other.c b/Kernel/syscall_other.c
index 2e699969..bc6f4214 100644
--- a/Kernel/syscall_other.c
+++ b/Kernel/syscall_other.c
@@ -28,7 +28,6 @@ arg_t _rename(void)
 {
 	staticfast inoptr srci, srcp, dsti, dstp;
 	char fname[FILENAME_LEN + 1];
-	int ret = -1;
 
 	srci = n_open(src, &srcp);
 	/* Source must exist */
@@ -42,7 +41,16 @@ arg_t _rename(void)
 	udata.u_rename = srci;
 	/* Destination maybe does not exist, but parent must */
 	filename(dst, fname);
+
 	dsti = n_open(dst, &dstp);
+	/* Same file - do nothing */
+	if (dsti == srci) {
+		ret = 0;
+		goto nogood3;
+	}
+
+	ret = -1;
+
 	/* Destination not found, but neither is the directory to
 	   put the new node in -> so fail */
 	if (dstp == NULLINODE)
@@ -52,6 +60,12 @@ arg_t _rename(void)
 		udata.u_error = EXDEV;
 		goto nogood;
 	}
+	/* Can't rename a directory yet.. need to fix this but to do so we
+	   must update .. in the child. Probably a LEVEL 2 functionality ? */
+	if (getmode(srci) == MODE_R(F_DIR)) {
+		udata.u_error = EISDIR;
+		goto nogood;
+	}
 	/* Can't rename one dir into another */
 	if (udata.u_rename == NULL) {
 		/* dst is within src */
@@ -66,6 +80,11 @@ arg_t _rename(void)
 	}
 	/* Destination exists ? If so we must remove it if possible */
 	if (dsti) {
+		/* Can't overwrite a directory */
+		if (getmode(dsti) == MODE_R(F_DIR)) {
+			udata.u_error = EISDIR;
+			goto nogood;
+		}
 		if (unlinki(dsti, dstp, fname) == -1)
 			goto nogood;
 		/* Drop the reference to the unlinked file */