X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fio.c;h=271e920de7919d49ab8b6964aa597e6799d9a20f;hb=3c3c26b58055f511af5b7f0c3ab22e83961c775f;hp=f5b16cc1cc39f58f18a37e3c43fc5408ca442250;hpb=015f48988e0ff398409d71dfc692005ab439490a;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/io.c b/KernelLand/Kernel/vfs/io.c
index f5b16cc1..271e920d 100644
--- a/KernelLand/Kernel/vfs/io.c
+++ b/KernelLand/Kernel/vfs/io.c
@@ -23,43 +23,40 @@ size_t VFS_Read(int FD, size_t Length, void *Buffer)
 	tVFS_Handle	*h;
 	size_t	ret;
 	
-	ENTER("xFD xLength pBuffer", FD, Length, Buffer);
-	
 	h = VFS_GetHandle(FD);
 	if(!h) {
-		LOG("Bad Handle");
-		LEAVE_RET('i', -1);
+		LOG("FD%i is a bad Handle", FD);
+		return -1;
 	}
 	
 	if( !(h->Mode & VFS_OPENFLAG_READ) ) {
-		LOG("Bad mode");
-		LEAVE_RET('i', -1);
+		LOG("FD%i not open for reading", FD);
+		return -1;
 	}
 	if( (h->Node->Flags & VFS_FFLAG_DIRECTORY) ) {
-		LOG("Reading directory");
-		LEAVE_RET('i', -1);
+		LOG("FD%i is a directory", FD);
+		return -1;
 	}
 
 	if(!h->Node->Type || !h->Node->Type->Read) {
-		LOG("No read method");
-		LEAVE_RET('i', -1);
+		LOG("FD%i has no read method", FD);
+		return -1;
 	}
 
 	if( !MM_GetPhysAddr(h->Node->Type->Read) ) {
 		Log_Error("VFS", "Node type %p(%s) read method is junk %p",
 			h->Node->Type, h->Node, h->Node->Type->TypeName,
 			h->Node->Type->Read);
-		LEAVE_RET('i', -1);
+		return -1;
 	}
 	
-	LOG("Position=%llx", h->Position);
 	Uint	flags = 0;
 	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
 	ret = h->Node->Type->Read(h->Node, h->Position, Length, Buffer, flags);
-	if(ret == (size_t)-1)	LEAVE_RET('i', -1);
+	if(ret != Length)	LOG("%i/%i read", ret, Length);
+	if(ret == (size_t)-1)	return -1;
 	
 	h->Position += ret;
-	LEAVE('x', ret);
 	return ret;
 }
 
@@ -87,12 +84,12 @@ size_t VFS_ReadAt(int FD, Uint64 Offset, size_t Length, void *Buffer)
 		Log_Error("VFS", "Node type %p(%s) read method is junk %p",
 			h->Node->Type, h->Node->Type->TypeName,
 			h->Node->Type->Read);
-		LEAVE_RET('i', -1);
 	}
 	
 	Uint	flags = 0;
 	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
 	ret = h->Node->Type->Read(h->Node, Offset, Length, Buffer, flags);
+	if(ret != Length)	LOG("%i/%i read", ret, Length);
 	if(ret == (size_t)-1)	return -1;
 	return ret;
 }
@@ -107,19 +104,26 @@ size_t VFS_Write(int FD, size_t Length, const void *Buffer)
 	size_t	ret;
 	
 	h = VFS_GetHandle(FD);
-	if(!h)	return -1;
+	if(!h) {
+		LOG("FD%i is not open", FD);
+		errno = EBADF;
+		return -1;
+	}
 	
 	if( !(h->Mode & VFS_OPENFLAG_WRITE) ) {
 		LOG("FD%i not opened for writing", FD);
+		errno = EBADF;
 		return -1;
 	}
 	if( h->Node->Flags & VFS_FFLAG_DIRECTORY ) {
-		LOG("FD%i is a director", FD);
+		LOG("FD%i is a directory", FD);
+		errno = EISDIR;
 		return -1;
 	}
 
 	if( !h->Node->Type || !h->Node->Type->Write ) {
 		LOG("FD%i has no write method", FD);
+		errno = EINTERNAL;
 		return 0;
 	}
 
@@ -127,12 +131,14 @@ size_t VFS_Write(int FD, size_t Length, const void *Buffer)
 		Log_Error("VFS", "Node type %p(%s) write method is junk %p",
 			h->Node->Type, h->Node->Type->TypeName,
 			h->Node->Type->Write);
+		errno = EINTERNAL;
 		return -1;
 	}
 	
 	Uint flags = 0;
 	flags |= (h->Mode & VFS_OPENFLAG_NONBLOCK) ? VFS_IOFLAG_NOBLOCK : 0;
 	ret = h->Node->Type->Write(h->Node, h->Position, Length, Buffer, flags);
+	if(ret != Length)	LOG("%i/%i written", ret, Length);
 	if(ret == (size_t)-1)	return -1;
 
 	h->Position += ret;
@@ -228,9 +234,17 @@ int VFS_IOCtl(int FD, int ID, void *Buffer)
 	tVFS_Handle	*h;
 	
 	h = VFS_GetHandle(FD);
-	if(!h)	return -1;
+	if(!h) {
+		LOG("FD%i is invalid", FD);
+		errno = EINVAL;
+		return -1;
+	}
 
-	if(!h->Node->Type || !h->Node->Type->IOCtl)	return -1;
+	if(!h->Node->Type || !h->Node->Type->IOCtl) {
+		LOG("FD%i does not have an IOCtl method");
+		errno = EINVAL;
+		return -1;
+	}
 	return h->Node->Type->IOCtl(h->Node, ID, Buffer);
 }