Differences From Artifact [bf28fd0153]:
- File
src/OFProcess.m
— part of check-in
[505137f25f]
at
2018-02-25 04:31:30
on branch trunk
— Reintroduce of_char{16,32}_t
There is no reliable way to check if C++ already defined those, as Clang
now defines char{16,32}_t even when it is not in C++ 11 mode. So we
cannot check if we are not in C++ 11 and then define them and otherwise
rely on the C++ 11 types. (user: js, size: 14267) [annotate] [blame] [check-ins using]
To Artifact [2efa587efd]:
- File src/OFProcess.m — part of check-in [aa0384d1bf] at 2018-07-28 18:45:36 on branch trunk — Rename OFLocalization -> OFLocale (user: js, size: 14243) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
32 33 34 35 36 37 38 | #endif #import "OFProcess.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFData.h" | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | #endif #import "OFProcess.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFData.h" #import "OFLocale.h" #import "OFInitializationFailedException.h" #import "OFNotOpenException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" |
| ︙ | ︙ | |||
141 142 143 144 145 146 147 | const char *path; char **argv; if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
const char *path;
char **argv;
if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
path = [program cStringWithEncoding: [OFLocale encoding]];
[self of_getArgv: &argv
forProgramName: programName
andArguments: arguments];
@try {
char **env = [self
of_environmentForDictionary: environment];
|
| ︙ | ︙ | |||
341 342 343 344 345 346 347 | OFString *const *objects = [arguments objects]; size_t i, count = [arguments count]; of_string_encoding_t encoding; *argv = [self allocMemoryWithSize: sizeof(char *) count: count + 2]; | | | | 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 |
OFString *const *objects = [arguments objects];
size_t i, count = [arguments count];
of_string_encoding_t encoding;
*argv = [self allocMemoryWithSize: sizeof(char *)
count: count + 2];
encoding = [OFLocale encoding];
(*argv)[0] = (char *)[programName cStringWithEncoding: encoding];
for (i = 0; i < count; i++)
(*argv)[i + 1] =
(char *)[objects[i] cStringWithEncoding: encoding];
(*argv)[i + 1] = NULL;
}
- (char **)of_environmentForDictionary: (OFDictionary *)environment
{
OFEnumerator *keyEnumerator, *objectEnumerator;
char **envp;
size_t i, count;
of_string_encoding_t encoding;
if (environment == nil)
return NULL;
encoding = [OFLocale encoding];
count = [environment count];
envp = [self allocMemoryWithSize: sizeof(char *)
count: count + 1];
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
|
| ︙ | ︙ |