diff --git a/include/minishell.h b/include/minishell.h index 6275863..871162b 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -31,9 +31,6 @@ # include "execution.h" char set_env(char **env, const char *name, char *content); -char *get_hostname(void); -char *get_prompt(void); -char *get_pwd(void); bool is_str(char *src, char *dst); #endif diff --git a/include/prompt.h b/include/prompt.h index 3452ad4..57fabf9 100644 --- a/include/prompt.h +++ b/include/prompt.h @@ -6,13 +6,15 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/19 13:48:05 by adjoly #+# #+# */ -/* Updated: 2024/05/19 14:20:45 by adjoly ### ########.fr */ +/* Updated: 2024/05/27 18:59:56 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef PROMPT_H # define PROMPT_H +# include "env.h" + /** * @brief return the short hostname from /etc/hostname * or return nixos if file doesn't exist or is empty @@ -27,13 +29,13 @@ char *get_hostname(void); * * @return (char *) the pwd */ -char *get_pwd(void); +char *get_pwd(t_env env); /** * @brief return the full prompt * * @prompt (char *) the prompt */ -char *get_prompt(void); +char *get_prompt(t_env env); #endif diff --git a/src/prompt/get_prompt.c b/src/prompt/get_prompt.c index f892077..e43cf57 100644 --- a/src/prompt/get_prompt.c +++ b/src/prompt/get_prompt.c @@ -6,18 +6,19 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/30 13:25:42 by adjoly #+# #+# */ -/* Updated: 2024/05/21 21:02:18 by adjoly ### ########.fr */ +/* Updated: 2024/05/27 19:01:17 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" #include "prompt.h" +#include "env.h" -char *get_prompt(void) +char *get_prompt(t_env env) { char *prompt; - prompt = getenv("USER"); + prompt = env_get_value("USER", &env);//getenv("USER"); if (!prompt) prompt = ft_strdup("nixos"); prompt = ft_strjoin(prompt, "@"); @@ -29,7 +30,7 @@ char *get_prompt(void) prompt = ft_strjoin_free_s1(prompt, ":"); if (!prompt) return (NULL); - prompt = ft_strjoin_free(prompt, get_pwd()); + prompt = ft_strjoin_free(prompt, get_pwd(env)); if (!prompt) return (NULL); prompt = ft_strjoin_free_s1(prompt, "$ "); diff --git a/src/prompt/get_pwd.c b/src/prompt/get_pwd.c index 7a819fc..189b06e 100644 --- a/src/prompt/get_pwd.c +++ b/src/prompt/get_pwd.c @@ -6,22 +6,23 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/02 14:42:00 by adjoly #+# #+# */ -/* Updated: 2024/05/27 12:52:07 by adjoly ### ########.fr */ +/* Updated: 2024/05/27 19:00:47 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include #include "libft.h" +#include "env.h" -char *get_pwd(void) +char *get_pwd(t_env env) { char *pwd; char *home; - pwd = getenv("PWD"); + pwd = env_get_value("PWD", &env);//getenv("PWD"); if (!pwd) return (NULL); - home = getenv("HOME"); + home = env_get_value("HOME", &env);//getenv("HOME"); if (!pwd) return (NULL); if (!ft_strncmp(pwd, home, ft_strlen(home)))