Differences From Artifact [a3579a0193]:
- File
utils/OFZIP.m
— part of check-in
[7e6942f348]
at
2013-12-21 01:12:29
on branch trunk
— OFZIP: Keep going after non-fatal errors.
The error will be reported instantly, but the program will not terminate
instantly anymore, but instead remember the error and terminate with the
according status code after the operation finished. (user: js, size: 7694) [annotate] [blame] [check-ins using]
To Artifact [aeca64a644]:
- File utils/OFZIP.m — part of check-in [e0f9c1b105] at 2013-12-21 01:37:06 on branch trunk — OFZIP: Better error reporting. (user: js, size: 8761) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFApplication.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFDictionary.h"
#import "OFFile.h"
#import "OFOptionsParser.h"
#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFZIPArchive.h"
#import "OFZIPArchiveEntry.h"
#import "autorelease.h"
#import "macros.h"
#define BUFFER_SIZE 4096
@interface OFZIP: OFObject
{
int_fast8_t _override, _outputLevel;
int _exitStatus;
}
- (void)listFilesInArchive: (OFZIPArchive*)archive;
- (void)extractFiles: (OFArray*)files
fromArchive: (OFZIPArchive*)archive;
@end
OF_APPLICATION_DELEGATE(OFZIP)
| > > > > > > > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include <string.h>
#import "OFApplication.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFDictionary.h"
#import "OFFile.h"
#import "OFOptionsParser.h"
#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFZIPArchive.h"
#import "OFZIPArchiveEntry.h"
#import "OFCreateDirectoryFailedException.h"
#import "OFInvalidFormatException.h"
#import "OFOpenFileFailedException.h"
#import "autorelease.h"
#import "macros.h"
#define BUFFER_SIZE 4096
@interface OFZIP: OFObject
{
int_fast8_t _override, _outputLevel;
int _exitStatus;
}
- (OFZIPArchive*)openArchiveWithPath: (OFString*)path;
- (void)listFilesInArchive: (OFZIPArchive*)archive;
- (void)extractFiles: (OFArray*)files
fromArchive: (OFZIPArchive*)archive;
@end
OF_APPLICATION_DELEGATE(OFZIP)
|
| ︙ | ︙ | |||
110 111 112 113 114 115 116 |
remainingArguments = [optionsParser remainingArguments];
switch (mode) {
case 'l':
if ([remainingArguments count] != 1)
help(of_stderr, false, 1);
| | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
remainingArguments = [optionsParser remainingArguments];
switch (mode) {
case 'l':
if ([remainingArguments count] != 1)
help(of_stderr, false, 1);
archive = [self openArchiveWithPath:
[remainingArguments firstObject]];
[self listFilesInArchive: archive];
break;
case 'x':
if ([remainingArguments count] < 1)
help(of_stderr, false, 1);
files = [remainingArguments objectsInRange:
of_range(1, [remainingArguments count] - 1)];
archive = [self openArchiveWithPath:
[remainingArguments firstObject]];
@try {
[self extractFiles: files
fromArchive: archive];
} @catch (OFCreateDirectoryFailedException *e) {
[of_stderr writeFormat:
@"\rFailed to create directory %@: %s\n",
[e path], strerror([e errNo])];
_exitStatus = 1;
} @catch (OFOpenFileFailedException *e) {
[of_stderr writeFormat:
@"\rFailed to open file %@: %s\n",
[e path], strerror([e errNo])];
_exitStatus = 1;
}
break;
default:
help(of_stderr, true, 1);
break;
}
[OFApplication terminateWithStatus: _exitStatus];
}
- (OFZIPArchive*)openArchiveWithPath: (OFString*)path
{
OFZIPArchive *archive;
@try {
archive = [OFZIPArchive archiveWithPath: path];
} @catch (OFOpenFileFailedException *e) {
[of_stderr writeFormat: @"Failed to open file %@: %s\n",
[e path], strerror([e errNo])];
[OFApplication terminateWithStatus: 1];
} @catch (OFInvalidFormatException *e) {
[of_stderr writeFormat: @"File %@ is not a valid archive!\n",
path];
[OFApplication terminateWithStatus: 1];
}
return archive;
}
- (void)listFilesInArchive: (OFZIPArchive*)archive
{
OFEnumerator *enumerator = [[archive entries] objectEnumerator];
OFZIPArchiveEntry *entry;
while ((entry = [enumerator nextObject]) != nil) {
|
| ︙ | ︙ |