From 4543c3ba3222d47780ad3e091cfe6f3098cc2bca Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sun, 6 Sep 2020 21:56:20 +0200 Subject: Stacked --- src/b_export_next.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/b_export_next.c') diff --git a/src/b_export_next.c b/src/b_export_next.c index c46389a..059fbc6 100644 --- a/src/b_export_next.c +++ b/src/b_export_next.c @@ -92,10 +92,9 @@ static void } void - b_export_with_equals(const char arg[], - t_msh *msh) + b_export_with_equals(const char arg[], t_msh *msh) { - char *varval; + char varval[4096]; char **var; int64_t env_i; @@ -105,8 +104,10 @@ void ft_memdel((void*)&msh->envp[env_i]); if ((msh->envp[env_i] = ft_strdup(arg)) == NULL) f_alloc_and_destroy_msh(msh); + return ; } - else if ((varval = u_get_cstm_vr(var[FT_VAR_NAME], msh)) != NULL) + u_get_custom_var(varval, var[FT_VAR_NAME], 4096, msh); + if (varval[0] != C_NUL) { b_add_to_env(arg, msh); lvars_delone(&msh->vars, var[FT_VAR_NAME] + 1); -- cgit v1.2.3 From 477ea057edf32486e944ef4e33023e9ab6636e07 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sat, 12 Sep 2020 15:07:22 +0200 Subject: Aliases work, fucker --- src/b_export_next.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/b_export_next.c') diff --git a/src/b_export_next.c b/src/b_export_next.c index 059fbc6..1fc732e 100644 --- a/src/b_export_next.c +++ b/src/b_export_next.c @@ -13,6 +13,7 @@ #include #include +#include "d_define.h" #include "b_export_next.h" #include "f_fail.h" #include "s_lvars.h" @@ -21,8 +22,7 @@ #include "u_vars.h" static char - **b_get_var(const char arg[], - t_msh *msh) + **b_get_var(const char arg[], t_msh *msh) { size_t len; char **var; @@ -44,8 +44,7 @@ static char } static int64_t - b_is_it_in_env(const char varname[], - t_msh *msh) + b_is_it_in_env(const char varname[], t_msh *msh) { char **env_dup; size_t i; @@ -66,8 +65,7 @@ static int64_t } static void - b_add_to_env(const char arg[], - t_msh *msh) + b_add_to_env(const char arg[], t_msh *msh) { size_t i; char **nenvp; @@ -98,6 +96,7 @@ void char **var; int64_t env_i; + varval[0] = C_NUL; var = b_get_var(arg, msh); if ((env_i = b_is_it_in_env(var[FT_VAR_NAME] + 1, msh)) != -1) { -- cgit v1.2.3