prevent LIBRARY from inside EVAL

Author: braindigitalis

include/basic.h

@@ -884,6 +884,7 @@ void until_statement(struct basic_ctx* ctx);
 void endif_statement(struct basic_ctx* ctx);
 void end_statement(struct basic_ctx* ctx);
 void panic_statement(struct basic_ctx* ctx);
+bool basic_in_eval(struct basic_ctx* ctx);
 
 /* Process/memory functions */
 int64_t basic_getproccount(struct basic_ctx* ctx);

os/programs/libraries/match.rrbasic

@@ -0,0 +1,64 @@
+DEF FNrematch(pat$, txt$)
+	FOR I = 0 TO LEN(pat$)
+		re_pat$(I) = MID$(pat$, I, I + 1)
+	NEXT
+	FOR I = 0 TO LEN(txt$)
+		re_txt$(I) = MID$(txt$, I, I + 1)
+	NEXT
+	re_pat_len = LEN(pat$)
+	re_txt_len = LEN(txt$)
+
+	IF re_pat$(0) = "^" THEN
+		IF FNmatchhere(1, 0) = TRUE THEN
+			=TRUE
+		ENDIF
+		=FALSE
+	ENDIF
+
+	FOR i = 0 TO re_txt_len
+		IF FNmatchhere(0, i) = TRUE THEN
+			=TRUE
+		ENDIF
+	NEXT
+=FALSE
+
+DEF FNmatchhere(pi, ti)
+	IF pi = re_pat_len THEN
+		=TRUE
+	ENDIF
+
+	IF re_pat$(pi) = "$" THEN
+		IF pi + 1 = re_pat_len THEN
+			IF ti = re_txt_len THEN
+				=TRUE
+			ENDIF
+			=FALSE
+		ENDIF
+	ENDIF
+
+	IF pi + 1 < re_pat_len THEN
+		IF re_pat$(pi + 1) = "*" THEN
+			=FNmatchstar(re_pat$(pi), pi + 2, ti)
+		ENDIF
+	ENDIF
+
+	IF ti < re_txt_len THEN
+		IF re_pat$(pi) = "." OR re_pat$(pi) = re_txt$(ti) THEN
+			=FNmatchhere(pi + 1, ti + 1)
+		ENDIF
+	ENDIF
+=FALSE
+
+DEF FNmatchstar(c$, pi, ti)
+	FOR i = ti TO re_txt_len
+		IF FNmatchhere(pi, i) = TRUE THEN
+			=TRUE
+		ENDIF
+		IF i = re_txt_len THEN
+			=FALSE
+		ENDIF
+		IF c$ <> "." AND c$ <> re_txt$(i) THEN
+			=FALSE
+		ENDIF
+	NEXT
+=FALSE

src/basic/main.c

@@ -294,6 +294,12 @@ void library_statement(struct basic_ctx* ctx)
 	/* Validate the file exists and is not a directory */
 	fs_directory_entry_t* file_info = fs_get_file_info(lib_file);
 	accept_or_return(NEWLINE, ctx);
+
+	if (basic_in_eval(ctx)) {
+		tokenizer_error_print(ctx, "Loading libraries from EVAL is not allowed");
+		return;
+	}
+
 	if (!file_info || fs_is_directory(lib_file)) {
 		tokenizer_error_printf(ctx, "Not a library file: '%s'", lib_file);
 		return;
@@ -583,15 +589,24 @@ void chain_statement(struct basic_ctx* ctx)
 	accept_or_return(NEWLINE, ctx);
 }
 
+bool basic_in_eval(struct basic_ctx* ctx)
+{
+	return (ctx->current_linenum == EVAL_LINE);
+}
+
 void eval_statement(struct basic_ctx* ctx)
 {
 	accept_or_return(EVAL, ctx);
 	const char* v = str_expr(ctx);
 	accept_or_return(NEWLINE, ctx);
 
-	if (ctx->current_linenum == EVAL_LINE) {
+	if (basic_in_eval(ctx)) {
 		ctx->eval_linenum = 0;
-		tokenizer_error_print(ctx, "Recursive EVAL");
+		basic_set_string_variable("ERROR$", "Recursive EVAL", ctx, false, false);
+		basic_set_int_variable("ERROR", 1, ctx, false, false);
+		setforeground(current_console, COLOUR_LIGHTRED);
+		kprintf("Recursive EVAL\n");
+		setforeground(current_console, COLOUR_WHITE);
 		return;
 	}