diff options
| -rw-r--r-- | src/cmd/jsh/builtin.c | 49 | ||||
| -rw-r--r-- | src/cmd/jsh/builtin.h | 8 | ||||
| -rwxr-xr-x | src/cmd/jsh/jsh | bin | 0 -> 51168 bytes | |||
| -rwxr-xr-x | src/cmd/jsh/jsh.c | 81 | ||||
| -rwxr-xr-x | src/cmd/jsh/makefile | 2 |
5 files changed, 115 insertions, 25 deletions
diff --git a/src/cmd/jsh/builtin.c b/src/cmd/jsh/builtin.c new file mode 100644 index 0000000..dbcc415 --- /dev/null +++ b/src/cmd/jsh/builtin.c @@ -0,0 +1,49 @@ +#include "builtin.h" +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> + +static int shellcd(const size_t n, char * const args[n]); + +static const char * const builtins[] = { + "cd" +}; + +static int (*functions[])(const size_t n, char * const args[n]) = { + shellcd +}; + +int execbuiltin(size_t index, const size_t n, char * const args[n]) { + return (*functions[index])(n, args); +} + +size_t checkbuiltin(const char * const function) { + size_t len = sizeof(builtins) / sizeof(builtins[0]); + for (size_t i = 0; i < len; i++) { + if (strcmp(builtins[i], function) == 0) { + return i; + } + } + return -1; +} + +static int shellcd(const size_t n, char * const args[n]) { + int status; + char *home = getenv("HOME"); + if (n == 2) { + status = chdir(args[1]); + } else if (n == 1) { + status = chdir(home); + } else { + errno = E2BIG; + status = -1; + } + if (status != 0) { + perror("cd"); + return EXIT_FAILURE; + } + return EXIT_SUCCESS; +} + diff --git a/src/cmd/jsh/builtin.h b/src/cmd/jsh/builtin.h new file mode 100644 index 0000000..fdc9af4 --- /dev/null +++ b/src/cmd/jsh/builtin.h @@ -0,0 +1,8 @@ +#ifndef BUILTIN_H +#define BUILTIN_H +#include <stddef.h> + +size_t checkbuiltin(const char * const function); +int execbuiltin(size_t index, const size_t n, char * const args[n]); + +#endif diff --git a/src/cmd/jsh/jsh b/src/cmd/jsh/jsh Binary files differnew file mode 100755 index 0000000..bc07cab --- /dev/null +++ b/src/cmd/jsh/jsh diff --git a/src/cmd/jsh/jsh.c b/src/cmd/jsh/jsh.c index 320a93d..8e07d8c 100755 --- a/src/cmd/jsh/jsh.c +++ b/src/cmd/jsh/jsh.c @@ -3,12 +3,16 @@ #include <string.h> #include <unistd.h> #include <stdbool.h> -#include <ctype.h> +#include <fcntl.h> +#include "builtin.h" size_t getargs(const size_t n, char *args[n], FILE * const stream); int shellexec(size_t n, char * const args[n]); +/* int shellredirect(size_t n, char * const args[n], const char * const file, const int mode); */ +/* int shelltofile(size_t n, char * const args[n], const int fd); */ static bool run = true; +static const char * const delim = "\t\n &|><"; int main(int argc, char *argv[]) { char *words[BUFSIZ] = {NULL}; @@ -23,7 +27,7 @@ int main(int argc, char *argv[]) { while (run) { printf("$ "); numberofwords = getargs(BUFSIZ, words, fp); - shellexec(BUFSIZ, words); + shellexec(numberofwords, words); for (int i = 0; i < numberofwords; i++) { free(words[i]); words[i] = NULL; @@ -33,33 +37,26 @@ int main(int argc, char *argv[]) { } size_t getargs(const size_t n, char *args[n], FILE * const stream) { - size_t i = 0; - char c = 0, s[BUFSIZ], *sp = s; - memset(s, '\0', sizeof(s)); - while ((c = fgetc(stream)) != EOF && i < n && sp < s + BUFSIZ) { - if (isspace(c)) { - *sp = '\0'; - args[i++] = strdup(s); - sp = s; - if (strcmp(args[i-1], "") == 0) { - free(args[i-1]); - args[i-1] = NULL; - i--; - } - if (c == '\n') { - break; - } - } else { - *sp++ = c; + char *line = (char *)malloc(BUFSIZ), *tofree, *token; + size_t linecap = 0, num = 0; + getline(&line, &linecap, stream); + tofree = line; + while ((token = strsep(&line, delim)) != NULL) { + if (strcmp(token, "") != 0) { + args[num++] = strdup(token); } } - return i; + free((void *)tofree); + return num; } -int shellexec(size_t n, char * const args[n]) { +int shellexec(const size_t n, char * const args[n]) { + int index; if (strcmp(args[0], "exit") == 0) { run = false; - return 0; + return EXIT_SUCCESS; + } else if ((index = checkbuiltin(args[0])) != -1) { + return execbuiltin(index, n, args); } pid_t pid = fork(); int status; @@ -76,6 +73,42 @@ int shellexec(size_t n, char * const args[n]) { waitpid(pid, &status, WUNTRACED); } while (!WIFEXITED(status) && !WIFSIGNALED(status)); } - return 0; + return EXIT_SUCCESS; } + +/* int shellredirect(size_t n, char * const args[n], const char * const file, const int mode) { */ +/* int fd = open(file, mode); */ +/* int status; */ +/* if (mode & O_WRONLY || mode & O_APPEND) { */ +/* status = shelltofile(n, args, fd); */ +/* } else if (mode & O_RDONLY) { */ +/* status = EXIT_FAILURE; */ +/* } else { */ +/* status = EXIT_FAILURE; */ +/* } */ +/* close(fd); */ +/* return status; */ +/* } */ + +/* int shelltofile(size_t n, char * const args[n], const int fd) { */ +/* pid_t pid = fork(); */ +/* int status; */ +/* if (pid == 0) { */ +/* close(STDOUT_FILENO); */ +/* dup2(fd, STDOUT_FILENO); */ +/* if (execvp(args[0], args) == -1) { */ +/* perror("jsh"); */ +/* exit(EXIT_FAILURE); */ +/* } */ +/* exit(EXIT_SUCCESS); */ +/* } else if (pid < 0) { */ +/* perror("jsh"); */ +/* exit(EXIT_FAILURE); */ +/* } else { */ +/* do { */ +/* waitpid(pid, &status, WUNTRACED); */ +/* } while (!WIFEXITED(status) && !WIFSIGNALED(status)); */ +/* } */ +/* return EXIT_SUCCESS; */ +/* } */ diff --git a/src/cmd/jsh/makefile b/src/cmd/jsh/makefile index 72d7d68..8ea7241 100755 --- a/src/cmd/jsh/makefile +++ b/src/cmd/jsh/makefile @@ -4,7 +4,7 @@ build: jsh @cp jsh $(PROROOT)/build/bin/jsh jsh: jsh.c - $(CC) $(CFLAGS) -o jsh jsh.c + $(CC) $(CFLAGS) -o jsh jsh.c builtin.c clean: @rm -r jsh |