merge conflicts

srcs/builtins/unset.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/12/05 17:05:05 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/18 13:43:22 by hulamy           ###   ########.fr       */
+/*   Updated: 2021/12/19 12:10:57 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

srcs/generic/ft_is_posix_name.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/08 09:25:35 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/16 03:50:43 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/18 13:31:11 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,8 @@ int	ft_is_posix_name(char *str)
 {
 	unsigned int	i;
 
+	if (!str)
+		return (0);
 	if (str[0] != '_' && !ft_isalpha(str[0]))
 		return (0);
 	i = 1;

srcs/init/init.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/08 09:22:12 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/18 04:53:11 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/18 14:22:20 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,6 +19,7 @@ int		handle_argv(t_all *c, char *argv[]);
 int	init(t_all *c, char *argv[])
 {
 	ft_bzero(c, sizeof (*c));
+	set_signals_behaviour();
 	init_readline();
 	environ = ft_dup_2d_arr(environ, (t_dup_f)ft_strdup);
 	if (!environ)
@@ -28,6 +29,5 @@ int	init(t_all *c, char *argv[])
 		return (ft_reti_perror(0, "init_shlvl()"));
 	if (!handle_argv(c, argv))
 		return (0);
-	set_signals_behaviour();
 	return (1);
 }

srcs/misc/free.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/10 23:53:17 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/16 06:35:03 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/18 14:15:13 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,7 +20,10 @@ int	exit_free(t_all *c, int exit_status)
 	ft_free_2d_arr(environ);
 	ft_free_2d_arr(c->path);
 	free_pipeline(&c->pipeline);
-	rl_clear_history();
+	if (!isatty(STDIN_FILENO))
+		gnl(STDIN_FILENO, NULL, 1);
+	else
+		rl_clear_history();
 	close_stdio();
 	exit(exit_status);
 }

srcs/misc/signals.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/23 18:56:53 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/16 15:06:50 by hulamy           ###   ########.fr       */
+/*   Updated: 2021/12/19 12:11:14 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,4 +35,5 @@ void	set_signals_behaviour(void)
 	ft_bzero(&signal_behaviour, sizeof signal_behaviour);
 	signal_behaviour.sa_handler = SIG_IGN;
 	sigaction(SIGQUIT, &signal_behaviour, NULL);
+	sigaction(SIGINT, &signal_behaviour, NULL);
 }

srcs/parsing/redirections/here_doc.c

@@ -6,25 +6,22 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/11 18:46:43 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/17 22:09:51 by hulamy           ###   ########.fr       */
+/*   Updated: 2021/12/19 12:12:27 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-#define TMP_HERE_DOC "/tmp/minishell_here_doc"
-
 static int	here_doc_write(char *delimiter, int doc_fd);
+static int	here_doc_write_interactive(char *delimiter, int doc_fd);
+static int	here_doc_write_script(char *delimiter, int doc_fd);
+static int	event_hook_empty(void);
+
+#define TMP_HERE_DOC "/tmp/minishell_here_doc"
+#define WARNING_EOF "warning: here-document delimited by end-of-file (wanted `"
 
 int	here_doc(char *delimiter)
 {
-	// https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
-	// https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_02
-	/* If any part of word is quoted,
-	the delimiter shall be formed by performing quote removal on word,
-	and the here-document lines shall not be expanded.
-	Otherwise, the delimiter shall be the word itself. */
-	// TODO : A voir si on fait les expansions de variables dans le here_doc.
 	int	here_doc;
 	int	ret;
 
@@ -52,64 +49,113 @@ int	here_doc(char *delimiter)
 	return (here_doc);
 }
 
-int	void_func_return_readline(void)
-{
-	return (0);
-}
-
-// rl_done
-//   Setting this to a non-zero value causes Readline to return the current line
-//   immediately
-// rl_event_hook
-//   If non-zero, this is the address of a function to call periodically when Readline
-//   is waiting for terminal input. By default, this will be called at most ten times
-//   a second if there is no keyboard input
-// from stackoverflow (https://stackoverflow.com/questions/53165704/readline-c-force-return-of-certain-text-in-readline)
-//   "rl_done is only checked in the event loop. When you give it a null event hook
-//    function, it checks the rl_done and exits"
-//
-// rl_signal_event_hook
-//   If non-zero, this is the address of a function to call if a read system call is
-//   interrupted when Readline is reading terminal input.
 static int	here_doc_write(char *delimiter, int doc_fd)
 {
-	char	*line;
+	int					ret;
-	size_t	line_count;
 	struct sigaction	signal_action;
 
-	ft_bzero(&signal_action, sizeof(signal_action));
+	if (isatty(STDIN_FILENO))
-	signal_action.sa_handler = sigint_handler_heredoc;
+	{
-	sigaction(SIGINT, &signal_action, NULL);
+		ft_bzero(&signal_action, sizeof(signal_action));
+		signal_action.sa_handler = sigint_handler_heredoc;
+		sigaction(SIGINT, &signal_action, NULL);
+		rl_event_hook = event_hook_empty;
+		ret = here_doc_write_interactive(delimiter, doc_fd);
+		rl_event_hook = NULL;
+		signal_action.sa_handler = SIG_IGN;
+		sigaction(SIGINT, &signal_action, NULL);
+	}
+	else
+	{
+		ret = here_doc_write_script(delimiter, doc_fd);
+	}
+	return (ret);
+}
+
+static int	here_doc_write_interactive(char *delimiter, int doc_fd)
+{
+	char	*line;
+
+	line = NULL;
 	g_switch_heredoc_sigint = 0;
-	rl_event_hook = void_func_return_readline;
-	line_count = 0;
 	while (1)
 	{
-		line_count++;
-		line = NULL;
 		line = readline("> ");
 		if (g_switch_heredoc_sigint == 1)
 			return (set_last_exit_status(EXIT_SIGNAL + SIGINT));
 		if (!line)
-		{ // TODO : error print wrapper
+			return (shell_error(WARNING_EOF, delimiter, "')", 0));
-			ft_putstr_fd("minishell: ", 2);
-			ft_putstr_fd("warning: here-document at line ", 2);
-			ft_putnbr_fd(line_count, 2);
-			ft_putstr_fd(" delimited by end-of-file (wanted `", 2);
-			ft_putstr_fd(delimiter, 2);
-			ft_putstr_fd("')\n", 2);
-			return (0);
-		}
 		if (ft_strncmp(line, delimiter, ft_strlen(line) + 1) == 0) // Ou ft_strlen(delimiter) + 1 ? Ça devrais être identique et ça peux se calculer une seul fois.
 			break ;
 		if (write(doc_fd, line, ft_strlen(line)) == -1)
-			return (ft_reti_perror_free(-1, line, free, "write() "TMP_HERE_DOC));
+			return (ft_reti_perror_free(-1, line, free, "write "TMP_HERE_DOC));
 		if (write(doc_fd, "\n", 1) == -1)
-			return (ft_reti_perror_free(-1, line, free, "write() "TMP_HERE_DOC));
+			return (ft_reti_perror_free(-1, line, free, "write "TMP_HERE_DOC));
-		free(line);
+		ft_free_null(&line);
 	}
 	free(line);
-	signal_action.sa_handler = SIG_IGN;
-	sigaction(SIGINT, &signal_action, NULL);
 	return (0);
 }
