CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pack200 use QFile by proxy, eliminating some unicode issues.

Browse Source
This commit is contained in:
Petr Mrázek
2013-12-22 18:49:52 +01:00
parent 7a07ed7940
commit 3051d0d328
5 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
depends/pack200/anti200.cpp
View File

@ -8,21 +8,36 @@
int main(int argc, char **argv)
{
if (argc == 3)
if (argc != 3)
{
try
{
unpack_200(argv[1], argv[2]);
}
catch (std::runtime_error &e)
{
std::cerr << "Bad things happened: " << e.what() << std::endl;
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
else
std::cerr << "Simple pack200 unpacker!" << std::endl << "Run like this:" << std::endl
<< " " << argv[0] << " input.jar.lzma output.jar" << std::endl;
return EXIT_FAILURE;
return EXIT_FAILURE;
}
FILE *input = fopen(argv[1], "rb");
FILE *output = fopen(argv[2], "wb");
if (!input)
{
std::cerr << "Can't open input file";
return EXIT_FAILURE;
}
if (!output)
{
fclose(output);
std::cerr << "Can't open output file";
return EXIT_FAILURE;
}
try
{
unpack_200(input, output);
}
catch (std::runtime_error &e)
{
std::cerr << "Bad things happened: " << e.what() << std::endl;
fclose(input);
fclose(output);
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}

2
depends/pack200/include/unpack200.h
View File

@ -34,4 +34,4 @@
* @return void
* @throw std::runtime_error for any error encountered
*/
void unpack_200(std::string input_path, std::string output_path);
void unpack_200(FILE * input, FILE * output);

13
depends/pack200/src/unpack200.cpp
View File

@ -94,20 +94,9 @@ static int read_magic(unpacker *u, char peek[], int peeklen)
return magic;
}
void unpack_200(std::string input_path, std::string output_path)
void unpack_200(FILE *input, FILE *output)
{
unpacker u;
FILE *input = fopen(input_path.c_str(), "rb");
if (!input)
{
throw std::runtime_error("Can't open input file" + input_path);
}
FILE *output = fopen(output_path.c_str(), "wb");
if (!output)
{
fclose(output);
throw std::runtime_error("Can't open output file" + output_path);
}
u.init(read_input_via_stdio);
// initialize jar output