From 316b2f237fb55a9d05326285efddf0e558b09e26 Mon Sep 17 00:00:00 2001 From: Ofacy Date: Wed, 10 Apr 2024 22:42:32 +0200 Subject: [PATCH] Fix export and env still using printf --- srcs/builtins/env.c | 6 +++--- srcs/builtins/export.c | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/srcs/builtins/env.c b/srcs/builtins/env.c index 0a6d6a4..1e1e27e 100644 --- a/srcs/builtins/env.c +++ b/srcs/builtins/env.c @@ -6,17 +6,17 @@ /* By: bwisniew +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/14 13:57:41 by bwisniew #+# #+# */ -/* Updated: 2024/03/19 17:32:45 by bwisniew ### ########.fr */ +/* Updated: 2024/04/10 19:46:23 by lcottet ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -#include +#include "ft_printf.h" void print_env(t_env *env) { if (env->value) - printf("%s=%s\n", env->key, env->value); + ft_printf("%s=%s\n", env->key, env->value); } int env(t_mshell *sh, t_execute *exec) diff --git a/srcs/builtins/export.c b/srcs/builtins/export.c index fabb552..ad95c48 100644 --- a/srcs/builtins/export.c +++ b/srcs/builtins/export.c @@ -6,14 +6,14 @@ /* By: bwisniew +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/14 13:57:39 by bwisniew #+# #+# */ -/* Updated: 2024/03/19 18:35:56 by bwisniew ### ########.fr */ +/* Updated: 2024/04/10 22:45:14 by lcottet ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" +#include "ft_printf.h" #include "minishell.h" #include -#include t_env *export_sort(t_mshell *sh) { @@ -38,10 +38,11 @@ int export_print(t_mshell *sh) return (1); while (i < sh->env.len) { - if (env[i].value && printf("%s=%s\n", env[i].key, env[i].value) == -1) - return (0); - else if (!env[i].value && printf("%s\n", env[i].key) == -1) - return (0); + if (env[i].value + && ft_printf("%s=%s\n", env[i].key, env[i].value) == -1) + return (1); + else if (!env[i].value && ft_printf("%s\n", env[i].key) == -1) + return (1); i++; } free(env);