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

win32 standard io fixup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39454 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-03-04 18:06:01 +00:00
parent 4f9d5c0982
commit d3aab9bc45
2 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/GSFileHandle.m
View file

@ -96,9 +96,9 @@
#define NETBUF_SIZE (1024 * 16)
#define READ_SIZE NETBUF_SIZE*10
static GSFileHandle* fh_stdin = nil;
static GSFileHandle* fh_stdout = nil;
static GSFileHandle* fh_stderr = nil;
static GSFileHandle *fh_stdin = nil;
static GSFileHandle *fh_stdout = nil;
static GSFileHandle *fh_stderr = nil;
@interface GSTcpTune : NSObject
- (int) delay;

66
Source/win32/GSFileHandle.m
View file

@ -70,9 +70,9 @@
#define NETBUF_SIZE 4096
#define READ_SIZE NETBUF_SIZE*10
static GSFileHandle* fh_stdin = nil;
static GSFileHandle* fh_stdout = nil;
static GSFileHandle* fh_stderr = nil;
static GSFileHandle *fh_stdin = nil;
static GSFileHandle *fh_stdout = nil;
static GSFileHandle *fh_stderr = nil;
// Key to info dictionary for operation mode.
static NSString* NotificationKey = @"NSFileHandleNotificationKey";
@ -239,6 +239,24 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
- (void) dealloc
{
if (self == fh_stdin)
{
RETAIN(self);
[NSException raise: NSGenericException
format: @"Attempt to deallocate standard input handle"];
}
if (self == fh_stdout)
{
RETAIN(self);
[NSException raise: NSGenericException
format: @"Attempt to deallocate standard output handle"];
}
if (self == fh_stderr)
{
RETAIN(self);
[NSException raise: NSGenericException
format: @"Attempt to deallocate standard error handle"];
}
RELEASE(address);
RELEASE(service);
RELEASE(protocol);
@ -1022,18 +1040,16 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
if (fh_stderr != nil)
{
RETAIN(fh_stderr);
DESTROY(self);
ASSIGN(self, fh_stderr);
}
else
{
self = [self initWithFileDescriptor: 2 closeOnDealloc: NO];
fh_stderr = self;
}
self = fh_stderr;
if (self)
{
readOK = NO;
ASSIGN(fh_stderr, self);
if (self)
{
readOK = NO;
}
}
return self;
}
@ -1042,18 +1058,16 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
if (fh_stdin != nil)
{
RETAIN(fh_stdin);
DESTROY(self);
ASSIGN(self, fh_stdin);
}
else
{
self = [self initWithFileDescriptor: 0 closeOnDealloc: NO];
fh_stdin = self;
}
self = fh_stdin;
if (self)
{
writeOK = NO;
ASSIGN(fh_stdin, self);
if (self)
{
writeOK = NO;
}
}
return self;
}
@ -1062,18 +1076,16 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
if (fh_stdout != nil)
{
RETAIN(fh_stdout);
DESTROY(self);
ASSIGN(fh_stdout, self);
}
else
{
self = [self initWithFileDescriptor: 1 closeOnDealloc: NO];
fh_stdout = self;
}
self = fh_stdout;
if (self)
{
readOK = NO;
ASSIGN(fh_stdout, self);
if (self)
{
readOK = NO;
}
}
return self;
}