diff options
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/Makefile | 54 | ||||
| -rw-r--r-- | sh/commands.c | 50 | ||||
| -rw-r--r-- | sh/commands.h | 34 | ||||
| -rw-r--r-- | sh/parser.c | 114 | ||||
| -rw-r--r-- | sh/parser.h | 35 | ||||
| -rw-r--r-- | sh/sh.c | 158 |
6 files changed, 0 insertions, 445 deletions
diff --git a/sh/Makefile b/sh/Makefile deleted file mode 100644 index e2eb1b1..0000000 --- a/sh/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2022 Ferass EL HAFIDI -# Copyright (C) 2022 Leah Rowe -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -include ../config.mk - -# Commands -# ======== - -all: clean sh - -sh: sh.o - $(CC) $(CFLAGS) *.o -o sh - rm -f version.h - -clean: - rm -f *.o - rm -Rf sh - -# Utilities -# ========= - -sh.o: - echo "#ifndef VERSION_H" > version.h - echo "#define VERSION_H" >> version.h - echo "#define COMPILETIME \"$$(date)\"" >> version.h - echo >> version.h - echo "#endif" >> version.h - for s in *.c; do $(CC) $(CFLAGS) $(NOLINKER) $$s -o $${s%.c}.o; done diff --git a/sh/commands.c b/sh/commands.c deleted file mode 100644 index 0c91456..0000000 --- a/sh/commands.c +++ /dev/null @@ -1,50 +0,0 @@ -/* sh - the standard command language interpreter - * Copyright (C) 2022 Ferass EL HAFIDI - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* POSIX Header Files */ -#include <unistd.h> -#include <stdio.h> -#include <errno.h> -#include <string.h> - -/* sh Header Files */ -#include "commands.h" - -int builtin_cd(int argc, char *argv[]); - -/* *** COMMANDS *** */ - -/* cd - change directory */ - -int builtin_cd(int argc, char *argv[]) { - if (argc > 1 && chdir(argv[1]) == -1 && errno) { - printf("sh: cd: %s\n", strerror(errno)); - return errno; - } - return 0; -} diff --git a/sh/commands.h b/sh/commands.h deleted file mode 100644 index ce35012..0000000 --- a/sh/commands.h +++ /dev/null @@ -1,34 +0,0 @@ -/* sh - the standard command language interpreter - * Copyright (C) 2022 Ferass EL HAFIDI - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef COMMANDS_H -#define COMMANDS_H - -int builtin_cd(int argc, char *argv[]); - -#endif /* COMMANDS_H */ diff --git a/sh/parser.c b/sh/parser.c deleted file mode 100644 index f1efddc..0000000 --- a/sh/parser.c +++ /dev/null @@ -1,114 +0,0 @@ -/* sh - the standard command language interpreter - * Copyright (C) 2022 Ferass EL HAFIDI - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#define _POSIX_C_SOURCE 200809L - -/* POSIX Header Files */ -#include <unistd.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <signal.h> - -/* sh Header Files */ -#include "parser.h" -#include "commands.h" - -int parseCommand(int, char **); -int splitCommand(char [4096], char *[4096]); - -/* USAGE - * ----- - * parseCommand(name); - * - * DESCRIPTION - * ----------- - * Parse a shell command and determine if the command to run is built-in or - * external. It then runs the command accordinately. - * <It also could in the future handle tokens.> - */ - -int parseCommand(int argc, char *argv[]) { - struct sigaction signal_action; - int status_code = 0, err = 0; - pid_t isparent; - if (argc == 0) return 0; /* There's no argument. */ - if (!strcmp(argv[0], "cd")) return builtin_cd(argc, argv); - /* The command isn't built-in. */ - isparent = fork(); - wait(&status_code); - if (!isparent) { - /* Do not ignore SIGINT when in a child process. */ - signal_action.sa_handler = SIG_DFL; - sigemptyset(&signal_action.sa_mask); - sigaction(SIGINT, &signal_action, NULL); - /* Some sh implementations manually search for the command in PATH. - * This is not needed here because execvp is going to search for - * that command in PATH anyway. - */ - status_code = execvp(argv[0], argv); - /* If the child process is still alive, we know execvp(3) failed. */ - exit(-errno); - } - /* This code may be used to store the exit value in $?. */ - //if (errno != EINTR && WEXITSTATUS(status_code) !=) return WEXITSTATUS(status_code); - //else return 0; - err = WEXITSTATUS(status_code); - if (err-256 == -E2BIG || err-256 == -EACCES || err-256 == -EINVAL || - err-256 == -ELOOP || - err-256 == -ENAMETOOLONG || err-256 == -ENOENT || err-256 == -ENOTDIR) - printf("sh: %s: %s\n", argv[0], strerror(-(err-256))); - return err; -} - -/* USAGE - * ----- - * splitCommand(name, dest); - * - * DESCRIPTION - * ----------- - * This splits a command string in multiple words. - * The array command can then be ran using execvp(3). It - * also returns an int that can be used as argc. - */ - -int splitCommand(char name[4096], char *splitted_name[4096]) { - long unsigned int array_index = 1; - char *token; - if ((token = strtok(name, " ")) != NULL && token[0] != '#') - splitted_name[0] = token; - else return 0; - /* WARNING: Not thread-safe! */ - for (; (token = strtok(NULL, " ")) != NULL && - token[0] != '#' && - (splitted_name[array_index] = token); array_index++) - /* Do nothing. */ ; - return array_index; -} - diff --git a/sh/parser.h b/sh/parser.h deleted file mode 100644 index a006024..0000000 --- a/sh/parser.h +++ /dev/null @@ -1,35 +0,0 @@ -/* sh - the standard command language interpreter - * Copyright (C) 2022 Ferass EL HAFIDI - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef PARSER_H -#define PARSER_H - -int parseCommand(int, char **); -int splitCommand(char [4096], char *[4096]); - -#endif /* PARSER_H */ diff --git a/sh/sh.c b/sh/sh.c deleted file mode 100644 index 2e44d9e..0000000 --- a/sh/sh.c +++ /dev/null @@ -1,158 +0,0 @@ -/* sh - the standard command language interpreter - * Copyright (C) 2022 Ferass EL HAFIDI - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* Here's the POSIX specification of sh: */ -/* https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html */ - -/* Define feature test macro. It doesn't compile with gcc without that for - * some reason. - */ -#define _POSIX_C_SOURCE 200809L - -/* POSIX Header files */ -#include <stdio.h> -#include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <fcntl.h> -#include <errno.h> -#include <stdint.h> -#include <sys/wait.h> -#include <spawn.h> -#include <libgen.h> -#include <signal.h> - -/* Our own header files */ -#include "parser.h" -#include "version.h" - -#ifndef COMPILETIME -#define COMPILETIME -#endif - -#warning "This shell implementation is really buggy and incomplete. \ - Please don't use this as a /bin/sh replacement." - -void commandLoop(); -int getopt(int argc, char *const argv[], const char *optstring); -char *pathSearch(const char *path, const char *name); -void printUsage(); - -int main(int argc, char *const argv[]) { - int argument, i = 1; - FILE *file; - char param[256]; - struct sigaction signal_action; - signal_action.sa_handler = SIG_IGN; - sigemptyset(&signal_action.sa_mask); - for (; i <= 256; i++) param[i] = 0; - - while ((argument = getopt(argc, argv, "c")) != -1) { - if (argument == '?') { - printUsage(); - return 1; - } - param[(uint8_t)argument] = argument; - } - argc -= optind; - argv += optind; - - sigaction(SIGINT, &signal_action, NULL); - if (errno) return errno; - - if (argv[0]) { - file = fopen(argv[0], "r"); - if (errno) return errno; - commandLoop(file); - } - else commandLoop(stdin); - return 0; -} - -/* USAGE - * ----- - * commandLoop() - * - * DESCRIPTION - * ----------- - * This function is the actual command prompt. - */ - -void commandLoop(FILE *filstr) { - struct sigaction signal_action; - char *prompt = getenv("PS1"); - char *path = getenv("PATH"); - char *token, *tokenstate; - char *command[4096]; - pid_t isparent; - char name[4096], tempstr[4096]; - int return_code; - int command_argc; - if (prompt == NULL) prompt = "$ "; - for (;;) { - for (int i = 0; i <= 4096; i++) { - name[i] = 0; /* (Re)Initialise name and command, - * very important. */ - command[i] = 0; - } - setvbuf(stdout, NULL, _IONBF, 0); - if (filstr == stdin && isatty(STDIN_FILENO)) printf(prompt); - if (fgets(name, 4096, filstr) == NULL) - break; - //read(fildes, name, 4096); - if (!strcmp(name, "\n")) - continue; - else if (*name == 0 || *name == EOF) { - putchar('\n'); - break; - } - name[strlen(name) - 1] = 0; - strcpy(tempstr, name); /* We don't want to override `name`. */ - if (strtok(tempstr, ";") != NULL && strtok(NULL, ";") != NULL) { - /* Hacky wacky hack. */ - strcpy(tempstr, name); - token = strtok_r(tempstr, ";", &tokenstate); - for (; token != NULL;) { - command_argc = splitCommand(token, command); /* See parser.c */ - parseCommand(command_argc, command); /* See parser.c */ - token = strtok_r(NULL, ";", &tokenstate); - } - } - else { - command_argc = splitCommand(name, command); /* See parser.c */ - parseCommand(command_argc, command); /* See parser.c */ - } - } -} - -void printUsage() { - printf("Ferass' Base System. (%s)\n\n" - "Usage: sh [-c command_string]\n\n" - "The standard command language interpreter.\n\n" - "\t-c command_string\tExecute command_string and exit.\n", COMPILETIME); -} |