X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fbinary.c;h=46f93232799a01083eb03e5180cd80c53b6e358d;hb=aa62597b70c3f3753ee21b174ca695b6b6c4cdef;hp=f618673900668ad54c7e74e2003ab9817457f0b3;hpb=e7a76b0d8a0cc6aa77966509780973a6f8216ef7;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/binary.c b/KernelLand/Kernel/binary.c
index f6186739..46f93232 100644
--- a/KernelLand/Kernel/binary.c
+++ b/KernelLand/Kernel/binary.c
@@ -32,6 +32,7 @@ extern tBinaryType	gELF_Info;
 
 // === PROTOTYPES ===
  int	Binary_int_CacheArgs(const char **Path, const char ***ArgV, const char ***EnvP, void *DestBuffer);
+ int	Proc_int_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize, bool bClearUser);
 tVAddr	Binary_Load(const char *Path, tVAddr *EntryPoint);
 tBinary	*Binary_GetInfo(tMount MountID, tInode InodeID);
 tVAddr	Binary_MapIn(tBinary *Binary, const char *Path, tVAddr LoadMin, tVAddr LoadMax);
@@ -191,7 +192,7 @@ int Proc_SysSpawn(const char *Binary, const char **ArgV, const char **EnvP, int
 		VFS_RestoreHandles(nFD, handles);
 		VFS_FreeSavedHandles(nFD, handles);
 		// Frees cachebuf
-		Proc_Execve(Binary, ArgV, EnvP, size);
+		Proc_int_Execve(Binary, ArgV, EnvP, size, 0);
 		for(;;);
 	}
 	if( ret == -1 )
@@ -211,6 +212,11 @@ int Proc_SysSpawn(const char *Binary, const char **ArgV, const char **EnvP, int
  * \note Called Proc_ for historical reasons
  */
 int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize)
+{
+	return Proc_int_Execve(File, ArgV, EnvP, DataSize, 1);
+}
+
+int Proc_int_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize, bool bClearUser)
 {
 	void	*cachebuf;
 	tVAddr	entry;
@@ -236,6 +242,7 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int Data
 	// --- 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;
@@ -819,22 +826,20 @@ int Binary_GetSymbol(const char *Name, Uint *Val)
  */
 Uint Binary_GetSymbolEx(const char *Name, Uint *Value)
 {
-	 int	i;
 	tKernelBin	*pKBin;
 	 int	numKSyms = ((Uint)&gKernelSymbolsEnd-(Uint)&gKernelSymbols)/sizeof(tKernelSymbol);
 	
-	LOG("numKSyms = %i", numKSyms);
-
 	// Scan Kernel
-	for( i = 0; i < numKSyms; i++ )
+	for( int i = 0; i < numKSyms; i++ )
 	{
-		LOG("KSym %s = %p", gKernelSymbols[i].Name, gKernelSymbols[i].Value);
 		if(strcmp(Name, gKernelSymbols[i].Name) == 0) {
+			LOG("KSym %s = %p", gKernelSymbols[i].Name, gKernelSymbols[i].Value);
 			*Value = gKernelSymbols[i].Value;
 			return 1;
 		}
 	}
 	
+	
 	// Scan Loaded Libraries
 	for(pKBin = glLoadedKernelLibs;
 		pKBin;