ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Linux "invalid encoding" filename

This commit is contained in:
WaluigiWare64 2020-07-24 18:19:02 +01:00 committed by GitHub
parent 7937406af6
commit a5d9f69127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/qt_sdl/main.cpp
View File

@ -1411,7 +1411,8 @@ std::string extractROM(char* zipName, std::string zipDir){
struct zip_stat st; struct zip_stat st;
zip_stat_init(&st); zip_stat_init(&st);
zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0 zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0
char newName[255];
strcpy(newName, st.name); //fix for Linux invalid encoding filename
//Allocate memory for its uncompressed contents //Allocate memory for its uncompressed contents
u8 *contents = new u8[st.size]; u8 *contents = new u8[st.size];
@ -1423,7 +1424,7 @@ std::string extractROM(char* zipName, std::string zipDir){
zip_close(z); zip_close(z);
//Write the file (binary mode) //Write the file (binary mode)
std::ofstream(zipDir + "/" + st.name, std::ofstream::binary).write((char*) contents, st.size); std::ofstream(zipDir + "/" + newName, std::ofstream::binary).write((char*) contents, st.size);
delete[] contents; delete[] contents;
return zipDir + "/" + st.name; return zipDir + "/" + st.name;
} }
@ -1441,11 +1442,15 @@ void MainWindow::onOpenFile()
if (filenameExtLoc.completeSuffix().toUtf8() == "zip") if (filenameExtLoc.completeSuffix().toUtf8() == "zip")
{ {
printf("Extracting ROM from ZIP...\n"); printf("Extracting ROM from ZIP...\n");
std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data()); std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data());
printf("Done.\n"); printf("Done.\n");
filename = QString::fromUtf8(extractRomLoc.c_str()); filename = QString::fromUtf8(extractRomLoc.c_str());
romExtracted = true; romExtracted = true;
} else if (filenameExtLoc.completeSuffix().toUtf8() == "") {
//do nothing
} else {
romExtracted = false;
} }
if (filename.isEmpty()) if (filename.isEmpty())