Overview
Comment: | OFZIP: Add support for tar and tar.gz files |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8dee4cac41873d5305f46eb18e1fc2f5 |
User & Date: | js on 2016-05-22 21:02:57 |
Other Links: | manifest | tags |
Context
2016-05-22
| ||
21:14 | OFTarArchive.h: Fix a typo check-in: 804809a28e user: js tags: trunk | |
21:02 | OFZIP: Add support for tar and tar.gz files check-in: 8dee4cac41 user: js tags: trunk | |
20:14 | OFTarArchiveEntry: Rename name to fileName check-in: b10933a514 user: js tags: trunk | |
Changes
Modified utils/ofzip/Archive.h from [9e6c49c585] to [900d834d42].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #import "OFObject.h" #import "OFFile.h" #import "OFArray.h" @protocol Archive <OFObject> | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 | */ #import "OFObject.h" #import "OFFile.h" #import "OFArray.h" @protocol Archive <OFObject> + (instancetype)archiveWithStream: (OF_KINDOF(OFStream*))stream; - initWithStream: (OF_KINDOF(OFStream*))stream; - (void)listFiles; - (void)extractFiles: (OFArray OF_GENERIC(OFString*)*)files; - (void)printFiles: (OFArray OF_GENERIC(OFString*)*)files; @end |
Modified utils/ofzip/GZIPArchive.m from [bc8629617c] to [d0b4b1bf2e].
︙ | ︙ | |||
43 44 45 46 47 48 49 | @implementation GZIPArchive + (void)initialize { if (self == [GZIPArchive class]) app = [[OFApplication sharedApplication] delegate]; } | | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | @implementation GZIPArchive + (void)initialize { if (self == [GZIPArchive class]) app = [[OFApplication sharedApplication] delegate]; } + (instancetype)archiveWithStream: (OF_KINDOF(OFStream*))stream { return [[[self alloc] initWithStream: stream] autorelease]; } - initWithStream: (OF_KINDOF(OFStream*))stream { self = [super init]; @try { _stream = [[OFGZIPStream alloc] initWithStream: stream]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ |
Modified utils/ofzip/Makefile from [115d091be2] to [46bd4340de].
1 2 3 4 5 6 7 8 9 10 11 12 | include ../../extra.mk PROG = ofzip${PROG_SUFFIX} SRCS = GZIPArchive.m \ OFZIP.m \ ZIPArchive.m include ../../buildsys.mk ${PROG}: ${LIBOBJFW_DEP_LVL2} CPPFLAGS += -I../../src -I../../src/runtime -I../../src/exceptions -I../.. | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | include ../../extra.mk PROG = ofzip${PROG_SUFFIX} SRCS = GZIPArchive.m \ OFZIP.m \ TarArchive.m \ ZIPArchive.m include ../../buildsys.mk ${PROG}: ${LIBOBJFW_DEP_LVL2} CPPFLAGS += -I../../src -I../../src/runtime -I../../src/exceptions -I../.. |
︙ | ︙ |
Modified utils/ofzip/OFZIP.m from [3d1c32bca2] to [45c0a2620e].
︙ | ︙ | |||
22 23 24 25 26 27 28 | #import "OFArray.h" #import "OFFile.h" #import "OFFileManager.h" #import "OFOptionsParser.h" #import "OFStdIOStream.h" #import "OFZIP.h" | | > | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFArray.h" #import "OFFile.h" #import "OFFileManager.h" #import "OFOptionsParser.h" #import "OFStdIOStream.h" #import "OFZIP.h" #import "GZIPArchive.h" #import "TarArchive.h" #import "ZIPArchive.h" #import "OFCreateDirectoryFailedException.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" |
︙ | ︙ | |||
238 239 240 241 242 243 244 | } @catch (OFOpenItemFailedException *e) { [of_stderr writeFormat: @"Failed to open file %@: %s\n", [e path], strerror([e errNo])]; [OFApplication terminateWithStatus: 1]; } @try { | > > > > > | | > > | | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | } @catch (OFOpenItemFailedException *e) { [of_stderr writeFormat: @"Failed to open file %@: %s\n", [e path], strerror([e errNo])]; [OFApplication terminateWithStatus: 1]; } @try { /* This one has to be first for obvious reasons */ if ([path hasSuffix: @".tar.gz"] || [path hasSuffix: @".tgz"] || [path hasSuffix: @".TAR.GZ"] || [path hasSuffix: @".TGZ"]) archive = [TarArchive archiveWithStream: [OFGZIPStream streamWithStream: file]]; else if ([path hasSuffix: @".gz"] || [path hasSuffix: @".GZ"]) archive = [GZIPArchive archiveWithStream: file]; else if ([path hasSuffix: @".tar"] || [path hasSuffix: @".TAR"]) archive = [TarArchive archiveWithStream: file]; else archive = [ZIPArchive archiveWithStream: file]; } @catch (OFReadFailedException *e) { [of_stderr writeFormat: @"Failed to read file %@: %s\n", path, strerror([e errNo])]; [OFApplication terminateWithStatus: 1]; } @catch (OFInvalidFormatException *e) { [of_stderr writeFormat: @"File %@ is not a valid archive!\n", path]; |
︙ | ︙ |
Added utils/ofzip/TarArchive.h version [c907133818].
> > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * 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 "OFTarArchive.h" #import "Archive.h" @interface TarArchive: OFObject <Archive> { OFTarArchive *_archive; } @end |
Added utils/ofzip/TarArchive.m version [5eeadf9d58].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 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 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 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 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 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * 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 "config.h" #import "OFDate.h" #import "OFSet.h" #import "OFApplication.h" #import "OFFileManager.h" #import "OFStdIOStream.h" #import "TarArchive.h" #import "OFZIP.h" #ifndef S_IRWXG # define S_IRWXG 0 #endif #ifndef S_IRWXO # define S_IRWXO 0 #endif static OFZIP *app; static void setPermissions(OFString *path, OFTarArchiveEntry *entry) { #ifdef OF_HAVE_CHMOD uint32_t mode = [entry mode]; /* Only allow modes that are safe */ mode &= (S_IRWXU | S_IRWXG | S_IRWXO); [[OFFileManager defaultManager] changePermissionsOfItemAtPath: path permissions: mode]; #endif } @implementation TarArchive + (void)initialize { if (self == [TarArchive class]) app = [[OFApplication sharedApplication] delegate]; } + (instancetype)archiveWithStream: (OF_KINDOF(OFStream*))stream { return [[[self alloc] initWithStream: stream] autorelease]; } - initWithStream: (OF_KINDOF(OFStream*))stream { self = [super init]; @try { _archive = [[OFTarArchive alloc] initWithStream: stream]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_archive release]; [super dealloc]; } - (void)listFiles { OFTarArchiveEntry *entry; while ((entry = [_archive nextEntry]) != nil) { void *pool = objc_autoreleasePoolPush(); [of_stdout writeLine: [entry fileName]]; if (app->_outputLevel >= 1) { OFString *date = [[entry modificationDate] localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"]; [of_stdout writeFormat: @"\tSize: %" PRIu64 @" bytes\n" @"\tModification date: %@\n", [entry size], date]; } if (app->_outputLevel >= 2) { switch ([entry type]) { case OF_TAR_ARCHIVE_ENTRY_TYPE_FILE: [of_stdout writeLine: @"\tType: Normal file"]; break; case OF_TAR_ARCHIVE_ENTRY_TYPE_LINK: [of_stdout writeLine: @"\tType: Hard link"]; [of_stdout writeFormat: @"\tTarget file name: %@\n", [entry targetFileName]]; break; case OF_TAR_ARCHIVE_ENTRY_TYPE_SYMLINK: [of_stdout writeLine: @"\tType: Symbolic link"]; [of_stdout writeFormat: @"\tTarget file name: %@\n", [entry targetFileName]]; break; default: [of_stdout writeLine: @"\tType: Unknown"]; break; } } objc_autoreleasePoolPop(pool); } } - (void)extractFiles: (OFArray OF_GENERIC(OFString*)*)files { OFFileManager *fileManager = [OFFileManager defaultManager]; bool all = ([files count] == 0); OFMutableSet OF_GENERIC(OFString*) *missing = [OFMutableSet setWithArray: files]; OFTarArchiveEntry *entry; while ((entry = [_archive nextEntry]) != nil) { void *pool = objc_autoreleasePoolPush(); OFString *fileName = [entry fileName]; OFString *outFileName = [fileName stringByStandardizingPath]; OFArray OF_GENERIC(OFString*) *pathComponents; OFString *directory; OFFile *output; uint64_t written = 0, size = [entry size]; int8_t percent = -1, newPercent; if (!all && ![files containsObject: fileName]) continue; if ([entry type] != OF_TAR_ARCHIVE_ENTRY_TYPE_FILE) { if (app->_outputLevel >= 0) [of_stdout writeFormat: @"Skipping %@...\n", fileName]; continue; } [missing removeObject: fileName]; #if !defined(OF_WINDOWS) && !defined(OF_MSDOS) if ([outFileName hasPrefix: @"/"]) { #else if ([outFileName hasPrefix: @"/"] || [outFileName containsString: @":"]) { #endif [of_stderr writeFormat: @"Refusing to extract %@!\n", fileName]; app->_exitStatus = 1; goto outer_loop_end; } pathComponents = [outFileName pathComponents]; for (OFString *component in pathComponents) { if ([component isEqual: OF_PATH_PARENT_DIRECTORY]) { [of_stderr writeFormat: @"Refusing to extract %@!\n", fileName]; app->_exitStatus = 1; goto outer_loop_end; } } outFileName = [OFString pathWithComponents: pathComponents]; if (app->_outputLevel >= 0) [of_stdout writeFormat: @"Extracting %@...", fileName]; if ([fileName hasSuffix: @"/"]) { [fileManager createDirectoryAtPath: outFileName createParents: true]; setPermissions(outFileName, entry); if (app->_outputLevel >= 0) [of_stdout writeLine: @" done"]; goto outer_loop_end; } directory = [outFileName stringByDeletingLastPathComponent]; if (![fileManager directoryExistsAtPath: directory]) [fileManager createDirectoryAtPath: directory createParents: true]; if (![app shouldExtractFile: fileName outFileName: outFileName]) goto outer_loop_end; output = [OFFile fileWithPath: outFileName mode: @"wb"]; setPermissions(outFileName, entry); while (![entry isAtEndOfStream]) { ssize_t length = [app copyBlockFromStream: entry toStream: output fileName: fileName]; if (length < 0) { app->_exitStatus = 1; goto outer_loop_end; } written += length; newPercent = (written == size ? 100 : (int8_t)(written * 100 / size)); if (app->_outputLevel >= 0 && percent != newPercent) { percent = newPercent; [of_stdout writeFormat: @"\rExtracting %@... %3u%%", fileName, percent]; } } if (app->_outputLevel >= 0) [of_stdout writeFormat: @"\rExtracting %@... done\n", fileName]; outer_loop_end: objc_autoreleasePoolPop(pool); } if ([missing count] > 0) { for (OFString *file in missing) [of_stderr writeFormat: @"File %@ is not in the archive!\n", file]; app->_exitStatus = 1; } } - (void)printFiles: (OFArray OF_GENERIC(OFString*)*)files_ { OFMutableSet *files; OFTarArchiveEntry *entry; if ([files_ count] < 1) { [of_stderr writeLine: @"Need one or more files to print!"]; app->_exitStatus = 1; return; } files = [OFMutableSet setWithArray: files_]; while ((entry = [_archive nextEntry]) != nil) { OFString *fileName = [entry fileName]; if (![files containsObject: fileName]) continue; while (![entry isAtEndOfStream]) { ssize_t length = [app copyBlockFromStream: entry toStream: of_stdout fileName: fileName]; if (length < 0) { app->_exitStatus = 1; return; } } [files removeObject: fileName]; [entry close]; } for (OFString *path in files) { [of_stderr writeFormat: @"File %@ is not in the archive!\n", path]; app->_exitStatus = 1; } } @end |
Modified utils/ofzip/ZIPArchive.m from [63ecae10f5] to [da9497b9c3].
︙ | ︙ | |||
60 61 62 63 64 65 66 | @implementation ZIPArchive + (void)initialize { if (self == [ZIPArchive class]) app = [[OFApplication sharedApplication] delegate]; } | | | | | > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | @implementation ZIPArchive + (void)initialize { if (self == [ZIPArchive class]) app = [[OFApplication sharedApplication] delegate]; } + (instancetype)archiveWithStream: (OF_KINDOF(OFStream*))stream { return [[[self alloc] initWithStream: stream] autorelease]; } - initWithStream: (OF_KINDOF(OFStream*))stream { self = [super init]; @try { _archive = [[OFZIPArchive alloc] initWithSeekableStream: stream]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ |