frzysk/42_minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: free value returned by readline

Browse source
This commit is contained in:
mcolonna 2024-06-25 15:30:03 +02:00
parent b2f6d4b058
commit 67bf858a49
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dev/TODO
View file

@ -10,7 +10,6 @@
- exit (with no options) - exit (with no options)
- fix - fix
- empty variables aren't freed - empty variables aren't freed
- need to free value returned by readline
- the builtins should get all arguments and check if they're good - the builtins should get all arguments and check if they're good
- command `echo "hello` with unclosed quotes - command `echo "hello` with unclosed quotes

7
src/parse_command.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */ /* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/24 13:47:40 by mcolonna #+# #+# */ /* Created: 2024/04/24 13:47:40 by mcolonna #+# #+# */
/* Updated: 2024/06/25 13:06:57 by mcolonna ### ########.fr */ /* Updated: 2024/06/25 15:28:41 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -57,7 +57,8 @@ static int heredoc(t_memclass mc, int *readfd, const char *eof)
{ {
const t_memclass mc_in = mem_subclass(fatal_error, mc); const t_memclass mc_in = mem_subclass(fatal_error, mc);
int outpipe[2]; int outpipe[2];
t_const_string line; char *line;
char *to_free;
const t_const_string eof_line = str_join(fatal_error, mc_in, eof, "\n"); const t_const_string eof_line = str_join(fatal_error, mc_in, eof, "\n");
if (pipe(outpipe) == -1) if (pipe(outpipe) == -1)
@ -66,12 +67,14 @@ static int heredoc(t_memclass mc, int *readfd, const char *eof)
while (true) while (true)
{ {
line = cool_readline("\e[38;5;33m( 'o')> \e[0m"); line = cool_readline("\e[38;5;33m( 'o')> \e[0m");
to_free = line;
if (!line) if (!line)
line = ""; line = "";
if (str_eq(line, eof) || str_eq(line, eof_line)) if (str_eq(line, eof) || str_eq(line, eof_line))
break ; break ;
print_str(err_remember, outpipe[1], line); print_str(err_remember, outpipe[1], line);
print_str(err_remember, outpipe[1], "\n"); print_str(err_remember, outpipe[1], "\n");
free(to_free);
if (err_get()) if (err_get())
return (minishell_error("errno"), errno); return (minishell_error("errno"), errno);
} }