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

1 files changed, 29 insertions, 14 deletions

diff --git a/depends/pack200/anti200.cpp b/depends/pack200/anti200.cpp
index 3dfdb5dc..1e1ec0c8 100644
--- a/depends/pack200/anti200.cpp
+++ b/depends/pack200/anti200.cpp
@@ -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;
 }