diff options
Diffstat (limited to 'src/cmd')
-rw-r--r-- | src/cmd/Makefile | 6 | ||||
-rw-r--r-- | src/cmd/cat/Makefile | 16 | ||||
-rw-r--r-- | src/cmd/cat/cat.c | 64 | ||||
-rw-r--r-- | src/cmd/echo/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/fetch/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/hush/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/init/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/init/init.c | 28 | ||||
-rw-r--r-- | src/cmd/login/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/lsdisk/Makefile | 4 | ||||
-rw-r--r-- | src/cmd/mex/Makefile | 18 | ||||
-rw-r--r-- | src/cmd/mex/mex.c | 107 | ||||
-rw-r--r-- | src/cmd/reboot/Makefile | 4 |
13 files changed, 246 insertions, 21 deletions
diff --git a/src/cmd/Makefile b/src/cmd/Makefile index 1263be8..7c51ebf 100644 --- a/src/cmd/Makefile +++ b/src/cmd/Makefile @@ -20,6 +20,10 @@ all: LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) cd echo/; make LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) + cd cat/; make LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ + LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) + cd mex/; make LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ + LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) .PHONY: clean clean: @@ -30,3 +34,5 @@ clean: cd lsdisk/; make clean cd login/; make clean cd echo/; make clean + cd cat/; make clean + cd mex/; make clean diff --git a/src/cmd/cat/Makefile b/src/cmd/cat/Makefile new file mode 100644 index 0000000..8ae32ac --- /dev/null +++ b/src/cmd/cat/Makefile @@ -0,0 +1,16 @@ +include ../../data/build/user.mk + +CFILES = $(shell find . -name "*.c") +CFILES = $(shell find . -name "*.c") +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc +OBJECTS = $(CFILES:%.c=%.o) + +$(SYSROOT)/usr/bin/cat: $(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/cat/cat.c b/src/cmd/cat/cat.c new file mode 100644 index 0000000..bb5049d --- /dev/null +++ b/src/cmd/cat/cat.c @@ -0,0 +1,64 @@ +/* + * 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 <stdio.h> +#include <unistd.h> +#include <stddef.h> +#include <fcntl.h> + +static void +cat(const char *path) +{ + char buf[128]; + ssize_t len; + int fd; + + fd = open(path, O_RDONLY); + if (fd < 0) { + printf("error: could not open \"%s\"\n", path); + return; + } + + /* Read chunk by chunk */ + while ((len = read(fd, buf, sizeof(buf))) > 0) { + printf("%s", buf); + } + + close(fd); +} + +int +main(void) +{ + for (int i = 1; i < __argc; ++i) { + cat(__argv[i]); + } + + return 0; +} diff --git a/src/cmd/echo/Makefile b/src/cmd/echo/Makefile index 40b3d93..0ebf3fd 100644 --- a/src/cmd/echo/Makefile +++ b/src/cmd/echo/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/echo: $(OBJECTS) diff --git a/src/cmd/fetch/Makefile b/src/cmd/fetch/Makefile index bcc5da2..1f6461f 100644 --- a/src/cmd/fetch/Makefile +++ b/src/cmd/fetch/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/fetch: $(OBJECTS) diff --git a/src/cmd/hush/Makefile b/src/cmd/hush/Makefile index 29ac3b0..d97efa3 100644 --- a/src/cmd/hush/Makefile +++ b/src/cmd/hush/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/hush: $(OBJECTS) diff --git a/src/cmd/init/Makefile b/src/cmd/init/Makefile index b58b223..73fefe5 100644 --- a/src/cmd/init/Makefile +++ b/src/cmd/init/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/init: $(OBJECTS) diff --git a/src/cmd/init/init.c b/src/cmd/init/init.c index 3f39743..7851c9c 100644 --- a/src/cmd/init/init.c +++ b/src/cmd/init/init.c @@ -28,13 +28,41 @@ */ #include <sys/spawn.h> +#include <sys/mount.h> #include <stddef.h> +#include <stdio.h> void main(void) { char login_path[] = "/usr/sbin/login"; char *argv_dmmy[] = { "/usr/sbin/login", NULL }; + int error; + + /* Mount tmpfs */ + error = mount( + NULL, + "/tmp", + MOUNT_TMPFS, + 0, + NULL + ); + + if (error < 0) { + printf("init: failed to mount tmpfs\n"); + } + + error = mount( + NULL, + "/dev", + MOUNT_DEVFS, + 0, + NULL + ); + + if (error < 0) { + printf("init: failed to mount devfs\n"); + } spawn(login_path, argv_dmmy); for (;;); diff --git a/src/cmd/login/Makefile b/src/cmd/login/Makefile index f0018e8..f9a9fff 100644 --- a/src/cmd/login/Makefile +++ b/src/cmd/login/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/sbin/login: $(OBJECTS) diff --git a/src/cmd/lsdisk/Makefile b/src/cmd/lsdisk/Makefile index 721f530..b785bde 100644 --- a/src/cmd/lsdisk/Makefile +++ b/src/cmd/lsdisk/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/lsdisk: $(OBJECTS) diff --git a/src/cmd/mex/Makefile b/src/cmd/mex/Makefile new file mode 100644 index 0000000..bc88287 --- /dev/null +++ b/src/cmd/mex/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/mex: $(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/mex/mex.c b/src/cmd/mex/mex.c new file mode 100644 index 0000000..da501c3 --- /dev/null +++ b/src/cmd/mex/mex.c @@ -0,0 +1,107 @@ +/* + * 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 <unistd.h> +#include <stddef.h> +#include <fcntl.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> + +#define LINE_LEN 16 + +static void +dump_line(const char *line, size_t len) +{ + /* The amount of bytes we write */ + const uint8_t BYTE_COUNT = 2; + + for (size_t i = 0; i < LINE_LEN; ++i) { + if (i < len) { + printf("%02x", line[i] & 0xFF); + } else { + printf(" "); + } + + /* Put spacing between bytes */ + if (((i + 1) % BYTE_COUNT) == 0) { + printf(" "); + } + } + + printf(" "); + for (size_t i = 0; i < len; ++i) { + if (line[i] > 31 && line[i] < 127) { + printf("%c", line[i]); + } else { + printf("."); + } + } + + printf("\n"); +} + +static void +dump_file(int fd) +{ + char buf[LINE_LEN]; + ssize_t count; + size_t offset = 0; + + for (;;) { + count = read(fd, buf, sizeof(char) * LINE_LEN); + if (count <= 0) { + break; + } + + printf("%08x: ", offset); + offset += LINE_LEN; + dump_line(buf, count); + } +} + +int +main(int argc, char **argv) +{ + int fd; + + if (__argc < 2) { + printf("mex: usage: mex <filename>\n"); + return -1; + } + + if ((fd = open(__argv[1], O_RDONLY)) < 0) { + printf("mex: failed to open input\n"); + return fd; + } + + dump_file(fd); + close(fd); + return 0; +} diff --git a/src/cmd/reboot/Makefile b/src/cmd/reboot/Makefile index be5c21f..c39fcb9 100644 --- a/src/cmd/reboot/Makefile +++ b/src/cmd/reboot/Makefile @@ -2,9 +2,7 @@ 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/ +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) -L../../lib/libc/ -lc OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/reboot: $(OBJECTS) |