lib: consolidate util macros in util/util.h

[petitboot] / discover / grub2 / builtins.c

diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c
index 4261eebdbdea73563b4c6d50d01a975e8fea11e3..668ed93aa10e6db074d3a7736d473f21446085dc 100644 (file)
--- a/discover/grub2/builtins.c
+++ b/discover/grub2/builtins.c
@@ -5,7 +5,7 @@
 #include <log/log.h>
 #include <types/types.h>
 #include <talloc/talloc.h>
-#include <array-size/array-size.h>
+#include <util/util.h>
 
 #include "grub2.h"
 
@@ -123,6 +123,131 @@ static int builtin_search(struct grub2_script *script,
        return 0;
 }
 
+static bool builtin_test_op(int argc, char **argv, int *consumed)
+{
+       char *op;
+
+       if (argc >= 3) {
+               const char *a1, *a2;
+
+               a1 = argv[0];
+               op = argv[1];
+               a2 = argv[2];
+
+               if (!strcmp(op, "=") || !strcmp(op, "==")) {
+                       *consumed = 3;
+                       return !strcmp(a1, a2);
+               }
+
+               if (!strcmp(op, "!=")) {
+                       *consumed = 3;
+                       return strcmp(a1, a2);
+               }
+
+               if (!strcmp(op, "<")) {
+                       *consumed = 3;
+                       return strcmp(a1, a2) < 0;
+               }
+
+               if (!strcmp(op, ">")) {
+                       *consumed = 3;
+                       return strcmp(a1, a2) > 0;
+               }
+       }
+
+       if (argc >= 2) {
+               const char *a1;
+
+               op = argv[0];
+               a1 = argv[1];
+
+               if (!strcmp(op, "-z")) {
+                       *consumed = 2;
+                       return strlen(a1) == 0;
+               }
+
+               if (!strcmp(op, "-n")) {
+                       *consumed = 2;
+                       return strlen(a1) != 0;
+               }
+
+               /* todo: implement file checks */
+               if (!strcmp(op, "-s") || !strcmp(op, "-f")) {
+                       *consumed = 2;
+                       return false;
+               }
+       }
+
+       op = argv[0];
+       *consumed = 1;
+       return strlen(op) > 0;
+}
+
+static int builtin_test(struct grub2_script *script __attribute__((unused)),
+               void *data __attribute__((unused)),
+               int argc, char *argv[])
+{
+       int consumed;
+       bool not, rc;
+
+       if (!strcmp(argv[0], "[") && !strcmp(argv[argc - 1], "]"))
+               argc--;
+
+       /* skip command name */
+       argc--;
+       argv++;
+
+       not = false;
+       rc = false;
+
+       for (consumed = 0; argc > 0; argv += consumed, argc -= consumed) {
+
+               if (!strcmp(argv[0], "!")) {
+                       not = true;
+                       consumed = 1;
+                       continue;
+               }
+
+               if (!strcmp(argv[0], "-a")) {
+                       if (!rc)
+                               return 1;
+                       consumed = 1;
+                       continue;
+               }
+
+               if (!strcmp(argv[0], "-o")) {
+                       if (rc)
+                               return 0;
+                       consumed = 1;
+                       continue;
+               }
+
+               rc = builtin_test_op(argc, argv, &consumed);
+               if (not) {
+                       rc = !rc;
+                       not = false;
+               }
+       }
+
+       return rc ? 0 : 1;
+}
+
+static int builtin_true(struct grub2_script *script __attribute__((unused)),
+               void *data __attribute__((unused)),
+               int argc __attribute__((unused)),
+               char *argv[] __attribute__((unused)))
+{
+       return 0;
+}
+
+static int builtin_false(struct grub2_script *script __attribute__((unused)),
+               void *data __attribute__((unused)),
+               int argc __attribute__((unused)),
+               char *argv[] __attribute__((unused)))
+{
+       return 1;
+}
+
 static int builtin_nop(struct grub2_script *script __attribute__((unused)),
                void *data __attribute__((unused)),
                int argc __attribute__((unused)),
@@ -131,6 +256,14 @@ static int builtin_nop(struct grub2_script *script __attribute__((unused)),
        return 0;
 }
 
+extern int builtin_load_env(struct grub2_script *script,
+               void *data __attribute__((unused)),
+               int argc, char *argv[]);
+int builtin_save_env(struct grub2_script *script,
+               void *data __attribute__((unused)),
+               int argc, char *argv[]);
+
+
 static struct {
        const char *name;
        grub2_function fn;
@@ -143,6 +276,10 @@ static struct {
                .name = "linux",
                .fn = builtin_linux,
        },
+       {
+               .name = "linux16",
+               .fn = builtin_linux,
+       },
        {
                .name = "initrd",
                .fn = builtin_initrd,
@@ -150,7 +287,31 @@ static struct {
        {
                .name = "search",
                .fn = builtin_search,
-       }
+       },
+       {
+               .name = "[",
+               .fn = builtin_test,
+       },
+       {
+               .name = "test",
+               .fn = builtin_test,
+       },
+       {
+               .name = "true",
+               .fn = builtin_true,
+       },
+       {
+               .name = "false",
+               .fn = builtin_false,
+       },
+       {
+               .name = "load_env",
+               .fn = builtin_load_env,
+       },
+       {
+               .name = "save_env",
+               .fn = builtin_save_env,
+       },
 };
 
 static const char *nops[] = {