X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fbinary.c;h=5170dac06ccda9de159b0f49ac54f3795d31781c;hb=71402d670b1de4f4db7c1768e92ac1f723b51d9a;hp=507b45f7ddbaa61182bf78d82de67352816dcaa7;hpb=1e2a88066d605257be131a70a07a4024c4707638;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/binary.c b/KernelLand/Kernel/binary.c
index 507b45f7..5170dac0 100644
--- a/KernelLand/Kernel/binary.c
+++ b/KernelLand/Kernel/binary.c
@@ -231,23 +231,19 @@ int Proc_int_Execve(const char *File, const char **ArgV, const char **EnvP, int
 	}
 
 	// --- Get argc	
-	for( argc = 0; ArgV && ArgV[argc]; argc ++ );
+	for( argc = 0; ArgV && ArgV[argc]; argc ++ )
+		;
 	
 	// --- Set Process Name
 	Threads_SetName(File);
 	
 	// --- Clear User Address space
-	// NOTE: This is a little roundabout, maybe telling ClearUser to not touch the
-	//       PPD area would be a better idea.
 	if( bClearUser )
 	{
-		 int	nfd = *Threads_GetMaxFD();
-		void	*handles;
-		handles = VFS_SaveHandles(nfd, NULL);
-		VFS_CloseAllUserHandles();
+		// MM_ClearUser should preserve handles
 		MM_ClearUser();
-		VFS_RestoreHandles(nfd, handles);
-		VFS_FreeSavedHandles(nfd, handles);
+		// - NOTE: Not a reliable test, but helps for now
+		ASSERTC( VFS_IOCtl(0, 0, NULL), !=, -1 );
 	}
 	
 	// --- Load new binary