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

plus de segfault apres la racine

Browse Source
This commit is contained in:
PrStein 2022-04-07 23:23:14 +02:00
parent b771550397
commit 1e8fe6e5a7
2 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
srcs/built_in/cd.c
View File

@ -55,12 +55,14 @@ 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);
printf("-------------\n"); // printf ("-->%s\n", r);
printf("%s\n", cmd->env[find_pwd(cmd)]);
printf("%d\n", find_pwd(cmd));
// free(cmd->env[find_pwd(cmd)]); // free(cmd->env[find_pwd(cmd)]);
cmd->env[find_pwd(cmd)] = r; if (r)
// cmd->env[find_pwd(cmd)] = ft_strdup(r); cmd->env[find_pwd(cmd)] = ft_strdup(r);
else
cmd->env[find_pwd(cmd)] = ft_strdup("PWD=/");
if (r)
free(r); free(r);
} }
@ -70,28 +72,11 @@ void add_one(t_s_cmd *cmd, char *str)
r = ft_strjoin(cmd->env[find_pwd(cmd)], "/"); r = ft_strjoin(cmd->env[find_pwd(cmd)], "/");
r = ft_strjoin(r, str); r = ft_strjoin(r, str);
// free(cmd->env[find_pwd(cmd)]); //free(cmd->env[find_pwd(cmd)]);
cmd->env[find_pwd(cmd)] = ft_strdup(r); cmd->env[find_pwd(cmd)] = ft_strdup(r);
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;
@ -99,26 +84,27 @@ 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 ;
// printf("--->%s\n", cmd->env[i]); 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] && tab_len(tab) > 4)
{ {
// printf("%d -> %s\n", tab_len(tab), tab[i]);
// if (tab_len(tab) < 2)
// break ;
if (ft_strcmp(tab[i], "..") == 0) if (ft_strcmp(tab[i], "..") == 0)
del_one(cmd); del_one(cmd);
else else
add_one(cmd, tab[i]); add_one(cmd, tab[i]);
i++; i++;
} }
} }
@ -130,9 +116,7 @@ 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]));
@ -149,10 +133,10 @@ void open_directory(t_s_cmd *cmd)
j = tab_len(str); j = tab_len(str);
if (!cmd->args[1]) if (!cmd->args[1])
{ {
reboot_pwd(cmd, j); // reboot_pwd(cmd, j);
// while (j-- > 3) while (j-- > 3)
// if (chdir("..") == 0) if (chdir("..") == 0)
// del_one(cmd); del_one(cmd);
} }
if (tab_len(cmd->args) == 2) if (tab_len(cmd->args) == 2)
{ {

9
srcs/built_in/init_builtin.c
View File

@ -113,9 +113,14 @@ int find_pwd(t_s_cmd *cmd)
int i; int i;
i = 0; i = 0;
while (cmd->env[i] && ft_strncmp(cmd->env[i], "PWD=", 4) != 0) while (cmd->env[i])
i++; {
if (!ft_strncmp(cmd->env[i], "PWD=", 4))
return (i); return (i);
i++;
}
return (0);
// printf("%s\n", cmd->env[i]);
} }
void init_s_cmd(t_s_cmd *cmd, char **env) void init_s_cmd(t_s_cmd *cmd, char **env)