GUSI 2.1.6b3 update

This commit is contained in:
chombier 2001-04-02 15:38:10 +00:00
parent 6c24e9da58
commit 0723d1631d
11 changed files with 33 additions and 10 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -215,12 +215,13 @@ GUSIFileSpec::GUSIFileSpec(const char * path, bool useAlias)
while (!fError && *++path == ':')
--(*this);
} else {
fullSpec = true;
if (nextPath = strchr(path, ':')) {
AddPathComponent(path, nextPath-path, fullSpec);
fullSpec = true;
path = nextPath+1;
} else {
AddPathComponent(path, strlen(path), fullSpec);
fullSpec = true;
break;
}
}
@ -288,6 +289,7 @@ GUSIFileSpec & GUSIFileSpec::operator++()
fSpec.vRefNum = 0;
fSpec.parID = fsRtParID;
fSpec.name[0] = 0;
fValidInfo = false;
goto punt;
}
@ -326,6 +328,7 @@ GUSIFileSpec & GUSIFileSpec::AddPathComponent(const char * name, int length, boo
goto punt;
memcpy(fSpec.name+1, name, fSpec.name[0] = length);
fValidInfo = false;
if (fSpec.parID == fsRtParID)
GetVolume();

View File

@ -346,7 +346,15 @@ GUSISocket * GUSIMPWDevice::open(GUSIFileToken & file, int flags)
if (!ConnectToMPWLibrary())
return GUSISetPosixError(ENOEXEC), static_cast<GUSISocket *>(nil);
int fd = MPW_open(file.Path(), TranslateOpenFlags(flags));
// To ensure that our fancy path handling gets applied to all complex paths, but MPW gets
// to do its magic on [[Dev:]] paths, we normalize paths if they contain more than 1 colon.
//
// <Normalize [[path]] for MPW>=
const char * path = file.Path();
const char * colon = strchr(path, ':');
if (colon && strchr(colon, ':'))
path = file.RelativePath();
int fd = MPW_open(path, TranslateOpenFlags(flags));
if (fd == -1) {
return static_cast<GUSISocket *>(nil);

View File

@ -52,12 +52,15 @@ pascal void GUSIOTNetDBNotify(
break;
}
break;
default:
if (code == kOTProviderWillClose || code == kOTProviderIsClosed) {
switch (code) {
case kOTProviderWillClose:
case kOTProviderIsClosed:
netdb->fCreationContext = nil; // Close & reopen
} else {
break;
default:
result = 0;
break;
}
break;
}

View File

@ -23,6 +23,7 @@ inline uint32_t CompleteMask(OTEventCode code)
pascal void GUSIOTNotify(
GUSIOTSocket * sock, OTEventCode code, OTResult result, void *cookie)
{
GUSI_MESSAGE1(("GUSIOTNotify %08x %d\n", code, result));
switch (code & 0x7f000000L) {
case 0:
sock->fNewEvent |= code;
@ -156,6 +157,7 @@ void GUSIOTSocket::close()
// <Disconnect the [[GUSIOTSocket]], dammit>=
fCompletion &= ~(CompleteMask(T_DISCONNECTCOMPLETE));
GUSIOTTCall * call = new (fEndpoint, 0) GUSIOTTCall;
fAsyncError = 0;
SetAsyncMacError(OTSndDisconnect(fEndpoint, call));
delete call;
AddContext();
@ -206,6 +208,7 @@ int GUSIOTSocket::BindToAddress(GUSIOTTBind * addr)
if (!fSockName)
return GUSISetPosixError(ENOMEM);
fCompletion &= ~CompleteMask(T_BINDCOMPLETE);
fAsyncError = 0;
SetAsyncMacError(OTBind(fEndpoint, addr, fSockName));
AddContext();
MopupEvents();
@ -226,6 +229,7 @@ int GUSIOTSocket::BindToAddress(GUSIOTTBind * addr)
void GUSIOTSocket::Unbind()
{
fCompletion &= ~(CompleteMask(T_BINDCOMPLETE) | CompleteMask(T_UNBINDCOMPLETE));
fAsyncError = 0;
SetAsyncMacError(OTUnbind(fEndpoint));
AddContext();
MopupEvents();
@ -250,6 +254,7 @@ int GUSIOTSocket::getsockname(void * name, socklen_t * namelen)
return GUSISetPosixError(ENOMEM);
fCompletion &= ~CompleteMask(T_GETPROTADDRCOMPLETE);
fAsyncError = 0;
SetAsyncMacError(OTGetProtAddress(fEndpoint, otname, nil));
AddContext();
@ -325,7 +330,7 @@ bool GUSIOTSocket::pre_select(bool wantRead, bool wantWrite, bool wantExcept)
if (wantRead && OTCountDataBytes(fEndpoint, &sz) == kOTNoDataErr)
fEvent &= ~(T_DATA|T_EXDATA);
return true;
return GUSISocket::pre_select(wantRead, wantWrite, wantExcept);
}
// <Member functions for class [[GUSIOTSocket]]>=
int GUSIOTSocket::getsockopt(int level, int optname, void *optval, socklen_t * optlen)
@ -605,6 +610,7 @@ int GUSIOTStreamSocket::listen(int queueLength)
else
queueLength = ((queueLength * 3) >> 1) + 1;
fSockName->qlen = queueLength;
fAsyncError = 0;
SetAsyncMacError(OTBind(fEndpoint, fSockName, nil));
AddContext();
MopupEvents();
@ -672,6 +678,7 @@ if (err) {
// <Call [[OTAccept]] and [[return]] if successful>=
GUSIOTStreamSocket * sock = fNextListener;
fCompletion &= ~(CompleteMask(T_ACCEPTCOMPLETE));
fAsyncError = 0;
SetAsyncMacError(OTAccept(fEndpoint, sock->fEndpoint, sock->fPeerName));
AddContext();
MopupEvents();
@ -721,6 +728,7 @@ int GUSIOTStreamSocket::connect(void * address, socklen_t addrlen)
MopupEvents();
OTResult res = 0;
GUSI_MESSAGE(("Connecting...\n"));
switch (OTGetEndpointState(fEndpoint)) {
case T_OUTCON:
if (!fBlocking)
@ -857,6 +865,7 @@ bool GUSIOTStreamSocket::select(bool * canRead, bool * canWrite, bool * except)
{
MopupEvents();
size_t sz;
bool res = false;
OTResult state = OTGetEndpointState(fEndpoint);

Binary file not shown.