gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

task fixups for mingw

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15938 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-02-11 15:48:41 +00:00
parent 8b76113f0b
commit 1a4d37e943
2 changed files with 66 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Source/NSTask.m
View file

@ -28,8 +28,10 @@
#include <base/preface.h>
#include <Foundation/NSObject.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSCharacterSet.h>
#include <Foundation/NSData.h>
#include <Foundation/NSDate.h>
#include <Foundation/NSEnumerator.h>
#include <Foundation/NSString.h>
#include <Foundation/NSException.h>
#include <Foundation/NSFileHandle.h>
@ -1008,6 +1010,58 @@ static DWORD WINAPI _threadFunction(LPVOID t)
}
}
static NSString*
endSlashesDoubledFromString(NSString *aString)
{
int i = [aString length] - 2;
NSMutableString *returnString;
if (![aString hasSuffix:@"\\"])
{
return aString;
}
returnString = [NSMutableString stringWithFormat: @"%@\\", aString];
while ([aString characterAtIndex: i] == '\\' && i >= 0)
{
[returnString appendString:@"\\"];
i--;
}
return returnString;
}
static NSString*
quotedFromString(NSString *aString)
{
NSString *resultString;
NSMutableArray *components;
int i;
/* First split on "'s */
components = [NSMutableArray arrayWithArray:
[aString componentsSeparatedByString: @"\""]];
/* Iterate over all but the last component and double slashes if needed */
i = [components count];
while (i-- > 0)
{
[components replaceObjectAtIndex: i withObject:
endSlashesDoubledFromString([components objectAtIndex: i])];
}
/* Join them again with \" as separator */
resultString = [components componentsJoinedByString: @"\\\""];
/* Put in in "'s if it contains spaces */
if ([resultString rangeOfCharacterFromSet:
[NSCharacterSet whitespaceCharacterSet]].length > 0)
{
resultString = [NSString stringWithFormat: @"\"%@\"", resultString];
}
return resultString;
}
- (void) launch
{
DWORD tid;
@ -1019,7 +1073,7 @@ static DWORD WINAPI _threadFunction(LPVOID t)
char *c_args;
int result;
const char *executable;
if (_hasLaunched)
{
return;
@ -1027,13 +1081,16 @@ static DWORD WINAPI _threadFunction(LPVOID t)
lpath = [self _fullLaunchPath];
executable = [lpath fileSystemRepresentation];
args = [[NSMutableString alloc] initWithCString: executable];
args = [[NSMutableString alloc] initWithString:
quotedFromString([NSString stringWithCString: executable])];
arg_enum = [[self arguments] objectEnumerator];
while ((arg = [arg_enum nextObject]))
{
[args appendString: @" "];
[args appendString: arg];
[args appendString: quotedFromString(arg)];
}
c_args = NSZoneMalloc(NSDefaultMallocZone(), [args cStringLength]+1);
[args getCString: c_args];