Index: .gitignore
==================================================================
--- .gitignore
+++ .gitignore
@@ -34,6 +34,6 @@
 tests/tests.exe
 tests/EBOOT.PBP
 tests/PARAM.SFO
 tests/objc_sync/objc_sync
 utils/objfw-config
-utils/objfw-unzip
+utils/ofzip

Index: utils/Makefile
==================================================================
--- utils/Makefile
+++ utils/Makefile
@@ -1,7 +1,7 @@
-PROG = objfw-unzip
-SRCS = objfw-unzip.m
+PROG = ofzip
+SRCS = OFZIP.m
 
 include ../buildsys.mk
 
 DISTCLEAN = objfw-config
 

ADDED   utils/OFZIP.m
Index: utils/OFZIP.m
==================================================================
--- utils/OFZIP.m
+++ utils/OFZIP.m
@@ -0,0 +1,193 @@
+#import "OFApplication.h"
+#import "OFArray.h"
+#import "OFDictionary.h"
+#import "OFFile.h"
+#import "OFOptionsParser.h"
+#import "OFStdIOStream.h"
+#import "OFZIPArchive.h"
+#import "OFZIPArchiveEntry.h"
+
+#import "autorelease.h"
+#import "macros.h"
+
+#define BUFFER_SIZE 4096
+
+@interface OFZIP: OFObject
+- (void)extractAllFilesFromArchive: (OFZIPArchive*)archive;
+@end
+
+OF_APPLICATION_DELEGATE(OFZIP)
+
+static void
+help(OFStream *stream, int status)
+{
+	[stream writeFormat: @"Usage: %@ -x archive1.zip [archive2.zip ...]\n",
+			     [OFApplication programName]];
+	[OFApplication terminateWithStatus: status];
+}
+
+@implementation OFZIP
+- (void)applicationDidFinishLaunching
+{
+	OFOptionsParser *optionsParser =
+	    [OFOptionsParser parserWithOptions: @"xh"];
+	enum {
+		NONE,
+		EXTRACT
+	} mode;
+	OFEnumerator *enumerator;
+	OFString *file;
+	of_unichar_t option;
+
+	while ((option = [optionsParser nextOption]) != '\0') {
+		switch (option) {
+		case 'x':
+			mode = EXTRACT;
+			break;
+		case 'h':
+			help(of_stdout, 0);
+			break;
+		case '?':
+			[of_stderr writeFormat: @"%@: Unknown option: -%c\n",
+						[OFApplication programName],
+						[optionsParser lastOption]];
+			[OFApplication terminateWithStatus: 1];
+			break;
+		}
+	}
+
+	switch (mode) {
+	case EXTRACT:
+		enumerator =
+		    [[optionsParser remainingArguments] objectEnumerator];
+
+		while ((file = [enumerator nextObject]) != nil) {
+			void *pool = objc_autoreleasePoolPush();
+
+			[self extractAllFilesFromArchive:
+			   [OFZIPArchive archiveWithPath: file]];
+
+			objc_autoreleasePoolPop(pool);
+		}
+		break;
+	default:
+		help(of_stderr, 1);
+		break;
+	}
+
+	[OFApplication terminate];
+}
+
+- (void)extractAllFilesFromArchive: (OFZIPArchive*)archive
+{
+	OFEnumerator *enumerator = [[archive entries] objectEnumerator];
+	OFZIPArchiveEntry *entry;
+	int_fast8_t override = 0;
+
+	while ((entry = [enumerator nextObject]) != nil) {
+		void *pool = objc_autoreleasePoolPush();
+		OFString *fileName = [entry fileName];
+		OFString *outFileName = [fileName stringByStandardizingPath];
+		OFEnumerator *componentEnumerator;
+		OFString *component, *directory;
+		OFStream *stream;
+		OFFile *output;
+		char buffer[BUFFER_SIZE];
+		off_t written = 0, size = [entry uncompressedSize];
+		int_fast8_t percent = -1, newPercent;
+
+#ifndef _WIN32
+		if ([outFileName hasPrefix: @"/"]) {
+#else
+		if ([outFileName hasPrefix: @"/"] ||
+		    [outFileName containsString: @":"]) {
+#endif
+			[of_stdout writeFormat: @"Refusing to extract %@!\n",
+						fileName];
+			[OFApplication terminateWithStatus: 1];
+		}
+
+		componentEnumerator =
+		    [[outFileName pathComponents] objectEnumerator];
+		while ((component = [componentEnumerator nextObject]) != nil) {
+			if ([component isEqual: OF_PATH_PARENT_DIRECTORY]) {
+				[of_stdout writeFormat:
+				    @"Refusing to extract %@!\n", fileName];
+				[OFApplication terminateWithStatus: 1];
+			}
+		}
+
+		[of_stdout writeFormat: @"Extracting %@...", fileName];
+
+		if ([fileName hasSuffix: @"/"]) {
+			[OFFile createDirectoryAtPath: outFileName
+					createParents: true];
+			[of_stdout writeLine: @" done"];
+			continue;
+		}
+
+		directory = [outFileName stringByDeletingLastPathComponent];
+		if (![OFFile directoryExistsAtPath: directory])
+			[OFFile createDirectoryAtPath: directory
+					createParents: true];
+
+		if ([OFFile fileExistsAtPath: outFileName] && override != 1) {
+			OFString *line;
+
+			if (override == -1) {
+				[of_stdout writeLine: @" skipped"];
+				continue;
+			}
+
+			do {
+				[of_stderr writeFormat:
+				    @"\rOverride %@? [ynAN] ", fileName];
+
+				line = [of_stdin readLine];
+			} while (![line isEqual: @"y"] &&
+			    ![line isEqual: @"n"] && ![line isEqual: @"N"] &&
+			    ![line isEqual: @"A"]);
+
+			if ([line isEqual: @"A"])
+				override = 1;
+			else if ([line isEqual: @"N"])
+				override = -1;
+
+			if ([line isEqual: @"n"] || [line isEqual: @"N"]) {
+				[of_stdout writeFormat: @"Skipping %@...\n",
+							fileName];
+				continue;
+			}
+
+			[of_stdout writeFormat: @"Extracting %@...", fileName];
+		}
+
+		stream = [archive streamForReadingFile: fileName];
+		output = [OFFile fileWithPath: outFileName
+					 mode: @"w"];
+
+		while (![stream isAtEndOfStream]) {
+			size_t length = [stream readIntoBuffer: buffer
+							length: BUFFER_SIZE];
+			[output writeBuffer: buffer
+				     length: length];
+
+			written += length;
+			newPercent = (written == size
+			    ? 100 : (int_fast8_t)(written * 100 / size));
+
+			if (percent != newPercent) {
+				percent = newPercent;
+
+				[of_stdout writeFormat:
+				    @"\rExtracting %@... %3u%%",
+				    fileName, percent];
+			}
+		}
+
+		[of_stdout writeFormat: @"\rExtracting %@... done\n", fileName];
+
+		objc_autoreleasePoolPop(pool);
+	}
+}
+@end

DELETED utils/objfw-unzip.m
Index: utils/objfw-unzip.m
==================================================================
--- utils/objfw-unzip.m
+++ utils/objfw-unzip.m
@@ -1,150 +0,0 @@
-#import "OFApplication.h"
-#import "OFArray.h"
-#import "OFDictionary.h"
-#import "OFFile.h"
-#import "OFStdIOStream.h"
-#import "OFZIPArchive.h"
-#import "OFZIPArchiveEntry.h"
-
-#import "autorelease.h"
-#import "macros.h"
-
-#define BUFFER_SIZE 4096
-
-@interface UnZIP: OFObject
-- (void)extractAllFilesFromArchive: (OFZIPArchive*)archive;
-@end
-
-OF_APPLICATION_DELEGATE(UnZIP)
-
-@implementation UnZIP
-- (void)applicationDidFinishLaunching
-{
-	OFEnumerator *enumerator = [[OFApplication arguments] objectEnumerator];
-	OFString *file;
-
-	while ((file = [enumerator nextObject]) != nil) {
-		void *pool = objc_autoreleasePoolPush();
-
-		[self extractAllFilesFromArchive:
-		    [OFZIPArchive archiveWithPath: file]];
-
-		objc_autoreleasePoolPop(pool);
-	}
-
-	[OFApplication terminate];
-}
-
-- (void)extractAllFilesFromArchive: (OFZIPArchive*)archive
-{
-	OFEnumerator *enumerator = [[archive entries] objectEnumerator];
-	OFZIPArchiveEntry *entry;
-	int_fast8_t override = 0;
-
-	while ((entry = [enumerator nextObject]) != nil) {
-		void *pool = objc_autoreleasePoolPush();
-		OFString *fileName = [entry fileName];
-		OFString *outFileName = [fileName stringByStandardizingPath];
-		OFEnumerator *componentEnumerator;
-		OFString *component, *directory;
-		OFStream *stream;
-		OFFile *output;
-		char buffer[BUFFER_SIZE];
-		off_t written = 0, size = [entry uncompressedSize];
-		int_fast8_t percent = -1, newPercent;
-
-#ifndef _WIN32
-		if ([outFileName hasPrefix: @"/"]) {
-#else
-		if ([outFileName hasPrefix: @"/"] ||
-		    [outFileName containsString: @":"]) {
-#endif
-			[of_stdout writeFormat: @"Refusing to extract %@!\n",
-						fileName];
-			[OFApplication terminateWithStatus: 1];
-		}
-
-		componentEnumerator =
-		    [[outFileName pathComponents] objectEnumerator];
-		while ((component = [componentEnumerator nextObject]) != nil) {
-			if ([component isEqual: OF_PATH_PARENT_DIRECTORY]) {
-				[of_stdout writeFormat:
-				    @"Refusing to extract %@!\n", fileName];
-				[OFApplication terminateWithStatus: 1];
-			}
-		}
-
-		[of_stdout writeFormat: @"Extracting %@...", fileName];
-
-		if ([fileName hasSuffix: @"/"]) {
-			[OFFile createDirectoryAtPath: outFileName
-					createParents: true];
-			[of_stdout writeLine: @" done"];
-			continue;
-		}
-
-		directory = [outFileName stringByDeletingLastPathComponent];
-		if (![OFFile directoryExistsAtPath: directory])
-			[OFFile createDirectoryAtPath: directory
-					createParents: true];
-
-		if ([OFFile fileExistsAtPath: outFileName] && override != 1) {
-			OFString *line;
-
-			if (override == -1) {
-				[of_stdout writeLine: @" skipped"];
-				continue;
-			}
-
-			do {
-				[of_stderr writeFormat:
-				    @"\rOverride %@? [ynAN] ", fileName];
-
-				line = [of_stdin readLine];
-			} while (![line isEqual: @"y"] &&
-			    ![line isEqual: @"n"] && ![line isEqual: @"N"] &&
-			    ![line isEqual: @"A"]);
-
-			if ([line isEqual: @"A"])
-				override = 1;
-			else if ([line isEqual: @"N"])
-				override = -1;
-
-			if ([line isEqual: @"n"] || [line isEqual: @"N"]) {
-				[of_stdout writeFormat: @"Skipping %@...\n",
-							fileName];
-				continue;
-			}
-
-			[of_stdout writeFormat: @"Extracting %@...", fileName];
-		}
-
-		stream = [archive streamForReadingFile: fileName];
-		output = [OFFile fileWithPath: outFileName
-					 mode: @"w"];
-
-		while (![stream isAtEndOfStream]) {
-			size_t length = [stream readIntoBuffer: buffer
-							length: BUFFER_SIZE];
-			[output writeBuffer: buffer
-				     length: length];
-
-			written += length;
-			newPercent = (written == size
-			    ? 100 : (int_fast8_t)(written * 100 / size));
-
-			if (percent != newPercent) {
-				percent = newPercent;
-
-				[of_stdout writeFormat:
-				    @"\rExtracting %@... %3u%%",
-				    fileName, percent];
-			}
-		}
-
-		[of_stdout writeFormat: @"\rExtracting %@... done\n", fileName];
-
-		objc_autoreleasePoolPop(pool);
-	}
-}
-@end