Overview
Comment: | OFFile: Use AmigaDOS API on MorphOS + libnix |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
7a0f290eae0a92bb1c394898c1df791a |
User & Date: | js on 2017-05-28 21:29:36 |
Other Links: | manifest | tags |
Context
2017-05-28
| ||
23:38 | platform.h: Add OF_ANDROID and OF_DJGPP check-in: 476483dd19 user: js tags: trunk | |
21:29 | OFFile: Use AmigaDOS API on MorphOS + libnix check-in: 7a0f290eae user: js tags: trunk | |
18:57 | Separate std{out,err} on MorphOS + libnix check-in: 0dabf9dc62 user: js tags: trunk | |
Changes
Modified src/OFFile.h from [b0c1c66905] to [1fb9cda36b].
︙ | ︙ | |||
39 40 41 42 43 44 45 | /*! * @class OFFile OFFile.h ObjFW/OFFile.h * * @brief A class which provides methods to read and write files. */ @interface OFFile: OFSeekableStream { | > > > | > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | /*! * @class OFFile OFFile.h ObjFW/OFFile.h * * @brief A class which provides methods to read and write files. */ @interface OFFile: OFSeekableStream { #if !defined(OF_MORPHOS) || defined(OF_IXEMUL) int _fd; #else long _fd; bool _append; #endif bool _atEndOfStream; } /*! * @brief Creates a new OFFile with the specified path and mode. * * @param path The path to the file to open as a string |
︙ | ︙ |
Modified src/OFFile.m from [20677504a4] to [08f6a9dc6a].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #include <errno.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #include "unistd_wrapper.h" | < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include <errno.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #include "unistd_wrapper.h" #import "OFFile.h" #import "OFString.h" #import "OFLocalization.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFOpenItemFailedException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFSeekFailedException.h" #import "OFWriteFailedException.h" #ifdef OF_WINDOWS # include <windows.h> #endif #if defined(OF_MORPHOS) && !defined(OF_IXEMUL) # define BOOL EXEC_BOOL # include <proto/dos.h> # undef BOOL # define INVALID_FD 0 # define close(fd) Close(fd) #endif #ifdef OF_WII # define BOOL OGC_BOOL # include <fat.h> # undef BOOL #endif #ifdef OF_NINTENDO_DS # include <stdbool.h> # include <filesystem.h> #endif #ifndef INVALID_FD # define INVALID_FD -1 #endif #ifndef O_BINARY # define O_BINARY 0 #endif #ifndef O_CLOEXEC # define O_CLOEXEC 0 #endif #ifndef O_EXCL # define O_EXCL 0 #endif #ifndef O_EXLOCK # define O_EXLOCK 0 #endif #ifndef S_IRGRP # define S_IRGRP 0 #endif #ifndef S_IROTH # define S_IROTH 0 #endif #ifndef S_IWGRP # define S_IWGRP 0 #endif #ifndef S_IWOTH # define S_IWOTH 0 #endif #define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH #if !defined(OF_MORPHOS) || defined(OF_IXEMUL) static int parseMode(const char *mode) { if (strcmp(mode, "r") == 0) return O_RDONLY; if (strcmp(mode, "w") == 0) return O_WRONLY | O_CREAT | O_TRUNC; |
︙ | ︙ | |||
109 110 111 112 113 114 115 116 117 118 119 120 121 122 | if (strcmp(mode, "w+bx") == 0 || strcmp(mode, "wb+x") == 0) return O_RDWR | O_CREAT | O_EXCL | O_EXLOCK; if (strcmp(mode, "ab+") == 0 || strcmp(mode, "a+b") == 0) return O_RDWR | O_CREAT | O_APPEND | O_BINARY; return -1; } @implementation OFFile + (void)initialize { if (self != [OFFile class]) return; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | if (strcmp(mode, "w+bx") == 0 || strcmp(mode, "wb+x") == 0) return O_RDWR | O_CREAT | O_EXCL | O_EXLOCK; if (strcmp(mode, "ab+") == 0 || strcmp(mode, "a+b") == 0) return O_RDWR | O_CREAT | O_APPEND | O_BINARY; return -1; } #else static int parseMode(const char *mode, bool *append) { if (strcmp(mode, "r") == 0) return MODE_OLDFILE; if (strcmp(mode, "w") == 0) return MODE_NEWFILE; if (strcmp(mode, "wx") == 0) return MODE_NEWFILE; if (strcmp(mode, "a") == 0) { *append = true; return MODE_READWRITE; } if (strcmp(mode, "rb") == 0) return MODE_OLDFILE; if (strcmp(mode, "wb") == 0) return MODE_NEWFILE; if (strcmp(mode, "wbx") == 0) return MODE_NEWFILE; if (strcmp(mode, "ab") == 0) { *append = true; return MODE_READWRITE; } if (strcmp(mode, "r+") == 0) return MODE_OLDFILE; if (strcmp(mode, "w+") == 0) return MODE_NEWFILE; if (strcmp(mode, "a+") == 0) { *append = true; return MODE_READWRITE; } if (strcmp(mode, "r+b") == 0 || strcmp(mode, "rb+") == 0) return MODE_OLDFILE; if (strcmp(mode, "w+b") == 0 || strcmp(mode, "wb+") == 0) return MODE_NEWFILE; if (strcmp(mode, "w+bx") == 0 || strcmp(mode, "wb+x") == 0) return MODE_NEWFILE; if (strcmp(mode, "ab+") == 0 || strcmp(mode, "a+b") == 0) { *append = true; return MODE_READWRITE; } return -1; } #endif @implementation OFFile + (void)initialize { if (self != [OFFile class]) return; |
︙ | ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 166 | mode: (OFString *)mode { self = [super init]; @try { int flags; if ((flags = parseMode([mode UTF8String])) == -1) @throw [OFInvalidArgumentException exception]; flags |= O_CLOEXEC; | > | | | | > > > > > > > > > > > > > > > > > | | | < < < < < > > > > > > > > > > > > | | < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > | | | | 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 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | mode: (OFString *)mode { self = [super init]; @try { int flags; #if !defined(OF_MORPHOS) || defined(OF_IXEMUL) if ((flags = parseMode([mode UTF8String])) == -1) @throw [OFInvalidArgumentException exception]; flags |= O_CLOEXEC; # if defined(OF_WINDOWS) if ((_fd = _wopen([path UTF16String], flags, DEFAULT_MODE)) == -1) # elif defined(OF_HAVE_OFF64_T) if ((_fd = open64([path cStringWithEncoding: [OFLocalization encoding]], flags, DEFAULT_MODE)) == -1) # else if ((_fd = open([path cStringWithEncoding: [OFLocalization encoding]], flags, DEFAULT_MODE)) == -1) # endif @throw [OFOpenItemFailedException exceptionWithPath: path mode: mode errNo: errno]; #else if ((flags = parseMode([mode UTF8String], &_append)) == -1) @throw [OFInvalidArgumentException exception]; if ((_fd = Open([path cStringWithEncoding: [OFLocalization encoding]], flags)) == INVALID_FD) @throw [OFOpenItemFailedException exceptionWithPath: path mode: mode]; if (_append) { if (Seek64(_fd, 0, OFFSET_END) == -1) @throw [OFOpenItemFailedException exceptionWithPath: path mode: mode]; } #endif } @catch (id e) { [self release]; @throw e; } return self; } - initWithFileDescriptor: (int)fd { self = [super init]; _fd = fd; return self; } - (bool)lowlevelIsAtEndOfStream { if (_fd == INVALID_FD) return true; return _atEndOfStream; } - (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length { ssize_t ret; if (_fd == INVALID_FD || _atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; #if defined(OF_WINDOWS) if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if ((ret = read(_fd, buffer, (unsigned int)length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #elif defined(OF_MORPHOS) && !defined(OF_IXEMUL) if (length > LONG_MAX) @throw [OFOutOfRangeException exception]; if ((ret = Read(_fd, buffer, length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; #else if ((ret = read(_fd, buffer, length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif if (ret == 0) _atEndOfStream = true; return ret; } - (void)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length { if (_fd == INVALID_FD || _atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; #if defined(OF_WINDOWS) if (length > INT_MAX) @throw [OFOutOfRangeException exception]; if (write(_fd, buffer, (int)length) != (int)length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #elif defined(OF_MORPHOS) && !defined(OF_IXEMUL) if (length > LONG_MAX) @throw [OFOutOfRangeException exception]; if (_append) { if (Seek64(_fd, 0, OFFSET_END) == -1) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; } if (Write(_fd, (void *)buffer, length) != (LONG)length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; #else if (length > SSIZE_MAX) @throw [OFOutOfRangeException exception]; if (write(_fd, buffer, length) != (ssize_t)length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif } - (of_offset_t)lowlevelSeekToOffset: (of_offset_t)offset whence: (int)whence { of_offset_t ret; if (_fd == INVALID_FD) @throw [OFSeekFailedException exceptionWithStream: self offset: offset whence: whence]; #if !defined(OF_MORPHOS) || defined(OF_IXEMUL) # if defined(OF_WINDOWS) ret = _lseeki64(_fd, offset, whence); # elif defined(OF_HAVE_OFF64_T) ret = lseek64(_fd, offset, whence); # else ret = lseek(_fd, offset, whence); # endif if (ret == -1) @throw [OFSeekFailedException exceptionWithStream: self offset: offset whence: whence errNo: errno]; #else switch (whence) { case SEEK_SET: ret = Seek64(_fd, offset, OFFSET_BEGINNING); break; case SEEK_CUR: ret = Seek64(_fd, offset, OFFSET_CURRENT); break; case SEEK_END: ret = Seek64(_fd, offset, OFFSET_END); break; default: ret = -1; break; } if (ret == -1) @throw [OFSeekFailedException exceptionWithStream: self offset: offset whence: whence]; #endif _atEndOfStream = false; return ret; } #if !defined(OF_WINDOWS) && (!defined(OF_MORPHOS) || defined(OF_IXEMUL)) - (int)fileDescriptorForReading { return _fd; } - (int)fileDescriptorForWriting { return _fd; } #endif - (void)close { if (_fd != INVALID_FD) close(_fd); _fd = INVALID_FD; [super close]; } - (void)dealloc { if (_fd != INVALID_FD) close(_fd); [super dealloc]; } @end |
Modified src/OFSeekableStream.h from [e76a9b8133] to [2dafdfc3cf].
︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 36 37 38 39 40 | OF_ASSUME_NONNULL_BEGIN #if defined(OF_WINDOWS) typedef __int64 of_offset_t; #elif defined(__ANDROID__) typedef long long of_offset_t; #elif defined(OF_HAVE_OFF64_T) typedef off64_t of_offset_t; #else typedef off_t of_offset_t; #endif /*! | > > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | OF_ASSUME_NONNULL_BEGIN #if defined(OF_WINDOWS) typedef __int64 of_offset_t; #elif defined(__ANDROID__) typedef long long of_offset_t; #elif defined(OF_MORPHOS) && !defined(OF_IXEMUL) typedef signed long long of_offset_t; #elif defined(OF_HAVE_OFF64_T) typedef off64_t of_offset_t; #else typedef off_t of_offset_t; #endif /*! |
︙ | ︙ |
Modified src/exceptions/OFSeekFailedException.h from [2cb0456fd7] to [a442beb9d6].
︙ | ︙ | |||
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 | + (instancetype)exception OF_UNAVAILABLE; /*! * @brief Creates a new, autoreleased seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error that occurred * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; - init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error that occurred | > > > > > > > > > > > > > > > > > > > > > > > > | 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 | + (instancetype)exception OF_UNAVAILABLE; /*! * @brief Creates a new, autoreleased seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence; /*! * @brief Creates a new, autoreleased seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error that occurred * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; - init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @return An initialized seek failed exception */ - initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence; /*! * @brief Initializes an already allocated seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error that occurred |
︙ | ︙ |
Modified src/exceptions/OFSeekFailedException.m from [61374f4d60] to [aaa4670827].
︙ | ︙ | |||
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 | { OF_UNRECOGNIZED_SELECTOR } + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { return [[[self alloc] initWithStream: stream offset: offset whence: whence errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { self = [super init]; | > > > > > > > > > > > > > > > > > > > > > > | 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 | { OF_UNRECOGNIZED_SELECTOR } + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence { return [[[self alloc] initWithStream: stream offset: offset whence: whence] autorelease]; } + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { return [[[self alloc] initWithStream: stream offset: offset whence: whence errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence { self = [super init]; _stream = [stream retain]; _offset = offset; _whence = whence; return self; } - initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { self = [super init]; |
︙ | ︙ | |||
65 66 67 68 69 70 71 | [_stream release]; [super dealloc]; } - (OFString *)description { | > | | | > > > | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | [_stream release]; [super dealloc]; } - (OFString *)description { if (_errNo != 0) return [OFString stringWithFormat: @"Seeking failed in stream of type %@: %@", [_stream class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Seeking failed in stream of type %@!", [_stream class]]; } @end |