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

export +=

Browse Source
This commit is contained in:
Loic Deridder
2025-02-15 13:25:59 +01:00
parent dbc2813ad8
commit d9687a8e3a
6 changed files with 90 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
View File

@@ -1 +0,0 @@
Hello World tmp.txt

3
includes/exec/builtins.h
View File

@@ -39,6 +39,9 @@ int builtin_export(char **arg, t_ast_n *head);
//UTILS
int count_char(char *str);
int is_append(char *str);
char **key_value(char *str);
void set_new_export(char *str, t_ast_n *node);
int count_args(char **tab);
int extractenv(char *str, char **envp);
char *ft_getenv(char *str, char **envp);

1
includes/exec/env.h
View File

@@ -29,5 +29,6 @@ bool is_valid_key(char *key, t_msh *msh);
int remove_env_var(char *key, t_msh *msh);
void set_var_env(char *key, char *value, t_msh *msh);
char **init_env(char **envp);
void append_var(char *key, char *add, t_msh *msh);
#endif

39
srcs/builtins/export.c
View File

@@ -15,28 +15,26 @@
int is_export_valid(char *str)
{
char *equal;
char *key_end;
if (!ft_isalpha(*str) && str[0] != '_')
return (0);
equal = ft_strchr(str, '=');
if (!equal)
if (equal)
{
while (*(++str))
{
if (!ft_isalnum(*str) && *str != '_')
return (0);
}
return (1);
if (equal != str && *(equal - 1) == '+')
key_end = equal - 1;
else
key_end = equal;
}
else
{
while (++str < equal)
key_end = str + ft_strlen(str);
while ((++str) < key_end)
{
if (!ft_isalnum(*str) && *str != '_')
return (0);
}
return (1);
}
}
char **key_value(char *str)
@@ -44,12 +42,17 @@ char **key_value(char *str)
char **tmp;
char *save;
char *equal;
char *key_end;
tmp = malloc(sizeof(char *) * (2 + 1));
if (!tmp)
return (NULL);
equal = ft_strchr(str, '=');
tmp[0] = ft_substr(str, 0, equal - str);
if (*(equal - 1) == '+')
key_end = equal - 1;
else
key_end = equal;
tmp[0] = ft_substr(str, 0, key_end - str);
if (equal - str == 0)
tmp[1] = ft_strdup("");
else
@@ -109,7 +112,6 @@ int print_export(char **envp)
int builtin_export(char **arg, t_ast_n *head)
{
int i;
char **tmp;
i = 0;
if (count_args(arg) == 1)
@@ -117,18 +119,7 @@ int builtin_export(char **arg, t_ast_n *head)
while (++i < count_args(arg))
{
if (is_export_valid(arg[i]))
{
if (ft_strchr(arg[i], '=') != NULL)
{
tmp = key_value(arg[i]);
if (!tmp)
return (1);
set_var_env(tmp[0], tmp[1], head->msh);
free_tab(tmp);
}
else
set_var_env(arg[i], NULL, head->msh);
}
set_new_export(arg[i], head);
else
return (err_msg_cmd("export", arg[i], EXPRT_INV, 1));
}

41
srcs/builtins/export_utils.c Normal file
View File

@@ -0,0 +1,41 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* export_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/15 13:22:24 by lderidde #+# #+# */
/* Updated: 2025/02/15 13:22:24 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/minishell.h"
int is_append(char *str)
{
if (*(ft_strchr(str, '=') - 1) == '+')
return (1);
else
return (0);
}
void set_new_export(char *str, t_ast_n *node)
{
char **tmp;
if (ft_strchr(str, '=') != NULL)
{
tmp = key_value(str);
if (!tmp)
return ;
if (is_append(str))
append_var(tmp[0], tmp[1], node->msh);
else
set_var_env(tmp[0], tmp[1], node->msh);
free_tab(tmp);
}
else
set_var_env(str, NULL, node->msh);
}

27
srcs/env/var2.c vendored
View File

@@ -64,6 +64,33 @@ int remove_env_var(char *key, t_msh *msh)
return (0);
}
void append_var(char *key, char *add, t_msh *msh)
{
int i;
char *tmp;
tmp = NULL;
i = get_var_index(key, msh);
if (i != -1)
{
tmp = ft_strjoin(msh->env[i], add);
ft_free(&(msh->env[i]));
msh->env[i] = ft_strdup(tmp);
}
else
{
i = count_var(msh->env);
msh->env = copy_env_var(msh->env, i + 1);
if (!msh->env)
return ;
if (add)
tmp = ft_strjoin("=", add);
msh->env[i] = ft_strjoin(key, tmp);
}
ft_free(&tmp);
return ;
}
void set_var_env(char *key, char *value, t_msh *msh)
{
int i;