Differences From Artifact [1aa806b8bb]:
- File src/OFProcess.m — part of check-in [3b97fc3cd9] at 2014-01-04 00:24:08 on branch trunk — Update copyright. (user: js, size: 11519) [annotate] [blame] [check-ins using]
To Artifact [8b087c9ef5]:
- File
src/OFProcess.m
— part of check-in
[e54c8c0368]
at
2014-01-16 23:38:42
on branch trunk
— Add +[OFString nativeOSEncoding].
This replaces OF_STRING_ENCODING_NATIVE, as a define was not flexible
enough (determining the native OS encoding at startup was not possible). (user: js, size: 11519) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
136 137 138 139 140 141 142 143 144 145 146 |
exceptionWithClass: [self class]];
switch ((_pid = fork())) {
case 0:;
OFString **objects = [arguments objects];
size_t i, count = [arguments count];
char **argv;
argv = [self allocMemoryWithSize: sizeof(char*)
count: count + 2];
| > > > | < > | < | < | 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 |
exceptionWithClass: [self class]];
switch ((_pid = fork())) {
case 0:;
OFString **objects = [arguments objects];
size_t i, count = [arguments count];
char **argv;
of_string_encoding_t encoding;
argv = [self allocMemoryWithSize: sizeof(char*)
count: count + 2];
encoding = [OFString nativeOSEncoding];
argv[0] = (char*)[programName
cStringWithEncoding: encoding];
for (i = 0; i < count; i++)
argv[i + 1] = (char*)[objects[i]
cStringWithEncoding: encoding];
argv[i + 1] = NULL;
if (environment != nil) {
#ifdef __MACH__
*_NSGetEnviron() = [self
OF_environmentForDictionary: environment];
#else
environ = [self
OF_environmentForDictionary: environment];
#endif
}
close(_readPipe[0]);
close(_writePipe[1]);
dup2(_writePipe[0], 0);
dup2(_readPipe[1], 1);
execvp([program cStringWithEncoding: encoding], argv);
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
case -1:
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
default:
|
| ︙ | ︙ | |||
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 |
#ifndef _WIN32
- (char**)OF_environmentForDictionary: (OFDictionary*)environment
{
OFEnumerator *keyEnumerator, *objectEnumerator;
char **envp;
size_t i, count;
if (environment == nil)
return NULL;
count = [environment count];
envp = [self allocMemoryWithSize: sizeof(char*)
count: count + 1];
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
for (i = 0; i < count; i++) {
OFString *key;
OFString *object;
size_t keyLen, objectLen;
key = [keyEnumerator nextObject];
object = [objectEnumerator nextObject];
| > > > | < | < | < | | | 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 |
#ifndef _WIN32
- (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 = [OFString nativeOSEncoding];
count = [environment count];
envp = [self allocMemoryWithSize: sizeof(char*)
count: count + 1];
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
for (i = 0; i < count; i++) {
OFString *key;
OFString *object;
size_t keyLen, objectLen;
key = [keyEnumerator nextObject];
object = [objectEnumerator nextObject];
keyLen = [key cStringLengthWithEncoding: encoding];
objectLen = [object cStringLengthWithEncoding: encoding];
envp[i] = [self allocMemoryWithSize: keyLen + objectLen + 2];
memcpy(envp[i], [key cStringWithEncoding: encoding], keyLen);
envp[i][keyLen] = '=';
memcpy(envp[i] + keyLen + 1,
[object cStringWithEncoding: encoding], objectLen);
envp[i][keyLen + objectLen + 1] = '\0';
}
envp[i] = NULL;
return envp;
}
|
| ︙ | ︙ |