From e5aa953c043f0d0714a794453b7d485d60444382 Mon Sep 17 00:00:00 2001 From: Ahurac Date: Sat, 5 Oct 2024 20:22:53 +0200 Subject: [PATCH] feat(command): commands are executed --- src/command.c | 17 +++++++++++++++++ src/command.h | 8 ++++++++ src/main.c | 15 +++------------ src/parse.c | 4 +++- 4 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 src/command.c create mode 100644 src/command.h diff --git a/src/command.c b/src/command.c new file mode 100644 index 0000000..c993e0d --- /dev/null +++ b/src/command.c @@ -0,0 +1,17 @@ +#include "command.h" + +#include +#include + +#include "parse.h" + +unsigned char invoke(struct Args args) { + pid_t child = fork(); + if (child == 0 && args.argc > 0) { + execvp(args.argv[0], args.argv); + return 1; + } + waitpid(child, NULL, 0); + + return 0; +} diff --git a/src/command.h b/src/command.h new file mode 100644 index 0000000..b13a83c --- /dev/null +++ b/src/command.h @@ -0,0 +1,8 @@ +#ifndef COMMAND_H +#define COMMAND_H + +#include "parse.h" + +unsigned char invoke(struct Args args); + +#endif /* COMMAND_H */ diff --git a/src/main.c b/src/main.c index 34a844e..9ace236 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,7 @@ #include #include +#include "command.h" #include "parse.h" #include "reader.h" @@ -14,19 +15,9 @@ int main() { return 0; } - printf("command: '%s'\n", input_line); - struct Args args = parse(input_line); - unsigned int i = 0; - while (i < args.argc) { - if (i != 0) { - printf(" "); - } - printf("%s", args.argv[i]); - i++; - } - printf("\n"); - free(input_line); + + invoke(args); } } diff --git a/src/parse.c b/src/parse.c index c17ac41..fc3bdc5 100644 --- a/src/parse.c +++ b/src/parse.c @@ -27,7 +27,9 @@ void add_arg(struct Args *args, char *arg_ptr, unsigned int arg_length) { void parse_worker(struct Args *args, char *arg_position, unsigned int arg_length, char *line) { if (line[0] == '\n') { - add_arg(args, arg_position, arg_length); + if (arg_length != 0) { + add_arg(args, arg_position, arg_length); + } return; } else if (isspace(line[0])) { add_arg(args, arg_position, arg_length);