X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fvterm.c;h=aed92582e3b8e836a8fc99c136f6f9b0599a7131;hb=001546477549f71fd1af08e13c60e0a39397532a;hp=7d30511f4be7a09e221c14e0615e9c820b20d063;hpb=3e67a772afc3daa9404b75fc4b4c35bb682fab5b;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/vterm.c b/KernelLand/Kernel/drv/vterm.c
index 7d30511f..aed92582 100644
--- a/KernelLand/Kernel/drv/vterm.c
+++ b/KernelLand/Kernel/drv/vterm.c
@@ -34,7 +34,7 @@ extern void	Debug_SetKTerminal(const char *File);
 
 // === PROTOTYPES ===
  int	VT_Install(char **Arguments);
-char	*VT_ReadDir(tVFS_Node *Node, int Pos);
+ int	VT_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]);
 tVFS_Node	*VT_FindDir(tVFS_Node *Node, const char *Name);
  int	VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data);
 size_t	VT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);
@@ -114,11 +114,11 @@ int VT_Install(char **Arguments)
 			
 			if( strcmp(opt, "Video") == 0 ) {
 				if( !gsVT_OutputDevice )
-					gsVT_OutputDevice = strdup(val);
+					gsVT_OutputDevice = val;
 			}
 			else if( strcmp(opt, "Input") == 0 ) {
 				if( !gsVT_InputDevice )
-					gsVT_InputDevice = strdup(val);
+					gsVT_InputDevice = val;
 			}
 			else if( strcmp(opt, "Width") == 0 ) {
 				giVT_RealWidth = atoi( val );
@@ -129,6 +129,9 @@ int VT_Install(char **Arguments)
 			else if( strcmp(opt, "Scrollback") == 0 ) {
 				giVT_Scrollback = atoi( val );
 			}
+			else {
+				Log_Notice("VTerm", "Unknown option '%s'", opt);
+			}
 		}
 	}
 	
@@ -196,7 +199,6 @@ int VT_Install(char **Arguments)
 //		Semaphore_Init(&gVT_Terminals[i].InputSemaphore, 0, MAX_INPUT_CHARS8, "VTerm", gVT_Terminals[i].Name);
 	}
 	
-	Log_Debug("VTerm", "Registering with DevFS");
 	// Add to DevFS
 	DevFS_AddDevice( &gVT_DrvInfo );
 	
@@ -269,11 +271,12 @@ void VT_SetResolution(int Width, int Height)
  * \fn char *VT_ReadDir(tVFS_Node *Node, int Pos)
  * \brief Read from the VTerm Directory
  */
-char *VT_ReadDir(tVFS_Node *Node, int Pos)
+int VT_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 {
-	if(Pos < 0)	return NULL;
-	if(Pos >= NUM_VTS)	return NULL;
-	return strdup( gVT_Terminals[Pos].Name );
+	if(Pos < 0)	return -EINVAL;
+	if(Pos >= NUM_VTS)	return -EINVAL;
+	strncpy(Dest, gVT_Terminals[Pos].Name, FILENAME_MAX);
+	return 0;
 }
 
 /**
@@ -353,8 +356,7 @@ int VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data)
  */
 size_t VT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 {
-	 int	pos = 0;
-	 int	avail;
+	 int	pos, avail;
 	tVTerm	*term = &gVT_Terminals[ Node->Inode ];
 	Uint32	*codepoint_buf = Buffer;
 	Uint32	*codepoint_in;
@@ -373,9 +375,10 @@ size_t VT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 		avail = term->InputWrite - term->InputRead;
 		if(avail < 0)
 			avail += MAX_INPUT_CHARS8;
-		if(avail > Length - pos)
-			avail = Length - pos;
+		if(avail > Length)
+			avail = Length;
 		
+		pos = 0;
 		while( avail -- )
 		{
 			((char*)Buffer)[pos] = term->InputBuffer[term->InputRead];
@@ -395,12 +398,13 @@ size_t VT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 		if(avail < 0)
 			avail += MAX_INPUT_CHARS32;
 		Length /= 4;
-		if(avail > Length - pos)
-			avail = Length - pos;
+		if(avail > Length)
+			avail = Length;
 		
 		codepoint_in = (void*)term->InputBuffer;
 		codepoint_buf = Buffer;
 		
+		pos = 0;
 		while( avail -- )
 		{
 			codepoint_buf[pos] = codepoint_in[term->InputRead];
@@ -447,8 +451,8 @@ size_t VT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer
 		// - Sanity Checking
 		size = term->Width*term->Height*4;
 		if( Offset > size ) {
-			Log_Notice("VTerm", "VT_Write: Offset (0x%llx) > FBSize (0x%x)",
-				Offset, size);
+			Log_Notice("VTerm", "VT_Write: %i Offset (0x%llx) > FBSize (0x%x)",
+				(int)Node->Inode, Offset, size);
 			return 0;
 		}
 		if( Offset + Length > size ) {
@@ -512,7 +516,7 @@ size_t VT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer
 		break;
 	}
 	
-	return 0;
+	return Length;
 }
 
 /**