Differences From Artifact [5a7b7eae60]:
- File src/OFProcess.m — part of check-in [d31ec806ef] at 2017-05-27 10:33:09 on branch trunk — Add unistd.h wrapper to make things less horrible (user: js, size: 14236) [annotate] [blame] [check-ins using]
To Artifact [ea4c0fa50a]:
- File
src/OFProcess.m
— part of check-in
[f9cd4f9cab]
at
2017-06-05 15:51:48
on branch trunk
— OFStream: Don't throw when at end of stream
Instead, let reads return 0 and let writes append after the end. (user: js, size: 14093) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFDataArray.h" #import "OFLocalization.h" #import "OFInitializationFailedException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" #ifdef OF_WINDOWS # include <windows.h> #endif | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFDataArray.h" #import "OFLocalization.h" #import "OFInitializationFailedException.h" #import "OFNotOpenException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" #ifdef OF_WINDOWS # include <windows.h> #endif |
| ︙ | ︙ | |||
434 435 436 437 438 439 440 |
- (bool)lowlevelIsAtEndOfStream
{
#ifndef OF_WINDOWS
if (_readPipe[0] == -1)
#else
if (_readPipe[0] == NULL)
#endif
| | | | < | | < | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 |
- (bool)lowlevelIsAtEndOfStream
{
#ifndef OF_WINDOWS
if (_readPipe[0] == -1)
#else
if (_readPipe[0] == NULL)
#endif
@throw [OFNotOpenException exceptionWithObject: self];
return _atEndOfStream;
}
- (size_t)lowlevelReadIntoBuffer: (void *)buffer
length: (size_t)length
{
#ifndef OF_WINDOWS
ssize_t ret;
if (_readPipe[0] == -1)
@throw [OFNotOpenException exceptionWithObject: self];
if ((ret = read(_readPipe[0], buffer, length)) < 0)
@throw [OFReadFailedException exceptionWithObject: self
requestedLength: length
errNo: errno];
#else
DWORD ret;
if (length > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if (_readPipe[0] == NULL)
@throw [OFNotOpenException exceptionWithObject: self];
if (!ReadFile(_readPipe[0], buffer, (DWORD)length, &ret, NULL)) {
if (GetLastError() == ERROR_BROKEN_PIPE) {
_atEndOfStream = true;
return 0;
}
|
| ︙ | ︙ | |||
484 485 486 487 488 489 490 |
return ret;
}
- (void)lowlevelWriteBuffer: (const void *)buffer
length: (size_t)length
{
#ifndef OF_WINDOWS
| | | < | | < | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 |
return ret;
}
- (void)lowlevelWriteBuffer: (const void *)buffer
length: (size_t)length
{
#ifndef OF_WINDOWS
if (_writePipe[1] == -1)
@throw [OFNotOpenException exceptionWithObject: self];
if (length > SSIZE_MAX)
@throw [OFOutOfRangeException exception];
if (write(_writePipe[1], buffer, length) != (ssize_t)length)
@throw [OFWriteFailedException exceptionWithObject: self
requestedLength: length
errNo: errno];
#else
DWORD ret;
if (length > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if (_writePipe[1] == NULL)
@throw [OFNotOpenException exceptionWithObject: self];
if (!WriteFile(_writePipe[1], buffer, (DWORD)length, &ret, NULL) ||
ret != (DWORD)length) {
int errNo = 0;
if (GetLastError() == ERROR_BROKEN_PIPE)
errNo = EPIPE;
|
| ︙ | ︙ |