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

modif cd

Browse Source
This commit is contained in:
PrStein 2022-04-07 19:17:13 +02:00
parent 01d80ba1cd
commit ad18ecdeac
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/minishell.h
View File

@ -94,6 +94,8 @@ int find_pwd(t_s_cmd *cmd);
void init_s_cmd(t_s_cmd *cmd, char **env); void init_s_cmd(t_s_cmd *cmd, char **env);
int tab_len(char **tab); int tab_len(char **tab);
int find_len(char *input, int i, char c); int find_len(char *input, int i, char c);
int find_it(t_s_cmd *cmd, char *str);
//real builtin //real builtin
void ft_env(t_s_cmd *cmd, char **env); void ft_env(t_s_cmd *cmd, char **env);
void ft_exit(t_s_cmd *cmd); void ft_exit(t_s_cmd *cmd);

51
srcs/built_in/cd.c
View File

@ -55,8 +55,12 @@ void del_one(t_s_cmd *cmd)
while (cmd->env[find_pwd(cmd)][i] != '/') while (cmd->env[find_pwd(cmd)][i] != '/')
i--; i--;
r = ft_substr(cmd->env[find_pwd(cmd)], 0, i); r = ft_substr(cmd->env[find_pwd(cmd)], 0, i);
free(cmd->env[find_pwd(cmd)]); printf("-------------\n");
cmd->env[find_pwd(cmd)] = ft_strdup(r); printf("%s\n", cmd->env[find_pwd(cmd)]);
printf("%d\n", find_pwd(cmd));
// free(cmd->env[find_pwd(cmd)]);
cmd->env[find_pwd(cmd)] = r;
// cmd->env[find_pwd(cmd)] = ft_strdup(r);
free(r); free(r);
} }
@ -71,6 +75,23 @@ void add_one(t_s_cmd *cmd, char *str)
free(r); free(r);
} }
int find_it(t_s_cmd *cmd, char *str)
{
int i;
i = 0;
while (cmd->env[i])
{
if (ft_strncmp(cmd->env[i], str, ft_strlen(str)) == 0)
{
printf("--->%s\n", cmd->env[i]);
return (1);
}
i++;
}
return (0);
}
void change_path(t_s_cmd *cmd) void change_path(t_s_cmd *cmd)
{ {
char **tab; char **tab;
@ -78,15 +99,18 @@ void change_path(t_s_cmd *cmd)
i = 0; i = 0;
tab = ft_split(cmd->args[1], '/'); tab = ft_split(cmd->args[1], '/');
while (cmd->env[i]) // while (cmd->env[i])
{ // {
if (ft_strncmp(cmd->env[i], "OLDPWD=", 7) == 0) // if (ft_strncmp(cmd->env[i], "OLDPWD=", 7) == 0)
break ; // {
i++; // printf("--->%s\n", cmd->env[i]);
} // break ;
printf("%d\n", i); // }
// i++;
// }
/*if (cmd->env[i]) /*if (cmd->env[i])
free(cmd->env[i]);*/ free(cmd->env[i]);*/
if (find_it(cmd, "OLDPWD") == 1)
cmd->env[i] = ft_strjoin("OLD", cmd->env[find_pwd(cmd)]); cmd->env[i] = ft_strjoin("OLD", cmd->env[find_pwd(cmd)]);
i = 0; i = 0;
while (tab[i]) while (tab[i])
@ -106,7 +130,9 @@ void reboot_pwd(t_s_cmd *cmd, int i)
while (i > 3) while (i > 3)
{ {
if (chdir("..") == 0) if (chdir("..") == 0)
{
del_one(cmd); del_one(cmd);
}
i--; i--;
} }
str = ft_substr(cmd->args[1], 2, ft_strlen(cmd->args[1])); str = ft_substr(cmd->args[1], 2, ft_strlen(cmd->args[1]));
@ -123,9 +149,10 @@ void open_directory(t_s_cmd *cmd)
j = tab_len(str); j = tab_len(str);
if (!cmd->args[1]) if (!cmd->args[1])
{ {
while (j-- > 3) reboot_pwd(cmd, j);
if (chdir("..") == 0) // while (j-- > 3)
del_one(cmd); // if (chdir("..") == 0)
// del_one(cmd);
} }
if (tab_len(cmd->args) == 2) if (tab_len(cmd->args) == 2)
{ {