Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[esh] Support &, search path

Browse Source
This commit is contained in:
Kevin Lange 2011-12-07 15:08:40 -06:00
parent c4fe97af6d
commit c54de06083
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
userspace/esh.c
View File

@ -16,9 +16,12 @@ DEFN_SYSCALL1(wait, 17, unsigned int);
int main(int argc, char ** argv) {
printf("I am pid %d\n", getpid());
char cwd[1024] = {'/',0};
int pid = getpid();
int nowait = 0;
int free_cmd = 0;
while (1) {
char cmd[1024];
char * cmd = malloc(sizeof(char) * 1024);
printf("%s$ ", cwd);
fflush(stdout);
fgets(cmd, 1024, stdin);
@ -31,20 +34,49 @@ int main(int argc, char ** argv) {
}
tokens[i] = NULL;
if (!tokens[0] || strlen(tokens[0]) < 1) {
free(cmd);
continue;
}
if (!strcmp(tokens[0],"exit")) {
goto exit;
}
nowait = (!strcmp(tokens[i-1],"&"));
/* Attempt to open the command */
FILE * file = fopen(tokens[0], "r");
if (!file) {
if (!strstr(tokens[0],"/")) {
cmd = malloc(sizeof(char) * (strlen(tokens[0]) + strlen("/bin/") + 1));
sprintf(cmd, "%s%s", "/bin/", tokens[0]);
file = fopen(cmd,"r");
if (!file) {
printf("Command not found: %s\n", tokens[0]);
free(cmd);
continue;
}
fclose(file);
} else {
printf("Command not found: %s\n", tokens[0]);
free(cmd);
continue;
}
} else {
fclose(file);
}
uint32_t f = fork();
if (getpid() != pid) {
int i = execve(tokens[0], tokens, NULL);
int i = execve(cmd, tokens, NULL);
return i;
} else {
int i = syscall_wait(f);
if (i) {
printf("[%d] ");
if (!nowait) {
int i = syscall_wait(f);
if (i) {
printf("[%d] ");
}
}
free(cmd);
}
}
exit: