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

init_prompt() correct error return

Browse Source
This commit is contained in:
LuckyLaszlo
2021-12-08 04:02:00 +01:00
parent 312c90539b
commit 8125e43065
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
srcs/init.c
View File

@@ -50,7 +50,7 @@ char **retrieve_path(void)
return (path_split); return (path_split);
} }
static char *init_prompt_base(void) // WIP, error return TODO static char *init_prompt_base(void)
{ {
char *prompt_base; char *prompt_base;
char *tmp; char *tmp;
@@ -61,21 +61,33 @@ static char *init_prompt_base(void) // WIP, error return TODO
if (!tmp) if (!tmp)
tmp = U_DEFAULT_USER; tmp = U_DEFAULT_USER;
prompt_base = ft_strjoin(TERM_LIGHT_GREEN, tmp); prompt_base = ft_strjoin(TERM_LIGHT_GREEN, tmp);
if (!prompt_base)
return (NULL);
prompt_base = ft_strjoinfree_s1(prompt_base, "@"); prompt_base = ft_strjoinfree_s1(prompt_base, "@");
if (!prompt_base)
return (NULL);
tmp = getenv("NAME"); tmp = getenv("NAME");
if (!tmp) if (!tmp)
tmp = U_DEFAULT_NAME; tmp = U_DEFAULT_NAME;
prompt_base = ft_strjoinfree_s1(prompt_base, tmp); prompt_base = ft_strjoinfree_s1(prompt_base, tmp);
if (!prompt_base)
return (NULL);
prompt_base = ft_strjoinfree_s1(prompt_base, TERM_RESET":"TERM_LIGHT_BLUE); prompt_base = ft_strjoinfree_s1(prompt_base, TERM_RESET":"TERM_LIGHT_BLUE);
if (!prompt_base)
return (NULL);
return (prompt_base); return (prompt_base);
} }
char *init_prompt(char *prompt_base) // WIP, error return TODO char *init_prompt(char *prompt_base)
{ {
char *prompt; char *prompt;
prompt = ft_strjoinfree_s2(prompt_base, getcwd(NULL, 0)); prompt = ft_strjoinfree_s2(prompt_base, getcwd(NULL, 0));
if (!prompt)
return (NULL);
prompt = ft_strjoinfree_s1(prompt, TERM_RESET U_PROMPT_END); prompt = ft_strjoinfree_s1(prompt, TERM_RESET U_PROMPT_END);
if (!prompt)
return (NULL);
return (prompt); return (prompt);
} }