X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fbuiltins.c;h=71ae61a3ae97118ed63e7f30303e2c4d4c09dd7c;hp=4261eebdbdea73563b4c6d50d01a975e8fea11e3;hb=fcbb46482c413192756ce865a7336c5638fda6d3;hpb=27037bcd151ff8ecad1aaca7eaa06fb5c3f9fd1f

diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c
index 4261eeb..71ae61a 100644
--- a/discover/grub2/builtins.c
+++ b/discover/grub2/builtins.c
@@ -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,10 @@ 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[]);
+
 static struct {
 	const char *name;
 	grub2_function fn;
@@ -143,6 +272,10 @@ static struct {
 		.name = "linux",
 		.fn = builtin_linux,
 	},
+	{
+		.name = "linux16",
+		.fn = builtin_linux,
+	},
 	{
 		.name = "initrd",
 		.fn = builtin_initrd,
@@ -150,7 +283,27 @@ 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,
+	},
 };
 
 static const char *nops[] = {