pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 21:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Perl Linux fix [skip ci]

Browse Source
This commit is contained in:
Akkadius 2019-10-05 03:43:31 -05:00
parent 871657c68b
commit 6792db2cdd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/embperl.cpp
View File

@ -247,7 +247,7 @@ void Embperl::init_eval_file(void)
" return;" " return;"
"} else {" "} else {"
//we 'my' $filename,$mtime,$package,$sub to prevent them from changing our state up here. //we 'my' $filename,$mtime,$package,$sub to prevent them from changing our state up here.
" eval(\"package $package; my(\\$filename,\\$mtime,\\$package,\\$sub); \\$isloaded = 1; require '$filename'; \");" " eval(\"package $package; my(\\$filename,\\$mtime,\\$package,\\$sub); \\$isloaded = 1; require './$filename'; \");"
/* "local *FH;open FH, $filename or die \"open '$filename' $!\";" /* "local *FH;open FH, $filename or die \"open '$filename' $!\";"
"local($/) = undef;my $sub = <FH>;close FH;" "local($/) = undef;my $sub = <FH>;close FH;"
"my $eval = qq{package $package; sub handler { $sub; }};" "my $eval = qq{package $package; sub handler { $sub; }};"

4
zone/embxs.cpp
View File

@ -99,6 +99,10 @@ XS(XS_EQEmuIO_PRINT)
/* Strip newlines from log message 'str' */ /* Strip newlines from log message 'str' */
*std::remove(str, str + strlen(str), '\n') = '\0'; *std::remove(str, str + strlen(str), '\n') = '\0';
std::string log_string = str;
if (log_string.find("did not return a true") != std::string::npos)
return;
int i; int i;
int pos = 0; int pos = 0;
int len = 0; int len = 0;