summaryrefslogtreecommitdiff
path: root/src/user/app/init
diff options
context:
space:
mode:
authordzwdz2022-07-26 23:04:49 +0200
committerdzwdz2022-07-26 23:04:49 +0200
commit57152f6a03d857118fa82e0a28657d869f4c7110 (patch)
tree3b3143810a65cf5e5b1d1b9612aee157e33076a2 /src/user/app/init
parentd7767be24bdcc0101c2ba08c03600b9f3c608663 (diff)
user/libc: execv()
Diffstat (limited to 'src/user/app/init')
-rw-r--r--src/user/app/init/shell.c13
1 files changed, 6 insertions, 7 deletions
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 <camellia/syscalls.h>
+#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <user/lib/elfload.h>
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);
}