This commit is contained in:
Loic Deridder
2025-02-18 10:01:55 +01:00
parent 84d6079a44
commit 00d2420d9f
7 changed files with 23 additions and 6 deletions

View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */ /* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/27 11:25:25 by lderidde #+# #+# */ /* 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; t_ast_n *head;
int here_fd; int here_fd;
char *input; char *input;
char *prev_input;
int hist; int hist;
char **env; char **env;
} t_msh; } t_msh;

View File

@@ -82,6 +82,7 @@ int exec(t_ast_n *node)
if (execve(path, node->args, node->msh->env) == -1) if (execve(path, node->args, node->msh->env) == -1)
{ {
free_child(node->msh); free_child(node->msh);
ft_free(&path);
perror("execve"); perror("execve");
exit(1); exit(1);
} }

View File

@@ -96,7 +96,7 @@ void read_input(t_ast_n *node, int j)
check = ifhere_remove_quote(node, j); check = ifhere_remove_quote(node, j);
str = get_next_line(node->msh->here_fd, 0); 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) if (!check)
expander_here(&str, node); expander_here(&str, node);

View File

@@ -51,21 +51,24 @@ int expand_exit(t_ast_n *node, int j, int i)
{ {
int k; int k;
char *new; char *new;
char *num;
char *ret; char *ret;
int len; int len;
k = -1; k = -1;
if (node->args[j][i + 1] && node->args[j][i + 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); new = ft_calloc(ft_strlen(node->args[j]) + len + 1, 1);
if (!new) if (!new)
return (0); return (0);
ret = new; ret = new;
while (++k < i) while (++k < i)
*new++ = node->args[j][k]; *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_strlcat(new, &node->args[j][i + 2], -1);
ft_free(&num);
ft_free(&node->args[j]); ft_free(&node->args[j]);
node->args[j] = ret; node->args[j] = ret;
return (1); return (1);

View File

@@ -28,6 +28,8 @@ static void add_prevhistory(t_msh *msh)
while (str) while (str)
{ {
tmp = ft_substr(str, 0, ft_strlen(str) - 1); tmp = ft_substr(str, 0, ft_strlen(str) - 1);
ft_free(&msh->prev_input);
msh->prev_input = ft_strdup(tmp);
add_history(tmp); add_history(tmp);
free(tmp); free(tmp);
free(str); free(str);
@@ -67,6 +69,7 @@ static void exit_manual(t_msh *msh)
} }
else else
ret = msh->ex_code; ret = msh->ex_code;
ft_free(&msh->prev_input);
free_msh(msh); free_msh(msh);
ft_fprintf(2, "exit\n"); ft_fprintf(2, "exit\n");
exit(ret); exit(ret);

View File

@@ -39,6 +39,7 @@ t_msh *init_msh(char **envp)
msh->ex_code = 0; msh->ex_code = 0;
msh->here_fd = -1; msh->here_fd = -1;
msh->input = NULL; msh->input = NULL;
msh->prev_input = NULL;
if (!msh) if (!msh)
return (NULL); return (NULL);
if (!envp[0]) if (!envp[0])
@@ -56,5 +57,6 @@ void free_msh(t_msh *msh)
if (msh->here_fd != -1) if (msh->here_fd != -1)
close(msh->here_fd); close(msh->here_fd);
free(msh->input); free(msh->input);
ft_free(&msh->prev_input);
free(msh); free(msh);
} }

View File

@@ -16,11 +16,18 @@
static void handle_input(char *in, t_msh *msh) static void handle_input(char *in, t_msh *msh)
{ {
if (ft_strlen(in) > 0 && !is_only_space(in)) 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); add_history(in);
ft_fprintf(msh->hist, "%s\n", 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) char *get_pwd(void)
{ {