--- a/Win32OperatingSystem.st Tue Mar 05 18:10:13 2013 +0000
+++ b/Win32OperatingSystem.st Wed Mar 13 00:42:41 2013 +0000
@@ -6803,9 +6803,9 @@
list size == 0 ifTrue:[^ self ].
processGroupHandleOrPid isInteger ifTrue:[
- pid := processGroupHandleOrPid
+ pid := processGroupHandleOrPid
] ifFalse:[
- pid := processGroupHandleOrPid pid.
+ pid := processGroupHandleOrPid pid.
].
groupsToTerminate := Set with:pid.
list := list asSet.
@@ -6813,19 +6813,19 @@
"/ Transcript show:'terminate group '; showCR:pid.
anyMore := true.
[anyMore] whileTrue:[
- anyMore := false.
- list do:[:anOSProcess |
- |pid|
-
- (groupsToTerminate includes:anOSProcess parentPid) ifTrue:[
- pid := anOSProcess pid.
- groupsToTerminate add:pid.
- "/ Transcript show:'terminate '; showCR:pid.
- self terminateProcess:( pid ).
- list remove:anOSProcess.
- anyMore := true.
- ].
- ].
+ anyMore := false.
+ list do:[:anOSProcess |
+ |pid|
+
+ (groupsToTerminate includes:anOSProcess parentPid) ifTrue:[
+ pid := anOSProcess pid.
+ groupsToTerminate add:pid.
+ "/ Transcript show:'terminate '; showCR:pid.
+ self terminateProcess:( pid ).
+ list remove:anOSProcess.
+ anyMore := true.
+ ].
+ ].
].
! !
@@ -15928,14 +15928,14 @@
# ifdef DO_WRAP_CALLS
do {
__threadErrno = 0;
- res = STX_WSA_NOINT_CALL4( "getaddrinfo", getaddrinfo, __hostName, __serviceName, &hints, &info);
- } while ((res < 0) && (__threadErrno == EINTR));
+ ret = STX_WSA_NOINT_CALL4( "getaddrinfo", getaddrinfo, __hostName, __serviceName, &hints, &info);
+ } while ((ret < 0) && (__threadErrno == EINTR));
# else
__BEGIN_INTERRUPTABLE__
ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
__END_INTERRUPTABLE__
# endif
- } while (ret == EAI_SYSTEM && errno == EINTR);
+ } while (ret != 0 && __threadErrno == EINTR);
if (ret != 0) {
switch (ret) {
case EAI_FAMILY:
@@ -15953,12 +15953,6 @@
case EAI_SERVICE:
error = @symbol(unknownService);
break;
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
case EAI_MEMORY:
error = @symbol(allocationFailure);
break;
@@ -15968,9 +15962,6 @@
case EAI_AGAIN:
error = @symbol(tryAgain);
break;
- case EAI_SYSTEM:
- error = @symbol(systemError);
- break;
default:
error = @symbol(unknownError);
}
@@ -16305,11 +16296,19 @@
{
bp = (char *)(__byteArrayVal(socketAddress));
bp += nInstBytes;
+# ifdef DO_WRAP_CALLS
+ do {
+ __threadErrno = 0;
+ ret = STX_WSA_NOINT_CALL7( "getnameinfo", getnameinfo, (struct sockaddr *)bp, sockAddrSize, hp, hsz, sp, ssz, __flags);
+ } while ((ret < 0) && (__threadErrno == EINTR));
+# else
__BEGIN_INTERRUPTABLE__
ret = getnameinfo((struct sockaddr *)bp, sockAddrSize,
hp, hsz, sp, ssz, __flags);
__END_INTERRUPTABLE__
- } while (ret == EAI_SYSTEM && errno == EINTR);
+# endif
+ } while (ret != 0 && __threadErrno == EINTR);
+
if (ret != 0) {
switch (ret) {
case EAI_FAMILY:
@@ -16327,12 +16326,6 @@
case EAI_SERVICE:
error = @symbol(unknownService);
break;
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
case EAI_MEMORY:
error = @symbol(allocationFailure);
break;
@@ -16342,9 +16335,6 @@
case EAI_AGAIN:
error = @symbol(tryAgain);
break;
- case EAI_SYSTEM:
- error = @symbol(systemError);
- break;
default:
error = @symbol(unknownError);
}
@@ -16530,11 +16520,11 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.453 2013-03-04 15:17:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.456 2013-03-11 16:00:39 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.453 2013-03-04 15:17:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.456 2013-03-11 16:00:39 cg Exp $'
!
version_SVN