+
+static int	here_doc_write_script(char *delimiter, int doc_fd)
+{
+	char	*line;
+	int		ret;
+
+	line = NULL;
+	ret = 1;
+	while (ret)
+	{
+		ret = gnl(STDIN_FILENO, &line, 0);
+		if (ret == -1)
+			return (ft_reti_perror_free(-1, line, free, "gnl() STDIN"));
+		if (ft_strncmp(line, delimiter, ft_strlen(line) + 1) == 0) // Ou ft_strlen(delimiter) + 1 ? Ça devrais être identique et ça peux se calculer une seul fois.
+			break ;
+		if (write(doc_fd, line, ft_strlen(line)) == -1)
+			return (ft_reti_perror_free(-1, line, free, "write "TMP_HERE_DOC));
+		if ((ret || line[0]) && write(doc_fd, "\n", 1) == -1)
+			return (ft_reti_perror_free(-1, line, free, "write "TMP_HERE_DOC));
+		ft_free_null(&line);
+	}
+	if (!line && ret == 0)
+		shell_error(WARNING_EOF, delimiter, "')", 0);
+	free(line);
+	return (0);
+}
+
+static int	event_hook_empty(void)
+{
+	return (0);
+}
+
+/*
+https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
+#tag_18_07_04
+https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
+#tag_18_02
+*/
+/* If any part of word is quoted,
+the delimiter shall be formed by performing quote removal on word,
+and the here-document lines shall not be expanded.
+Otherwise, the delimiter shall be the word itself. */
+// TODO Bonus: expansions in here_doc.
+
+/*
+**	rl_done
+**		Setting this to a non-zero value causes Readline
+**		to return the current line immediately.
+**	rl_event_hook
+**		If non-zero, this is the address of a function to call periodically
+**		when Readline is waiting for terminal input.
+**		By default, this will be called at most
+**		ten times a second if there is no keyboard input.
+**	
+**	https://stackoverflow.com/questions/53165704/
+**	readline-c-force-return-of-certain-text-in-readline
+**		"rl_done is only checked in the event loop. When you give it
+**		a null event hook function, it checks the rl_done and exits"
+**	
+**	rl_signal_event_hook
+**		If non-zero, this is the address of a function to call if a read
+**		system call is interrupted when Readline is reading terminal input.
+*/

srcs/shell_script.c

@@ -6,7 +6,7 @@
 /*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/26 23:47:44 by lperrey           #+#    #+#             */
-/*   Updated: 2021/12/18 08:51:46 by lperrey          ###   ########.fr       */
+/*   Updated: 2021/12/18 15:15:30 by lperrey          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,6 +24,8 @@ void	shell_script(t_all *c)
 	{
 		free(line_input);
 		line_input = read_input_script(c);
+		if (!line_input)
+			break ;
 		if (line_input && *line_input)
 		{
 			c->token_list = lexing(line_input);
@@ -39,7 +41,6 @@ void	shell_script(t_all *c)
 				exit_signal(c);
 		}
 	}
-	free(line_input);
 	exit_free(c, get_last_exit_status());
 }
 
@@ -47,16 +48,23 @@ static char	*read_input_script(t_all *c)
 {
 	char				*line_input;
 	struct sigaction	signal_behaviour;
+	int					ret;
 
 	ft_bzero(&signal_behaviour, sizeof signal_behaviour);
-	signal_behaviour.sa_handler = sigint_handler_interactive;
-	sigaction(SIGINT, &signal_behaviour, NULL);
-	rl_event_hook = NULL;
-	line_input = readline(NULL);
 	signal_behaviour.sa_handler = SIG_IGN;
 	sigaction(SIGINT, &signal_behaviour, NULL);
-	if (!line_input)
+	line_input = NULL;
+	ret = gnl(STDIN_FILENO, &line_input, 0);
+	if (ret == -1)
+	{
+		free(line_input);
+		return (NULL);
+	}
+	if (!line_input[0] && ret == 0)
+	{
+		free(line_input);
 		exit_free(c, get_last_exit_status());
+	}
 	return (line_input);
 }