The unified diff between revisions [891173fb..] and [8583f573..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/lsi/vm.c'

#
# old_revision [891173fb957443aa4b4a92446e8e30e67c4d08fd]
# new_revision [8583f573519b60d2a4dfb35aa4ec8079f05b88c1]
#
# patch "src/lsi/vm.c"
#  from [7fbddce92f86fd74d95ad28871274cf4653d9d55]
#    to [6f62d2db74a2a4932bd876c11abeab092af42a19]
#
============================================================
--- src/lsi/vm.c	7fbddce92f86fd74d95ad28871274cf4653d9d55
+++ src/lsi/vm.c	6f62d2db74a2a4932bd876c11abeab092af42a19
@@ -614,13 +614,40 @@ int vm_intfn_sql_getvar(void)
 	snprintf(buf, len+1, stack_getstr(vm_current, len, 1));
 	snprintf(query, VM_STRING_MAX, "SELECT value FROM vars WHERE name=\"%s\"", buf);
 
-	sql_query(query, strlen(query), &result);
+	if (sql_query(query, strlen(query), &result) != 2)
+		result = -1;
 
 	/* XXX what to do with an error here? */
 	stack_poke(vm_current, 0, result); /* return value */
 	return 1;
 }
 
+int vm_intfn_sql_getvar_array(void)
+{
+	int len, off;
+	char buf[VM_STRING_MAX];
+	char query[VM_STRING_MAX];
+	int result;
+
+	off = stack_get(vm_current, 1);
+	len = stack_get(vm_current, 2);
+
+	if (len >= VM_STRING_MAX) {
+		printf("Excessive string length - can't perform query\n");
+		return 1;
+	}
+
+	snprintf(buf, len+1, stack_getstr(vm_current, len, 2));
+	snprintf(query, VM_STRING_MAX, "SELECT value FROM vars WHERE name=\"%s[%d]\"", buf, off);
+
+	if (sql_query(query, strlen(query), &result) != 2)
+		result = -1;
+
+	/* XXX what to do with an error here? */
+	stack_poke(vm_current, 0, result); /* return value */
+	return 1;
+}
+
 int vm_intfn_sql_setvar(void)
 {
 	int len, val;
@@ -645,6 +672,32 @@ int vm_intfn_sql_setvar(void)
 	stack_poke(vm_current, 0, result); /* return value */
 	return 1;
 }
+
+int vm_intfn_sql_setvar_array(void)
+{
+	int len, off, val;
+	char buf[VM_STRING_MAX];
+	char query[VM_STRING_MAX];
+	int result;
+
+	val = stack_get(vm_current, 1);
+	off = stack_get(vm_current, 2);
+	len = stack_get(vm_current, 3);
+
+	if (len >= VM_STRING_MAX) {
+		printf("Excessive string length - can't perform query\n");
+		return 1;
+	}
+
+	snprintf(buf, len+1, stack_getstr(vm_current, len, 3));
+	snprintf(query, VM_STRING_MAX, "INSERT OR REPLACE INTO vars VALUES(\"%s[%d]\", %d)", buf, off, val);
+
+	sql_query(query, strlen(query), &result);
+
+	/* XXX what to do with an error here? */
+	stack_poke(vm_current, 0, result); /* return value */
+	return 1;
+}
 #endif
 
 int vm_intfn_beatdetect_read(void)
@@ -808,7 +861,9 @@ void vm_load_file(char *filename)
 	char *ptr;
 
 	fh = fopen(filename, "r");
-	assert(fh != NULL);
+	if (fh == NULL) {
+		err(1, "Failed to open '%s'", filename);
+	}
 
 	for (ptr = vm_codearea; ptr < vm_codearea+vm_codesize; ptr++) {
 		int c;
@@ -834,16 +889,19 @@ void vm_init_functions(void)
 	struct hashentry *ptr;
 
 	/* First, let's check the magic */
-	assert(vm_codearea[0] == MAGIC1);
-	assert(vm_codearea[1] == MAGIC2);
-	assert(vm_codearea[2] == VERSION1);
-	assert(vm_codearea[3] == VERSION2);
+	if ((vm_codearea[0] != MAGIC1) ||
+	    (vm_codearea[1] != MAGIC2))
+		errx(1, "Bad magic - not a lightscript binary");
+	if ((vm_codearea[2] != VERSION1) ||
+	    (vm_codearea[3] != VERSION2))
+		errx(1, "Bad version - recompile");
 
-	assert(GETINT(vm_codearea, 8) == vm_abiversion1);
-	assert(GETINT(vm_codearea, 12) == vm_abiversion2);
-	assert(GETINT(vm_codearea, 16) == vm_abiversion3);
-	assert(GETINT(vm_codearea, 20) == vm_abiversion4);
-	assert(GETINT(vm_codearea, 24) == vm_abiversion5);
+	if ((GETINT(vm_codearea, 8) != vm_abiversion1) ||
+	    (GETINT(vm_codearea, 12) == vm_abiversion2) ||
+	    (GETINT(vm_codearea, 16) == vm_abiversion3) ||
+	    (GETINT(vm_codearea, 20) == vm_abiversion4) ||
+	    (GETINT(vm_codearea, 24) == vm_abiversion5))
+		errx(1, "Incompatible ABI version - recompile");
 
 	/* Now, get the function table pointer */
 	t = GETINT(vm_codearea, 4);
@@ -933,16 +991,20 @@ int vm_spawn_args(char *fn, int n, ...)
 		return 0;
 	}
 	newt->sp = newt->stackbase;
-	/* Push return address here, to point to some special thread exit
-	   routine */
 
+	stack_push(newt, 0); 	/* Return value */
+
 	/* Push optional arguments */
 	va_start(ap, n);
-	while (n--)
-	    stack_push(newt, va_arg(ap, int));
+	while (n--) {
+	    int a = va_arg(ap, int);
+//	    printf("arg is %d\n", a);
+	    stack_push(newt, a);
+	}
 	va_end(ap);
 
-	stack_push(newt, 0); 	/* Return value */
+	/* Push return address here, to point to some special thread exit
+	   routine */
 	stack_push(newt, 0);	/* Return address */
 
 	/* Insert into head of run queue */