Rick/rishtik
1
0
Fork 0
Code Issues 8 Pull requests Activity

Modification indentation

Browse source
This commit is contained in:
rick 2021-02-18 18:37:00 +01:00
parent b507e1ef82
commit 8eb34f0307
Signed by: Rick
GPG key ID: 2B593F087240EE99
1 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/shellOpt.c
View file

@ -43,39 +43,37 @@ int main()
{
while (commands[index] != NULL)
{
parse_string(commands[index], args, ' ');
if (!change_dir(args))
parse_string(commands[index], args, ' ');
if (!change_dir(args))
{
pid = fork();
if (!pid)
{
pid = fork();
if (!pid)
{
if (commands[index+1] == NULL)
dup2(my_pipe[0], STDIN_FILENO);
else if (index == 0)
dup2(my_pipe[1], STDOUT_FILENO);
close(my_pipe[0]);
close(my_pipe[1]);
if (commands[index+1] == NULL)
dup2(my_pipe[0], STDIN_FILENO);
else if (index == 0)
dup2(my_pipe[1], STDOUT_FILENO);
//close(my_pipe[0]);
//close(my_pipe[1]);
execvp(args[0], args);
return 0;
}
else
{
if (commands[index + 1] == NULL)
{
close(my_pipe[1]);
close(my_pipe[0]);
waitpid(pid, NULL, 0);
}
}
execvp(args[0], args);
return 0;
}
for (int i = 0; i < MAX_LENGTH; i++)
if (commands[index + 1] == NULL)
{
free(args[i]);
args[i] = (char *) calloc(MAX_LENGTH, sizeof(char));
close(my_pipe[1]);
close(my_pipe[0]);
waitpid(pid, NULL, 0);
}
index++;
}
for (int i = 0; i < MAX_LENGTH; i++)
{
free(args[i]);
args[i] = (char *) calloc(MAX_LENGTH, sizeof(char));
}
index++;
}
/* remise à 0 des entrées, des commandes, des pipes et de l’index */