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

Merge branch 'sadjigui'

Browse Source
This commit is contained in:
kinou-p 2022-04-09 21:29:31 +02:00
commit d4e928144b
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
srcs/built_in/cd.c
View File

@ -154,23 +154,24 @@ void open_directory(t_s_cmd *cmd)
if (!cmd->args[1])
{
// reboot_pwd(cmd, j);
if (tab_len(str) > 3)
{
while (j-- > 3)
if (chdir("..") == 0)
del_one(cmd);
}
else
{
char *p = ft_substr(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "HOME=")], 6, ft_strlen(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "HOME=")]));
// if (tab_len(str) > 3)
// {
// while (j-- > 3)
// if (chdir("..") == 0)
// del_one(cmd);
// }
// else
// {
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=")]));
printf("%s\n", p);
if (chdir(p) == 0)
{
cmd->big_cmd->env[find_it(cmd->big_cmd->env, "OLDPWD=")] = ft_strjoin("OLD", cmd->big_cmd->env[find_pwd(cmd)]);
cmd->big_cmd->env[find_pwd(cmd)] = ft_strjoin("PWD=/", p);
cmd->big_cmd->env[find_pwd(cmd)] = ft_strjoin("PWD=", p);
}
free(p);
// printf("%s\n", p);
}
// }
}
if (tab_len(cmd->args) == 2)
{
@ -199,4 +200,4 @@ void ft_pwd(t_s_cmd *cmd)
j++;
}
write(1, "\n", 1);
}
}

6
srcs/built_in/export.c
View File

@ -78,8 +78,10 @@ void ft_export_variable(t_s_cmd *cmd, char *variable)
{
if (ft_strncmp(unset, cmd->big_cmd->env[i], ft_strlen(unset)) == 0)
{
find_variable(unset, cmd);
break ;
free(cmd->big_cmd->env[i]);
cmd->big_cmd->env[i] = dest;
// find_variable(unset, cmd);
return ;
}
i++;
}

2
srcs/built_in/init_builtin.c
View File

@ -131,4 +131,4 @@ int tab_len(char **tab)
while (tab[i])
i++;
return (i);
}
}

2
srcs/built_in/unset.c
View File

@ -28,7 +28,7 @@ void unset_variable(t_s_cmd *cmd, int i)
{
// if (a == i)
// a++;
printf("%s\n", cmd->big_cmd->env[a]);
// printf("%s\n", cmd->big_cmd->env[a]);
if (a != i)
{
tmp[b] = ft_substr(cmd->big_cmd->env[a], 0, ft_strlen(cmd->big_cmd->env[a]));