BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix .zip extraction (mod store)

Browse Source
This commit is contained in:
ngosang 2015-01-22 17:09:29 +01:00 committed by Loic Blot
parent 146f77fdb7
commit e102cbd840
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/lua_api/l_mainmenu.cpp
View File

@ -859,19 +859,19 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
unsigned int number_of_files = files_in_zip->getFileCount(); unsigned int number_of_files = files_in_zip->getFileCount();
for (unsigned int i=0; i < number_of_files; i++) { for (unsigned int i=0; i < number_of_files; i++) {
std::string fullpath = destination; std::string fullpath = destination;
fullpath += DIR_DELIM; fullpath += DIR_DELIM;
fullpath += files_in_zip->getFullFileName(i).c_str(); fullpath += files_in_zip->getFullFileName(i).c_str();
std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
if (files_in_zip->isDirectory(i)) { if (!files_in_zip->isDirectory(i)) {
if (! fs::CreateAllDirs(fullpath) ) { if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
fs->removeFileArchive(fs->getFileArchiveCount()-1); fs->removeFileArchive(fs->getFileArchiveCount()-1);
lua_pushboolean(L,false); lua_pushboolean(L,false);
return 1; return 1;
} }
}
else {
io::IReadFile* toread = opened_zip->createAndOpenFile(i); io::IReadFile* toread = opened_zip->createAndOpenFile(i);
FILE *targetfile = fopen(fullpath.c_str(),"wb"); FILE *targetfile = fopen(fullpath.c_str(),"wb");
@ -883,7 +883,7 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
} }
char read_buffer[1024]; char read_buffer[1024];
unsigned int total_read = 0; long total_read = 0;
while (total_read < toread->getSize()) { while (total_read < toread->getSize()) {