diff options
| author | Christopher Uhlig | 2025-01-20 20:10:11 +0100 |
|---|---|---|
| committer | Christopher Uhlig | 2025-01-20 20:10:11 +0100 |
| commit | dc6a4f2d0de92984c2584ef905011e2a60792850 (patch) | |
| tree | 2fc0f567b1c4f2f168a931ad0bff69e52c6c226c | |
| parent | 852e00cb465b05f13aa6298ce71a1067c0846556 (diff) | |
| download | minishell-dc6a4f2d0de92984c2584ef905011e2a60792850.tar.gz minishell-dc6a4f2d0de92984c2584ef905011e2a60792850.zip | |
yippienorm and change open error and change of wife
| -rw-r--r-- | src/execute_cmd.c | 10 | ||||
| -rw-r--r-- | src/interpreter.c | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/execute_cmd.c b/src/execute_cmd.c index ab43032..1438f9c 100644 --- a/src/execute_cmd.c +++ b/src/execute_cmd.c @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/17 19:21:35 by chuhlig #+# #+# */ -/* Updated: 2025/01/20 15:43:41 by chuhlig ### ########.fr */ +/* Updated: 2025/01/20 20:04:31 by chuhlig ### ########.fr */ /* */ /* ************************************************************************** */ @@ -51,8 +51,8 @@ int execute_cmd(t_cmd *cmd, t_env **env) original_std[1] = dup(STDOUT_FILENO); original_std[0] = dup(STDIN_FILENO); - result = create_files(cmd->create_files); - if (result != EXIT_SUCCESS || handle_redirections(cmd->redirs) == -1) + create_files(cmd->create_files); + if (handle_redirections(cmd->redirs) == -1) { establish_pipeline(original_std[0], original_std[1]); return (EXIT_FAILURE); @@ -63,8 +63,6 @@ int execute_cmd(t_cmd *cmd, t_env **env) establish_pipeline(original_std[0], original_std[1]); return (result); } - if (result != EXIT_SUCCESS) - return (result); return (exec_cmd(cmd, env, original_std, EXIT_SUCCESS)); } @@ -102,5 +100,5 @@ static int exec_cmd(t_cmd *cmd, t_env **env, int original_std[2], int result) } waitpid(pid, &status, 0); establish_pipeline(original_std[0], original_std[1]); - return (WEXITSTATUS(status)); + return ((status >> 8) & 255); } diff --git a/src/interpreter.c b/src/interpreter.c index 44f4b95..9cd5292 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/17 19:15:49 by chuhlig #+# #+# */ -/* Updated: 2025/01/20 19:12:49 by chuhlig ### ########.fr */ +/* Updated: 2025/01/20 20:07:11 by chuhlig ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,7 +21,7 @@ int open_file(char *path, int flags, int mode) fd = open(path, flags, mode); if (fd < 0) - perror("open"); + perror(path); return (fd); } |