From c04b2fb9d2f5f7a7b0f2817e4dbeb5923ec69751 Mon Sep 17 00:00:00 2001
From: savalet <savinien.petitjean@gmail.com>
Date: Sat, 3 May 2025 21:48:46 +0200
Subject: [PATCH] Add if tests

---
 src/builtins/if.c   | 10 ++++++----
 validation_tests.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/builtins/if.c b/src/builtins/if.c
index 48f9dc7..a53fb58 100644
--- a/src/builtins/if.c
+++ b/src/builtins/if.c
@@ -21,7 +21,7 @@ int get_argc(char **args)
 {
     int i = 0;
 
-    for (; args[i]; i++);
+    for (; args[i] != nullptr; i++);
     return i;
 }
 
@@ -118,12 +118,14 @@ void exec_block(cmd_block_t *blk, ef_t *ef)
 }
 
 static
-bool handle_if_logic(ef_t *ef, bool cond)
+bool handle_if_logic(ef_t *ef, bool cond, char *last)
 {
     if_ctx_t ctx = {.buff = &(buff_t){ .str = nullptr, .sz = 0 }, .ef = ef};
     cmd_block_t then_blk;
     cmd_block_t else_blk;
 
+    if (strcmp("then", last) != 0)
+        return cond ? visitor(last, ef->exec_ctx), true : true;
     if (!init_block(&then_blk) || !init_block(&else_blk))
         return false;
     if (!read_if_blocks(&ctx, &then_blk, &else_blk))
@@ -147,7 +149,7 @@ int builtins_if(ef_t *ef, char **args)
         return WRITE_CONST(STDERR_FILENO, "if: Too few arguments.\n"),
             RETURN_FAILURE;
     if (args[2] == NULL)
-        return WRITE_CONST(STDERR_FILENO, "if: Empty if\n"), RETURN_FAILURE;
+        return WRITE_CONST(STDERR_FILENO, "if: Empty if.\n"), RETURN_FAILURE;
     last = strdup(args[get_argc(args) - 1]);
     if (!last)
         return RETURN_FAILURE;
@@ -156,7 +158,7 @@ int builtins_if(ef_t *ef, char **args)
     U_DEBUG("If expr result [%d]\n", result);
     if (result == -1)
         return free(last), RETURN_FAILURE;
-    if (!handle_if_logic(ef, result != 0))
+    if (!handle_if_logic(ef, result != 0, last))
         return free(last), RETURN_FAILURE;
     return free(last), RETURN_SUCCESS;
 }
diff --git a/validation_tests.py b/validation_tests.py
index 0856ce8..e8c2b22 100644
--- a/validation_tests.py
+++ b/validation_tests.py
@@ -215,4 +215,18 @@ TESTS = [
         ],
         depends_on=()
     ),
+
+    Test(
+        key="IF",
+        name="if",
+        cmds=[
+            "if 1 ls\n",
+            "if 0 ls\n",
+            "if 1 then\necho YES\nelse\necho NO\nendif\n",
+            "if 0 then\necho YES\nelse\necho NO\nendif\n",
+            "if\n",
+            "if 0\n",
+        ],
+        depends_on=()
+    ),
 ]