refactor: fix signal exit status between enter new line

Author: cuajarsaki

shell.h

@@ -19,6 +19,8 @@
 #include <termios.h>
 
 #define HISTORY_SIZE 10
+#define NOTSIG 1
+#define RSTSIG 0
 
 extern volatile sig_atomic_t g_signal_received;
 
@@ -102,7 +104,7 @@ void term_clear_screen();
 void handle_input(char *buf, size_t *len, size_t max_len);
 
 // SINGAL  FUNCTIONS
-void init_readline_for_signal(int *exit_stauts);
+void init_readline_for_signal(void);
 void setup_signals(void);
 void handle_sigint(int sig);
 void set_signal(int signum, void (*handler)(int), int flags);

src/executor/executor_command_group.c

@@ -16,10 +16,10 @@ int exec_command_group(t_command_group *command_group, t_env *env_list, char **e
     {
         t_cmd *cmd = (t_cmd *)cmds->content;
         if ((cmd->tokens) && (cmd->tokens->content) &&(ft_strcmp((char *)cmd->tokens->content, "exit") == 0 ||
-     ft_strcmp((char *)cmd->tokens->content, "cd") == 0))
-{
-    exit_status = exec_cmd_builtin(cmd, env_list);
-}
+     ft_strcmp((char *)cmd->tokens->content, "cd") == 0)) //unset//export
+     {
+        exit_status = exec_cmd_builtin(cmd, env_list);
+    }
 
         else
         {

src/main.c

@@ -6,7 +6,7 @@
 /*   By: pchung <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/26 23:57:54 by pchung            #+#    #+#             */
-/*   Updated: 2025/03/05 13:47:27 by pchung           ###   ########.fr       */
+/*   Updated: 2025/03/05 23:06:54 by pchung           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -127,19 +127,27 @@ void run_shell(t_env *env_list, char **envp)
     size_t len;
     int exit_stauts=0;
     t_ast *current_AST;
-
-    term_clear_screen();
+    //term_clear_screen();
     while (running)
     {
-        init_readline_for_signal(&exit_stauts);
+        if (g_signal_received == SIGINT)
+        {
+            exit_stauts = 130;
+        }
+        else if (g_signal_received == NOTSIG){
+            exit_stauts = 0;
+        }
+        
+        init_readline_for_signal();
         setup_signals();
         ft_memset(buf, 0, sizeof(buf));
         len = 0;
+
         handle_input(buf, &len, sizeof(buf));
-        g_signal_received = 0;
-        // printf("start running\n"); //debugs
+
         if (len > 0)
         {
+            g_signal_received = RSTSIG;
             current_AST = get_ast(buf, env_list, &exit_stauts);
             //debug_ast(current_AST);
             exit_stauts=exec_ast(current_AST, env_list, envp);
@@ -152,14 +160,12 @@ void run_shell(t_env *env_list, char **envp)
     }
 }
 
+
 int	main(int argc, char **argv, char **envp)
 {
-
 	(void)argc;
     (void)argv;
-
     t_env *env_list = init_env_list(envp); // Initialize environment variables
-
     struct termios orig_termios;
     setup_terminal(&orig_termios);
     run_shell(env_list, envp);     // Pass env_list

src/signal/signal.c

@@ -6,7 +6,7 @@
 /*   By: pchung <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/12 19:57:16 by pchung            #+#    #+#             */
-/*   Updated: 2025/03/05 13:48:29 by pchung           ###   ########.fr       */
+/*   Updated: 2025/03/05 21:17:43 by pchung           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,18 +16,17 @@ volatile sig_atomic_t g_signal_received = 0;
 
 static int event_hook_readline(void);
 
-void init_readline_for_signal(int *exit_stauts)
+void init_readline_for_signal(void)
 {
     rl_outstream = stderr;
     rl_done = 0;
     rl_catch_signals = 0;
     rl_event_hook = event_hook_readline;
-    *exit_stauts = 130;
 }
 
 static int event_hook_readline(void)
 {
-    if (g_signal_received == 1)
+    if (g_signal_received == SIGINT)
     {
         rl_replace_line("", 0);
         rl_done = 1;

src/signal/signal_2.c

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   signal_2.c                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: jidler <jidler@student.42tokyo.jp>         +#+  +:+       +#+        */
+/*   By: pchung <pchung@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/04 17:07:04 by jidler            #+#    #+#             */
-/*   Updated: 2025/03/04 17:07:06 by jidler           ###   ########.fr       */
+/*   Updated: 2025/03/05 22:59:19 by pchung           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,8 +15,7 @@
 void handle_sigint(int sig)
 {
     (void)sig;
-    g_signal_received = 1;
-    write(STDOUT_FILENO, "^C", 3);
+    g_signal_received = SIGINT;
 }
 
 void init_signal(void (*handler_for_sigint)(int),

src/termcaps/termcaps.c

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   termcaps.c                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: jidler <jidler@student.42tokyo.jp>         +#+  +:+       +#+        */
+/*   By: pchung <pchung@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/26 00:08:24 by pchung            #+#    #+#             */
-/*   Updated: 2025/03/04 16:15:02 by jidler           ###   ########.fr       */
+/*   Updated: 2025/03/05 23:07:53 by pchung           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,18 +20,15 @@ void	exit_program()
 
 
 void handle_input(char *buf, size_t *len, size_t buffsize) {
-    char *str;
+    g_signal_received = NOTSIG;
+    char *str;   
     str = readline("minishell ❤ ");
     if (str == NULL)
     {
         write(STDOUT_FILENO, "exit\n", 5);
         exit(0);
     }
-    else if (ft_strcmp(str, "\n") == 0)
-    {
-        write(STDOUT_FILENO, "\n", 1);
-        return;
-    }
+
     add_history(str);
     ft_strlcpy(buf, str, buffsize); 
     *len = ft_strlen(buf);