diff --git a/bin/shell/exec.c b/bin/shell/exec.c index 859daf8..4470e2d 100644 --- a/bin/shell/exec.c +++ b/bin/shell/exec.c @@ -32,10 +32,36 @@ #include #include "shell.h" -static char *argv_init[2] = { "/bin/sh", NULL, }; // ARGV For Initial Proccess -//static char *envp_init[12] = { "HOST=MrOlsen.uBixOS.com", "TERM=xterm", "SHELL=/bin/sh", "HOME=/", "PWD=/", "PATH=/bin:/sbin:/usr/bin:/usr/sbin", "USER=root", "LOGNAME=root", "GROUP=admin", "LD_DEBUG=all", "LD_LIBRARY_PATH=/lib:/usr/lib", NULL, }; //ENVP For Initial Proccess -static char *envp_init[11] = { "HOST=MrOlsen.uBixOS.com", "TERM=xterm", "SHELL=/bin/sh", "HOME=/", "PWD=/", "PATH=/bin:/sbin:/usr/bin:/usr/sbin", "USER=root", "LOGNAME=root", "GROUP=admin", "LD_LIBRARY_PATH=/lib:/usr/lib", NULL, }; //ENVP For Initial Proccess +static char *argv_init[2] = { + "/bin/sh", + NULL, }; // ARGV For Initial Proccess +static char *envp_init_old[12] = { + "HOST=MrOlsen.uBixOS.com", + "TERM=xterm", + "SHELL=/bin/sh", + "HOME=/", + "PWD=/", + "PATH=/bin:/sbin:/usr/bin:/usr/sbin", + "USER=root", + "LOGNAME=root", + "GROUP=admin", + "LD_DEBUG=all", + "LD_LIBRARY_PATH=/lib:/usr/lib", + NULL, }; //ENVP For Initial Proccess + +static char *envp_init[11] = { + "HOST=MrOlsen.uBixOS.com", + "TERM=xterm", + "SHELL=/bin/sh", + "HOME=/", + "PWD=/", + "PATH=/bin:/sbin:/usr/bin:/usr/sbin", + "USER=root", + "LOGNAME=root", + "GROUP=admin", + "LD_LIBRARY_PATH=/lib:/usr/lib", + NULL, }; //ENVP For Initial Proccess void execProgram(inputBuffer *data) { char file[1024]; @@ -46,13 +72,13 @@ if (!cPid) { sprintf(file, "%s%s", cwd, data->argv[1]); execve(file, argv_init, envp_init); - printf("%s: Command Not Found.\n",data->argv[1]); + printf("%s: Command Not Found.\n", data->argv[1]); exit(-1); - } + } else { if (data->bg == 0x0) { while (pidStatus(cPid) > 0) sched_yield(); - } - } + } } +}