From d8051926c84339d551cd75e8cea2811253cc4845 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Mon, 30 May 2011 18:15:56 +0100
Subject: [PATCH] More descriptive error messages for lua console

---
 includes/luaconsole.h | 1 +
 src/luaconsole.c      | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/includes/luaconsole.h b/includes/luaconsole.h
index ddcac43a1..00f28c269 100644
--- a/includes/luaconsole.h
+++ b/includes/luaconsole.h
@@ -9,6 +9,7 @@ void luacon_open();
 int luacon_step();
 int luacon_keypress(char key);
 int luacon_eval(char *command);
+char *luacon_geterror();
 void luacon_close();
 int process_command_lua(pixel *vid_buf, char *console, char *console_error);
 
diff --git a/src/luaconsole.c b/src/luaconsole.c
index 7e3403cd9..c2034cb19 100644
--- a/src/luaconsole.c
+++ b/src/luaconsole.c
@@ -24,6 +24,13 @@ int luacon_keypress(char key){
 int luacon_eval(char *command){
 	return luaL_dostring (l, command);
 }
+char *luacon_geterror(){
+	char *error = lua_tostring(l, -1);
+	if(error==NULL || !error[0]){
+		error = "failed to execute";	
+	}
+	return error;
+}
 void luacon_close(){
 	lua_close(l);
 }
@@ -44,7 +51,7 @@ int process_command_lua(pixel *vid_buf, char *console, char *console_error)
 		} else {
 			commandret = luacon_eval(console);
 			if (commandret)
-				strcpy(console_error,"failed to execute code.");
+				strcpy(console_error, luacon_geterror());
 		}
 	}
 	return 1;