diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/init/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/init/main.c | 54 | ||||
-rw-r--r-- | usr.sbin/init/mshell.c | 258 | ||||
-rw-r--r-- | usr.sbin/init/mshell.h | 35 | ||||
-rw-r--r-- | usr.sbin/sbin.mk | 5 |
6 files changed, 0 insertions, 366 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile deleted file mode 100644 index 30e7248..0000000 --- a/usr.sbin/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -CC = -LD = -LIBC = -USRDIR = - -.PHONY: all -all: - cd init/; make CC=$(CC) USRDIR=$(USRDIR) LIBC=$(LIBC) diff --git a/usr.sbin/init/Makefile b/usr.sbin/init/Makefile deleted file mode 100644 index 1bf7718..0000000 --- a/usr.sbin/init/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -include ../sbin.mk - -.PHONY: all -all: - @ # $(CC) -pie -nostdlib main.c -o init -e main - $(CC) main.c mshell.c -o init $(INTERNAL_CFLAGS) diff --git a/usr.sbin/init/main.c b/usr.sbin/init/main.c deleted file mode 100644 index 4a7176c..0000000 --- a/usr.sbin/init/main.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * 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 Hyra 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 OWNER 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 <stdio.h> -#include "mshell.h" - -#define VERSION "v0.0.1" - -static void -loginfo(const char *s) -{ - fputs("init [*]: ", stdout); - fputs(s, stdout); - fflush(stdout); -} - -int -main(int argc, char **argv) -{ - loginfo("Hyra init " VERSION " loaded\n"); - loginfo("Dropping into maintenance shell...\n"); - - if (mshell_enter() != 0) - loginfo("Failed to launch mshell!\n"); - - loginfo("** EXITING 0 **\n"); - return 0; -} diff --git a/usr.sbin/init/mshell.c b/usr.sbin/init/mshell.c deleted file mode 100644 index 03ddec9..0000000 --- a/usr.sbin/init/mshell.c +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * 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 Hyra 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 OWNER 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. - */ - -/* Maintenance shell */ - -#include <sys/reboot.h> -#include <sys/auxv.h> -#include <string.h> -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <termios.h> -#include "mshell.h" - -#define INPUT_SIZE 32 -#define MAX_FILE_SIZE 1024 -#define TTY_DEV "/dev/tty1" -#define PROMPT "mshell> " -#define NELEMENTS(ARRAY) (sizeof(ARRAY) / sizeof(ARRAY[0])) - -struct mshell_state { - uint8_t running : 1; - char input[INPUT_SIZE]; -}; - -struct command { - const char *name; - void(*run)(struct mshell_state *state); -}; - -static void -print_file(const char *path) -{ - char buf[MAX_FILE_SIZE]; - int fd = open(path, O_RDONLY); - int len; - - if (fd < 0) { - printf("Failed to open %s\n", path); - return; - } - - len = read(fd, buf, sizeof(buf)); - - if (len > 0) { - buf[len] = '\0'; - printf("%s", buf); - } - - close(fd); -} - -static void -rebootcmd(struct mshell_state *state) -{ - reboot(REBOOT_DEFAULT); -} - -static void -helpcmd(struct mshell_state *state) -{ - printf( - "MSHELL COMMANDS\n" - "\thelp - show this message\n" - "\treboot - reboot the system\n" - "\ttty - show the current TTY\n" - "\tpagesize - get the current page size\n" - "\tkversion - get the kernel version\n" - "\tmemstat - get info about memory\n" - "\tintr - get interrupt information\n" - "\texit - exit the shell\n" - ); -} - -static void -pagesizecmd(struct mshell_state *state) -{ - printf("%d\n", auxv_entry(AT_PAGESIZE)); -} - -static void -ttycmd(struct mshell_state *state) -{ - printf("%s\n", TTY_DEV); -} - -static void -exitcmd(struct mshell_state *state) -{ - state->running = 0; -} - -static void -kversioncmd(struct mshell_state *state) -{ - print_file("/proc/version"); -} - -static void -memstatcmd(struct mshell_state *state) -{ - print_file("/proc/memstat"); -} - -static void -intrcmd(struct mshell_state *state) -{ - print_file("/proc/interrupts"); -} - -static struct command cmdtab[] = { - { "reboot", rebootcmd }, - { "help", helpcmd }, - { "pagesize", pagesizecmd }, - { "tty", ttycmd }, - { "exit", exitcmd }, - { "kversion", kversioncmd }, - { "memstat", memstatcmd }, - { "intr", intrcmd } -}; - -static void -parse_input(struct mshell_state *state) -{ - char cmd[INPUT_SIZE]; - char *p = &state->input[0]; - size_t cmd_idx = 0; - - /* Skip leading whitespace */ - while (*p && *p == ' ') - ++p; - - /* Push the command */ - while (*p && *p != '\n') - cmd[cmd_idx++] = *p++; - - cmd[cmd_idx] = '\0'; - - /* Ignore empty commands */ - if (cmd_idx == 0) - return; - - /* Iterate through possible commands */ - for(int i = 0; i < NELEMENTS(cmdtab); i++) { - if (strcmp(cmd, cmdtab[i].name) == 0) { - cmdtab[i].run(state); - return; - } - } - - /* If no command was executed */ - printf("Unknown command '%s'\n", cmd); - printf("Use 'help' for help\n"); -} - -int -mshell_enter(void) -{ - int fd, tmp; - size_t input_idx; - struct termios tm_old, tm; - struct mshell_state state = { - .running = 1 - }; - - /* Try opening the TTY */ - fd = open(TTY_DEV, O_RDONLY); - if (fd < 0) - return -1; - - /* Set raw mode */ - tcgetattr(fd, &tm_old); - tm = tm_old; - tm.c_lflag &= ~(ICANON | ECHO); - tcsetattr(fd, 0, &tm); - - printf("%s", PROMPT); - input_idx = 0; - - while (state.running) { - if (read(fd, &tmp, 1) <= 0) - continue; - - switch (tmp) { - case '\n': - /* - * Parse the input, the newline is so that any printed - * text that is the result of a command can have - * its own lines. - */ - printf("\n"); - parse_input(&state); - - /* Reset the buffer */ - input_idx = 0; - state.input[0] = '\0'; - - printf("%s", PROMPT); - fflush(stdout); - break; - case '\b': - if (input_idx > 0) { - /* - * Replace the last char with a '\0' and rewrite - * the prompt. - */ - state.input[--input_idx] = '\0'; - printf("\b"); - fflush(stdout); - continue; - } - - break; - default: - if (input_idx < INPUT_SIZE) { - state.input[input_idx++] = tmp; - state.input[input_idx] = '\0'; - - printf("%c", tmp); - fflush(stdout); - } - - break; - } - - } - - /* Restore TTY state */ - tcsetattr(fd, 0, &tm_old); - close(fd); - return 0; -} diff --git a/usr.sbin/init/mshell.h b/usr.sbin/init/mshell.h deleted file mode 100644 index 9e9b456..0000000 --- a/usr.sbin/init/mshell.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * 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 Hyra 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 OWNER 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 MSHELL_H -#define MSHELL_H - -int mshell_enter(void); - -#endif /* MSHELL_H */ diff --git a/usr.sbin/sbin.mk b/usr.sbin/sbin.mk deleted file mode 100644 index a7a7bb9..0000000 --- a/usr.sbin/sbin.mk +++ /dev/null @@ -1,5 +0,0 @@ -CC = -LIBDIR = -USRDIR = -LDSCRIPT = -INTERNAL_CFLAGS = -T$(LDSCRIPT) -znoexecstack -nostdlib -I$(USRDIR)/include/ $(USRDIR)/lib/libc.a |