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

Various tidyups and documentation added.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9622 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2001-04-19 09:21:59 +00:00
parent 274fd06643
commit d6be9f040d
3 changed files with 183 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Source/NSTask.m
View file

@ -85,7 +85,7 @@ static void handleSignal(int sig)
@interface NSConcreteUnixTask : NSTask
{
char slave_name[32];
BOOL usePseudoTerminal;
BOOL _usePseudoTerminal;
}
@end
#define NSConcreteTask NSConcreteUnixTask
@ -781,7 +781,7 @@ GSCheckTasks()
{
BOOL found = NO;
if (hadChildSignal)
if (hadChildSignal == YES)
{
int result;
int status;
@ -793,36 +793,28 @@ GSCheckTasks()
result = waitpid(-1, &status, WNOHANG);
if (result > 0)
{
if (WIFEXITED(status))
{
NSTask *t;
NSTask *t;
[tasksLock lock];
t = (NSTask*)NSMapGet(activeTasks, (void*)result);
[tasksLock unlock];
if (t)
[tasksLock lock];
t = (NSTask*)NSMapGet(activeTasks, (void*)result);
[tasksLock unlock];
if (t != nil)
{
if (WIFEXITED(status))
{
[t _terminatedChild: WEXITSTATUS(status)];
found = YES;
}
}
else if (WIFSIGNALED(status))
{
NSTask *t;
[tasksLock lock];
t = (NSTask*)NSMapGet(activeTasks, (void*)result);
[tasksLock unlock];
if (t)
else if (WIFSIGNALED(status))
{
[t _terminatedChild: WTERMSIG(status)];
found = YES;
}
}
else
{
NSLog(@"Warning ... task %d neither exited nor signalled",
result);
else
{
NSLog(@"Warning ... task %d neither exited nor signalled",
result);
}
}
}
}
@ -955,7 +947,7 @@ GSCheckTasks()
#endif
#endif
if (usePseudoTerminal == YES)
if (_usePseudoTerminal == YES)
{
int s;
@ -1049,6 +1041,36 @@ GSCheckTasks()
}
}
- (void) setStandardError: (id)hdl
{
if (_usePseudoTerminal == YES)
{
[NSException raise: NSInvalidArgumentException
format: @"NSTask - set error for task on pseudo terminal"];
}
[super setStandardError: hdl];
}
- (void) setStandardInput: (id)hdl
{
if (_usePseudoTerminal == YES)
{
[NSException raise: NSInvalidArgumentException
format: @"NSTask - set input for task on pseudo terminal"];
}
[super setStandardInput: hdl];
}
- (void) setStandardOutput: (id)hdl
{
if (_usePseudoTerminal == YES)
{
[NSException raise: NSInvalidArgumentException
format: @"NSTask - set output for task on pseudo terminal"];
}
[super setStandardOutput: hdl];
}
- (void) _collectChild
{
if (_hasCollected == NO)
@ -1100,7 +1122,7 @@ GSCheckTasks()
int master;
NSFileHandle *fh;
if (usePseudoTerminal == YES)
if (_usePseudoTerminal == YES)
{
return YES;
}
@ -1123,7 +1145,7 @@ GSCheckTasks()
closeOnDealloc: YES];
[self setStandardError: fh];
RELEASE(fh);
usePseudoTerminal = YES;
_usePseudoTerminal = YES;
return YES;
}