Lua version now excludes "Lua engine", at least for MODULEVERSION.

Expand version string in lsmod.

diff --git a/control/control.c b/control/control.c
index 31cdaaa427eaf8d367f661346be9493fafacc1e2..d97df3bbbf39cf589ae5836fef73cbdd188d2f35 100644 (file)
--- a/control/control.c
+++ b/control/control.c
@@ -299,9 +299,9 @@ int controllsmod(void *sender, int cargc, char **cargv) {
     ptr = lsmod(i, &ver, &buildid, &t);
 
     /*                                                                    9999d 24h 59m 59s fbf2a4a69ee1-tip */
-    controlreply((nick *)sender,"Module                                   Loaded for        Version              Build id");
+    controlreply((nick *)sender,"Module                                   Loaded for        Version                        Build id");
     while (ptr != NULL) {
-      controlreply((nick *)sender," %-40s %-17s %-20s %s", ptr, longtoduration(t2-t, 2), ver?ver:"", buildid?buildid:"");
+      controlreply((nick *)sender," %-40s %-17s %-30s %s", ptr, longtoduration(t2-t, 2), ver?ver:"", buildid?buildid:"");
       ptr = lsmod(++i, &ver, &buildid, &t);
     }
   } else {

diff --git a/lua/lua.c b/lua/lua.c
index 036fc5dffea0a6624e3e0f3af4292229c4d1e37a..7681bf62a1e2e83b81b9f274f70a42ad223273f9 100644 (file)
--- a/lua/lua.c
+++ b/lua/lua.c
@@ -14,7 +14,7 @@
 
 #include "lua.h"
 
-MODULE_VERSION(LUA_FULLVERSION);
+MODULE_VERSION(LUA_SMALLVERSION);
 
 #ifdef LUA_DEBUGSOCKET
 

diff --git a/lua/lua.h b/lua/lua.h
index dcc7676df15a20a8bb314acd1df2739abc49cae1..35e96b8793b16580faa39b073d9a517391c0d35a 100644 (file)
--- a/lua/lua.h
+++ b/lua/lua.h
@@ -48,7 +48,8 @@
 #define LUA_AUXVERSION ""
 #endif
 
-#define LUA_FULLVERSION "Lua engine v" LUA_BOTVERSION " (" LUA_VERSION LUA_AUXVERSION ")"
+#define LUA_SMALLVERSION "v" LUA_BOTVERSION " (" LUA_VERSION LUA_AUXVERSION ")"
+#define LUA_FULLVERSION "Lua engine " LUA_SMALLVERSION
 
 /*** end defines ************************************/