mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

luaserver: use LUAPLUGINDIR_VAR

Browse Source 
Origin commit data
------------------
Commit: a4d8729100
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-06-14 (Fri, 14 Jun 2019)

Origin message was:
------------------
- luaserver: use LUAPLUGINDIR_VAR
This commit is contained in:
vanhofen
2019-06-14 22:40:28 +02:00
parent 170d7a1c33
commit 96615517de
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/system/luaserver.cpp
View File

@@ -235,16 +235,26 @@ bool CLuaServer::luaserver_parse_command(CBasicMessage::Header &rmsg __attribute
std::string luascript; std::string luascript;
if (data[0] == '/') if (data[0] == '/')
luascript = data; luascript = data;
else { const char * path[2] = { LUAPLUGINDIR_VAR, LUAPLUGINDIR };
luascript = LUAPLUGINDIR "/"; for (unsigned int i = 0; i < 2; i++)
luascript += data; {
luascript += ".lua"; std::string filename = path[i];
filename += "/";
filename += data;
filename += ".lua";
if (access(filename, R_OK) == 0)
{
luascript = filename;
break;
} }
if (access(luascript, R_OK)) { }
fprintf(stderr, "%s %s %d: %s not found\n", __file__, __func__, __LINE__, luascript.c_str()); if (access(luascript, R_OK) != 0)
{
fprintf(stderr, "%s %s %d: %s not found\n", __file__, __func__, __LINE__, data);
const char *result_code = "-1"; const char *result_code = "-1";
const char *result_string = ""; const char *result_string = "";
std::string error_string = luascript + " not found\n"; std::string error_string = data;
error_string += " not found\n";
size_t result_code_len = strlen(result_code) + 1; size_t result_code_len = strlen(result_code) + 1;
size_t result_string_len = strlen(result_string) + 1; size_t result_string_len = strlen(result_string) + 1;
size_t error_string_len = error_string.size() + 1; size_t error_string_len = error_string.size() + 1;