norminetted.

Author: Michail Chatzipanagiotou

Makefile

@@ -6,7 +6,7 @@
 #    By: mchatzip <[email protected]> +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/06/18 18:00:18 by mchatzip          #+#    #+#              #
-#    Updated: 2022/02/01 18:10:06 by mchatzip         ###   ########.fr        #
+#    Updated: 2022/02/07 13:09:52 by mchatzip         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,7 +17,8 @@ LIBFT_PATH = libft/
 LIBFT_LIB  = libft.a
 
 SRCS_FILES = minishell.c commands.c commands2.c history.c utils.c utils2.c utils3.c utils4.c utils5.c echoutils.c \
-			 utils6.c exportutils.c exportutils2.c exportutils3.c pipenredirutils.c utils7.c utils8.c pipeutils.c
+			 utils6.c exportutils.c exportutils2.c exportutils3.c pipenredirutils.c utils7.c utils8.c pipeutils.c \
+			 utils9.c utils10.c
 
 SRCS_OBJS  = ${SRCS_FILES:.c=.o}
 

commands.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 21:19:11 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 13:05:35 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,43 +16,28 @@ void	execexit(char *b, char *buff, char *name, t_nums *n)
 {
 	char	**args;
 	bool	num;
-	size_t	i;
 
 	args = ft_split(buff, ' ');
-	i = 0;
-	num = 0;
 	if (!args[1])
-	{
-		free(args[0]);
-		free(args);
+		freedstring(args);
+	if (!args[1])
 		exit(0);
-	}
 	if (args[2])
 	{
 		write(2, "exit: too many arguments\n", 25);
-		while (args[i])
-			free(args[i++]);
-		free(args);
+		freedstring(args);
 		return ;
 	}
-	while (args[1][i])
-		if (!ft_isdigit(args[1][i++]))
-			num = 1;
+	num = checkifnumeric(args[1]);
 	if (num == 1 || ft_atoi(args[1]) < 0 || ft_atoi(args[1]) > 255)
 	{
 		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);
+		freedstring(args);
 		exit(255);
 	}
-	free(args[0]);
-	free(args[1]);
-	free(args);
+	freedstring(args);
 	exit (ft_atoi(args[1]));
 }
 

commands2.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 19:54:38 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 12:54:51 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,29 +22,18 @@ void	execexport(char *b)
 	b = xportnmskip(b);
 	i = 0;
 	c = -1;
-	dest = malloc(1000);
+	dest = ft_calloc(1000, 1000);
 	if (echoerrcheck(b))
 		return ;
 	s = processinput(b);
 	while (s[++c])
 	{
 		i = incrementi(i, s[c]);
 		if (ft_strchr(s[c], '='))
-		{
-			if (g_env[i])
-				free(g_env[i]);
-			evalquotes(exportout2(dest, s[c]));
-			ft_bzero(dest, 1000);
-			g_env[i] = ft_strdup(exportout2(dest, s[c]));
-		}
+			xportloop(i, c, s, dest);
 		i = 0;
 	}
-	i = -1;
-	while (s[++i])
-		free(s[i]);
-	free(s);
-	free(dest);
-	cleartrash(g_env);
+	cleanhouse(s, dest);
 }
 
 void	execunset(char *b)

exportutils.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 21:01:59 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 12:40:07 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,7 +63,7 @@ static char	*handlespacexp(char *b, char *ret)
 	return (b);
 }
 
-static char	*handlescharsxp(char *b, char *ret)
+char	*handlescharsxp(char *b, char *ret)
 {
 	if (*b == ' ')
 		b = handlespacexp(b, ret);
@@ -96,14 +96,3 @@ 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);
-}

exportutils3.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 21:01:36 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 12:53:25 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,7 @@ int	incrementi(int i, char *s)
 {
 	char	*dest;
 
-	dest = malloc(1000);
+	dest = ft_calloc(1000, 1000);
 	while (g_env[i]
 		&& (!namecmp(g_env[i], exportout2(dest, s)) || !g_env[i][0]))
 		i++;

minishell.h

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:15:48 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 21:25:18 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 13:13:01 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -106,5 +106,11 @@ 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);
+void	cleanhouse(char **s, char *dest);
+void	xportloop(int i, int c, char **s, char *dest);
+char	*handlescharsxp(char *b, char *ret);
+void	freedstring(char **s);
+bool	checkifnumeric(char *s);
+void	initparseret(char **pr, char *name);
 
 #endif

