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

3 files changed, 31 insertions, 27 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;
 }
diff --git a/depends/pack200/include/unpack200.h b/depends/pack200/include/unpack200.h
index bcee8009..f9239488 100644
--- a/depends/pack200/include/unpack200.h
+++ b/depends/pack200/include/unpack200.h
@@ -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);
diff --git a/depends/pack200/src/unpack200.cpp b/depends/pack200/src/unpack200.cpp
index 0a9d2714..22b7f3b0 100644
--- a/depends/pack200/src/unpack200.cpp
+++ b/depends/pack200/src/unpack200.cpp
@@ -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