added inline environment

corrected env -i crash & SHLVL

Makefile

@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/03/27 16:51:02 by tmaze             #+#    #+#              #
-#    Updated: 2019/10/31 14:05:15 by tmaze            ###   ########.fr        #
+#    Updated: 2020/01/30 12:00:42 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -27,7 +27,7 @@ endif
 
 #	Compilator
 CC		=	gcc
-FLAGS	=	-Wall -Wextra -Werror -g
+FLAGS	=	-Wall -Wextra -Werror
 
 #	Folders
 LIBDIR	=	libft
@@ -43,8 +43,8 @@ SRC	=	main.c			\
 		cmd_cd.c		\
 		cmd_echo.c		\
 		ms_exec.c		\
-		ms_env.c		\
-		ms_ext.c
+		ms_ext.c		\
+		put_error_cd.c
 
 OBJ		=	$(SRC:.c=.o)
 

includes/minishell.h

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/11/18 13:12:34 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/10 20:57:46 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/26 22:19:25 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,13 +19,6 @@
 
 # define S_BIN 5
 
-typedef struct		s_env
-{
-	char			*key;
-	char			*val;
-	struct s_env	*next;
-}					t_env;
-
 typedef struct		s_builtin
 {
 	char			*cmd;
@@ -38,17 +31,12 @@ int					cmd_unsetenv(char **argv, t_env **env);
 int					cmd_cd(char **argv, t_env **env);
 int					cmd_echo(char **argv, t_env **env);
 
-void				ft_envdelelem(t_env **elem);
-void				ft_envdel(t_env **env);
-t_env				*ft_envnew(char *env);
-t_env				*ft_envaddend(t_env **alst, t_env *new);
-t_env				*ft_envgetelem(char *key, t_env *env);
-char				**ft_envtotab(t_env *env);
-char				*ft_envupdate(char *key, t_env *env, char *val);
-void				ft_envclean(t_env **env);
-
 char				**res_ext(char **argv, t_env *env);
 
 int					exec_cmd(char **argv, t_env **env);
+void				*ft_strdel_null(char **s);
+
+void				*put_error_cd(char *file, char *msg);
+int					put_error_cd2(char *file, char *msg);
 
 #endif

libft/Makefile

@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/07 12:47:06 by tmaze             #+#    #+#              #
-#    Updated: 2019/03/27 17:46:28 by tmaze            ###   ########.fr        #
+#    Updated: 2020/01/25 16:24:08 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -17,7 +17,7 @@ CCSTD =
 NAME = libft.a
 
 SRCS =	ft_memalloc.c	\
-		ft_memdel.c 	\
+		ft_memdel.c		\
 		ft_memset.c		\
 		ft_bzero.c		\
 		ft_memcpy.c		\
@@ -38,13 +38,13 @@ SRCS =	ft_memalloc.c	\
 		ft_iswhitespace.c	\
 		ft_issign.c			\
 		\
-		ft_strnew.c 			\
-		ft_strdel.c 			\
+		ft_strnew.c				\
+		ft_strdel.c				\
 		ft_strclr.c				\
 		ft_striter.c			\
 		ft_striteri.c			\
 		ft_strmap.c				\
-		ft_strmapi.c 			\
+		ft_strmapi.c			\
 		ft_strequ.c				\
 		ft_strnequ.c			\
 		ft_strsub.c				\
@@ -90,7 +90,7 @@ SRCS =	ft_memalloc.c	\
 		ft_putnbr_fd.c			\
 		ft_putstrpad.c			\
 		ft_putnbrpad.c			\
-		ft_putstrn.c 			\
+		ft_putstrn.c			\
 		ft_print_words_tables.c	\
 		ft_putendl2.c			\
 		ft_putendl_fd2.c		\
@@ -123,8 +123,8 @@ SRCS =	ft_memalloc.c	\
 		ft_printf_tools_float.c			\
 		ft_printf_tools_hexa.c			\
 		ft_printf_tools_int.c			\
-		ft_printf_tools_lenght.c 		\
-		ft_printf_tools_malloc_size.c 	\
+		ft_printf_tools_lenght.c		\
+		ft_printf_tools_malloc_size.c	\
 		ft_printf_tools_oct.c			\
 		ft_printf_tools_prec_size.c		\
 		ft_printf_tools_str.c			\
@@ -136,7 +136,17 @@ SRCS =	ft_memalloc.c	\
 		ft_getline.c	\
 		\
 		ft_sort_params.c	\
-		ft_realpath.c
+		ft_realpath.c		\
+		\
+		ft_envaddend.c	\
+		ft_envclean.c	\
+		ft_envdel.c		\
+		ft_envdelelem.c	\
+		ft_envgetelem.c	\
+		ft_envnew.c		\
+		ft_envtochar.c	\
+		ft_envtotab.c	\
+		ft_envupdate.c
 
 SRCDIR	= srcs
 OBJDIR	= objs
@@ -160,6 +170,6 @@ clean:
 
 fclean: clean
 	rm -f $(NAME)
-	rm -rf $(OBJDIR)	
+	rm -rf $(OBJDIR)
 
 re: fclean all

libft/includes/libft.h

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/08 00:12:36 by tmaze             #+#    #+#             */
-/*   Updated: 2019/03/20 16:46:41 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/12/06 09:57:17 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -119,6 +119,13 @@ typedef struct		s_conv
 	int				str_size;
 }					t_conv;
 
+typedef struct		s_env
+{
+	char			*key;
+	char			*val;
+	struct s_env	*next;
+}					t_env;
+
 /*
 ** Print functions
 */
@@ -364,4 +371,14 @@ int					ft_getline(char **line);
 int					ft_putendl2(char const *s);
 int					ft_putendl_fd2(char const *s, int fd);
 
+void				ft_envdelelem(t_env **elem);
+void				ft_envdel(t_env **env);
+t_env				*ft_envnew(char *env);
+t_env				*ft_envaddend(t_env **alst, t_env *new);
+t_env				*ft_envgetelem(char *key, t_env *env);
+char				*ft_envtochar(t_env *env);
+char				**ft_envtotab(t_env *env);
+void				ft_envclean(t_env **env);
+char				*ft_envupdate(char *key, t_env *env, char *val);;
+
 #endif

libft/srcs/ft_envaddend.c

@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envaddend.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 15:02:33 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/09 13:00:42 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+t_env	*ft_envaddend(t_env **alst, t_env *new)
+{
+	t_env *tmp;
+
+	if (new == NULL)
+		return (NULL);
+	if (*alst == NULL)
+		*alst = new;
+	else
+	{
+		tmp = *alst;
+		while (tmp->next)
+			tmp = tmp->next;
+		tmp->next = new;
+	}
+	return (*alst);
+}

libft/srcs/ft_envclean.c

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envclean.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/06 09:53:25 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/06 09:53:47 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_envclean(t_env **env)
+{
+	t_env **it;
+	t_env *tmp;
+
+	it = env;
+	while (*it)
+	{
+		if (ft_strequ((*it)->val, ""))
+		{
+			tmp = *it;
+			*it = tmp->next;
+			ft_envdelelem(&tmp);
+		}
+		else
+			it = &((*it)->next);
+	}
+}

libft/srcs/ft_envdel.c

@@ -0,0 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envdel.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 14:51:20 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/09 13:00:46 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_envdel(t_env **env)
+{
+	t_env *tmp;
+
+	while (*env)
+	{
+		tmp = *env;
+		*env = (*env)->next;
+		ft_envdelelem(&tmp);
+	}
+}

libft/srcs/ft_envdelelem.c

@@ -0,0 +1,23 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envdelelem.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 14:43:45 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/09 13:00:45 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_envdelelem(t_env **elem)
+{
+	if (elem)
+	{
+		ft_strdel(&((*elem)->key));
+		ft_strdel(&((*elem)->val));
+		ft_memdel((void**)elem);
+	}
+}

libft/srcs/ft_envgetelem.c

@@ -0,0 +1,23 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envgetelem.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 16:46:17 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/05 16:47:00 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+t_env	*ft_envgetelem(char *key, t_env *env)
+{
+	t_env	*it;
+
+	it = env;
+	while (it && !ft_strequ(it->key, key))
+		it = it->next;
+	return (it);
+}

libft/srcs/ft_envnew.c

@@ -0,0 +1,29 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envnew.c                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 14:54:55 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/05 17:12:59 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+t_env	*ft_envnew(char *env)
+{
+	t_env	*ret;
+	int		i;
+
+	i = 0;
+	ret = NULL;
+	while (env[i] && env[i] != '=')
+		i++;
+	if (env[i] == '=' && (ret = (t_env*)ft_memalloc(sizeof(t_env))) != NULL)
+		if ((ret->val = ft_strsub(env, i + 1, ft_strlen(env) - i - 1)) == NULL
+			|| (ret->key = ft_strsub(env, 0, i)) == NULL)
+			ft_envdelelem(&ret);
+	return (ret);
+}

libft/srcs/ft_envtochar.c

@@ -0,0 +1,28 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envtochar.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 17:28:25 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/09 13:00:44 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*ft_envtochar(t_env *env)
+{
+	int		size;
+	char	*ret;
+
+	size = ft_strlen(env->key) + ft_strlen(env->val) + 2;
+	if ((ret = ft_strnew(size)) != NULL)
+	{
+		ft_strlcpy(ret, env->key, size);
+		ft_strlcat(ret, "=", size);
+		ft_strlcat(ret, env->val, size);
+	}
+	return (ret);
+}

libft/srcs/ft_envtotab.c

@@ -0,0 +1,41 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envtotab.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 17:34:22 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/05 17:34:41 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	**ft_envtotab(t_env *env)
+{
+	t_env	*it;
+	char	*new;
+	char	**ret;
+	int		i;
+
+	i = 0;
+	ret = NULL;
+	it = env;
+	while (it && (++i))
+		it = it->next;
+	if ((ret = (char**)ft_memalloc(sizeof(char*) * (i + 1))) == NULL)
+		return (NULL);
+	it = env;
+	i = 0;
+	while (it)
+	{
+		if ((new = ft_envtochar(it)) == NULL)
+			ft_del_words_tables(&ret);
+		if (new == NULL)
+			break ;
+		ret[i++] = new;
+		it = it->next;
+	}
+	return (ret);
+}

libft/srcs/ft_envupdate.c

@@ -0,0 +1,28 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_envupdate.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/12/05 19:10:38 by tmaze             #+#    #+#             */
+/*   Updated: 2019/12/05 19:10:52 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*ft_envupdate(char *key, t_env *env, char *val)
+{
+	t_env	*elem;
+	char	*new;
+
+	new = NULL;
+	if ((elem = ft_envgetelem(key, env)) != NULL)
+		if ((new = ft_strdup(val)) != NULL)
+		{
+			ft_strdel(&elem->val);
+			elem->val = new;
+		}
+	return (new);
+}

libft/srcs/ft_strtrim.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/07 17:00:34 by tmaze             #+#    #+#             */
-/*   Updated: 2018/04/10 14:15:23 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/22 17:51:11 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

srcs/cmd_cd.c

@@ -6,20 +6,12 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/01/07 16:44:40 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/11 01:09:36 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/26 22:17:48 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-void	put_error_cd(char *file, char *msg)
-{
-	ft_putstr("cd: ");
-	ft_putstr(file);
-	ft_putstr(": ");
-	ft_putendl(msg);
-}
-
 char	*check_path_slash_cd(char *exec)
 {
 	int			i;
@@ -29,22 +21,15 @@ char	*check_path_slash_cd(char *exec)
 	if (exec[0] == '/')
 	{
 		if ((i = access(exec, F_OK)) != 0)
-			put_error_cd(exec, "no such file or directory");
-		if (i != 0)
-			return (NULL);
+			return (put_error_cd(exec, "no such file or directory"));
 		if ((i = lstat(exec, &info)) != 0)
-			put_error_cd(exec, "can't determine info");
-		if (i != 0)
-			return (NULL);
-		if (!S_ISDIR(info.st_mode) || (S_ISLNK(info.st_mode) && ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode))))
-		{
-			put_error_cd(exec, "not a directory");
-			return (NULL);
-		}
+			return (put_error_cd(exec, "can't determine info"));
+		if ((S_ISLNK(info.st_mode)
+			&& ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode)))
+			&& !S_ISDIR(info.st_mode))
+			return (put_error_cd(exec, "not a directory"));
 		if ((i = access(exec, X_OK)) != 0)
-			put_error_cd(exec, "permission denied");
-		if (i != 0)
-			return (NULL);
+			return (put_error_cd(exec, "permission denied"));
 		return (exec);
 	}
 	return (NULL);
@@ -59,23 +44,16 @@ int		cmd_cd_update_env(char *path, t_env **env, char opt)
 
 	ft_bzero(p_path, 4096);
 	if (!(pwd = ft_envgetelem("PWD", *env)))
-	{
-		put_error_cd(path, "env var PWD undefined");
-		return (1);
-	}
+		return (put_error_cd2(path, "env var PWD undefined"));
 	if (getcwd(p_path, 4096) == NULL || (oldpwd = ft_strdup(pwd->val)) == NULL
 		|| ft_realpath(path, &c_path) == NULL)
-	{
-		put_error_cd(path, "error");
-		return (1);
-	}
+		return (put_error_cd2(path, "error"));
 	if (ft_envupdate("PWD", *env, ((opt == 'P') ? p_path : c_path)) == NULL
 		|| ft_envupdate("OLDPWD", *env, oldpwd) == NULL)
 	{
-		put_error_cd(path, "error");
 		ft_strdel(&oldpwd);
 		ft_strdel(&c_path);
-		return (1);
+		return (put_error_cd2(path, "error"));
 	}
 	ft_strdel(&oldpwd);
 	ft_strdel(&c_path);
@@ -122,35 +100,42 @@ char	cd_getparams(char **argv, size_t *i)
 	return (ret[0]);
 }
 
-int		cmd_cd(char **argv, t_env **env)
+int		cmd_cd_switchboard(char **av, t_env **env, char opt, int i)
 {
-	t_env	*elem;
-	size_t	i;
-	char	*path;
-	char	opt;
+	t_env	*e;
+	char	*p;
 	int		ret;
 
-	i = 0;
-	if ((opt = cd_getparams(argv, &i)) == '\0')
-		return (1);
-	if (!argv[i] && (elem = ft_envgetelem("HOME", *env)) != NULL && elem->val != NULL)
-		return (cmd_cd_core(elem->val, env, opt));
-	else if (argv[i] && argv[i][0] == '/')
-		return (cmd_cd_core(argv[i], env, opt));
-	else if (argv[i] && argv[i][0] == '-' && (elem = ft_envgetelem("OLDPWD", *env)) != NULL)
-		return (cmd_cd_core(elem->val, env, opt));
-	else if (argv[i] && argv[i][0] != '/' && (elem = ft_envgetelem("PWD", *env)) != NULL && elem->val != NULL)
+	if ((!av[i] && (e = ft_envgetelem("HOME", *env)) != NULL && e->val
+		!= NULL) || (av[i] && av[i][0] == '-'
+		&& (e = ft_envgetelem("OLDPWD", *env)) != NULL))
+		return (cmd_cd_core(e->val, env, opt));
+	else if (av[i] && av[i][0] == '/')
+		return (cmd_cd_core(av[i], env, opt));
+	else if (av[i] && av[i][0] != '/'
+		&& (e = ft_envgetelem("PWD", *env)) != NULL && e->val != NULL)
 	{
-		if ((path = ft_strnew(ft_strlen(elem->val) + ft_strlen(argv[i]) + 1)) == NULL)
-			put_error_cd(argv[i], "memory error");
-		if (path == NULL)
+		if ((p = ft_strnew(ft_strlen(e->val) + ft_strlen(av[i]) + 1)) == NULL)
+			put_error_cd(av[i], "memory error");
+		if (p == NULL)
 			return (1);
-		ft_strcpy(path, elem->val);
-		path[ft_strlen(path)] = '/';
-		ft_strcat(path, argv[i]);
-		ret = cmd_cd_core(path, env, opt);
-		ft_strdel(&path);
+		ft_strcpy(p, e->val);
+		p[ft_strlen(p)] = '/';
+		ft_strcat(p, av[i]);
+		ret = cmd_cd_core(p, env, opt);
+		ft_strdel(&p);
 		return (ret);
 	}
 	return (1);
 }
+
+int		cmd_cd(char **argv, t_env **env)
+{
+	size_t	i;
+	char	opt;
+
+	i = 0;
+	if ((opt = cd_getparams(argv, &i)) == '\0')
+		return (1);
+	return (cmd_cd_switchboard(argv, env, opt, i));
+}

srcs/cmd_echo.c

@@ -14,9 +14,9 @@
 
 int	cmd_echo(char **argv, t_env **env)
 {
-	(void)env;
 	int	i;
 
+	(void)env;
 	i = 1;
 	while (argv[i])
 		ft_printf("%s ", argv[i++]);

srcs/cmd_env.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/20 14:33:48 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/08 21:55:51 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/30 15:41:08 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,6 +39,32 @@ t_env		*envcpy(t_env *env)
 	return (cpy);
 }
 
+int			env_cleanup(t_env *env_cp, int code)
+{
+	ft_envdel(&env_cp);
+	if (code == 2)
+		ft_putstr_fd("minishell: env: Env copy error\n", 2);
+	return (code);
+}
+
+t_env		*inline_env(char **argv, int *i, t_env **env_cp)
+{
+	t_env	*new;
+
+	while (ft_strchr(argv[*i], '='))
+	{
+		if ((new = ft_envnew(argv[*i])) == NULL)
+		{
+			ft_printf("env: memory error\n");
+			ft_envdel(env_cp);
+			break ;
+		}
+		ft_envaddend(env_cp, new);
+		(*i)++;
+	}
+	return (*env_cp);
+}
+
 int			cmd_env(char **argv, t_env **env)
 {
 	int		i;
@@ -47,28 +73,23 @@ int			cmd_env(char **argv, t_env **env)
 	t_env	*env_cp;
 
 	i = 1;
-	env_cp = NULL;
-	if (!ft_strequ(argv[i], "-i") && (env != NULL))
+	if (!(env_cp = NULL) && !ft_strequ(argv[i], "-i") && (env != NULL))
 	{
 		it = *env;
 		while (it)
 		{
 			if ((new = envcpy(it)) == NULL)
-			{
-				ft_envdel(&env_cp);
-				ft_putstr_fd("minishell: env: Env copy error\n", 2);
-				return (2);
-			}
+				return (env_cleanup(env_cp, 2));
 			ft_envaddend(&env_cp, new);
 			it = it->next;
 		}
 	}
-	if (ft_strequ(argv[i], "-i"))
+	else if (ft_strequ(argv[i], "-i"))
 		i++;
+	inline_env(argv, &i, &env_cp);
 	if (argv[i])
 		exec_cmd(argv + i, &env_cp);
 	else
 		put_env(env_cp);
-	ft_envdel(&env_cp);
-	return (0);
+	return (env_cleanup(env_cp, 0));
 }

srcs/main.c

@@ -6,12 +6,51 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/19 17:08:46 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/10 21:24:36 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/30 13:47:35 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
+t_env	*def_env(void)
+{
+	t_env	*ret;
+	t_env	*n;
+	char	p[PATH_MAX];
+
+	n = ft_memalloc(sizeof(t_env));
+	if (n != NULL && ((n->key = ft_strnew(3)) == NULL || !getcwd(p, PATH_MAX)))
+		ft_envdelelem(&n);
+	if (n != NULL)
+		ft_strcpy(n->key, "PWD");
+	if (n != NULL && (n->val = ft_strdup(p)) == NULL)
+		ft_envdelelem(&n);
+	if (n != NULL)
+		ft_envaddend(&ret, n);
+	n = ft_memalloc(sizeof(t_env));
+	if (n != NULL && (n->key = ft_strnew(5)) == NULL)
+		ft_envdelelem(&n);
+	if (n != NULL)
+		ft_strcpy(n->key, "SHLVL");
+	if (n != NULL && (n->val = ft_strdup("1")) == NULL)
+		ft_envdelelem(&n);
+	if (n != NULL)
+		ft_envaddend(&ret, n);
+	return (ret);
+}
+
+char	*inc_shlvl(char **shlvl)
+{
+	char	*ret;
+
+	if ((ret = ft_itoa(ft_atoi(*shlvl) + 1)) != NULL)
+	{
+		ft_strdel(shlvl);
+		*shlvl = ret;
+	}
+	return (ret);
+}
+
 t_env	*env2lst(char **env)
 {
 	t_env	*ret;
@@ -23,7 +62,11 @@ t_env	*env2lst(char **env)
 	while (env[i])
 	{
 		if ((new = ft_envnew(env[i])) != NULL)
+		{
+			if (ft_strequ(new->key, "SHLVL") && ft_str_is_numeric(new->val))
+				inc_shlvl(&new->val);
 			ft_envaddend(&ret, new);
+		}
 		else
 		{
 			ft_envdelelem(&new);
@@ -32,58 +75,60 @@ t_env	*env2lst(char **env)
 		}
 		i++;
 	}
+	if (i == 0 && ret == NULL && (ret = def_env()) == NULL)
+		ft_printf("Env: Memory Error\n");
 	return (ret);
 }
 
+void	check_exec(char **argv, t_env *env)
+{
+	int					i;
+	static t_builtin	built[S_BIN] = {{"env", &cmd_env}, {"cd", &cmd_cd}
+								, {"setenv", &cmd_setenv}, {"echo", &cmd_echo}
+								, {"unsetenv", &cmd_unsetenv}};
+
+	i = -1;
+	while (++i < S_BIN)
+		if (ft_strequ(argv[0], built[i].cmd))
+		{
+			built[i].f(argv, &env);
+			break ;
+		}
+	if (i == S_BIN)
+		exec_cmd(argv, &env);
+}
+
+int		cleanup(char **argv, t_env *env)
+{
+	ft_del_words_tables(&argv);
+	ft_envdel(&env);
+	return (0);
+}
+
 int		main(void)
 {
-	extern char			**environ;
-	static t_builtin	built[S_BIN] = {{"env", &cmd_env}, {"cd", &cmd_cd}
-								, {"setenv", &cmd_setenv}, {"echo", &cmd_echo}
-								, {"unsetenv", &cmd_unsetenv}};
-	char				**argv;
-	t_env				*env;
-	char				*cmd;
-	int					i;
+	extern char	**environ;
+	char		**argv;
+	t_env		*env;
+	char		*cmd;
 
-	env = NULL;
 	if ((env = env2lst(environ)) == NULL)
 		return (2);
 	while (1)
 	{
-		cmd = NULL;
 		ft_printf("%s$>%s ", FT_COLOR_GREEN, FT_RESET);
 		if (ft_getline(&cmd) >= 0 && cmd != NULL
-			&& (argv = ft_strsplit(cmd, ' ')) != NULL)
+			&& (argv = ft_strsplit(cmd, ' ')) != NULL && !ft_strdel_null(&cmd))
 		{
-			ft_strdel(&cmd);
 			if ((res_ext(argv, env)) != NULL)
 			{
 				if (ft_strequ(argv[0], "exit"))
-				{
-					ft_del_words_tables(&argv);
-					ft_envdel(&env);
-					return (0);
-				}
-				i = 0;
-				while (i < S_BIN)
-				{
-					if (ft_strequ(argv[0], built[i].cmd))
-					{
-						built[i].f(argv, &env);
-						break ;
-					}
-					i++;
-				}
-				if (i == S_BIN)
-					exec_cmd(argv, &env);
+					return (cleanup(argv, env));
+				check_exec(argv, env);
 			}
 		}
 		ft_strdel(&cmd);
 		ft_del_words_tables(&argv);
 	}
-	ft_del_words_tables(&argv);
-	ft_strdel(&cmd);
-	ft_envdel(&env);
 	return (0);
 }

srcs/ms_env.c

@@ -1,156 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ms_env.c                                           :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/09/20 11:43:53 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/10 20:49:35 by tmaze            ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "minishell.h"
-
-void	ft_envdelelem(t_env **elem)
-{
-	if (elem)
-	{
-		ft_strdel(&((*elem)->key));
-		ft_strdel(&((*elem)->val));
-		ft_memdel((void**)elem);
-	}
-}
-
-void	ft_envdel(t_env **env)
-{
-	t_env *tmp;
-
-	while (*env)
-	{
-		tmp = *env;
-		*env = (*env)->next;
-		ft_envdelelem(&tmp);
-	}
-}
-
-t_env	*ft_envnew(char *env)
-{
-	t_env	*ret;
-	int		i;
-
-	i = 0;
-	ret = NULL;
-	while (env[i] && env[i] != '=')
-		i++;
-	if (env[i] == '=' && (ret = (t_env*)ft_memalloc(sizeof(t_env))) != NULL)
-		if ((ret->val = ft_strsub(env, i + 1, ft_strlen(env) - i - 1)) == NULL
-			|| (ret->key = ft_strsub(env, 0, i)) == NULL)
-			ft_envdelelem(&ret);
-	return (ret);
-}
-
-t_env	*ft_envaddend(t_env **alst, t_env *new)
-{
-	t_env *tmp;
-
-	if (new == NULL)
-		return (NULL);
-	if (*alst == NULL)
-		*alst = new;
-	else
-	{
-		tmp = *alst;
-		while (tmp->next)
-			tmp = tmp->next;
-		tmp->next = new;
-	}
-	return (*alst);
-}
-
-t_env	*ft_envgetelem(char *key, t_env *env)
-{
-	t_env	*it;
-
-	it = env;
-	while (it && !ft_strequ(it->key, key))
-		it = it->next;
-	return (it);
-}
-
-char	*ft_envtochar(t_env *env)
-{
-	int		size;
-	char	*ret;
-
-	size = ft_strlen(env->key) + ft_strlen(env->val) + 1;
-	if ((ret = ft_strnew(size)) != NULL)
-	{
-		ft_strlcpy(ret, env->key, size);
-		ft_strlcat(ret, "=", size);
-		ft_strlcat(ret, env->val, size);
-	}
-	return (ret);
-}
-
-char	**ft_envtotab(t_env *env)
-{
-	t_env	*it;
-	char	*new;
-	char	**ret;
-	int		i;
-
-	i = 0;
-	ret = NULL;
-	it = env;
-	while (it && (++i))
-		it = it->next;
-	if ((ret = (char**)ft_memalloc(sizeof(char*) * (i + 1))) == NULL)
-		return (NULL);
-	it = env;
-	i = 0;
-	while (it)
-	{
-		if ((new = ft_envtochar(it)) == NULL)
-			ft_del_words_tables(&ret);
-		if (new == NULL)
-			break ;
-		ret[i++] = new;
-		it = it->next;
-	}
-	return (ret);
-}
-
-char *ft_envupdate(char *key, t_env *env, char *val)
-{
-	t_env	*elem;
-	char	*new;
-
-	new = NULL;
-	if ((elem = ft_envgetelem(key, env)) != NULL)
-		if ((new = ft_strdup(val)) != NULL)
-		{
-			ft_strdel(&elem->val);
-			elem->val = new;
-		}
-	return (new);
-}
-
-void	ft_envclean(t_env **env)
-{
-	t_env **it;
-	t_env *tmp;
-
-	it = env;
-	while (*it)
-	{
-		if (ft_strequ((*it)->val, "")) 
-		{
-			tmp = *it;
-			*it = tmp->next;
-			ft_envdelelem(&tmp);
-		}
-		else
-			it = &((*it)->next);
-	}
-}

srcs/ms_exec.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/26 16:25:00 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/10 15:52:54 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/30 11:48:25 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,12 +23,13 @@ int		ft_isin(char *str, char c)
 	return (-1);
 }
 
-void	put_error(char *file, char *msg)
+void	*put_error(char *file, char *msg)
 {
 	ft_putstr("minishell: ");
 	ft_putstr(file);
 	ft_putstr(": ");
 	ft_putendl(msg);
+	return (NULL);
 }
 
 char	*check_path_slash(char *exec)
@@ -64,10 +65,7 @@ char	*check_path_dot(char *exec, t_env *env)
 
 	if ((path = ft_envgetelem("PWD", env)) == NULL
 		|| path->val == NULL || (tmp = ft_strjoin(path->val, "/")) == NULL)
-	{
-		put_error(exec, "memory error");
-		return (NULL);
-	}
+		return (put_error(exec, "memory error"));
 	if ((ret = ft_strjoin(tmp, exec)) == NULL)
 		put_error(exec, "memory error");
 	ft_strdel(&tmp);
@@ -77,21 +75,53 @@ char	*check_path_dot(char *exec, t_env *env)
 	{
 		if (access(ret, X_OK) == 0)
 			return (exec);
-		put_error(exec, "permission denied");
 		ft_strdel(&ret);
-		return (NULL);
+		return (put_error(exec, "permission denied"));
 	}
-	put_error(exec, "no such file or directory");
 	ft_strdel(&ret);
+	return (put_error(exec, "no such file or directory"));
+}
+
+void	*ft_strdel_null(char **s)
+{
+	ft_strdel(s);
 	return (NULL);
 }
 
+char	*check_path_elems(char **path_elems, char *exec)
+{
+	int		i;
+	char	*tmp;
+	char	*ret;
+
+	i = -1;
+	ret = NULL;
+	while (path_elems[++i])
+	{
+		if ((tmp = ft_strjoin(path_elems[i], "/")) == NULL
+			&& !put_error(exec, "memory error"))
+			break ;
+		if ((ret = ft_strjoin(tmp, exec)) == NULL
+			&& !put_error(exec, "memory error") && !ft_strdel_null(&tmp))
+			break ;
+		if (!ft_strdel_null(&tmp) && access(ret, F_OK) == 0)
+		{
+			if (access(ret, X_OK) == 0)
+				break ;
+			ft_strdel(&ret);
+			ft_del_words_tables(&path_elems);
+			return (put_error(exec, "permission denied"));
+		}
+		ft_strdel(&ret);
+	}
+	return (ret);
+}
+
 char	*check_path(char *exec, t_env *env)
 {
 	size_t	i;
 	t_env	*path;
 	char	**path_elems;
-	char	*tmp;
 	char	*ret;
 
 	ret = NULL;
@@ -104,66 +134,43 @@ char	*check_path(char *exec, t_env *env)
 		if ((path = ft_envgetelem("PATH", env)) == NULL
 			|| path->val == NULL
 			|| (path_elems = ft_strsplit(path->val, ':')) == NULL)
-		{
-			put_error(exec, "could not resolve path");
-			return (NULL);
-		}
+			return (put_error(exec, "could not resolve path"));
 		i = 0;
-		while (path_elems[i])
+		if ((ret = check_path_elems(path_elems, exec)) == NULL)
 		{
-			if ((tmp = ft_strjoin(path_elems[i], "/")) == NULL)
-				put_error(exec, "memory error");
-			if (tmp == NULL)
-				break ;
-			if ((ret = ft_strjoin(tmp, exec)) == NULL)
-			{
-				put_error(exec, "memory error");
-				ft_strdel(&tmp);
-				break ;
-			}
-			ft_strdel(&tmp);
-			if (access(ret, F_OK) == 0)
-			{
-				if (access(ret, X_OK) == 0)
-					break ;
-				put_error(exec, "permission denied");
-				ft_strdel(&ret);
-				ft_del_words_tables(&path_elems);
-				return (NULL);
-			}
-			ft_strdel(&ret);
-			i++;
+			ft_del_words_tables(&path_elems);
+			return (put_error(exec, "command not found"));
 		}
-		if (path_elems[i] == NULL)
-			put_error(exec, "command not found");
 		ft_del_words_tables(&path_elems);
 	}
 	return (ret);
 }
 
+void	exec_cmd_child(char *path, char **argv, char **env_tab, t_env **env)
+{
+	execve(path, argv, env_tab);
+	ft_putendl_fd("minishell: error", 1);
+	if (ft_strcmp(path, argv[0]) != 0)
+		ft_strdel(&path);
+	ft_del_words_tables(&env_tab);
+	ft_envdel(env);
+	exit(-1);
+}
+
 int		exec_cmd(char **argv, t_env **env)
 {
-	int					ret;
-	char				**env_tab;
-	char				*path;
+	int		ret;
+	char	**env_tab;
+	char	*path;
 
 	if ((env_tab = ft_envtotab(*env)) == NULL)
 		return (-1);
 	if ((path = check_path(argv[0], *env)) == NULL)
 		ft_del_words_tables(&env_tab);
-	ft_printf("path after resolve: %s\n", path);
 	if (path == NULL)
 		return (-1);
 	if ((ret = fork()) == 0)
-	{
-		execve(path, argv, env_tab);
-		ft_putendl_fd("minishell: error", 1);
-		if (ft_strcmp(path, argv[0]) != 0)
-			ft_strdel(&path);
-		ft_del_words_tables(&env_tab);
-		ft_envdel(env);
-		exit(-1);
-	}
+		exec_cmd_child(path, argv, env_tab, env);
 	else if (ret == -1)
 		ft_putendl_fd("minishell: error", 1);
 	if (ret == -1)

srcs/ms_ext.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/25 18:21:47 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/18 09:35:44 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/30 15:42:17 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,6 +18,14 @@ void	*return_null(char *msg)
 	return (NULL);
 }
 
+void	ft_strreplace(char **dst, char *src, int *index, t_env *elem)
+{
+	if (*dst != NULL)
+		ft_strdel(dst);
+	*dst = src;
+	*index = ft_strlen(elem->val);
+}
+
 t_env	*search_key(t_env *env, char *cmd, int index)
 {
 	t_env	*it;
@@ -37,10 +45,7 @@ t_env	*search_key(t_env *env, char *cmd, int index)
 			j++;
 		}
 		if (!it->key[i] && (!ret || ft_strlen(it->key) > ft_strlen(ret->key)))
-		{
-			ft_printf("found key: %s\n", it->key);
 			ret = it;
-		}
 		it = it->next;
 	}
 	return (ret);
@@ -52,64 +57,61 @@ char	*replace_env(char *src, t_env *elem, int key_size, int i)
 	int		res_len;
 
 	res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
+	ft_printf("size replace: %d\n", res_len);
 	if ((ret = ft_strnew(res_len)) != NULL)
 	{
 		ft_strncpy(ret, src, i);
-		ft_strcat(ret, elem->val);
-		ft_strcat(ret, src + 1 + key_size);
+		ft_strlcat(ret, elem->val, res_len + 1);
+		ft_strlcat(ret, src + key_size, res_len + 1);
 	}
 	else
 		ft_printf("minishell: memory error\n");
 	return (ret);
 }
 
-char	*resolve_complete_key(char *src, int *index, t_env *env)
+char	*resolve_complete_key(char **src, int *index, t_env *env)
 {
 	t_env	*tmp;
 	char	*ret;
-	
-	if ((tmp = search_key(env, src, *index + 1)) != NULL)
+
+	if ((tmp = search_key(env, *src, *index + 1)) != NULL)
 	{
-		if ((ret = replace_env(src, tmp, ft_strlen(tmp->key)
-							   + 1, *index)) != NULL)
+		if ((ret = replace_env(*src, tmp, ft_strlen(tmp->key)
+			+ 1, *index)) != NULL)
 		{
-			ft_strdel(&src);
-			src = ret;
-			*index += ft_strlen(tmp->val);
-			return (src);
+			ft_strreplace(src, ret, index, tmp);
+			return (*src);
 		}
 		else
-			return return_null("minishell: memory error");
+			return (return_null("minishell: memory error"));
 	}
 	else
-		return return_null("minishell: variable not found");
+		return (return_null("minishell: variable not found"));
 }
 
 char	**res_ext(char **av, t_env *env)
 {
-	int		i[3];
+	int		i[2];
 	t_env	*tmp;
 	char	*ret;
 
-	i[0] = 0;
-	while (av && av[i[0]])
+	i[0] = -1;
+	while (av && av[++i[0]] && !(i[1] = 0))
 	{
-		i[2] = 0;
-		while (av[i[0]] && av[i[0]][i[2]])
+		while (av[i[0]][i[1]])
 		{
-			if (av[i[0]][i[2]] == '~'	&& (tmp = ft_envgetelem("HOME", env))
-				!= NULL	&& (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
-			{
-				ft_strdel(&av[i[0]]);
-				av[i[0]] = ret;
-				i[2] += ft_strlen(tmp->val);
-			}
-			else if (av[i[0]][i[2]] == '$'
-					&& resolve_complete_key(av[i[0]], &i[2], env) == NULL)
+			if (av[i[0]][i[1]] != '$' && av[i[0]][i[1]] != '~')
+				i[1]++;
+			else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
+				!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
+				ft_strreplace(&av[i[0]], ret, &i[1], tmp);
+			else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
+				== NULL)
+				return (return_null("Entry HOME not found\n"));
+			else if (av[i[0]][i[1]] == '$'
+				&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
 				return (NULL);
-			i[2]++;
 		}
-		i[0]++;
 	}
 	return (av);
 }

srcs/put_error_cd.c

@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   put_error_cd.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/01/26 22:18:09 by tmaze             #+#    #+#             */
+/*   Updated: 2020/01/26 22:18:24 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+void	*put_error_cd(char *file, char *msg)
+{
+	ft_putstr("cd: ");
+	ft_putstr(file);
+	ft_putstr(": ");
+	ft_putendl(msg);
+	return (NULL);
+}
+
+int		put_error_cd2(char *file, char *msg)
+{
+	ft_putstr("cd: ");
+	ft_putstr(file);
+	ft_putstr(": ");
+	ft_putendl(msg);
+	return (1);
+}