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

segfault cd after unset PWD after changed fint_it

Browse Source
This commit is contained in:
PrStein 2022-04-12 01:14:10 +02:00
parent 5bdde9b3da
commit c2f08b31e3
4 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
srcs/built_in/cd.c
View File

@ -111,6 +111,8 @@ void change_path(t_s_cmd *cmd)
i++; i++;
} }
if (tab)
free_double(tab);
} }
void reboot_pwd(t_s_cmd *cmd, int i) void reboot_pwd(t_s_cmd *cmd, int i)
@ -145,7 +147,7 @@ void open_directory(t_s_cmd *cmd)
char **str; char **str;
int j; int j;
if (find_it(cmd->big_cmd->env, "PWD")) if (find_it(cmd->big_cmd->env, "PWD") != -1)
{ {
str = ft_split(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")], '/'); str = ft_split(cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")], '/');
j = double_size(str); j = double_size(str);
@ -167,9 +169,9 @@ void open_directory(t_s_cmd *cmd)
return ; return ;
} }
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")])); 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); // printf("%s\n", p);
if (chdir(p) == 0) if (chdir(p) == 0)
if (find_it(cmd->big_cmd->env, "PWD")) 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, "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); cmd->big_cmd->env[find_it(cmd->big_cmd->env, "PWD")] = ft_strjoin("PWD=", p);
@ -182,8 +184,11 @@ void open_directory(t_s_cmd *cmd)
reboot_pwd(cmd, j); reboot_pwd(cmd, j);
if (chdir(cmd->args[1]) == 0) if (chdir(cmd->args[1]) == 0)
{ {
if (find_it(cmd->big_cmd->env, "PWD")) if (find_it(cmd->big_cmd->env, "PWD") != -1)
{
change_path(cmd); change_path(cmd);
}
} }
else else
{ {

51
srcs/built_in/export.c
View File

@ -29,35 +29,25 @@ int check_variable(char *variable)
return(0); return(0);
} }
// char *define_double_quotes(char *value) // char *check_value(char *value)
// { // {
// int i; // int i;
// char *dest; // char *dest;
//
// i = find_len(value, 0, '=') + 2; // i = find_len(value, 0, '=') + 1;
// if (value[i] == '"') // if (value[i] == '"')
// dest = ft_substr() // {
// printf("wait\n");
// dest = ft_strdup(" ");
// // dest = define_double_quotes(value);
// } // }
// else{
// dest = ft_substr(value, 0, find_len(value, 0, ' '));
// // printf("brrrrrrr------\n");
char *check_value(char *value) // }
{ // return (dest);
int i; // }
char *dest;
i = find_len(value, 0, '=') + 1;
if (value[i] == '"')
{
printf("wait\n");
dest = ft_strdup(" ");
// dest = define_double_quotes(value);
}
else{
dest = ft_substr(value, 0, find_len(value, 0, ' '));
// printf("brrrrrrr------\n");
}
return (dest);
}
void ft_export_variable(t_s_cmd *cmd, char *variable) void ft_export_variable(t_s_cmd *cmd, char *variable)
{ {
@ -74,16 +64,15 @@ void ft_export_variable(t_s_cmd *cmd, char *variable)
// 1 // 1
return ; return ;
} }
dest = check_value(variable); // dest = check_value(variable);
dest = ft_strdup(variable);
unset = ft_substr(dest, 0, find_len(dest, 0, '=')); unset = ft_substr(dest, 0, find_len(dest, 0, '='));
printf("%s\n", unset);
while (cmd->big_cmd->env[i] != NULL) while (cmd->big_cmd->env[i] != NULL)
{ {
if (ft_strncmp(unset, cmd->big_cmd->env[i], ft_strlen(unset)) == 0) if (ft_strncmp(unset, cmd->big_cmd->env[i], ft_strlen(unset)) == 0)
{ {
free(cmd->big_cmd->env[i]); free(cmd->big_cmd->env[i]);
cmd->big_cmd->env[i] = dest; cmd->big_cmd->env[i] = dest;
// find_variable(unset, cmd);
return ; return ;
} }
i++; i++;
@ -91,14 +80,8 @@ void ft_export_variable(t_s_cmd *cmd, char *variable)
register_env(cmd, dest); register_env(cmd, dest);
if (dest) if (dest)
free(dest); free(dest);
// if (unset) if (unset)
// free(unset); free(unset);
// if (check_variable(v_v[0]) == 1)
// {
// tmp = ft_strdup(v_v[1]);
// free(v_v[1]);
// v_v[1] = check_value(tmp);
// }
} }
void ft_export(t_s_cmd *cmd) void ft_export(t_s_cmd *cmd)

16
srcs/built_in/init_builtin.c
View File

@ -108,15 +108,15 @@ void ft_env(t_s_cmd *cmd, char **env)
cmd->big_cmd->env[i] = NULL; cmd->big_cmd->env[i] = NULL;
} }
int find_pwd(t_s_cmd *cmd) // int find_pwd(t_s_cmd *cmd)
{ // {
int i; // int i;
i = 0; // i = 0;
while (cmd->big_cmd->env[i] && ft_strncmp(cmd->big_cmd->env[i], "PWD=", 4) != 0) // while (cmd->big_cmd->env[i] && ft_strncmp(cmd->big_cmd->env[i], "PWD=", 4) != 0)
i++; // i++;
return (i); // return (i);
} // }
void init_s_cmd(t_s_cmd *cmd, char **env) void init_s_cmd(t_s_cmd *cmd, char **env)
{ {

1
srcs/built_in/unset.c
View File

@ -69,7 +69,6 @@ void find_variable(char *variable, t_s_cmd *cmd)
// j++; // j++;
// while (cmd->big_cmd->env[i] && !(ft_strncmp(cmd->big_cmd->env[i], str, j) == 0)) // while (cmd->big_cmd->env[i] && !(ft_strncmp(cmd->big_cmd->env[i], str, j) == 0))
// i++; // i++;
if (i == tab_len(cmd->big_cmd->env)) if (i == tab_len(cmd->big_cmd->env))
return ; return ;
unset_variable(cmd, i); unset_variable(cmd, i);