gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove some duplicate code

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-01-20 12:03:37 +00:00
parent 62ca624e12
commit a4ad8f1b90
2 changed files with 36 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -4,6 +4,7 @@
Always remove task from controlling terminal, not just when using
pseudo-terminals. This is compatible with OSX behavior
(testcase added to the testsuite).
Also remove some redundant/duplicate code
2010-01-11 Quentin Mathe <quentin.mathe@gmail.com>

87
Source/NSTask.m
View file

@ -84,6 +84,7 @@
#include <sys/param.h>
#endif
/*
* If we are on a streams based system, we need to include stropts.h
* for definitions needed to set up slave pseudo-terminal stream.
@ -103,6 +104,7 @@
#define NOFILE 256
#endif
@interface NSBundle(Private)
+ (NSString *) _absolutePathOfExecutable: (NSString *)path;
+ (NSString*) _gnustep_target_cpu;
@ -1334,11 +1336,25 @@ GSPrivateCheckTasks()
do
{
result = waitpid(-1, &status, WNOHANG);
if (result > 0)
{
NSTask *t;
NSTask *t;
errno = 0;
result = waitpid(-1, &status, WNOHANG);
if (result < 0)
{
#if defined(WAITDEBUG)
[tasksLock lock];
t = (NSTask*)NSMapGet(activeTasks, (void*)(intptr_t)result);
[tasksLock unlock];
if (t != nil)
{
NSLog(@"waitpid result %d, error %@",
result, [NSError _last]);
}
#endif
}
else if (result > 0)
{
[tasksLock lock];
t = (NSTask*)NSMapGet(activeTasks, (void*)(intptr_t)result);
IF_NO_GC(AUTORELEASE(RETAIN(t));)
@ -1347,11 +1363,19 @@ GSPrivateCheckTasks()
{
if (WIFEXITED(status))
{
#if defined(WAITDEBUG)
NSLog(@"waitpid %d, exit status = %d",
result, status);
#endif
[t _terminatedChild: WEXITSTATUS(status)];
found = YES;
}
else if (WIFSIGNALED(status))
{
#if defined(WAITDEBUG)
NSLog(@"waitpid %d, termination status = %d",
result, status);
#endif
[t _terminatedChild: WTERMSIG(status)];
found = YES;
}
@ -1361,6 +1385,12 @@ GSPrivateCheckTasks()
result);
}
}
#if defined(WAITDEBUG)
else
{
NSLog(@"Received signal for unknown child %d", result);
}
#endif
}
}
while (result > 0);
@ -1636,54 +1666,7 @@ GSPrivateCheckTasks()
- (void) _collectChild
{
if (_hasCollected == NO)
{
int result;
errno = 0;
result = waitpid(_taskId, &_terminationStatus, WNOHANG);
if (result < 0)
{
NSLog(@"waitpid %d, result %d, error %@",
_taskId, result, [NSError _last]);
[self _terminatedChild: -1];
}
else if (result == _taskId || (result > 0 && errno == 0))
{
int status = [self terminationStatus];
if (WIFEXITED(status))
{
#ifdef WAITDEBUG
NSLog(@"waitpid %d, termination status = %d",
_taskId, status);
#endif
[self _terminatedChild: WEXITSTATUS(status)];
}
else if (WIFSIGNALED(status))
{
#ifdef WAITDEBUG
NSLog(@"waitpid %d, termination status = %d",
_taskId, status);
#endif
[self _terminatedChild: WTERMSIG(status)];
}
#ifdef WAITDEBUG
else
{
NSLog(@"waitpid %d, event status = %d",
_taskId, status);
}
#endif
}
#ifdef WAITDEBUG
else
{
NSLog(@"waitpid %d, result %d, error %@",
_taskId, result, [NSError _last]);
}
#endif
}
GSPrivateCheckTasks();
}
- (BOOL) usePseudoTerminal