From 57152f6a03d857118fa82e0a28657d869f4c7110 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 26 Jul 2022 23:04:49 +0200 Subject: user/libc: execv() --- src/user/app/init/shell.c | 13 ++++++------- src/user/lib/include/unistd.h | 2 ++ src/user/lib/stdlib.c | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) (limited to 'src/user') diff --git a/src/user/app/init/shell.c b/src/user/app/init/shell.c index 048b713..a6b9965 100644 --- a/src/user/app/init/shell.c +++ b/src/user/app/init/shell.c @@ -1,12 +1,12 @@ #include "shell.h" #include "tests/tests.h" #include +#include #include #include #include #include #include -#include static bool isspace(char c) { return c == ' ' || c == '\t' || c == '\n'; @@ -202,14 +202,13 @@ void shell_loop(void) { memcpy(binname + 5, cmd, cmdlen + 1); } - FILE *file = fopen(binname, "r"); - if (!file) { - printf("unknown command: %s\n", cmd); + execv(binname, NULL); + if (errno == EINVAL) { + printf("%s isn't a valid executable\n", cmd); } else { - elf_execf(file); - fclose(file); - printf("couldn't execute %s\n", binname); + printf("unknown command: %s\n", cmd); } + if (binname != cmd) free(binname); } diff --git a/src/user/lib/include/unistd.h b/src/user/lib/include/unistd.h index b825e45..4f367ca 100644 --- a/src/user/lib/include/unistd.h +++ b/src/user/lib/include/unistd.h @@ -4,3 +4,5 @@ int fork(void); int close(handle_t h); _Noreturn void exit(int); + +int execv(const char *path, char *const argv[]); diff --git a/src/user/lib/stdlib.c b/src/user/lib/stdlib.c index 068635b..179bd8f 100644 --- a/src/user/lib/stdlib.c +++ b/src/user/lib/stdlib.c @@ -1,5 +1,8 @@ #include +#include +#include #include +#include int errno = 0; @@ -14,3 +17,16 @@ int close(handle_t h) { _Noreturn void exit(int c) { _syscall_exit(c); } + +int execv(const char *path, char *const argv[]) { + (void)argv; + + FILE *file = fopen(path, "r"); + if (!file) + return -1; + + elf_execf(file); + fclose(file); + errno = EINVAL; + return -1; +} -- cgit v1.2.3