42/42_INT_07_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

searching solution for invalid free in readline.

Browse Source
This commit is contained in:
LuckyLaszlo
2021-11-29 12:15:17 +01:00
parent 3baf91afb3
commit 5b3e566b25
4 changed files with 33 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srcs/init.c
View File

@@ -6,26 +6,25 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/08 09:22:12 by lperrey #+# #+# */
/* Updated: 2021/11/26 21:51:40 by lperrey ### ########.fr */
/* Updated: 2021/11/27 23:50:06 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static char *init_prompt_base(void);
// pas static si utilisee par cd
//static char *init_prompt(char *prompt_base);
char *init_prompt(char *prompt_base);
//int init(t_all *c, char *envp[])
int init(t_all *c)
{
ft_bzero(c, sizeof (*c));
environ = ft_dup_2d_arr(environ, (t_dup_f)ft_strdup);
g_ori_environ = environ; // Wip free test
//environ = ft_resize_2d_arr(environ, 0); // WIP free test
if (!environ)
return (ft_reti_perror(0, "ft_dup_2d_char_arr(environ) error"));
return (ft_reti_perror(0, "ft_dup_2d_arr(environ) error"));
//environ = NULL; // WIP free test
//print_matrix(c->envp, "\n --- \n"); // TEST WIP
c->path = retrieve_path(environ); // No return check. Its intended. PATH is optional
c->path = retrieve_path(); // No return check. Its intended. PATH is optional
c->prompt_base = init_prompt_base();
if (!c->prompt_base)
return (ft_reti_perror(0, "init_prompt_base() error"));
@@ -37,14 +36,11 @@ int init(t_all *c)
}
// done : TODO : Un appel à builtin_export() modifiant $PATH doit aussi entrainer un appel à "c->path = retrieve_path()"
// changer le prototype si utilise pas envp
char **retrieve_path(char *envp[])
char **retrieve_path(void)
{
char *path;
char **path_split;
(void)envp;
//path = search_env_var(envp, "PATH"); // A reprendre du projet pipex si besoin de remplacer getenv()
path = getenv("PATH");
if (!path)
return (ft_retp_print(NULL, "minishell: Warning, $PATH not set\n", 2));
@@ -74,7 +70,6 @@ static char *init_prompt_base(void) // WIP, error return TODO
return (prompt_base);
}
//static char *init_prompt(char *prompt_base) // WIP, error return TODO
char *init_prompt(char *prompt_base) // WIP, error return TODO
{
char *prompt;