fixed leaks, need norminette

Michail Chatzipanagiotou · Michail Chatzipanagiotou · commit 65364c93024c · 2022-02-05T21:45:09.000+01:00
diff --git a/commands.c b/commands.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/02 14:49:23 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:19:11 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,9 +21,18 @@ void	execexit(char *b, char *buff, char *name, t_nums *n)
 	args = ft_split(buff, ' ');
 	i = 0;
 	num = 0;
+	if (!args[1])
+	{
+		free(args[0]);
+		free(args);
+		exit(0);
+	}
 	if (args[2])
 	{
 		write(2, "exit: too many arguments\n", 25);
+		while (args[i])
+			free(args[i++]);
+		free(args);
 		return ;
 	}
 	while (args[1][i])
@@ -34,9 +43,15 @@ void	execexit(char *b, char *buff, char *name, t_nums *n)
 		printf
 		("exit: argument: '%s' is not numeric or exceeds scope\n", args[1]);
 		exitall(b, buff, name, n);
+		free(args[0]);
+		i = 0;
+		while (args[i])
+			free(args[i++]);
 		free(args);
 		exit(255);
 	}
+	free(args[0]);
+	free(args[1]);
 	free(args);
 	exit (ft_atoi(args[1]));
 }
diff --git a/commands2.c b/commands2.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/01 16:12:34 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 19:54:38 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,11 +16,13 @@ void	execexport(char *b)
 {
 	int		i;
 	int		c;
+	char	*dest;
 	char	**s;
 
 	b = xportnmskip(b);
 	i = 0;
 	c = -1;
+	dest = malloc(1000);
 	if (echoerrcheck(b))
 		return ;
 	s = processinput(b);
@@ -31,12 +33,17 @@ void	execexport(char *b)
 		{
 			if (g_env[i])
 				free(g_env[i]);
-			evalquotes(exportout(s[c]));
-			g_env[i] = ft_strdup(exportout(s[c]));
+			evalquotes(exportout2(dest, s[c]));
+			ft_bzero(dest, 1000);
+			g_env[i] = ft_strdup(exportout2(dest, s[c]));
 		}
 		i = 0;
 	}
+	i = -1;
+	while (s[++i])
+		free(s[i]);
 	free(s);
+	free(dest);
 	cleartrash(g_env);
 }
 
@@ -59,6 +66,8 @@ void	execunset(char *b)
 				ft_bzero(g_env[i], ft_strlen(g_env[i]));
 		i = -1;
 	}
+	while (s[++i])
+		free(s[i]);
 	free(s);
 }
 
diff --git a/exportutils.c b/exportutils.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 18:33:21 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:01:59 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -87,7 +87,7 @@ char	*exportout(char *b)
 {
 	char	*ret;
 
-	ret = malloc(1000);
+	ret = ft_calloc(1000, 1000);
 	if (echoerrcheck(b))
 		return ("");
 	while (*b == ' ')
@@ -96,3 +96,14 @@ char	*exportout(char *b)
 		b = handlescharsxp(b, ret);
 	return (ret);
 }
+
+char	*exportout2(char *dest, char *b)
+{
+	if (echoerrcheck(b))
+		return ("");
+	while (*b == ' ')
+		b++;
+	while (*b)
+		b = handlescharsxp(b, dest);
+	return (dest);
+}
diff --git a/exportutils3.c b/exportutils3.c
@@ -6,16 +6,21 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/01/25 13:23:43 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:01:36 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
 int	incrementi(int i, char *s)
 {
-	while (g_env[i] && (!namecmp(g_env[i], exportout(s)) || !g_env[i][0]))
+	char	*dest;
+
+	dest = malloc(1000);
+	while (g_env[i]
+		&& (!namecmp(g_env[i], exportout2(dest, s)) || !g_env[i][0]))
 		i++;
+	free(dest);
 	return (i);
 }
 
diff --git a/minishell.c b/minishell.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/01 18:20:06 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 20:49:35 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -103,8 +103,7 @@ int	main(int argc, char **argv, char **envp)
 		}
 		if (!b)
 		{
-			free(nums);
-			free(g_env);
+			freeenvnstruct(nums);
 			return (0);
 		}
 	}
diff --git a/minishell.h b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:15:48 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/02 14:20:04 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:25:18 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,7 +37,6 @@ typedef struct s_nums
 	int		print;
 	bool	hyphen;
 	char	*envbuff;
