Fix the return value of the builtins

diff --git a/src/builtins/echo.c b/src/builtins/echo.c
index 441f920269128120608035895e060f59addeb787..5c9f079709e72a2b77b11043112b69538ffc36a5 100644 (file)
--- a/src/builtins/echo.c
+++ b/src/builtins/echo.c
@@ -13,8 +13,6 @@ int   ft_check_n(char *str)
 
 int    echo(int argc, char **argv)
 {
-       if (argc == 1)
-               return (1);
        int i = 1;
        int flag = 0;
        int t;
@@ -34,5 +32,5 @@ int   echo(int argc, char **argv)
        }
        if (flag == 0)
                ft_putstr_fd("\n", 1);
-       return (1);
+       return (0);
 }

diff --git a/src/builtins/env.c b/src/builtins/env.c
index 03597df21c3ca655632775b3b4cbc939e1ccac54..ebfc66f13cfccb2a65cca2fc8e9bbbb859e0b585 100644 (file)
--- a/src/builtins/env.c
+++ b/src/builtins/env.c
@@ -19,7 +19,7 @@ int   env_exec(const t_execution_env *env)
                ft_putstr_fd("\n", 1);
                ++i;
        }
-       return (1);
+       return (0);
 }
 
 int    ft_env(int argc, t_execution_env *env)
@@ -27,8 +27,8 @@ int   ft_env(int argc, t_execution_env *env)
        if (argc == 1)
        {
                env_exec(env);
-               return (1);
+               return (0);
        }
        ft_putstr_fd("env: invalid option\n", 1);
-       return (0);
-}
\ No newline at end of file
+       return (1);
+}

diff --git a/src/execution.c b/src/execution.c
index 18d92657f2addbcef0b58e78d760d312596172c3..70a86a9bd32ed467539bdb1e29489cab86ac1087 100644 (file)
--- a/src/execution.c
+++ b/src/execution.c
@@ -6,7 +6,7 @@
 /*   By: lnikolov <lnikolov@student.42prague.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/21 08:57:54 by ljiriste          #+#    #+#             */
-/*   Updated: 2024/08/22 17:30:15 by ljiriste         ###   ########.fr       */
+/*   Updated: 2024/08/22 17:39:27 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -782,11 +782,11 @@ int       ex_builtin(char **fields, __attribute__((unused)) t_vec *assignments, __attr
 {
        if (!ft_strcmp(fields[0], "cd"))
                env->ret_val = cd(count_fields(fields), fields, env);
-       if (!ft_strcmp(fields[0], "echo"))
+       else if (!ft_strcmp(fields[0], "echo"))
                env->ret_val = echo(count_fields(fields), fields);
-       if (!ft_strcmp(fields[0], "pwd"))
+       else if (!ft_strcmp(fields[0], "pwd"))
                env->ret_val = pwd(count_fields(fields));
-       if (!ft_strcmp(fields[0], "env"))
+       else if (!ft_strcmp(fields[0], "env"))
                env->ret_val = ft_env(count_fields(fields), env);
        else
                return (-1);