nalebrun/mmoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norm

Browse Source
This commit is contained in:
Loic Deridder
2025-02-12 10:10:29 +01:00
parent ced584b17a
commit adc59eb33b
20 changed files with 822 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/expander/expand_tilde.c
View File

@@ -12,7 +12,7 @@
#include "../../includes/minishell.h"
static int get_new_len(t_ast_n *node, int j)
static int get_nw_len(t_ast_n *node, int j)
{
int i;
int len;
@@ -56,7 +56,7 @@ void expander_tilde(t_ast_n *node, int j)
char *new;
i = -1;
len = get_new_len(node, j);
len = get_nw_len(node, j);
new = ft_calloc(len + 1, sizeof(char));
if (!new)
return ;

35
srcs/expander/expand_var.c
View File

@@ -6,7 +6,7 @@
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/07 12:58:25 by lderidde #+# #+# */
/* Updated: 2025/02/11 15:31:05 by lderidde ### ########.fr */
/* Updated: 2025/02/12 09:06:11 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -44,7 +44,7 @@ static char *extract_env(char *str, char **envp)
return (var);
}
static int get_new_len(t_ast_n *node, int j)
int get_new_len(t_ast_n *node, int j)
{
int i;
int len;
@@ -53,7 +53,14 @@ static int get_new_len(t_ast_n *node, int j)
len = ft_strlen(node->args[j]);
while (node->args[j][i])
{
if (node->args[j][i] == '$')
if (node->args[j][i] == '$' && (node->args[j][i + 1]
&& node->args[j][i + 1] == '?')
&& !in_squote(node->args[j], &node->args[j][i]))
{
len -= 1;
}
else if (node->args[j][i] == '$' &&
!in_squote(node->args[j], &node->args[j][i]))
{
len += get_var_len(node, j, &i);
i--;
@@ -63,7 +70,7 @@ static int get_new_len(t_ast_n *node, int j)
return (len);
}
void expander_var(t_ast_n *node, int j)
void expander_var(t_ast_n *nd, int j)
{
int i;
int k;
@@ -71,25 +78,25 @@ void expander_var(t_ast_n *node, int j)
char *new;
i = -1;
len = get_new_len(node, j);
new = ft_calloc(len + 1, sizeof(char));
new = create_new(nd, j, &len);
if (!new)
return ;
k = 0;
while (node->args[j][k] && ++i < len)
while (nd->args[j][k] && ++i < len)
{
if (node->args[j][k] != '$')
new[i] = node->args[j][k++];
else if (node->args[j][k] == '$' && exvalid_next(node->args[j][k + 1]))
if (nd->args[j][k] != '$' || in_squote(nd->args[j], &nd->args[j][k]))
new[i] = nd->args[j][k++];
else if (expand_exit(nd, j, k))
cat_exit(nd, &new, i, &k);
else if (valid_expand(nd, j, k))
{
ft_strlcat(new, extract_env(&node->args[j][k], node->msh->env), -1);
ft_strlcat(new, extract_env(&nd->args[j][k], nd->msh->env), -1);
i = ft_strlen(new) - 1;
while (node->args[j][++k] && is_exvalidchar(node->args[j][k]))
while (nd->args[j][++k] && is_exvalidchar(nd->args[j][k]))
continue ;
}
}
ft_free(&node->args[j]);
node->args[j] = new;
handle_copy(nd, j, &new);
}
int expand_var(t_ast_n *node, int j)

55
srcs/expander/expander_var_utils.c Normal file
View File

@@ -0,0 +1,55 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander_var_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/12 09:17:28 by lderidde #+# #+# */
/* Updated: 2025/02/12 09:17:28 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/exec/expander.h"
int expand_exit(t_ast_n *node, int j, int k)
{
if (node->args[j][k] == '$' && (node->args[j][k + 1]
&& node->args[j][k + 1] == '?')
&& !in_squote(node->args[j], &node->args[j][k]))
{
return (1);
}
return (0);
}
int valid_expand(t_ast_n *node, int j, int k)
{
if (node->args[j][k] == '$' && exvalid_next(node->args[j][k + 1])
&& !in_squote(node->args[j], &node->args[j][k]))
{
return (1);
}
return (0);
}
char *create_new(t_ast_n *node, int j, int *len)
{
char *new;
*len = get_new_len(node, j);
new = ft_calloc(*len + 1, sizeof(char));
return (new);
}
void handle_copy(t_ast_n *node, int j, char **new)
{
ft_free(&node->args[j]);
node->args[j] = *new;
}
void cat_exit(t_ast_n *node, char **new, int i, int *k)
{
(*new)[i] = node->msh->ex_code + '0';
*k += 2;
}