Fixed cd when either or both PWD and OLDPWD doesn't exist

Author: Dillon Phang

inc/minishell.h

@@ -95,12 +95,6 @@ typedef struct s_parsestr
 
 extern int			g_sig_received;
 
-t_dls				*parse_token(char *input, t_minishell **mnsh);
-t_dls				*ft_dlsnew(char *content, t_type type);
-void				ft_dlsadd_back(t_dls **lst, t_dls *new);
-int					execute(t_dls *tokens, char **envp);
-t_ast				*parse_ast(t_dls *tokens, t_minishell **mnsh);
-int					execute_ast(t_minishell **mnst, int *opipe);
 //	=========================   built-ins   ===================================
 //	builtins_utils
 int					ft_strcmp(const char *s1, const char *s2);
@@ -127,6 +121,7 @@ int					export(char **cmd, t_minishell **mnsh);
 //	pwd
 int					pwd(void);
 //  unset
+void				rm_envp(t_minishell **mnsh, t_envp **to_rm);
 int					unset(char **cmd, t_minishell **mnsh);
 //  =========================   execution   ===================================
 //  excu
@@ -190,11 +185,17 @@ int					execute_tokens(t_dls *tokens, t_minishell **mnsh);
 // parsing
 char				**process_av(t_dls *tokens);
 char				**parse_to_arg(t_dls *tokens);
+int					execute_ast(t_minishell **mnst, int *opipe);
 // token utils
 t_dls				*parse_token(char *input, t_minishell **mnsh);
 char				**parse_to_arg(t_dls *tokens);
 // redir utils
 void				fork_heredoc(int pid, int fd[2], char *delim,
 						t_minishell **mnsh);
+//	dls
+t_dls				*ft_dlsnew(char *content, t_type type);
+void				ft_dlsadd_back(t_dls **lst, t_dls *new);
+//	ast
+t_ast				*parse_ast(t_dls *tokens, t_minishell **mnsh);
 
 #endif

src/builtins/cd.c

@@ -43,9 +43,12 @@ void	replace_prewd(t_envp **wd, t_envp **old_wd)
 {
 	char	*new_wd;
 
-	free((*old_wd)->content);
-	(*old_wd)->content = ft_strpathdup("OLDPWD=", (*wd)->content + 5);
-	free((*wd)->content);
+	if (old_wd)
+	{
+		free((*old_wd)->content);
+		(*old_wd)->content = ft_strpathdup("OLDPWD=", (*wd)->content + 4);
+		free((*wd)->content);
+	}
 	new_wd = (char *)malloc(PATH_MAX * sizeof(char));
 	getcwd(new_wd, PATH_MAX);
 	(*wd)->content = ft_strpathdup("PWD=", new_wd);
@@ -71,11 +74,10 @@ void	update_wd(t_minishell **mnsh)
 	}
 	if (wd && old_wd)
 		replace_prewd(&wd, &old_wd);
-	else
-	{
-		ft_putstr_fd("Error: PWD or OLDPWD not found in envp\n", 2);
-		(*mnsh)->exit_code = 1;
-	}
+	else if (wd && !old_wd)
+		replace_prewd(&wd, &old_wd);
+	else if (!wd && old_wd)
+		rm_envp(mnsh, &old_wd);
 }
 
 int	cd(char **cmd, t_minishell **mnsh)

src/builtins/exit.c

@@ -56,7 +56,8 @@ void	exit_child(t_minishell **mnsh, int exit_status)
 		(*mnsh)->exit_code = WEXITSTATUS(exit_status);
 	if (WIFSIGNALED(exit_status))
 	{
-		if (WTERMSIG(exit_status) == SIGINT)
+		if (WTERMSIG(exit_status) == SIGINT
+			|| WTERMSIG(exit_status) == SIGQUIT)
 		{
 			g_sig_received = 1;
 			printf("\n");

src/lst/dls.c

@@ -15,6 +15,7 @@
 t_dls	*ft_dlsnew(char *content, t_type type)
 {
 	t_dls	*node;
+
 	if (!content)
 		return (NULL);
 	node = malloc(sizeof(t_dls));