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 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'src/user/app/init')
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);
}
--
cgit v1.2.3