Overview
Comment: | OFTarArchiveEntry: Minor refactoring |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
a6b87a1a0ccb990587c2ec720c3dce33 |
User & Date: | js on 2017-08-06 21:45:05 |
Other Links: | manifest | tags |
Context
2017-08-06
| ||
22:09 | OFTarArchiveEntry: Add UID and GID check-in: 8c00ffb513 user: js tags: trunk | |
21:45 | OFTarArchiveEntry: Minor refactoring check-in: a6b87a1a0c user: js tags: trunk | |
20:27 | OFZIPArchive: Fix uncompressed + data descriptor check-in: 4f04f5be98 user: js tags: trunk | |
Changes
Modified src/OFTarArchive.m from [d2f44563d3] to [794d54862e].
︙ | |||
12 13 14 15 16 17 18 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - - | * 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" |
︙ | |||
54 55 56 57 58 59 60 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | - - - - - - - - - - - - - - | uint64_t _toWrite; } - initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry; @end |
︙ | |||
225 226 227 228 229 230 231 | 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 | - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | return [[_lastReturnedStream retain] autorelease]; } - (OFStream *)streamForWritingEntry: (OFTarArchiveEntry *)entry { void *pool; |
︙ |
Modified src/OFTarArchiveEntry+Private.h from [b914204d31] to [3a30f14045].
︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | + + + | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFTarArchiveEntry.h" OF_ASSUME_NONNULL_BEGIN @class OFStream; @interface OFTarArchiveEntry () - (instancetype)of_initWithHeader: (char [_Nonnull 512])header OF_METHOD_FAMILY(init); - (void)of_writeToStream: (OFStream *)stream; @end OF_ASSUME_NONNULL_END |
Modified src/OFTarArchiveEntry.m from [0e7f87b9e6] to [060412ff27].
︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | 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 | + + + + + + + + + + + + + + | for (size_t i = 0; i < length; i++) if (buffer[i] == '\0') length = i; return [OFString stringWithUTF8String: buffer length: length]; } static void stringToBuffer(unsigned char *buffer, OFString *string, size_t length) { size_t UTF8StringLength = [string UTF8StringLength]; if (UTF8StringLength > length) @throw [OFOutOfRangeException exception]; memcpy(buffer, [string UTF8String], UTF8StringLength); for (size_t i = UTF8StringLength; i < length; i++) buffer[i] = '\0'; } static uintmax_t octalValueFromBuffer(const char *buffer, size_t length, uintmax_t max) { uintmax_t value = [stringFromBuffer(buffer, length) octalValue]; if (value > max) |
︙ | |||
239 240 241 242 243 244 245 246 | 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 294 295 296 297 298 299 300 301 302 303 304 305 306 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } - (void)of_writeToStream: (OFStream *)stream { unsigned char buffer[512]; uint64_t modificationDate; uint16_t checksum = 0; stringToBuffer(buffer, _fileName, 100); stringToBuffer(buffer + 100, [OFString stringWithFormat: @"%06" PRIo32 " ", _mode], 8); memcpy(buffer + 108, "000000 \0" "000000 \0", 16); stringToBuffer(buffer + 124, [OFString stringWithFormat: @"%011" PRIo64 " ", _size], 12); modificationDate = [_modificationDate timeIntervalSince1970]; stringToBuffer(buffer + 136, [OFString stringWithFormat: @"%011" PRIo64 " ", modificationDate], 12); /* * During checksumming, the checksum field is expected to be set to 8 * spaces. */ memset(buffer + 148, ' ', 8); buffer[156] = _type; stringToBuffer(buffer + 157, _targetFileName, 100); /* ustar */ memcpy(buffer + 257, "ustar\0" "00", 8); stringToBuffer(buffer + 265, _owner, 32); stringToBuffer(buffer + 297, _group, 32); stringToBuffer(buffer + 329, [OFString stringWithFormat: @"%06" PRIo32 " ", _deviceMajor], 8); stringToBuffer(buffer + 337, [OFString stringWithFormat: @"%06" PRIo32 " ", _deviceMinor], 8); memset(buffer + 345, '\0', 155 + 12); /* Fill in the checksum */ for (size_t i = 0; i < 500; i++) checksum += buffer[i]; stringToBuffer(buffer + 148, [OFString stringWithFormat: @"%06" PRIo16, checksum], 7); [stream writeBuffer: buffer length: sizeof(buffer)]; } @end |