Differences From Artifact [273ab6b21b]:
- File
src/OFProcess.m
— part of check-in
[1de551cb5f]
at
2016-06-07 22:56:28
on branch trunk
— Add support for reusing OFStreams after close
Right now, this is only useful for OFTCPSocket, as this is the only
class so far not establishing the stream in the init method. However,
this adds the general infrastructure to allow reuse to all subclasses of
OFStream. (user: js, size: 14342) [annotate] [blame] [check-ins using]
To Artifact [b11627a172]:
- File
src/OFProcess.m
— part of check-in
[06bcb21fc7]
at
2017-01-09 06:26:04
on branch trunk
— Add OFLocalization
This singleton gives access to all things locale, including the ability
to get localized strings.This also adds the OF_LOCALIZED() macro. Its first argument is an ID for
the string to be localized and its second argument is the fallback
string to be used if it cannot retrieve the localized string. Following
that are variable name / value pairs to be replaced in the localized
string.Getting translated strings is not implemented yet: Instead, it always
uses the fallback string.This also switches ofhttp to localized strings. (user: js, size: 14314) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
37 38 39 40 41 42 43 | #endif #import "OFProcess.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFDataArray.h" | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #endif #import "OFProcess.h" #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 |
| ︙ | ︙ | |||
145 146 147 148 149 150 151 | const char *path; char **argv; if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; | | < | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 |
const char *path;
char **argv;
if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
path = [program cStringWithEncoding: [OFLocalization encoding]];
[self OF_getArgV: &argv
forProgramName: programName
andArguments: arguments];
@try {
char **env = [self
OF_environmentForDictionary: environment];
|
| ︙ | ︙ | |||
346 347 348 349 350 351 352 | OFString *const *objects = [arguments objects]; size_t i, count = [arguments count]; of_string_encoding_t encoding; *argv = [self allocMemoryWithSize: sizeof(char*) count: count + 2]; | | | | 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 377 378 379 380 |
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 = [OFLocalization 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 = [OFLocalization encoding];
count = [environment count];
envp = [self allocMemoryWithSize: sizeof(char*)
count: count + 1];
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
|
| ︙ | ︙ |