pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-22 02:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for file loading

Browse Source
This commit is contained in:
KimLS 2014-10-12 14:41:53 -07:00
parent f4621bd5c0
commit 45b83feb99
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
world/remote_call.cpp
View File

@ -166,7 +166,7 @@ void handle_rc_quest_interface(const std::string &method, const std::string &con
std::string error; std::string error;
std::map<std::string, std::string> res; std::map<std::string, std::string> res;
FILE *f = fopen("quests/global/Waypoint.pl", "r"); FILE *f = fopen("quests/global/Waypoint.pl", "rb");
if(!f) { if(!f) {
error = "File not found"; error = "File not found";
RemoteCallResponse(connection_id, request_id, res, error); RemoteCallResponse(connection_id, request_id, res, error);
@ -177,32 +177,19 @@ void handle_rc_quest_interface(const std::string &method, const std::string &con
size_t sz = ftell(f); size_t sz = ftell(f);
rewind(f); rewind(f);
//todo: actually break the message apart or something so we don't destroy web_interface's poor buffer
//dunno where to do this yet, got some musing to do
//if(sz >= 1024) {
// error = "File too large... for now...";
// RemoteCallResponse(connection_id, request_id, res, error);
// return;
//}
char *buffer = new char[sz + 1]; char *buffer = new char[sz + 1];
size_t r = fread(buffer, 1, sz, f); size_t r = fread(buffer, 1, sz, f);
if(r != sz) { if(r != sz) {
error = "Unable to read file"; error = "Unable to read file";
RemoteCallResponse(connection_id, request_id, res, error); RemoteCallResponse(connection_id, request_id, res, error);
fclose(f);
delete[] buffer; delete[] buffer;
return; return;
} }
fclose(f);
buffer[sz] = '\0'; buffer[sz] = '\0';
//std::string str;
//std::ifstream file("quests/global/Waypoint.pl", std::ios::in);
//if (file) {
// while (!file.eof())
// str.push_back(file.get());
//}
res["quest_text"] = buffer; res["quest_text"] = buffer;
RemoteCallResponse(connection_id, request_id, res, error); RemoteCallResponse(connection_id, request_id, res, error);
} }