diff --git a/readline.supp b/readline.supp new file mode 100644 index 0000000..0689766 --- /dev/null +++ b/readline.supp @@ -0,0 +1,53 @@ +{ + readline + Memcheck:Leak + match-leak-kinds: reachable + ... + fun:readline + ... +} +{ + readline-history + Memcheck:Leak + ... + fun:xmalloc + fun:add_history + ... +} +{ + + Memcheck:Leak + match-leak-kinds: reachable + ... + obj:/usr/bin/toe + fun:(below main) +} +{ + + Memcheck:Leak + ... + obj:/usr/bin/locale + fun:(below main) +} +{ + + Memcheck:Leak + match-leak-kinds: reachable + ... + obj:/usr/bin/clear + fun:(below main) +} +{ + + Memcheck:Leak + ... + obj:/usr/bin/cat + fun:(below main) +} +{ + + Memcheck:Leak + ... + obj:/usr/bin/ls + fun:(below main) +} diff --git a/src/main.c b/src/main.c index 1251a54..5b32f9b 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: mmoussou +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/30 12:52:22 by adjoly #+# #+# */ -/* Updated: 2024/07/16 14:24:14 by adjoly ### ########.fr */ +/* Updated: 2024/07/18 17:04:06 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,13 +42,3 @@ bool check_pipe(char *readline) } return (false); } - -bool check_space(char *rl) -{ - while (*rl && *rl == ' ') - rl++; - if (!*rl) - return (send_error_parsing(ERROR_NO_FILE)); - else - return (false); -} diff --git a/src/parsing/check_error/run_checks.c b/src/parsing/check_error/run_checks.c index 376b457..5af898c 100644 --- a/src/parsing/check_error/run_checks.c +++ b/src/parsing/check_error/run_checks.c @@ -6,7 +6,7 @@ /* By: mmoussou +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/20 21:05:04 by adjoly #+# #+# */ -/* Updated: 2024/07/18 14:08:29 by adjoly ### ########.fr */ +/* Updated: 2024/07/18 17:00:51 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/prompt/get_pwd.c b/src/prompt/get_pwd.c index 381ab07..59a45ed 100644 --- a/src/prompt/get_pwd.c +++ b/src/prompt/get_pwd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/02 14:42:00 by adjoly #+# #+# */ -/* Updated: 2024/07/09 14:36:05 by adjoly ### ########.fr */ +/* Updated: 2024/07/18 16:57:47 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,18 +14,10 @@ #include "libft.h" #include "env.h" -char *get_pwd(t_env *env) +char *_format_pwd(char *pwd, char *home) { - char *pwd; - char *home; char *tmp; - pwd = env_get_value("PWD", env); - if (!pwd) - return (NULL); - home = env_get_value("HOME", env); - if (!home) - return (NULL); if (!ft_strncmp(pwd, home, ft_strlen(home) - 1)) { tmp = pwd; @@ -40,3 +32,20 @@ char *get_pwd(t_env *env) free(home); return (pwd); } + +char *get_pwd(t_env *env) +{ + char *pwd; + char *home; + + pwd = env_get_value("PWD", env); + if (!pwd) + return (NULL); + home = env_get_value("HOME", env); + if (!home) + { + free(pwd); + return (NULL); + } + return (_format_pwd(pwd, home)); +}