「🏗️」 wip: Started cd and pwd

include/builtins.h

@@ -0,0 +1,21 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   builtins.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/22 13:05:18 by adjoly            #+#    #+#             */
+/*   Updated: 2024/06/24 12:47:28 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef BUILTINS_H
+# define BUILTINS_H
+
+#include "env.h"
+
+void	ft_pwd(t_env *env);
+void	ft_cd(t_env *env, char *args);
+
+#endif

include/env.h

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 13:20:22 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/06/10 17:10:18 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/06/22 14:07:50 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -99,7 +99,7 @@ void	ft_envclear(t_env **lst, void (*del)(void *));
 void	ft_envdelone(t_env *lst, void (*del)(void *));
 t_env	*ft_envlast(t_env *env);
 t_env	*ft_envnew(char *name, char *content);
-uint	ft_envsize(t_env *lst);
+unsigned int	ft_envsize(t_env *lst);
 
 /**
  * @brief				DEBUG FUNC : print the actual state of the env struct

src/builtins/ft_cd.c

@@ -0,0 +1,62 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_cd.c                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/22 15:07:24 by adjoly            #+#    #+#             */
+/*   Updated: 2024/06/24 18:48:11 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+#include "env.h"
+#include "libft.h"
+
+char	*__get_parent_directory(char *pwd)
+{
+	char	*tmp;
+	char	*dir;
+	char	*parent;
+
+	tmp = pwd;
+	while (*tmp)
+	{
+		if (*tmp == '/')
+			dir = tmp;
+		tmp++;
+	}
+	parent = ft_calloc(dir - pwd + 1, sizeof(char));
+	ft_strlcpy(parent, pwd, dir - pwd + 1);
+	free(pwd);
+	return (parent);
+}
+
+char	*ret_cwd(void)
+{
+	
+}
+
+void	ft_cd(t_env *env, char *args)
+{
+	char	*new_pwd;
+
+	new_pwd = NULL;
+	pwd = getcwd();
+	ft_putendl_fd(args, STDOUT_FILENO);
+	ft_putendl_fd(env_get_value("PWD", env), STDOUT_FILENO);
+	if (!args)
+		new_pwd = env_get_value("HOME", env);
+	else if (args[0] == '/')
+		new_pwd = ft_strdup(args);
+	else if (is_str(args, ".."))
+		new_pwd = __get_parent_directory(env_get_value("PWD", env));
+	ret = chdir(new_pwd);
+	if (ret == -1)
+	{
+	}
+	env_edit("PWD", new_pwd, env);
+	free(args);
+	ft_putendl_fd(new_pwd, STDOUT_FILENO);
+}

src/builtins/ft_pwd.c

@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_pwd.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/22 13:02:02 by adjoly            #+#    #+#             */
+/*   Updated: 2024/06/24 12:33:50 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <unistd.h>
+#include "env.h"
+#include "libft.h"
+
+void	ft_pwd(t_env *env)
+{
+	char	*pwd;
+
+	pwd = env_get_value("PWD", env);
+	ft_putendl_fd(pwd, STDOUT_FILENO);
+	free(pwd);
+}

src/main.c

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/06/21 09:33:03 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/06/24 12:47:08 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 #include "libft.h"
+#include "builtins.h"
 #include "minishell.h"
 #include "parsing.h"
 #include "prompt.h"
@@ -86,6 +87,17 @@ int	main(int ac, char **av, char **env)
 			continue ;
 		if (is_str(test, "exit"))
 			break ;
+		if (is_str(test, "pwd"))
+		{
+			ft_pwd(&env_l);
+			continue ;
+		}
+		if (is_str(test, "cd"))
+		{
+			ft_cd(&env_l, lll[1]);
+			continue ;
+		}
+		check_quote(test);
 		piped = tokenizer(test);
 		//check_redir(((t_token *)(piped->content))->redirection, av);
 		cmd_list = get_cmd_list(piped, &env_l);

src/parsing/check_error/check_redir.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/28 18:17:26 by adjoly            #+#    #+#             */
-/*   Updated: 2024/05/30 12:52:51 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/06/24 12:51:27 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,7 +20,7 @@ void	check_redir(t_list *redir, char **argv)
 	t_redirection	*tmp_redir;
 
 	tmp = redir;
-	while(tmp)
+	while (tmp)
 	{
 		tmp_redir = tmp->content;
 		if (tmp_redir->sign == HEREDOC && \

src/parsing/env_var/env_var_replace.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/05 21:14:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/06/20 14:34:25 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/06/24 12:57:59 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,20 @@
 #include "parsing.h"
 #include "env.h"
 
+void	__cpy_dollar(char *tmp, size_t dollar_size, t_env *env, char **rl_dlrd)
+{
+	char	*dollar;
+
+	dollar = env_getn_value(tmp, env, dollar_size - 1);
+	if (!dollar)
+	{
+		tmp += dollar_size;
+		return ;
+	}
+	ft_strlcat(*rl_dlrd, dollar, \
+			ft_strlen(dollar) + ft_strlen(*rl_dlrd) + 1);
+}
+
 size_t	strlen_till_notalnum(char *s)
 {
 	char	*tmp;
@@ -30,7 +44,6 @@ char	*env_var_replace(char *readline, t_env *env)
 	char	*tmp;
 	char	*rl_dollared;
 	size_t	dollar_size;
-	char	*dollar;
 
 	rl_dollared = ft_calloc(get_size_with_env(readline, env) + 1, sizeof(char));
 	if (rl_dollared == NULL)
@@ -42,13 +55,7 @@ char	*env_var_replace(char *readline, t_env *env)
 		{
 			tmp++;
 			dollar_size = strlen_till_notalnum(tmp);
-			dollar = env_getn_value(tmp, env, dollar_size - 1);
+			__cpy_dollar(tmp, dollar_size, env, &rl_dollared);
-			if (!dollar)
-			{
-				tmp += dollar_size;
-				continue ;
-			}
-			ft_strlcat(rl_dollared, dollar, ft_strlen(dollar) + ft_strlen(rl_dollared) + 1);
 			tmp += dollar_size;
 		}
 		else

src/parsing/env_var/get_size_with_env.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/06 15:01:19 by adjoly            #+#    #+#             */
-/*   Updated: 2024/06/10 17:11:16 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/06/24 12:51:59 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,8 @@ size_t	get_size_with_env(char *readline, t_env *env)
 	size = ft_strlen(readline);
 	while (*tmp)
 	{
-		if (*tmp == '$' && is_inquote(tmp, tmp - readline) != SINGLE && is_inquote(tmp, tmp - readline) != NOT_CLOSED)
+		if (*tmp == '$' && is_inquote(tmp, tmp - readline) != SINGLE && \
+				is_inquote(tmp, tmp - readline) != NOT_CLOSED)
 		{
 			tmp++;
 			size -= strlen_till_char(tmp, ' ');

src/parsing/is_inquote.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/20 20:06:13 by adjoly            #+#    #+#             */
-/*   Updated: 2024/06/20 17:41:33 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/06/24 12:50:58 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */