Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norme cd

Browse Source
This commit is contained in:
PrStein 2022-04-14 16:29:00 +02:00
parent 3b8d055260
commit 42a77e1986
3 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/minishell.h
View File

@ -110,6 +110,9 @@ void lone_export(t_s_cmd *cmd);
int find_variable(char *variable, t_s_cmd *cmd); int find_variable(char *variable, t_s_cmd *cmd);
int find_it(char **str, char *s); int find_it(char **str, char *s);
int check_variable(char *variable); int check_variable(char *variable);
int cd_error_simple(char *str, int i);
int msg_error(char *cmd, char *entry, char *error, int i);
int size_path(char **str);
//real builtin //real builtin
void print_env(t_cmd *cmd); void print_env(t_cmd *cmd);

53
srcs/built_in/cd.c
View File

@ -112,38 +112,52 @@ void reboot_pwd(t_s_cmd *cmd, int i)
free(str); free(str);
} }
void check_home(t_s_cmd *cmd, char *p)
{
int home;
int len_home;
int old_pwd;
int pwd;
home = find_it(cmd->big_cmd->env, "HOME");
len_home = ft_strlen(cmd->big_cmd->env[home]);
old_pwd = find_it(cmd->big_cmd->env, "OLDPWD");
pwd = find_it(cmd->big_cmd->env, "PWD");
p = ft_substr(cmd->big_cmd->env[home], 5, ft_strlen(cmd->big_cmd->env[len_home]));
if (chdir(p) == 0)
if (find_it(cmd->big_cmd->env, "PWD") != -1)
{
cmd->big_cmd->env[old_pwd] = ft_strjoin("OLD", cmd->big_cmd->env[pwd]);
cmd->big_cmd->env[pwd] = ft_strjoin("PWD=", p);
}
free(p);
}
void open_directory(t_s_cmd *cmd) void open_directory(t_s_cmd *cmd)
{ {
char **str; char **str;
char *p;
int j; int j;
p = NULL;
if (find_it(cmd->big_cmd->env, "PWD") != -1) if (find_it(cmd->big_cmd->env, "PWD") != -1)
{ j = size_path(cmd->big_cmd->env);
str = ft_split(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")], '/');
j = double_size(str);
free_double(str);
}
if (cmd->nb_args > 2) if (cmd->nb_args > 2)
{ {
printf("Minishell: cd: too many arguments\n"); ft_putstr_fd("Minishell: cd: too many arguments\n", 2);
// return (1); return ;
// return (cd_erreur("Minishell: cd: too many arguments", 1));
} }
if (!cmd->args[1]) if (!cmd->args[1])
{ {
if (find_it(cmd->big_cmd->env, "HOME") < 0) if (find_it(cmd->big_cmd->env, "HOME") < 0)
{ {
printf("Minishell: cd: HOME not set\n"); ft_putstr_fd("Minishell: cd: HOME not set", 2);
cmd->big_cmd->err_var = 1; return ;
// return (1); // return (cd_erreur("Minishell: cd: HOME not set", 1));
} }
char *p = ft_substr(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "HOME")], 5, ft_strlen(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "HOME")])); check_home(cmd, p);
if (chdir(p) == 0)
if (find_it(cmd->big_cmd->env, "PWD") != -1)
{
cmd->big_cmd->env[find_it(cmd->big_cmd->env, "OLDPWD")] = ft_strjoin("OLD", cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")]);
cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")] = ft_strjoin("PWD=", p);
}
free(p);
} }
if (tab_len(cmd->args) == 2) if (tab_len(cmd->args) == 2)
{ {
@ -156,10 +170,11 @@ void open_directory(t_s_cmd *cmd)
} }
else else
{ {
// return (msg_error("Minishell: cd: ", cmd->args[1], ": No such directory\n", 1));
ft_putstr_fd("Minishell: cd: ", 2); ft_putstr_fd("Minishell: cd: ", 2);
ft_putstr_fd(cmd->args[1], 2); ft_putstr_fd(cmd->args[1], 2);
ft_putstr_fd(": No such directory\n", 2); ft_putstr_fd(": No such directory\n", 2);
// return (1); return ;//(1);
} }
} }
} }

28
srcs/built_in/utils_builtin.c
View File

@ -34,3 +34,31 @@ int find_it(char **str, char *s)
return (-1); return (-1);
return (i); return (i);
} }
int cd_error_simple(char *str, int i)
{
ft_putstr_fd(str, 2);
ft_putstr_fd("\n", 2);
return (i);
}
int msg_error(char *cmd, char *entry, char *error, int i)
{
ft_putstr_fd(cmd, 2);
ft_putstr_fd(entry, 2);
ft_putstr_fd(error, 2);
return (i);
}
int size_path(char **str)
{
int i;
int j;
char **s;
i = find_it(str, "PWD");
s = ft_split(str[i], '/');
j = double_size(s);
free_double(s);
return (j);
}