logistic-bot/minishell
1
0
Fork 0
mirror of https://codeberg.org/la-chouette/minishell.git synced 2025-12-06 07:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

connec_cmd_execute: handle && and ||

Browse source
This commit is contained in:
Khaïs COLIN 2025-04-07 10:40:31 +02:00
parent 8feacccb15
commit df73b3d0c7
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
4 changed files with 61 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -30,6 +30,7 @@ srcs = \
src/env/envp.c \
src/executing/cmd/cmd_execute.c \
src/executing/common/do_waitpid.c \
src/executing/connec_cmd/connec_cmd_execute.c \
src/executing/group_cmd/group_cmd_execute.c \
src/executing/here_doc/here_doc.c \
src/executing/here_doc/here_doc_errors.c \

5
src/executing/cmd/cmd_execute.c
View file

@ -6,12 +6,13 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/04 19:26:37 by khais #+# #+# */
/* Updated: 2025/04/04 19:42:16 by khais ### ########.fr */
/* Updated: 2025/04/07 10:38:07 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#include "cmd_execute.h"
#include "../simple_cmd/simple_cmd_execute.h"
#include "../connec_cmd/connec_cmd_execute.h"
#include "../group_cmd/group_cmd_execute.h"
void cmd_execute(t_cmd *cmd, t_minishell *app)
@ -20,4 +21,6 @@ void cmd_execute(t_cmd *cmd, t_minishell *app)
simple_cmd_execute(cmd->value.simple, app);
if (cmd->type == FT_GROUP)
group_cmd_execute(cmd->value.group, app);
if (cmd->type == FT_CONNECTION)
connec_cmd_execute(cmd->value.connection, app);
}

36
src/executing/connec_cmd/connec_cmd_execute.c Normal file
View file

@ -0,0 +1,36 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* connec_cmd_execute.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/07 10:38:55 by khais #+# #+# */
/* Updated: 2025/04/07 10:51:19 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#include "connec_cmd_execute.h"
#include "../cmd/cmd_execute.h"
static void connec_and_cmd_execute(t_connec_cmd *cmd, t_minishell *app)
{
cmd_execute(cmd->first, app);
if (app->last_return_value == 0)
cmd_execute(cmd->second, app);
}
static void connec_or_cmd_execute(t_connec_cmd *cmd, t_minishell *app)
{
cmd_execute(cmd->first, app);
if (app->last_return_value != 0)
cmd_execute(cmd->second, app);
}
void connec_cmd_execute(t_connec_cmd *cmd, t_minishell *app)
{
if (cmd->connector == FT_AND)
connec_and_cmd_execute(cmd, app);
if (cmd->connector == FT_OR)
connec_or_cmd_execute(cmd, app);
}

20
src/executing/connec_cmd/connec_cmd_execute.h Normal file
View file

@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* connec_cmd_execute.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/07 10:38:19 by khais #+# #+# */
/* Updated: 2025/04/07 10:38:48 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef CONNEC_CMD_EXECUTE_H
# define CONNEC_CMD_EXECUTE_H
# include "../../minishell.h"
void connec_cmd_execute(t_connec_cmd *cmd, t_minishell *app);
#endif // CONNEC_CMD_EXECUTE_H