Differences From Artifact [ef90137219]:
- File src/OFProcess.m — part of check-in [e40729d406] at 2013-02-12 18:22:15 on branch trunk — Prefix all ivars with an underscore. (user: js, size: 11351) [annotate] [blame] [check-ins using]
To Artifact [c2449bdcce]:
- File
src/OFProcess.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 11354) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
223 224 225 226 227 228 229 |
[argumentsString appendString: @"\""];
}
enumerator = [arguments objectEnumerator];
while ((argument = [enumerator nextObject]) != nil) {
OFMutableString *tmp =
[[argument mutableCopy] autorelease];
| | | 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
[argumentsString appendString: @"\""];
}
enumerator = [arguments objectEnumerator];
while ((argument = [enumerator nextObject]) != nil) {
OFMutableString *tmp =
[[argument mutableCopy] autorelease];
bool containsSpaces = [tmp containsString: @" "];
[argumentsString appendString: @" "];
if (containsSpaces)
[argumentsString appendString: @"\""];
[tmp replaceOccurrencesOfString: @"\\\""
|
| ︙ | ︙ | |||
355 356 357 358 359 360 361 | [env addItems: &zero count: 1]; return [env items]; } #endif | | | | | | 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 |
[env addItems: &zero
count: 1];
return [env items];
}
#endif
- (bool)lowlevelIsAtEndOfStream
{
#ifndef _WIN32
if (_readPipe[0] == -1)
#else
if (_readPipe[0] == NULL)
#endif
return true;
return _atEndOfStream;
}
- (size_t)lowlevelReadIntoBuffer: (void*)buffer
length: (size_t)length
{
#ifndef _WIN32
ssize_t ret;
#else
DWORD ret;
#endif
#ifndef _WIN32
if (_readPipe[0] == -1 || _atEndOfStream ||
(ret = read(_readPipe[0], buffer, length)) < 0) {
#else
if (_readPipe[0] == NULL || _atEndOfStream ||
!ReadFile(_readPipe[0], buffer, length, &ret, NULL)) {
if (GetLastError() == ERROR_BROKEN_PIPE) {
_atEndOfStream = true;
return 0;
}
#endif
@throw [OFReadFailedException exceptionWithClass: [self class]
stream: self
requestedLength: length];
}
if (ret == 0)
_atEndOfStream = true;
return ret;
}
- (void)lowlevelWriteBuffer: (const void*)buffer
length: (size_t)length
{
|
| ︙ | ︙ |