discover/udev: Don't call udev_set_log_fn()

[petitboot] / discover / grub2 / builtins.c

diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c
index 0716276e9bbf78bcafdfabce36e8c38bbcd8556e..8bff7328108479f1b95dbd2d3196cdeada238808 100644 (file)
--- a/discover/grub2/builtins.c
+++ b/discover/grub2/builtins.c
@@ -5,8 +5,9 @@
 #include <log/log.h>
 #include <types/types.h>
 #include <talloc/talloc.h>
-#include <array-size/array-size.h>
+#include <util/util.h>
 
+#include "discover/parser.h"
 #include "grub2.h"
 
 
@@ -123,7 +124,62 @@ static int builtin_search(struct grub2_script *script,
        return 0;
 }
 
-static bool builtin_test_op(int argc, char **argv, int *consumed)
+/* Note that GRUB does not follow symlinks in evaluating all file
+ * tests but -s, unlike below. However, it seems like a bad idea to
+ * emulate GRUB's behavior (e.g., it would take extra work), so we
+ * implement the behavior that coreutils' test binary has. */
+static bool builtin_test_op_file(struct grub2_script *script, char op,
+               const char *file)
+{
+       bool result;
+       int rc;
+       struct stat statbuf;
+
+       rc = parser_stat_path(script->ctx, script->ctx->device,
+                       file, &statbuf);
+       if (rc)
+               return false;
+
+       switch (op) {
+       case 's':
+               /* -s: return true if file exists and has non-zero size */
+               result = statbuf.st_size > 0;
+               break;
+       case 'f':
+               /* -f: return true if file exists and is not a directory. This is
+                * different than the behavior of "test", but is what GRUB does
+                * (though note as above that we follow symlinks unlike GRUB). */
+               result = !S_ISDIR(statbuf.st_mode);
+               break;
+       default:
+               result = false;
+
+       }
+
+       return result;
+}
+
+/* See comment at builtin_test_op_file for differences between how
+ * GRUB implements file tests versus Petitboot's GRUB parser. */
+static bool builtin_test_op_dir(struct grub2_script *script, char op,
+               const char *dir)
+{
+       int rc;
+       struct stat statbuf;
+
+       if (op != 'd')
+               return false;
+
+       rc = parser_stat_path(script->ctx, script->ctx->device, dir, &statbuf);
+       if (rc) {
+               return false;
+       }
+
+       return S_ISDIR(statbuf.st_mode);
+}
+
+static bool builtin_test_op(struct grub2_script *script,
+               int argc, char **argv, int *consumed)
 {
        char *op;
 
@@ -171,18 +227,23 @@ static bool builtin_test_op(int argc, char **argv, int *consumed)
                        return strlen(a1) != 0;
                }
 
-               /* todo: implement file checks */
                if (!strcmp(op, "-s") || !strcmp(op, "-f")) {
                        *consumed = 2;
-                       return false;
+                       return builtin_test_op_file(script, op[1], a1);
+               }
+
+               if (!strcmp(op, "-d")) {
+                       *consumed = 2;
+                       return builtin_test_op_dir(script, op[1], a1);
                }
        }
 
+       op = argv[0];
        *consumed = 1;
        return strlen(op) > 0;
 }
 
-static int builtin_test(struct grub2_script *script __attribute__((unused)),
+static int builtin_test(struct grub2_script *script,
                void *data __attribute__((unused)),
                int argc, char *argv[])
 {
@@ -221,7 +282,7 @@ static int builtin_test(struct grub2_script *script __attribute__((unused)),
                        continue;
                }
 
-               rc = builtin_test_op(argc, argv, &consumed);
+               rc = builtin_test_op(script, argc, argv, &consumed);
                if (not) {
                        rc = !rc;
                        not = false;
@@ -255,6 +316,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;
@@ -295,6 +364,14 @@ static struct {
                .name = "false",
                .fn = builtin_false,
        },
+       {
+               .name = "load_env",
+               .fn = builtin_load_env,
+       },
+       {
+               .name = "save_env",
+               .fn = builtin_save_env,
+       },
 };
 
 static const char *nops[] = {