Added more useful error messages to require

Author: darkdreamingdan

Server/mods/deathmatch/logic/lua/CLuaMain.cpp

@@ -757,7 +757,7 @@ void CLuaMain::SetPackage(lua_State* L, SString &strName )
 // Push the value of a package of name to the stack
 //
 ///////////////////////////////////////////////////////////////
-void CLuaMain::GetPackage(lua_State* L, SString &strName)
+void CLuaMain::GetPackage(lua_State* L, SString &strName )
 {
     if (m_iPackageLoadedRef < 0)
         return;
@@ -775,7 +775,7 @@ void CLuaMain::GetPackage(lua_State* L, SString &strName)
 // Load a Lua lib of a given name
 //
 ///////////////////////////////////////////////////////////////
-bool CLuaMain::LoadLuaLib(lua_State *L, SString strName)
+bool CLuaMain::LoadLuaLib(lua_State *L, SString strName, SString &strError)
 {
     SString strPath = strName;
     // Name format shouldn't include slashes.  Subdirs are dots.
@@ -792,10 +792,21 @@ bool CLuaMain::LoadLuaLib(lua_State *L, SString strName)
         FileLoad(strFilePath, buffer);
     else
     {
+        // Don't use a format string for safety, so we construct the error by hand
+        strError += "error loading module " + strName + " from file " + strFilePath + 
+            ":\n\t The specified module could not be found";
+
         // Try <resource>/?/init.lua
         strFilePath = PathJoin(strResPath, strPath, "init.lua");
         if (FileExists(strFilePath))
             FileLoad(strFilePath, buffer);
+        else
+        {
+            strError += "\n";
+            strError += "error loading module " + strName + " from file " + strFilePath +
+                ":\n\t The specified module could not be found";
+            return false;
+        }
     }
 
     if (buffer.size() > 0)
@@ -806,9 +817,19 @@ bool CLuaMain::LoadLuaLib(lua_State *L, SString strName)
         if (lua_gettop(L) > luaSavedTop)
             lua_settop(L, luaSavedTop+1);
 
+        if (lua_type(L, -1) == LUA_TNIL)
+        {
+            strError += "error loading module " + strName + " from file " + strFilePath +
+                ":\n\t Module didn't return a value";
+            return false;
+        }
+
         SetPackage(L, strName);  // Store our package into package.loaded
         return true;
     }
+    else
+        strError += "error loading module " + strName + " from file " + strFilePath +
+            ":\n\t Error loading script file";
 
     return false;
 }
@@ -820,7 +841,7 @@ bool CLuaMain::LoadLuaLib(lua_State *L, SString strName)
 // Load a C lib of a given name
 //
 ///////////////////////////////////////////////////////////////
-bool CLuaMain::LoadClib(lua_State* L, SString strName)
+bool CLuaMain::LoadClib(lua_State* L, SString strName, SString &strError )
 {
     SString strPath = strName;
     // Name format shouldn't include slashes.  Subdirs are dots.
@@ -836,9 +857,19 @@ bool CLuaMain::LoadClib(lua_State* L, SString strName)
     strPath += ".so";
 #endif
 
-    luaL_loader_C(L, strName.c_str(), strPath.c_str());
-    if (lua_type(L, -1) == LUA_TNIL)
+    if (!FileExists(strPath))
+    {
+        strError += "error loading module " + strName + " from file " + strPath +
+            ":\n\t The specified module could not be found";
         return false;
+    }
+
+    if (!luaL_loader_C(L, strName.c_str(), strPath.c_str()) || lua_type(L, -1) == LUA_TNIL)
+    {
+        strError += "error loading module " + strName + " from file " + strPath +
+            ":\n\t Failed to load module";
+        return false;
+    }
 
     SetPackage(L, strName);
     return true;

Server/mods/deathmatch/logic/lua/CLuaMain.h

@@ -123,8 +123,8 @@ class CLuaMain //: public CClient
     void                            InitPackageStorage      ( lua_State* L );  // Create a psuedo package.loaded table
     void                            GetPackage              ( lua_State *L, SString &strName ); // Push the package value to the top of the stack
     void                            SetPackage              ( lua_State *L, SString &strName ); // Set the package to the value at the top of the stack
-    bool                            LoadLuaLib              ( lua_State *L, SString strName ); // Load a lua library of a given name
-    bool                            LoadClib                ( lua_State *L, SString strName ); // Load a C Lib of a given name
+    bool                            LoadLuaLib              ( lua_State *L, SString strName, SString &strError ); // Load a lua library of a given name
+    bool                            LoadClib                ( lua_State *L, SString strName, SString &strError ); // Load a C Lib of a given name
 
 private:
     void                            InitSecurity            ( void );

Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp

@@ -575,6 +575,7 @@ int CLuaUtilDefs::Require(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
+        SString strError = "";
         // Check if package exists already, if so load it
                                                         // stack: ["moduleName"]
         pLuaMain->GetPackage(luaVM, strMod);            // stack: ["moduleName",pkgModule/nil]
@@ -583,12 +584,15 @@ int CLuaUtilDefs::Require(lua_State* luaVM)
         lua_pop(luaVM,1);                               // stack: ["moduleName"]
 
         // Check whether the appropriate pure lua module exists
-        if (pLuaMain->LoadLuaLib(luaVM, strMod))        // stack: ["moduleName",pkgLuaMod/nil]
+        if (pLuaMain->LoadLuaLib(luaVM, strMod,strError))        // stack: ["moduleName",pkgLuaMod/nil]
             return 1;
+        strError += "\n";
 
         // Check if a C library exists
-        if (pLuaMain->LoadClib(luaVM, strMod))          // stack: ["moduleName",fncModule/nil]
+        if (pLuaMain->LoadClib(luaVM, strMod,strError))          // stack: ["moduleName",fncModule/nil]
             return 1;
+        m_pScriptDebugging->LogCustom(luaVM, strError);
+
         lua_pop(luaVM,2);                               // stack: []
     }
     else

vendor/lua/src/loadlib.c

@@ -673,6 +673,6 @@ LUALIB_API int luaopen_package (lua_State *L) {
 LUA_API int luaL_loader_C(lua_State *L, const char* name, const char* filename) {
     const char* funcname = mkfuncname(L, name);
     if (ll_loadfunc(L, filename, funcname) != 0)
-        loaderror(L, filename);
+        return 0;
     return 1;  /* library loaded successfully */
 }