From: Chris Porter <redacted>
Date: Mon, 18 Aug 2008 17:54:35 +0000 (+0100)
Subject: Lua version now excludes "Lua engine", at least for MODULEVERSION.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/c3c955ee89f4bd849814a889a3c7f77ee040499f

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 31cdaaa4..d97df3bb 100644
--- 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 036fc5df..7681bf62 100644
--- 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 dcc7676d..35e96b87 100644
--- 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 ************************************/