-	char	**pr;
 }	t_nums;
 
 void	execexit(char *b, char *buff, char *name, t_nums *n);
@@ -105,5 +104,7 @@ char	*handlehyphen(char *b, char *ret);
 int		handlerightredir(char *b, int i);
 int		handleleftredir(char *b, int i);
 void	exitall(char *b, char *buff, char *name, t_nums *n);
+void	freeenvnstruct(t_nums *n);
+char	*exportout2(char *dest, char *b);
 
 #endif
diff --git a/pipenredirutils.c b/pipenredirutils.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/01 17:21:25 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:25:54 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,29 +63,40 @@ void	initparse(char	*b, t_nums *n)
 {
 	char	*buff;
 	char	*name;
+	int		i;
+	char	**pr;
 
+	i = -1;
 	if (echoerrcheck(b))
 		return ;
 	name = parsecmdname(b);
-	n->pr = checkpipesnredirs(b);
-	if (!*n->pr)
+	pr = checkpipesnredirs(b);
+	if (!*pr)
 	{
-		free(n->pr);
+		while (++i < 1000)
+			free(pr[i]);
+		free(pr);
+		free(name);
 		return ;
 	}
-	if (!n->pr[1])
+	if (!pr[1])
 	{
 		if (checkstrayops(b))
 		{
-			free(n->pr);
+			while (++i < 1000)
+				free(pr[i]);
+			free(pr);
+			free(name);
 			return ;
 		}
 		buff = exportout(b);
 		parseargs(b, buff, name, n);
 		n->hyphen = 1;
-		free3(n->pr, buff, name);
 	}
 	//else to be added for pipes/redirections handling
+	while (pr[++i])
+		free(pr[i]);
+	free3(pr, buff, name);
 }
 
 	// for (int k = 0; ret[k]; k++)
diff --git a/utils4.c b/utils4.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/01/31 12:24:04 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:42:11 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,6 +37,10 @@ char	**processinput(char	*b)
 	while (*b == ' ')
 		b++;
 	s = xportsplit(b);
+	if (!*s)
+		while (g_env[++i])
+			printf("declare -x %s\n", g_env[i]);
+	i = -1;
 	while (s[++i])
 	{
 		if (isnumeric(s[i]))
@@ -89,6 +93,18 @@ int	isnumeric(char *b)
 	return (0);
 }
 
+void	freeenvnstruct(t_nums *n)
+{
+	int	i;
+
+	i = -1;
+	while (g_env[++i])
+		free(g_env[i]);
+	free (g_env[998]);
+	free(g_env);
+	free(n);
+}
+
 	// g_env = malloc(1000 * sizeof(char *));
 	// g_env[0] = ft_strjoin("PATH=", getenv("PATH"));
 	// g_env[1] = ft_strjoin("PWD=", getenv("PWD"));
diff --git a/utils7.c b/utils7.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/01 16:16:54 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 20:48:48 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/utils8.c b/utils8.c
@@ -6,7 +6,7 @@
 /*   By: mchatzip <mchatzip@student.42wolfsburg.de> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/02 14:19:47 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/05 21:26:54 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -99,6 +99,12 @@ char	*handlehyphen(char *b, char *ret)
 
 void	exitall(char *b, char *buff, char *name, t_nums *n)
 {
+	int	i;
+
+	i = -1;
+	while (g_env[++i])
+		free(g_env[i]);
+	free(g_env[998]);
 	free(g_env);
 	free(b);
 	free(buff);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`/* By: mchatzip <[email protected]> +#+ +:+ +#+ */`
`7`	`7`	`/* +#+#+#+#+#+ +#+ */`
`8`	`8`	`/* Created: 2021/11/16 11:19:39 by mchatzip #+# #+# */`
`9`		`-/* Updated: 2022/02/01 18:20:06 by mchatzip ### ########.fr */`
	`9`	`+/* Updated: 2022/02/05 20:49:35 by mchatzip ### ########.fr */`
`10`	`10`	`/* */`
`11`	`11`	`/* ************************************************************************** */`
`12`	`12`
`@@ -103,8 +103,7 @@ int main(int argc, char argv, char envp)`
`103`	`103`	`}`
`104`	`104`	`if (!b)`
`105`	`105`	`{`
`106`		`- free(nums);`
`107`		`- free(g_env);`
	`106`	`+ freeenvnstruct(nums);`
`108`	`107`	`return (0);`
`109`	`108`	`}`
`110`	`109`	`}`