tvdu29/minishell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added put_error_cd2 in put_error_cd.c

Browse Source
This commit is contained in:
Tanguy Maze 2020-01-30 11:03:30 +01:00
parent de2a6e77d7
commit cd72d29c63
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/minishell.h
View File

@ -37,5 +37,6 @@ int exec_cmd(char **argv, t_env **env);
void *ft_strdel_null(char **s); void *ft_strdel_null(char **s);
void *put_error_cd(char *file, char *msg); void *put_error_cd(char *file, char *msg);
int put_error_cd2(char *file, char *msg);
#endif #endif

18
srcs/cmd_cd.c
View File

@ -12,24 +12,6 @@
#include "minishell.h" #include "minishell.h"
void *put_error_cd(char *file, char *msg)
{
ft_putstr("cd: ");
ft_putstr(file);
ft_putstr(": ");
ft_putendl(msg);
return (NULL);
}
int put_error_cd2(char *file, char *msg)
{
ft_putstr("cd: ");
ft_putstr(file);
ft_putstr(": ");
ft_putendl(msg);
return (1);
}
char *check_path_slash_cd(char *exec) char *check_path_slash_cd(char *exec)
{ {
int i; int i;

6
srcs/ms_ext.c
View File

@ -104,6 +104,12 @@ char **res_ext(char **av, t_env *env)
else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env)) else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL) != NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
ft_strreplace(&av[i[0]], ret, &i[1], tmp); ft_strreplace(&av[i[0]], ret, &i[1], tmp);
else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
== NULL)
{
ft_printf("Entry %s not found\n", "HOME");
return (NULL);
}
else if (av[i[0]][i[1]] == '$' else if (av[i[0]][i[1]] == '$'
&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL) && resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
return (NULL); return (NULL);

9
srcs/put_error_cd.c
View File

@ -20,3 +20,12 @@ void *put_error_cd(char *file, char *msg)
ft_putendl(msg); ft_putendl(msg);
return (NULL); return (NULL);
} }
int put_error_cd2(char *file, char *msg)
{
ft_putstr("cd: ");
ft_putstr(file);
ft_putstr(": ");
ft_putendl(msg);
return (1);
}