fixes
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/01/27 11:25:25 by lderidde #+# #+# */
|
||||
/* Updated: 2025/02/11 14:20:44 by lderidde ### ########.fr */
|
||||
/* Updated: 2025/02/18 09:08:46 by lderidde ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -49,6 +49,7 @@ typedef struct s_msh
|
||||
t_ast_n *head;
|
||||
int here_fd;
|
||||
char *input;
|
||||
char *prev_input;
|
||||
int hist;
|
||||
char **env;
|
||||
} t_msh;
|
||||
|
||||
@@ -82,6 +82,7 @@ int exec(t_ast_n *node)
|
||||
if (execve(path, node->args, node->msh->env) == -1)
|
||||
{
|
||||
free_child(node->msh);
|
||||
ft_free(&path);
|
||||
perror("execve");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ void read_input(t_ast_n *node, int j)
|
||||
|
||||
check = ifhere_remove_quote(node, j);
|
||||
str = get_next_line(node->msh->here_fd, 0);
|
||||
while (str && ft_strncmp(str, node->files[j], ft_strlen(str) - 1) != 0)
|
||||
while (str && ft_strncmp(str, node->files[j], -1) != 0)
|
||||
{
|
||||
if (!check)
|
||||
expander_here(&str, node);
|
||||
|
||||
@@ -51,21 +51,24 @@ int expand_exit(t_ast_n *node, int j, int i)
|
||||
{
|
||||
int k;
|
||||
char *new;
|
||||
char *num;
|
||||
char *ret;
|
||||
int len;
|
||||
|
||||
k = -1;
|
||||
if (node->args[j][i + 1] && node->args[j][i + 1] == '?')
|
||||
{
|
||||
len = ft_strlen(ft_itoa(node->msh->ex_code));
|
||||
num = ft_itoa(node->msh->ex_code);
|
||||
len = ft_strlen(num);
|
||||
new = ft_calloc(ft_strlen(node->args[j]) + len + 1, 1);
|
||||
if (!new)
|
||||
return (0);
|
||||
ret = new;
|
||||
while (++k < i)
|
||||
*new++ = node->args[j][k];
|
||||
ft_strlcat(new, ft_itoa(node->msh->ex_code), -1);
|
||||
ft_strlcat(new, num, -1);
|
||||
ft_strlcat(new, &node->args[j][i + 2], -1);
|
||||
ft_free(&num);
|
||||
ft_free(&node->args[j]);
|
||||
node->args[j] = ret;
|
||||
return (1);
|
||||
|
||||
@@ -28,6 +28,8 @@ static void add_prevhistory(t_msh *msh)
|
||||
while (str)
|
||||
{
|
||||
tmp = ft_substr(str, 0, ft_strlen(str) - 1);
|
||||
ft_free(&msh->prev_input);
|
||||
msh->prev_input = ft_strdup(tmp);
|
||||
add_history(tmp);
|
||||
free(tmp);
|
||||
free(str);
|
||||
@@ -67,6 +69,7 @@ static void exit_manual(t_msh *msh)
|
||||
}
|
||||
else
|
||||
ret = msh->ex_code;
|
||||
ft_free(&msh->prev_input);
|
||||
free_msh(msh);
|
||||
ft_fprintf(2, "exit\n");
|
||||
exit(ret);
|
||||
|
||||
@@ -39,6 +39,7 @@ t_msh *init_msh(char **envp)
|
||||
msh->ex_code = 0;
|
||||
msh->here_fd = -1;
|
||||
msh->input = NULL;
|
||||
msh->prev_input = NULL;
|
||||
if (!msh)
|
||||
return (NULL);
|
||||
if (!envp[0])
|
||||
@@ -56,5 +57,6 @@ void free_msh(t_msh *msh)
|
||||
if (msh->here_fd != -1)
|
||||
close(msh->here_fd);
|
||||
free(msh->input);
|
||||
ft_free(&msh->prev_input);
|
||||
free(msh);
|
||||
}
|
||||
|
||||
@@ -16,11 +16,18 @@
|
||||
static void handle_input(char *in, t_msh *msh)
|
||||
{
|
||||
if (ft_strlen(in) > 0 && !is_only_space(in))
|
||||
{
|
||||
if (ft_strlen(in) != ft_strlen(msh->prev_input) ||
|
||||
ft_strncmp(in, msh->prev_input, -1) != 0)
|
||||
{
|
||||
add_history(in);
|
||||
ft_fprintf(msh->hist, "%s\n", in);
|
||||
}
|
||||
}
|
||||
ft_free(&msh->prev_input);
|
||||
if (in)
|
||||
msh->prev_input = ft_strdup(in);
|
||||
}
|
||||
|
||||
char *get_pwd(void)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user