From 93b071ad2d81f0976e41af1b5c4db7be44d68f30 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 10 Oct 2025 15:21:05 -0400 Subject: cmd: Add shell prototype Signed-off-by: Ian Moffett --- src/cmd/Makefile | 3 ++ src/cmd/hush/Makefile | 18 +++++++++ src/cmd/hush/hush.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/cmd/init/init.c | 36 +++++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 src/cmd/hush/Makefile create mode 100644 src/cmd/hush/hush.c (limited to 'src') diff --git a/src/cmd/Makefile b/src/cmd/Makefile index 6caf79b..7c05606 100644 --- a/src/cmd/Makefile +++ b/src/cmd/Makefile @@ -8,7 +8,10 @@ LD = all: cd init/; make LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) + cd hush/; make LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ + LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) .PHONY: clean clean: cd init/; make clean + cd hush/; make clean diff --git a/src/cmd/hush/Makefile b/src/cmd/hush/Makefile new file mode 100644 index 0000000..29ac3b0 --- /dev/null +++ b/src/cmd/hush/Makefile @@ -0,0 +1,18 @@ +include ../../data/build/user.mk + +CFILES = $(shell find . -name "*.c") +CFILES = $(shell find . -name "*.c") +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) \ + -L../../lib/libwidget -lwidget -L../../lib/libc/ -lc \ + -I../../lib/libwidget/include/ +OBJECTS = $(CFILES:%.c=%.o) + +$(SYSROOT)/usr/bin/hush: $(OBJECTS) + $(LD) $(OBJECTS) -o $@ $(CFLAGS) + +%.o: %.c + $(CC) $(INTERNAL_CFLAGS) -c $(CFLAGS) $< -o $@ + +.PHONY: clean +clean: + rm -f *.o *.d diff --git a/src/cmd/hush/hush.c b/src/cmd/hush/hush.c new file mode 100644 index 0000000..ade7b4e --- /dev/null +++ b/src/cmd/hush/hush.c @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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 +#include +#include +#include +#include +#include + +/* XXX: Hardcoded for now, will change */ +#define PROMPT "[sv@l5]: " + +/* + * Read input from an input device + * + * @buf: Buffer to fill with input + * @maxlen: Max length of buffer + */ +static void +read_input(char *buf, size_t maxlen) +{ + ssize_t retval; + size_t i = 0; + char c = '\0'; + struct iotap_msg msg = { + .opcode = IOTAP_OPC_READ, + .buf = &c, + .len = 1 + }; + + if (buf == NULL) { + return; + } + + /* + * Read all the input until we hit a '\n' + */ + do { + retval = iotap_mux("input.igkbd", &msg); + if (retval < 0) { + continue; + } + + if (!isascii(c)) { + continue; + } + + if (c != '\n' && i < maxlen) { + buf[i++] = c; + write(STDOUT_FILENO, &c, 1); + } + + } while (c != '\n'); +} + +int +main(void) +{ + char buf[128]; + ssize_t retval; + + for (;;) { + write(STDOUT_FILENO, PROMPT, sizeof(PROMPT) - 1); + read_input(buf, sizeof(buf)); + write(STDOUT_FILENO, "\n", 1); + + /* XXX: For initial demonstration */ + if (strcmp(buf, "hello") == 0) { + puts("meow!!"); + } else { + puts("mrrp?"); + } + + buf[0] = '\0'; + memset(buf, 0, sizeof(buf)); + } + + return 0; +} diff --git a/src/cmd/init/init.c b/src/cmd/init/init.c index 66b8c19..befaa18 100644 --- a/src/cmd/init/init.c +++ b/src/cmd/init/init.c @@ -1,5 +1,41 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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 +#include + void main(void) { + char shell_path[] = "/usr/bin/hush"; + char *argv_dmmy[] = {NULL}; + + spawn(shell_path, argv_dmmy); for (;;); } -- cgit v1.2.3