diff --git a/flake.nix b/flake.nix index 3069590a..351bb4e9 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,21 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.generic_c.url = "github:Maix0/generic_c"; - outputs = { self, nixpkgs, flake-utils, generic_c }: - flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; in - { + outputs = { + self, + nixpkgs, + flake-utils, + generic_c, + }: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { devShell = pkgs.mkShell { packages = with pkgs; [clang valgrind gnumake readline.out readline.dev generic_c.packages.${system}.default]; + shellHook = '' + alias 'valgrind'='valgrind --supressions=${./valgrind_readline_leaks_ignore.txt}'; + ''; }; } ); diff --git a/sources/ft_exit.c b/sources/ft_exit.c index 19a0d8ce..ace74c4b 100644 --- a/sources/ft_exit.c +++ b/sources/ft_exit.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/29 11:35:51 by rparodi #+# #+# */ -/* Updated: 2024/04/30 16:16:55 by maiboyer ### ########.fr */ +/* Updated: 2024/04/30 22:03:14 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,6 +37,8 @@ void ft_free_utils(t_utils *s) (void)(s); if (s->str_input) free(s->str_input); + if (s->path) + ft_free_strs(s->path); ts_parser_delete(s->parser.parser); } diff --git a/sources/main.c b/sources/main.c index 37f6ddae..227ce0f2 100644 --- a/sources/main.c +++ b/sources/main.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */ -/* Updated: 2024/04/30 21:32:13 by maiboyer ### ########.fr */ +/* Updated: 2024/04/30 22:05:49 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -122,14 +122,15 @@ void free_myparser(t_myparser self) ts_parser_delete(self.parser); } -t_i32 main(t_i32 argc, t_str argv[], t_str arge[]) +t_i32 main(t_i32 argc, t_str argv[], t_str envp[]) { t_utils utils; (void)argc; (void)argv; + (void)envp; utils.parser = create_myparser(); - ft_find_path(arge, &utils); + //ft_find_path(arge, &utils); utils.name_shell = "42sh > "; ft_take_args(&utils); }