Differences From 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]
To Artifact [4f94efa779]:
- File src/OFProcess.m — part of check-in [8fe08864f8] at 2013-04-09 22:09:15 on branch trunk — Fix incomplete of_char16_t migration. (user: js, size: 11369) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
172 173 174 175 176 177 178 | SECURITY_ATTRIBUTES sa; PROCESS_INFORMATION pi; STARTUPINFOW si; void *pool; OFMutableString *argumentsString; OFEnumerator *enumerator; OFString *argument; | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | SECURITY_ATTRIBUTES sa; PROCESS_INFORMATION pi; STARTUPINFOW si; void *pool; OFMutableString *argumentsString; OFEnumerator *enumerator; OFString *argument; of_char16_t *argumentsCopy; size_t length; sa.nLength = sizeof(sa); sa.bInheritHandle = TRUE; sa.lpSecurityDescriptor = NULL; if (!CreatePipe(&_readPipe[0], &_readPipe[1], &sa, 0)) |
| ︙ | ︙ | |||
242 243 244 245 246 247 248 | [argumentsString appendString: tmp]; if (containsSpaces) [argumentsString appendString: @"\""]; } length = [argumentsString UTF16StringLength]; | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
[argumentsString appendString: tmp];
if (containsSpaces)
[argumentsString appendString: @"\""];
}
length = [argumentsString UTF16StringLength];
argumentsCopy = [self allocMemoryWithSize: sizeof(of_char16_t)
count: length + 1];
memcpy(argumentsCopy, [argumentsString UTF16String],
([argumentsString UTF16StringLength] + 1) * 2);
@try {
if (!CreateProcessW([program UTF16String],
argumentsCopy, NULL, NULL, TRUE,
CREATE_UNICODE_ENVIRONMENT,
|
| ︙ | ︙ | |||
326 327 328 329 330 331 332 | } envp[i] = NULL; return envp; } #else | | | | | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 |
}
envp[i] = NULL;
return envp;
}
#else
- (of_char16_t*)OF_environmentForDictionary: (OFDictionary*)environment
{
OFDataArray *env = [OFDataArray dataArrayWithItemSize: 2];
OFEnumerator *keyEnumerator, *objectEnumerator;
OFString *key, *object;
const of_char16_t equal = '=';
const of_char16_t zero = 0;
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
[env addItems: [key UTF16String]
|
| ︙ | ︙ |