From a282cb8c921299b54a719452ec2bdaff63d8d3e9 Mon Sep 17 00:00:00 2001 From: Miguel Date: Thu, 18 Oct 2018 12:26:18 +0200 Subject: New Scheduling / Syscalls! --- userspace/init.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'userspace/init.c') diff --git a/userspace/init.c b/userspace/init.c index f9a4e78..255b274 100644 --- a/userspace/init.c +++ b/userspace/init.c @@ -4,16 +4,18 @@ * * */ -char *env1[]={"HOME=/home/miguel","PS1=\033[34m$\033[37m","PWD=/home/miguel","PATH=/bin","TERM=fool-term",0}; -char *argv2[]={"pain2",0}; +static char *env1[]={"HOME=/home/miguel","PS1=\033[34m$\033[37m","PWD=/home/miguel","PATH=/bin","TERM=fool-term",0}; +static char *argv1[]={"xterm","/bin/fsh",0}; -#define LAUNCH_COUNT 1 +/* +#define LAUNCH_COUNT 3 char *argv1[][4]={ {"/bin/xterm","xterm","/bin/fsh",0}, {"/bin/xterm","xterm","/bin/fsh",0}, {"/bin/xterm","xterm","/bin/fsh",0}, }; +*/ void fork_and_exec(char **argv) { @@ -22,17 +24,17 @@ void fork_and_exec(char **argv) if(!pid) //child { execve(argv[0],&argv[1],env1); - while(1);//hopefully never reached } } int main(int argc, char **argv) { + execve("/bin/xterm",argv1,env1); + /* for(int i=0;i