diff options
Diffstat (limited to 'kernel/syscalls.c')
| -rw-r--r-- | kernel/syscalls.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/kernel/syscalls.c b/kernel/syscalls.c index 642f04a..c025b06 100644 --- a/kernel/syscalls.c +++ b/kernel/syscalls.c @@ -151,12 +151,23 @@ int copy_args(char **in, char **out) } -int syscall_execve(char *name, char **argv1, char **env1) +int syscall_execve(char *name, char **argv, char **env) { + #ifdef LOG_SYSCALLS - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"execve (name=0x%08X(%s), argvs=0x%08X, env=0x%08X)", name,name,argv1,env1); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"execve (name=0x%08X(%s), argvs=0x%08X, env=0x%08X)", name,name,argv,env); #endif + int arg_count=0; + while(argv[arg_count]!=NULL)arg_count++; + + char **argv1=kballoc(1); + char **env1=kballoc(1); + + copy_args(argv,argv1); + copy_args(env,env1); + + uint32_t alloc; uint32_t entry_global=load_elf(name,&alloc); task_set_brk(alloc); @@ -172,7 +183,6 @@ int syscall_execve(char *name, char **argv1, char **env1) /* try to move this to asm */ //asm volatile("jmp ."); asm volatile("mov $0x8fff000,%esp"); // set stack at high end of process image - int arg_count=0; asm volatile ("push %0" :: "r" (argv1)); asm volatile ("push %0" :: "r" (arg_count)); @@ -184,7 +194,6 @@ int syscall_execve(char *name, char **argv1, char **env1) asm volatile ("sti"); asm volatile ("ret"); - // this is never reached! } |