diff --git a/srcs/.main.c.swp b/srcs/.main.c.swp deleted file mode 100644 index a95f211..0000000 Binary files a/srcs/.main.c.swp and /dev/null differ diff --git a/srcs/export.c b/srcs/export.c index 760bf74..215ddc5 100755 --- a/srcs/export.c +++ b/srcs/export.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 13:06:58 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 13:45:58 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,18 +21,11 @@ int export_invalid_identifier(char *arg, char *name) return (1); } -t_env *export_set_env(t_env *env, char *name, char *value, int append) +t_env *set_env(t_env *env, char *name, char *value, int append) { t_env *tmp; tmp = env; - if (!value || !name) - { - free(name); - free(value); - ft_printf_fd(2, "minishell: malloc failed"); - return (env); - } while (tmp) { if (!ft_strcmp(name, tmp->name)) @@ -53,6 +46,19 @@ t_env *export_set_env(t_env *env, char *name, char *value, int append) } tmp = tmp->next; } + return (env); +} + +t_env *export_set_env(t_env *env, char *name, char *value, int append) +{ + if (!value || !name) + { + free(name); + free(value); + ft_printf_fd(2, "minishell: malloc failed"); + return (env); + } + set_env(env, name, value, append); return (env_add_back(env, name, value)); } diff --git a/srcs/main.c b/srcs/main.c index 9822822..41df755 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/04/24 13:07:14 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 13:34:44 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -77,13 +77,13 @@ t_env *add_shlvl(t_env *env) char *tmp; tmp = ft_get_env(env, "SHLVL"); - if(!tmp) + if (!tmp) nb = 0; else nb = ft_atoi(tmp); nb++; env = export_set_env(env, ft_strdup("SHLVL"), ft_itoa(nb), 0); - return(env); + return (env); } int init_minishell(t_msh **msh, int argc, char **argv, char **envp) diff --git a/todo_list b/todo_list index af6056d..6bccdce 100644 --- a/todo_list +++ b/todo_list @@ -17,3 +17,4 @@ To test: test signals test and verify all malocs verify forbidden functions +check for any hidden or useless files