gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfixes and tidy.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3521 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-01-05 10:18:56 +00:00
parent 237a7030a2
commit 4a13ae7fc2
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jan 5 9:45:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* src/NSTask.m: Workaround for bug in linux waitpid(), general
tidying, clean up descriptors in child process.
Mon Jan 4 15:35:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* src/NSInvocation.m: Fix for machines that pass structures by ref.

41
Source/NSTask.m
View file

@ -336,12 +336,11 @@ NSString *NSTaskDidTerminateNotification = @"NSTaskDidTerminateNotification";
if (val)
{
s = [NSString stringWithFormat: @"%s=%s",
[key cString], [val cString]];
s = [NSString stringWithFormat: @"%@=%@", key, val];
}
else
{
s = [NSString stringWithFormat: @"%s=", [key cString]];
s = [NSString stringWithFormat: @"%@=", key];
}
envl[i] = [s cString];
}
@ -388,17 +387,31 @@ NSString *NSTaskDidTerminateNotification = @"NSTaskDidTerminateNotification";
}
if (pid == 0)
{
/*
* Set up stdin, stdout and stderr by duplicating descriptors as
* necessary and closing the originals (to ensure we won't have a
* pipe left with two write descriptors etc).
*/
if (idesc != 0)
{
dup2(idesc, 0);
if (idesc != odesc && idesc != edesc)
{
(void) close(idesc);
}
}
if (odesc != 1)
{
dup2(odesc, 1);
if (odesc != edesc)
{
(void) close(odesc);
}
}
if (edesc != 2)
{
dup2(edesc, 2);
(void) close(edesc);
}
chdir(path);
execve(executable, args, envl);
@ -452,11 +465,11 @@ NSString *NSTaskDidTerminateNotification = @"NSTaskDidTerminateNotification";
NSDate *limit;
/*
* Poll at 1.0 second intervals.
* Poll at 0.1 second intervals.
*/
limit = [[NSDate alloc] initWithTimeIntervalSinceNow: 1.0];
limit = [[NSDate alloc] initWithTimeIntervalSinceNow: 0.1];
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
beforeDate: nil];
beforeDate: limit];
[limit release];
}
}
@ -466,9 +479,15 @@ NSString *NSTaskDidTerminateNotification = @"NSTaskDidTerminateNotification";
- (void) _collectChild
{
extern int errno;
if (hasCollected == NO)
{
if (waitpid(taskId, &terminationStatus, WNOHANG) == taskId)
int result;
errno = 0;
result = waitpid(taskId, &terminationStatus, WNOHANG);
if (result == taskId || (result == 0 && errno == 0))
{
if (WIFEXITED(terminationStatus))
{
@ -480,7 +499,15 @@ NSString *NSTaskDidTerminateNotification = @"NSTaskDidTerminateNotification";
[self _sendNotification];
}
}
#ifdef DEBUG
else
NSLog(@"Termination status = %d", terminationStatus);
#endif
}
#ifdef DEBUG
else
NSLog(@"waitpid result %d, error %s", result, strerror(errno));
#endif
}
}