pipenredirutils.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 21:25:54 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 13:24:50 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,40 +63,28 @@ void	initparse(char	*b, t_nums *n)
 {
 	char	*buff;
 	char	*name;
-	int		i;
 	char	**pr;
 
-	i = -1;
+	buff = NULL;
 	if (echoerrcheck(b))
 		return ;
 	name = parsecmdname(b);
 	pr = checkpipesnredirs(b);
 	if (!*pr)
-	{
-		while (++i < 1000)
-			free(pr[i]);
-		free(pr);
-		free(name);
-		return ;
-	}
+		return (initparseret(pr, name));
 	if (!pr[1])
 	{
 		if (checkstrayops(b))
-		{
-			while (++i < 1000)
-				free(pr[i]);
-			free(pr);
-			free(name);
-			return ;
-		}
+			return (initparseret(pr, name));
 		buff = exportout(b);
 		parseargs(b, buff, name, n);
 		n->hyphen = 1;
 	}
-	//else to be added for pipes/redirections handling
-	while (pr[++i])
-		free(pr[i]);
-	free3(pr, buff, name);
+	//else
+		//to be added for pipes/redirections handling
+	freedstring(pr);
+	free(buff);
+	free(name);
 }
 
 	// for (int k = 0; ret[k]; k++)

utils.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/02/05 18:36:41 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 12:38:46 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,7 +32,7 @@ void	dhandler(int signum)
 	{
 		write(1, "\n", 1);
 		rl_on_new_line();
-		rl_replace_line("", 0);
+		//rl_replace_line("", 0);
 		rl_redisplay();
 	}
 	else if (signum == SIGQUIT)

utils10.c

@@ -0,0 +1,19 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   utils10.c                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
+/*   Updated: 2022/02/07 13:12:45 by mchatzip         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+void	initparseret(char **pr, char *name)
+{
+	freedstring(pr);
+	free(name);
+}

utils3.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/01/20 15:43:09 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 13:21:51 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -69,7 +69,10 @@ void	restoreenv(char *s)
 
 void	free3(void *s, void *sp, void *sav)
 {
-	free(s);
-	free(sp);
-	free(sav);
+	if (s)
+		free(s);
+	if (sp)
+		free(sp);
+	if (sav)
+		free(sav);
 }

utils6.c

@@ -6,7 +6,7 @@
 /*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
-/*   Updated: 2022/01/21 14:55:02 by mchatzip         ###   ########.fr       */
+/*   Updated: 2022/02/07 13:19:44 by mchatzip         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -88,6 +88,6 @@ char	*handlenflag(char *b)
 		free(buff);
 		j = 0;
 	}
-	free(s);
+	freedstring(s);
 	return (b);
 }

utils9.c

@@ -0,0 +1,68 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   utils9.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mchatzip <[email protected]> +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/11/16 11:19:39 by mchatzip          #+#    #+#             */
+/*   Updated: 2022/02/07 13:04:11 by mchatzip         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+char	*exportout2(char *dest, char *b)
+{
+	if (echoerrcheck(b))
+		return ("");
+	while (*b == ' ')
+		b++;
+	while (*b)
+		b = handlescharsxp(b, dest);
+	return (dest);
+}
+
+void	cleanhouse(char **s, char *dest)
+{
+	int	i;
+
+	i = -1;
+	while (s[++i])
+		free(s[i]);
+	free(s);
+	free(dest);
+	cleartrash(g_env);
+}
+
+void	xportloop(int i, int c, char **s, char *dest)
+{
+	if (g_env[i])
+		free(g_env[i]);
+	evalquotes(exportout2(dest, s[c]));
+	ft_bzero(dest, 1000);
+	g_env[i] = ft_strdup(exportout2(dest, s[c]));
+}
+
+void	freedstring(char **s)
+{
+	int	i;
+
+	i = -1;
+	while (s[i])
+		free(s[i++]);
+	free(s);
+}
+
+bool	checkifnumeric(char *s)
+{
+	size_t	i;
+	bool	num;
+
+	i = 0;
+	num = 0;
+	while (s[i])
+		if (!ft_isdigit(s[i++]))
+			num = 1;
+	return (num);
+}