From e48ee8b6930b97913e47d2b2b51c08065de48214 Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@1E2.42angouleme.fr>
Date: Thu, 16 Feb 2023 16:29:46 +0100
Subject: [PATCH] fix: empty line, leaks, pipe

---
 .fill_env.c.swp         | Bin 0 -> 12288 bytes
 Makefile                |   2 +-
 env.c                   |   3 ++-
 minishell.h             |   2 +-
 spacer.c                |   7 +++++--
 syntatics.c             |   6 ++++--
 utils/ft_str_is_empty.c |  23 +++++++++++++++++++++++
 utils/utils.h           |   4 ++--
 8 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 .fill_env.c.swp
 create mode 100644 utils/ft_str_is_empty.c

diff --git a/.fill_env.c.swp b/.fill_env.c.swp
new file mode 100644
index 0000000000000000000000000000000000000000..164f87ed8368dd090827827fcd1c796dcb97e8ac
GIT binary patch
literal 12288
zcmeI2K}y3w6o#j+t%~kkjRq7N$Ruegb#Nhy3l}cyQc0VsEvB`!X|Wq!sORwlUcd`@
z7MH#>nI=euszE6H6JFj+GV^8TgDgs?VPBk`^P1%_Y8%lhZt7!?HJfd3G*+R$_g!{Q
zU8~}Hz3baipt{Ox4d(Z}*FaHmMYq%I4BILQM5_}7SE@I*n)8R@E)2jxE(VJAvg_Cp
z%GllETbuP<sDQu#48Q;kzyJ)u01UtY3@nF%uwP&gG}V=4y2T_HzU1T*2?k&Q24DaN
zU;qYS00v+H24DaNU|<Oics^t0RmL7EqW}N(@Bf!|#x5y}6t8QH-B4^(yitccihYWA
z8uLu?q{lDe`Y~k~fB_hQ0T_S*7=Qs7fPsHDAWFQHTjM3c2$*Bjz<S^JLgh>D+HP6c
zu5hZ{sY>@i+BM#oaJ{{G_G-g0sHXF@(Z1;9i3Xkw)X#w2Fe9Q)36B46$tJ;)gFsZx
za4GP3BGY9Z>IEJR!;!CgVP@BNJa!5(r6y&VddZo0ELKLelt}YT=o*;r9$$<{y`(AQ
izDW@$4O|$L?I@*2QWZ6N_$Oc%uIm_>+lN9QonW8PH@O1<

literal 0
HcmV?d00001

diff --git a/Makefile b/Makefile
index 1142f9a..8d576dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c
+UTILS_SRC = utils/ft_is_in_quote.c utils/ft_strncpy.c utils/ft_strreplace.c utils/ft_strnchr.c utils/ft_split_quoted.c utils/ft_strshift.c utils/ft_quote_remover.c utils/ft_str_is_empty.c
 SRCS = ${UTILS_SRC} main.c file.c infile.c outfile.c heredoc.c syntatics.c cmd.c cmds.c env.c execution.c spacer.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/env.c b/env.c
index cab6ec4..bb3d3f8 100644
--- a/env.c
+++ b/env.c
@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/16 15:18:48 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 16:24:21 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -113,6 +113,7 @@ void	env_del(void *ptr)
 	content = ptr;
 	free(content->key);
 	free(content->value);
+	free(content);
 }
 
 char	*get_key(char *str)
diff --git a/minishell.h b/minishell.h
index 966233f..c3d4f4d 100644
--- a/minishell.h
+++ b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 15:17:07 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 16:12:26 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/spacer.c b/spacer.c
index f009870..8f0b24b 100644
--- a/spacer.c
+++ b/spacer.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/15 13:35:50 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 14:53:16 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 16:26:15 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -101,6 +101,8 @@ char	*ft_normalizer(char *str)
 	char	*out;
 	char	*temp;
 
+	if (ft_str_is_empty(str))
+		return (ft_strdup(" "));
 	temp = ft_spacer_after(str);
 	if (temp == NULL)
 		return (NULL);
@@ -109,6 +111,7 @@ char	*ft_normalizer(char *str)
 	if (out == NULL)
 		return (NULL);
 	ft_space_simplifier(out);
-	out[ft_strlen(out) - 1] = '\0';
+	if (out[ft_strlen(out) - 1] == ' ')
+		out[ft_strlen(out) - 1] = '\0';
 	return (out);
 }
diff --git a/syntatics.c b/syntatics.c
index e8b719b..067979c 100644
--- a/syntatics.c
+++ b/syntatics.c
@@ -24,7 +24,9 @@ static int	ft_pipe_is_alone(const char *str)
 	{
 		while (str[i] == ' ')
 			i++;
-		if (str[i] != '|' && str[i] != '\0')
+		if (str[i] == '\0')
+			break ;
+		if (str[i] != '|')
 			check = 1;
 		else
 		{
@@ -89,7 +91,7 @@ int	ft_empty_verif(const char *str)
 int	ft_syntatic_verif(const char *str)
 {
 	return (ft_quote_verif(str)
-		|| ft_pipe_is_alone(str)
 		|| ft_empty_verif(str)
+		|| ft_pipe_is_alone(str)
 		|| ft_special_char_dub(str));
 }
diff --git a/utils/ft_str_is_empty.c b/utils/ft_str_is_empty.c
new file mode 100644
index 0000000..f647b75
--- /dev/null
+++ b/utils/ft_str_is_empty.c
@@ -0,0 +1,23 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_str_is_empty.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/02/16 16:12:46 by cchauvet          #+#    #+#             */
+/*   Updated: 2023/02/16 16:13:07 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "utils.h"
+
+int	ft_str_is_empty(const char *str)
+{
+	size_t	i;
+
+	i = 0;
+	while (str[i] == ' ')
+		i++;
+	return (str[i] == '\0');
+}
diff --git a/utils/utils.h b/utils/utils.h
index e274794..6481706 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:46:40 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 15:15:05 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 16:13:47 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,7 +21,7 @@ char		*ft_strreplace(const char *str, const char *fill,
 				size_t start, size_t stop);
 ssize_t		ft_strnchr(const char *str, char c);
 char		*ft_getstr(const char *str, size_t n);
-void		ft_printn(const char *str, size_t n);
+int			ft_str_is_empty(const char *str);
 char		**ft_split_quoted(const char *s, char c);
 void		ft_strshift(char *str, int shift);
 char		*ft_quote_remover(char *str);