X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fbinary.c;h=0f5183c00542c85597afc60596a8634ef73deacd;hb=df1d534cfe822903fc38e1cc13c4b18941c91908;hp=5a919e177b8fb9f48baa744b45db9c99d951337b;hpb=0cf0603b0b1f6a8617f8efc73375b9b1a9da2159;p=tpg%2Facess2.git diff --git a/Kernel/binary.c b/Kernel/binary.c index 5a919e17..0f5183c0 100644 --- a/Kernel/binary.c +++ b/Kernel/binary.c @@ -28,7 +28,7 @@ extern char *Threads_GetName(int ID); extern Uint MM_ClearUser(void); extern void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize); extern tKernelSymbol gKernelSymbols[]; -extern void gKernelSymbolsEnd; +extern tKernelSymbol gKernelSymbolsEnd[]; extern tBinaryType gELF_Info; // === PROTOTYPES === @@ -101,7 +101,7 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP) { int argc, envc, i; int argenvBytes; - char *argenvBuf, *strBuf; + char **argenvBuf, *strBuf; char **argvSaved, **envpSaved; char *savedFile; Uint entry; @@ -127,10 +127,10 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP) LEAVE('i', 0); return 0; } - strBuf = argenvBuf + (argc+1)*sizeof(void*) + (envc+1)*sizeof(void*); + strBuf = (char*)argenvBuf + (argc+1)*sizeof(void*) + (envc+1)*sizeof(void*); // Populate - argvSaved = (char **) argenvBuf; + argvSaved = argenvBuf; for( i = 0; i < argc; i++ ) { argvSaved[i] = strBuf;