UBB/myshellin
1
0
Fork 0
Code Issues Pull Requests Releases Activity

environ #15

Merged
cromer merged 27 commits from environ into master 2021-07-17 22:15:24 -04:00
Conversation 0 Commits 27 Files Changed 18 +25 -2
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6cbfcaee9a - Show all commits

27
src/launch.c
View File

@ -19,6 +19,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include "array.h" #include "array.h"
#include "utils.h"
void launch_program(StringArray *args) { void launch_program(StringArray *args) {
pid_t child = 0; pid_t child = 0;
@ -26,9 +27,31 @@ void launch_program(StringArray *args) {
child = fork(); child = fork();
if (child == 0) { if (child == 0) {
if (execvp(args->array[0], args->array) == -1) { StringArray *new_args = create_string_array();
fprintf(stderr, "%s: command not found\n", args->array[0]); insert_string_array(new_args, args->array[0]);
for (size_t i = 1; i < args->size; i++) {
if (args->array[i][0] == '$') {
char *variable = remove_variable_symbol(args->array[i]);
char *value = get_array_list(variables, variable);
if (value != NULL) {
insert_string_array(new_args, value);
}
if (variable != NULL) {
free(variable);
variable = NULL;
}
}
else {
insert_string_array(new_args, args->array[i]);
}
}
if (execvp(new_args->array[0], new_args->array) == -1) {
fprintf(stderr, "%s: command not found\n", new_args->array[0]);
free_string_array(args); free_string_array(args);
free_string_array(new_args);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }