ObjFW  Diff

Differences From Artifact [37633a42a1]:

To Artifact [f85ab98d59]:


99
100
101
102
103
104
105


106
107


108
109
110
111
112


113
114
115
116
117
118
119
120
121
122








123
124
125
126
127
128
129
99
100
101
102
103
104
105
106
107


108
109
110




111
112





113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132







+
+
-
-
+
+

-
-
-
-
+
+
-
-
-
-
-





+
+
+
+
+
+
+
+







						[optionsParser lastOption]];
			[OFApplication terminateWithStatus: 1];
		}
	}

	remainingArguments = [optionsParser remainingArguments];

	switch (mode) {
	case 'l':
	if ([remainingArguments count] < 1)
		help(of_stderr, false, 1);
		if ([remainingArguments count] != 1)
			help(of_stderr, false, 1);

	files = [remainingArguments objectsInRange:
	    of_range(1, [remainingArguments count] - 1)];
	archive = [OFZIPArchive archiveWithPath:
	    [remainingArguments firstObject]];
		archive = [OFZIPArchive archiveWithPath:
		    [remainingArguments firstObject]];

	switch (mode) {
	case 'l':
		if ([files count] > 0)
			help(of_stderr, false, 1);

		[self listFilesInArchive: archive
				 verbose: verbose];
		break;
	case 'x':
		if ([remainingArguments count] < 1)
			help(of_stderr, false, 1);

		files = [remainingArguments objectsInRange:
		    of_range(1, [remainingArguments count] - 1)];
		archive = [OFZIPArchive archiveWithPath:
		    [remainingArguments firstObject]];

		[self extractFiles: files
		       fromArchive: archive
			  override: override];
		break;
	default:
		help(of_stderr, true, 1);
		break;