From 2753031a63117fd9de2d189d6731b4de8dd94769 Mon Sep 17 00:00:00 2001 From: Anton Kling Date: Mon, 6 Nov 2023 20:55:03 +0100 Subject: Userland: Remove old coreutil applications that have moved to minibox --- userland/cat/Makefile | 10 ---------- userland/cat/cat | Bin 33852 -> 0 bytes userland/cat/cat.c | 24 ------------------------ userland/init/Makefile | 10 ---------- userland/init/crt0_old.c | 12 ------------ userland/init/init | Bin 31476 -> 0 bytes userland/init/init.c | 15 --------------- 7 files changed, 71 deletions(-) delete mode 100644 userland/cat/Makefile delete mode 100755 userland/cat/cat delete mode 100644 userland/cat/cat.c delete mode 100644 userland/init/Makefile delete mode 100644 userland/init/crt0_old.c delete mode 100755 userland/init/init delete mode 100644 userland/init/init.c diff --git a/userland/cat/Makefile b/userland/cat/Makefile deleted file mode 100644 index b45fae9..0000000 --- a/userland/cat/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CC="/home/anton/opt/cross/bin/i686-elf-gcc" -CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -BINS=cat -all: $(BINS) - -cat.o: cat.c - $(CC) $(CFLAGS) -L../libc/ -lc -c cat.c -I../libc/ - -cat: cat.o - $(CC) -shared -o cat -ffreestanding -nostdlib $(CFLAGS) cat.o -L../libc/ -lc -lgcc #-L../libc/c.a diff --git a/userland/cat/cat b/userland/cat/cat deleted file mode 100755 index 2ba0c4d..0000000 Binary files a/userland/cat/cat and /dev/null differ diff --git a/userland/cat/cat.c b/userland/cat/cat.c deleted file mode 100644 index b143581..0000000 --- a/userland/cat/cat.c +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include -#include - -int main(int argc, char **argv) { - DIR *d = opendir("/"); - struct dirent *de = readdir(d); - printf("x : %x\n", de->d_name[0]); - for (;;) - ; - /* - int fd = 0; - if (argc < 2) - goto read_stdin; - for (int i = 1; i < argc; i++) { - if ((fd = open(argv[i], O_RDONLY, 0)) == -1) { - return 1; - } - read_stdin: - for (char c[4096], int rc; (rc = read(fd, c, 4096) > 0);) - write(1, c, rc); - }*/ - return 0; -} diff --git a/userland/init/Makefile b/userland/init/Makefile deleted file mode 100644 index 932fcd3..0000000 --- a/userland/init/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CC="/home/anton/opt/cross/bin/i686-elf-gcc" -CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -BINS=init -all: $(BINS) - -init.o: init.c - $(CC) $(CFLAGS) -I../libc/ -L../libc/ -lc -c init.c - -init: init.o - $(CC) -shared -o init -ffreestanding -nostdlib $(CFLAGS) init.o -L../libc/ -lc -lgcc #-L../libc/c.a diff --git a/userland/init/crt0_old.c b/userland/init/crt0_old.c deleted file mode 100644 index 7d1e977..0000000 --- a/userland/init/crt0_old.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -int main(int argc, char **argv); -//int main(); - -void _start(int a, int b, int argc, char** argv) -{ - (void)a; - kprintf("argc : %x\n", &argc); - kprintf("argv : %x\n", &argv); - for(;;); -// main(argc, t); -} diff --git a/userland/init/init b/userland/init/init deleted file mode 100755 index 3ae9020..0000000 Binary files a/userland/init/init and /dev/null differ diff --git a/userland/init/init.c b/userland/init/init.c deleted file mode 100644 index 78c4420..0000000 --- a/userland/init/init.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include -#include -#include - -int main(void) { - if (fork()) - for (;;) - wait(NULL); - - char *a[] = {NULL}; - execv("/term", a); - return 1; -} -- cgit v1.2.3