Fix executing single builtin command

servettonga · Jul 16, 2024 · 757e7e3 · 757e7e3
1 parent c868216
commit 757e7e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/include/minishell.h b/include/minishell.h
@@ -106,6 +106,6 @@ void		free_pipeline(t_pipeline *p);
 void		interactive_signal_handlers(void);
 void		non_interactive_signal_handlers(void);
 
-# define PROMPT "(minishell) -> "
+# define PROMPT "\033[0;36mminishell\033[0m \033[0;32m> \033[0m"
 
 #endif
diff --git a/src/builtin/cmd_exit.c b/src/builtin/cmd_exit.c
@@ -36,12 +36,11 @@ int	cmd_exit(t_shell *shell, char **args, t_connection ct)
 		ft_putstr_fd(": numeric argument required\n", STDERR_FILENO);
 		shell->exit_status = 255;
 	}
-	if (shell->exit_status == EXIT_SUCCESS)
-		ft_putendl_fd("exit", STDERR_FILENO);
 	if (shell->exit_status < 0)
 		shell->exit_status = 256 + shell->exit_status;
 	if (shell->exit_status > 255)
 		shell->exit_status %= 256;
+	ft_putendl_fd("exit", STDERR_FILENO);
 	if (ct == CON_NONE)
 		cleanup_and_exit_shell(shell);
 	return (shell->exit_status);

diff --git a/src/exec/execute.c b/src/exec/execute.c
@@ -64,8 +64,7 @@ static pid_t	find_type(t_shell *shell, t_pipeline *p, t_pipeline *cur)
 
 static pid_t	handle_builtin(t_shell *shell, t_pipeline *p, t_pipeline *cur)
 {
-	if (cur->cmd.connection_type != CON_NONE
-		&& (cur->cmd.infile != NULL || cur->cmd.outfile != NULL))
+	if (cur->next == NULL && cur->prev == NULL)
 		return (execute_builtin(cur->cmd, shell));
 	else
 		return (create_child(shell, p, cur));