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

pipe fixup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25310 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-07-10 05:22:50 +00:00
parent 7c07115c17
commit bf24d21cb4
2 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-07-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/win32/GSFileHandleWin32.m: Fixup for pipes as suggested by
Matthew Jiminez.
2007-06-26 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSKeyedArchiver.m:

54
Source/win32/GSFileHandleWin32.m
View file

@ -1748,6 +1748,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
NSRunLoop *l;
NSArray *modes;
void *e;
int t;
if (descriptor < 0)
{
@ -1762,22 +1764,25 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
NSFileHandleNotificationMonitorModes];
}
e = (void*)(event ? (uintptr_t)event : (uintptr_t)descriptor);
t = event ? ET_HANDLE : ET_TRIGGER;
if (modes && [modes count])
{
unsigned int i;
for (i = 0; i < [modes count]; i++)
{
[l removeEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l removeEvent: e
type: t
forMode: [modes objectAtIndex: i]
all: YES];
}
}
else
{
[l removeEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l removeEvent: e
type: t
forMode: NSDefaultRunLoopMode
all: YES];
}
@ -1787,6 +1792,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
NSRunLoop *l;
NSArray *modes;
void *e;
int t;
if (descriptor < 0)
{
@ -1802,22 +1809,25 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
modes=(NSArray*)[info objectForKey: NSFileHandleNotificationMonitorModes];
}
e = (void*)(event ? (uintptr_t)event : (uintptr_t)descriptor);
t = event ? ET_HANDLE : ET_TRIGGER;
if (modes && [modes count])
{
unsigned int i;
for (i = 0; i < [modes count]; i++)
{
[l removeEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l removeEvent: e
type: t
forMode: [modes objectAtIndex: i]
all: YES];
}
}
else
{
[l removeEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l removeEvent: e
type: t
forMode: NSDefaultRunLoopMode
all: YES];
}
@ -1826,6 +1836,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
- (void) watchReadDescriptorForModes: (NSArray*)modes;
{
NSRunLoop *l;
void *e;
int t;
if (descriptor < 0)
{
@ -1834,14 +1846,18 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
l = [NSRunLoop currentRunLoop];
[self setNonBlocking: YES];
e = (void*)(event ? (uintptr_t)event : (uintptr_t)descriptor);
t = event ? ET_HANDLE : ET_TRIGGER;
if (modes && [modes count])
{
unsigned int i;
for (i = 0; i < [modes count]; i++)
{
[l addEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l addEvent: e
type: t
watcher: self
forMode: [modes objectAtIndex: i]];
}
@ -1849,8 +1865,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else
{
[l addEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l addEvent: e
type: t
watcher: self
forMode: NSDefaultRunLoopMode];
}
@ -1867,26 +1883,32 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
NSMutableDictionary *info = [writeInfo objectAtIndex: 0];
NSRunLoop *l = [NSRunLoop currentRunLoop];
NSArray *modes = nil;
void *e;
int t;
modes = [info objectForKey: NSFileHandleNotificationMonitorModes];
[self setNonBlocking: YES];
e = (void*)(event ? (uintptr_t)event : (uintptr_t)descriptor);
t = event ? ET_HANDLE : ET_TRIGGER;
if (modes && [modes count])
{
unsigned int i;
for (i = 0; i < [modes count]; i++)
{
[l addEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l addEvent: e
type: t
watcher: self
forMode: [modes objectAtIndex: i]];
}
}
else
{
[l addEvent: (void*)(uintptr_t)event
type: event ? ET_HANDLE : ET_TRIGGER
[l addEvent: e
type: t
watcher: self
forMode: NSDefaultRunLoopMode];
}