hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:bf7f37b63ea2
+:eb433f2c42b2
 #  endif
 # endif /* aix */
 # ifdef __osx__
 #  include <time.h>
+#  define HAS_TIMEGM
 struct tm {
-int     tm_sec;         /* seconds after the minute [0-60] */
+	int     tm_sec;         /* seconds after the minute [0-60] */
-int     tm_min;         /* minutes after the hour [0-59] */
+	int     tm_min;         /* minutes after the hour [0-59] */
-int     tm_hour;        /* hours since midnight [0-23] */
+	int     tm_hour;        /* hours since midnight [0-23] */
-int     tm_mday;        /* day of the month [1-31] */
+	int     tm_mday;        /* day of the month [1-31] */
-int     tm_mon;         /* months since January [0-11] */
+	int     tm_mon;         /* months since January [0-11] */
-int     tm_year;        /* years since 1900 */
+	int     tm_year;        /* years since 1900 */
-int     tm_wday;        /* days since Sunday [0-6] */
+	int     tm_wday;        /* days since Sunday [0-6] */
-int     tm_yday;        /* days since January 1 [0-365] */
+	int     tm_yday;        /* days since January 1 [0-365] */
-int     tm_isdst;       /* Daylight Savings Time flag */
+	int     tm_isdst;       /* Daylight Savings Time flag */
-long    tm_gmtoff;      /* offset from CUT in seconds */
+	long    tm_gmtoff;      /* offset from CUT in seconds */
-char    *tm_zone;       /* timezone abbreviation */
+	char    *tm_zone;       /* timezone abbreviation */
 };
 #  include <crt_externs.h>
 # endif /* __osx__ */
 initializeCodeset
 "initialize the codeset, we are running under.
 The codeset is determined from the environment.
 The LC_CTYPE locale is set from the environment as a side effect."
 |codeset|
 %{
 #include <langinfo.h>
 char *__codeset;
 setlocale(LC_CTYPE, "");
 __codeset = nl_langinfo(CODESET);
 if (strlen(__codeset) > 0) {
-codeset = __MKSTRING(__codeset);
+	codeset = __MKSTRING(__codeset);
 }
 %}.
 codeset notNil ifTrue:[
-codeset := codeset asLowercase.
+	codeset := codeset asLowercase.
-codeset = 'utf-8' ifTrue:[
+	codeset = 'utf-8' ifTrue:[
-codeset := #utf8.
+	    codeset := #utf8.
-] ifFalse:[
+	] ifFalse:[
-codeset := codeset asSymbol.
+	    codeset := codeset asSymbol.
-].
+	].
 ].
 Codeset := codeset.
 ^ codeset.
 "
 update:something with:aParameter from:changedObject
 "catch image restart and flush some cached data"
 something == #earlyRestart ifTrue:[
-self initializeCachedData
+	self initializeCachedData
 ]
 "Created: / 15.6.1996 / 15:22:37 / cg"
 "Modified: / 7.1.1997 / 19:36:11 / stefan"
 "Modified: / 11.12.1998 / 16:22:48 / cg"
 struct stat buf;
 int ret;
 if (__isSmallInteger(aFileDescriptor)) {
 # ifdef TRACE_STAT_CALLS
-printf("fstat on '%d' for accessMode\n", __smallIntegerVal(aFileDescriptor));
+	printf("fstat on '%d' for accessMode\n", __smallIntegerVal(aFileDescriptor));
 # endif
-__BEGIN_INTERRUPTABLE__
+	__BEGIN_INTERRUPTABLE__
-do {
+	do {
-ret = fstat(__smallIntegerVal(aFileDescriptor), &buf);
+	    ret = fstat(__smallIntegerVal(aFileDescriptor), &buf);
-} while ((ret < 0) && (errno == EINTR));
+	} while ((ret < 0) && (errno == EINTR));
-__END_INTERRUPTABLE__
+	__END_INTERRUPTABLE__
-if (ret < 0) {
+	if (ret < 0) {
-@global(LastErrorNumber) = __mkSmallInteger(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
-RETURN ( nil );
+	    RETURN ( nil );
-}
+	}
-RETURN ( __mkSmallInteger(buf.st_mode & 0777) );
+	RETURN ( __mkSmallInteger(buf.st_mode & 0777) );
 }
 %}.
 ^ self primitiveFailed
 "
 '/' asFilename readingFileDo:[:s|
-(OperatingSystem accessModeOfFd:s fileDescriptor) printStringRadix:8
+	(OperatingSystem accessModeOfFd:s fileDescriptor) printStringRadix:8
 ].
 "
 !
 changeAccessModeOf:aPathName to:modeBits
 %{
 int ret;
 if (__isSmallInteger(aFileDescriptor) && __isSmallInteger(modeBits)) {
-__BEGIN_INTERRUPTABLE__
+	__BEGIN_INTERRUPTABLE__
-do {
+	do {
-ret = fchmod(__smallIntegerVal(aFileDescriptor), __intVal(modeBits));
+	    ret = fchmod(__smallIntegerVal(aFileDescriptor), __intVal(modeBits));
-} while (ret < 0 && errno == EINTR);
+	} while (ret < 0 && errno == EINTR);
-__END_INTERRUPTABLE__
+	__END_INTERRUPTABLE__
-if (ret < 0) {
+	if (ret < 0) {
-@global(LastErrorNumber) = __mkSmallInteger(errno);
+	    @global(LastErrorNumber) = __mkSmallInteger(errno);
-RETURN ( false );
+	    RETURN ( false );
-}
+	}
-RETURN ( true );
+	RETURN ( true );
 }
 %}.
 ^ self primitiveFailed
 ! !
 "Created: 23.12.1995 / 14:19:20 / cg"
 !
 getNetworkAddressInfo
 "return a Dictionary of network interface information.
-key -> name of interface
+	key -> name of interface
-value -> a Set of network address
+	value -> a Set of network address
-information for the interface - a dictionaries containing the
+		information for the interface - a dictionaries containing the
-information about the configuration of each interface in the system.
+		information about the configuration of each interface in the system.
-The dictionary keys are:
+		The dictionary keys are:
-#address
+		    #address
-#netmask
+		    #netmask
-#flags
+		    #flags
-#destAddress"
+		    #destAddress"
 |returnArray addressArray nameArray noOfIf retDictionary error retIndex|
 noOfIf := 0.
 int n_ifa = 0;
 int retI = 0;
 OBJ t;
 if (getifaddrs(&ifap) < 0) {
-error = __MKSTRING("getifaddrs() failed");
+	error = __MKSTRING("getifaddrs() failed");
-goto out;
+	goto out;
 }
 for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) n_ifa++;
 returnArray = __ARRAY_NEW_INT(n_ifa*5);
 if (returnArray == nil) {
-/* Creating a string wouldn't work here */
+	/* Creating a string wouldn't work here */
-error = @symbol(allocationFailure);
+	error = @symbol(allocationFailure);
-goto bad;
+	goto bad;
 }
 for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) {
-int family, len;
+	int family, len;
-if (ifaLoop->ifa_addr == 0)
+	if (ifaLoop->ifa_addr == 0)
-continue;
+	       continue;
-family = ifaLoop->ifa_addr->sa_family;
+	family = ifaLoop->ifa_addr->sa_family;
-switch (family) {
+	switch (family) {
-case AF_INET:
+	case AF_INET:
-len = sizeof(struct sockaddr_in);
+	    len = sizeof(struct sockaddr_in);
-break;
+	    break;
-case AF_INET6:
+	case AF_INET6:
-len = sizeof(struct sockaddr_in6);
+	    len = sizeof(struct sockaddr_in6);
-break;
+	    break;
 #if 0
-case AF_PACKET:
+	case AF_PACKET:
-len = sizeof(sockaddr_ll);
+	    len = sizeof(sockaddr_ll);
-break;
+	    break;
 #endif
-default:
+	default:
-/* skip */
+	    /* skip */
-continue;
+	    continue;
-};
+	};
-t = __MKSTRING(ifaLoop->ifa_name);
+	t = __MKSTRING(ifaLoop->ifa_name);
-__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-t = __MKUINT(ifaLoop->ifa_flags);
+	t = __MKUINT(ifaLoop->ifa_flags);
-__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
+	t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
-__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+	__arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
-if (ifaLoop->ifa_netmask != 0) {
+	if (ifaLoop->ifa_netmask != 0) {
-t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
+	    t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
-__arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+	    __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
-}
+	}
-retI++;
+	retI++;
-if (ifaLoop->ifa_dstaddr != 0) {
+	if (ifaLoop->ifa_dstaddr != 0) {
-t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
+	    t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
-__arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+	    __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
-}
+	}
-retI++;
+	retI++;
 }
 noOfIf = __mkSmallInteger(n_ifa);
 bad:
 ** Open an INET socket
 */
 afinet_socket = socket(AF_INET, SOCK_DGRAM, 0);
 if (afinet_socket < 0) {
-goto bad;
+	goto bad;
 }
 /*
 ** Get the list of network interfaces
 */
 ifc.ifc_len = sizeof (buf);
 ifc.ifc_buf = (caddr_t) buf;
 if (ioctl (afinet_socket, SIOCGIFCONF, (caddr_t) &ifc) < 0) {
-close(afinet_socket);
+	close(afinet_socket);
-error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+	error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
-goto bad;
+	goto bad;
 }
 n_ifs = ifc.ifc_len / sizeof (struct ifreq);
 nameArray    = __ARRAY_NEW_INT(n_ifs);
 addressArray = __ARRAY_NEW_INT(n_ifs);
 if (nameArray == nil || addressArray == nil) {
-/* Creating a string wouldn/t work here */
+	/* Creating a string wouldn/t work here */
-error = @symbol(allocationFailure);
+	error = @symbol(allocationFailure);
-goto bad;
+	goto bad;
 }
 /*
 ** Iterate of the list of the system's netif. Find all
 ** active interfaces and their ethernet addresses
 */
 countOfIf = 0;
 for (i=0, ifr = ifc.ifc_req; i < n_ifs; i++, ifr++) {
-/*
+	/*
-** Get address for this interface
+	** Get address for this interface
-*/
+	*/
-memset (&ifreq, 0, sizeof(ifreq));
+	memset (&ifreq, 0, sizeof(ifreq));
-memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
+	memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
-if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
+	if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
-t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
+	    t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
-__arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
+	    __arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
-t = __MKSTRING(&ifreq.ifr_name);
+	    t = __MKSTRING(&ifreq.ifr_name);
-__arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
+	    __arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
-countOfIf++;
+	    countOfIf++;
-} else {
+	} else {
-fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
+	    fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
-}
+	}
-error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+	error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
 }
 noOfIf = __mkSmallInteger(countOfIf);
 bad:
 if (afinet_socket >= 0)
-close(afinet_socket);
+	close(afinet_socket);
 #else
 error = @symbol(notSupported);
 #endif /* defined(SIOCGIFADDR) */
 out:;
 %}.
 retDictionary := Dictionary new:noOfIf.
 error notNil ifTrue:[
-self primitiveFailed:error.
+	self primitiveFailed:error.
-"return empty dictionary if proceeding from error"
+	"return empty dictionary if proceeding from error"
-^  retDictionary.
+	^  retDictionary.
 ].
 retIndex := 1.
 1 to:noOfIf do:[:cnt|
-|name addressBytes set dict|
+	|name addressBytes set dict|
-name := returnArray at:retIndex.
+	name := returnArray at:retIndex.
-addressBytes := returnArray at:retIndex+2.
+	addressBytes := returnArray at:retIndex+2.
-addressBytes notNil ifTrue:[
+	addressBytes notNil ifTrue:[
-set := retDictionary at:name ifAbsentPut:[Set new].
+	    set := retDictionary at:name ifAbsentPut:[Set new].
-dict := Dictionary new:5.
+	    dict := Dictionary new:5.
-dict at:#flags put:(returnArray at:retIndex+1).
+	    dict at:#flags put:(returnArray at:retIndex+1).
-dict at:#address put:(SocketAddress fromBytes:addressBytes).
+	    dict at:#address put:(SocketAddress fromBytes:addressBytes).
-addressBytes := returnArray at:retIndex+3.
+	    addressBytes := returnArray at:retIndex+3.
-addressBytes notNil ifTrue:[
+	    addressBytes notNil ifTrue:[
-dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
+		dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
-].
+	    ].
-addressBytes := returnArray at:retIndex+4.
+	    addressBytes := returnArray at:retIndex+4.
-addressBytes notNil ifTrue:[
+	    addressBytes notNil ifTrue:[
-dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
+		dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
-].
+	    ].
-set add:dict.
+	    set add:dict.
-].
+	].
-retIndex := retIndex + 5.
+	retIndex := retIndex + 5.
 ].
 ^ retDictionary
 "
 OperatingSystem setEnvironment:#LD_LIBRARY_PATH to:'/opt/oracle/instantclient10_1'.
 "
 !
 setLocale:categorySymbol to:localeStringOrNil
 "set (and get) the locale for categorySymbol (e.g. #LC_ALL, #LC_CTYPE,....).
 If localeStringOrNil is nil, nothing is set.
 If localeStringOrNil is empty, the locale for categorySymbol ist set from the environment.
 If localeStringOrNil is 'C', the locale for categorySymbol ist set to the default.
 If localeStringOrNil is to a locale name, the locale for categorySymbol ist set.
 The current locale setting is returned."
 |locale error|
 %{
 int __category;
 char *__locale, *ret;
 if (categorySymbol == @symbol(LC_ALL)) {
-__category = LC_ALL;
+	__category = LC_ALL;
 } else if (categorySymbol == @symbol(LC_COLLATE)) {
-__category = LC_COLLATE;
+	__category = LC_COLLATE;
 } else if (categorySymbol == @symbol(LC_CTYPE)) {
-__category = LC_CTYPE;
+	__category = LC_CTYPE;
 } else if (categorySymbol == @symbol(LC_MESSAGES)) {
-__category = LC_MESSAGES;
+	__category = LC_MESSAGES;
 } else if (categorySymbol == @symbol(LC_MONETARY)) {
-__category = LC_MONETARY;
+	__category = LC_MONETARY;
 } else if (categorySymbol == @symbol(LC_NUMERIC)) {
-__category = LC_NUMERIC;
+	__category = LC_NUMERIC;
 } else if (categorySymbol == @symbol(LC_TIME)) {
-__category = LC_TIME;
+	__category = LC_TIME;
 } else {
-error = @symbol(argument1);
+	error = @symbol(argument1);
-goto out;
+	goto out;
 }
 if (localeStringOrNil == nil) {
-__locale = 0;
+	__locale = 0;
 } else if (__isStringLike(localeStringOrNil)){
-__locale = __stringVal(localeStringOrNil);
+	__locale = __stringVal(localeStringOrNil);
 } else {
-error = @symbol(argument1);
+	error = @symbol(argument1);
-goto out;
+	goto out;
 }
 ret = setlocale(__category, __locale);
 if (ret) {
-locale = __MKSTRING(ret);
+	locale = __MKSTRING(ret);
 }
 out:;
 %}.
 locale notNil ifTrue:[
-^ locale.
+	^ locale.
 ].
 ^ self primitiveFailed:error.
 "
 OperatingSystem setLocale:#LC_ALL to:nil
 	tm.tm_year = __intVal(y) - 1900;
 	tm.tm_mon = __intVal(m) - 1;
 	tm.tm_mday = __intVal(d);
 	tm.tm_isdst = -1;
+#ifdef HAS_TIMEGM
-	t = mktime(&tm);                        /* mktime() interprets tm as localtime */
+	if (utcBoolean == true) {               /* convert to utc time */
+	    t = timegm(&tm);                    /* timegm() interprets tm as utc time */
+	} else
+#endif
+	{
+	    t = mktime(&tm);                    /* mktime() interprets tm as localtime */
+	}
 	if ((INT)t != -1) {
+#ifndef HAS_TIMEGM
 	    if (utcBoolean == true) {           /* convert to utc time */
 		t = (INT)t - TIMEZONE(&tm);     /* TIMZONE = seconds westward from 0 */
 	    }
+#endif
 	    osSeconds = __MKINT((INT)t);        /* be careful, t can be negative at the start of the epoch ! */
 	}
 }
 %}.
 osSeconds notNil ifTrue:[
 !UnixOperatingSystem class methodsFor:'users & groups'!
 getDesktopDirectory
 "{ Pragma: +optSpace }"
 "return the name of the user's desktop directory."
 |home desktop|
 home := self getHomeDirectory.
 desktop := home,'/Desktop'.
 desktop asFilename exists ifTrue:[^ desktop].
 ^ (self getEffectiveUserID == 0)
 and:[self getUserID ~~ 0 ]
 "
 self isRunningWithElevatedRootOrAdminRights
 "
 !
 isRunningWithRootOrAdminRights
 "return true, if running with root rights (either an elevated normal user
 domain := OperatingSystem domainCodeOf:domainArg.
 type := OperatingSystem socketTypeCodeOf:typeArg.
 proto := self protocolCodeOf:protoArg.
 serviceNameArg notNil ifTrue:[
-serviceName := serviceNameArg printString.      "convert integer port numbers"
+	serviceName := serviceNameArg printString.      "convert integer port numbers"
 ].
 hostName isNil ifTrue:[
-encodedHostName := nil.
+	encodedHostName := nil.
 ] ifFalse:[
-encodedHostName := hostName utf8Encoded.
+	encodedHostName := hostName utf8Encoded.
 ].
 (encodedHostName ~~ hostName and:[OperatingSystem getCodeset ~~ #utf8]) ifTrue:[
-"hostName is not plain ASCII - so this is an IDN domain name. Have to ensure, that the locale is UTF-8.
+	"hostName is not plain ASCII - so this is an IDN domain name. Have to ensure, that the locale is UTF-8.
-Block interrupt to not affect othe ST/X processes while the locale is changed."
+	 Block interrupt to not affect othe ST/X processes while the locale is changed."
-|interruptsBlocked oldLocale|
+	|interruptsBlocked oldLocale|
-interruptsBlocked := OperatingSystem blockInterrupts.
+	interruptsBlocked := OperatingSystem blockInterrupts.
-oldLocale := OperatingSystem setLocale:#'LC_CTYPE' to:nil.
+	oldLocale := OperatingSystem setLocale:#'LC_CTYPE' to:nil.
-OperatingSystem setLocale:#'LC_CTYPE' to:'en_US.UTF-8'.
+	OperatingSystem setLocale:#'LC_CTYPE' to:'en_US.UTF-8'.
-result := self primGetAddressInfo:encodedHostName serviceName:serviceName domainCode:domain socketTypeCode:type protocolCode:proto flags:flags.
+	result := self primGetAddressInfo:encodedHostName serviceName:serviceName domainCode:domain socketTypeCode:type protocolCode:proto flags:flags.
-OperatingSystem setLocale:#'LC_CTYPE' to:oldLocale.
+	OperatingSystem setLocale:#'LC_CTYPE' to:oldLocale.
-interruptsBlocked ifFalse:[
+	interruptsBlocked ifFalse:[
-OperatingSystem unblockInterrupts.
+	    OperatingSystem unblockInterrupts.
-].
+	].
 ] ifFalse:[
-result := self primGetAddressInfo:encodedHostName serviceName:serviceName domainCode:domain socketTypeCode:type protocolCode:proto flags:flags.
+	result := self primGetAddressInfo:encodedHostName serviceName:serviceName domainCode:domain socketTypeCode:type protocolCode:proto flags:flags.
 ].
 result isArray ifFalse:[
-|request|
+	|request|
-request := SocketAddressInfo new
+	request := SocketAddressInfo new
-domain:domainArg;
+	    domain:domainArg;
-type:typeArg;
+	    type:typeArg;
-protocol:protoArg;
+	    protocol:protoArg;
-canonicalName:hostName;
+	    canonicalName:hostName;
-serviceName:serviceName.
+	    serviceName:serviceName.
-^ (HostNameLookupError new
+	^ (HostNameLookupError new
-parameter:result;
+		parameter:result;
-messageText:' - ', (result printString);
+		messageText:' - ', (result printString);
-request:request) raiseRequest.
+		request:request) raiseRequest.
 ].
 1 to:result size do:[:i |
-|entry dom info|
+	|entry dom info|
-entry := result at:i.
+	entry := result at:i.
-info := SocketAddressInfo new.
+	info := SocketAddressInfo new.
-info
+	info
-flags:(entry at:1);
+	    flags:(entry at:1);
-domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
+	    domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
-type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
+	    type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
-protocol:(self protocolSymbolOf:(entry at:4));
+	    protocol:(self protocolSymbolOf:(entry at:4));
-socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
+	    socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
-canonicalName:(entry at:6).
+	    canonicalName:(entry at:6).
-result at:i put:info.
+	result at:i put:info.
 ].
 ^ result
 "
 self getAddressInfo:'localhost' serviceName:nil
-domain:nil type:nil protocol:nil flags:nil
+	    domain:nil type:nil protocol:nil flags:nil
 self getAddressInfo:'localhost' serviceName:nil
-domain:#inet type:#stream protocol:nil flags:nil
+	    domain:#inet type:#stream protocol:nil flags:nil
 self getAddressInfo:'localhost' serviceName:nil
-domain:#inet type:#stream protocol:#tcp flags:nil
+	    domain:#inet type:#stream protocol:#tcp flags:nil
 self getAddressInfo:'blurb.exept.de' serviceName:nil
-domain:#inet type:nil protocol:nil flags:nil
+	    domain:#inet type:nil protocol:nil flags:nil
 self getAddressInfo:'1.2.3.4' serviceName:'bla'
-domain:#inet type:nil protocol:nil flags:nil
+	    domain:#inet type:nil protocol:nil flags:nil
 self getAddressInfo:'localhost' serviceName:'echo'
-domain:#inet type:nil protocol:nil flags:nil
+	    domain:#inet type:nil protocol:nil flags:nil
 self getAddressInfo:nil serviceName:'echo'
-domain:#inet type:nil protocol:nil flags:nil
+	    domain:#inet type:nil protocol:nil flags:nil
 self getAddressInfo:nil serviceName:nil
-domain:#inet type:nil protocol:nil flags:nil
+	    domain:#inet type:nil protocol:nil flags:nil
 self getAddressInfo:'www.google.de' serviceName:nil
-domain:nil type:nil protocol:nil flags:nil
+	    domain:nil type:nil protocol:nil flags:nil
 self getAddressInfo:'www.exept.de' serviceName:nil
-domain:nil type:nil protocol:nil flags:nil
+	    domain:nil type:nil protocol:nil flags:nil
 self getAddressInfo:'www.exept.de' serviceName:nil
-domain:#'AF_INET' type:nil protocol:nil flags:nil
+	    domain:#'AF_INET' type:nil protocol:nil flags:nil
 self getAddressInfo:'www.exept.de' serviceName:nil
-domain:#'AF_INET6' type:nil protocol:nil flags:nil
+	    domain:#'AF_INET6' type:nil protocol:nil flags:nil
 self getAddressInfo:'www.baden-wrttemberg.de' serviceName:nil
-domain:#'AF_INET' type:#stream protocol:nil flags:nil
+	    domain:#'AF_INET' type:#stream protocol:nil flags:nil
 "
 !
 getNameInfo:socketAddress wantHostName:wantHostName wantServiceName:wantServiceName datagram:useDatagram flags:flags
 "answer an Array containing the hostName and serviceName
 #if !defined(NO_SOCKET)
 char *__hostName, *__serviceName;
 int ret, cnt = 0;
 if (hostName == nil) {
-__hostName = 0;
+	__hostName = 0;
 } else if (__isStringLike(hostName)) {
-__hostName = __stringVal(hostName);
+	__hostName = __stringVal(hostName);
 } else {
-error = @symbol(badArgument1);
+	error = @symbol(badArgument1);
-goto out;
+	goto out;
 }
 if (serviceName == nil) {
-__serviceName = 0;
+	__serviceName = 0;
 } else if (__isStringLike(serviceName)) {
-__serviceName = __stringVal(serviceName);
+	__serviceName = __stringVal(serviceName);
 } else {
-error = @symbol(badArgument2);
+	error = @symbol(badArgument2);
-goto out;
+	goto out;
 }
 if (__hostName == 0 && __serviceName == 0) {
-error = @symbol(badArgument);
+	error = @symbol(badArgument);
-goto out;
+	goto out;
 }
 {
 # if defined(AI_NUMERICHOST)
 /*
 #if defined(AI_IDN)
 hints.ai_flags = AI_IDN | AI_CANONIDN;      // map non-ascii domain names to IDN format
 #endif
 if (__isSmallInteger(domain))
-hints.ai_family = __intVal(domain);
+	hints.ai_family = __intVal(domain);
 if (__isSmallInteger(type))
-hints.ai_socktype = __intVal(type);
+	hints.ai_socktype = __intVal(type);
 if (__isSmallInteger(proto))
-hints.ai_protocol = __intVal(proto);
+	hints.ai_protocol = __intVal(proto);
 if (__isSmallInteger(flags))
-hints.ai_flags |= __intVal(flags);
+	hints.ai_flags |= __intVal(flags);
 do {
-/* reload */
+	/* reload */
-if (__hostName) {
+	if (__hostName) {
-__hostName = __stringVal(hostName);
+	    __hostName = __stringVal(hostName);
-}
+	}
-if (__serviceName) {
+	if (__serviceName) {
-__serviceName = __stringVal(serviceName);
+	    __serviceName = __stringVal(serviceName);
-}
+	}
 //        __BEGIN_INTERRUPTABLE__
-ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
+	ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
 //        __END_INTERRUPTABLE__
 } while (ret == EAI_SYSTEM && errno == EINTR);
 if (ret != 0) {
-switch (ret) {
+	switch (ret) {
-case EAI_FAMILY:
+	case EAI_FAMILY:
-error = @symbol(badProtocol);
+	    error = @symbol(badProtocol);
-break;
+	    break;
-case EAI_SOCKTYPE:
+	case EAI_SOCKTYPE:
-error = @symbol(badSocketType);
+	    error = @symbol(badSocketType);
-break;
+	    break;
-case EAI_BADFLAGS:
+	case EAI_BADFLAGS:
-error = @symbol(badFlags);
+	    error = @symbol(badFlags);
-break;
+	    break;
-case EAI_NONAME:
+	case EAI_NONAME:
-error = @symbol(unknownHost);
+	    error = @symbol(unknownHost);
-break;
+	    break;
-case EAI_SERVICE:
+	case EAI_SERVICE:
-error = @symbol(unknownService);
+	    error = @symbol(unknownService);
-break;
+	    break;
 #ifdef EAI_ADDRFAMILY
-case EAI_ADDRFAMILY :
+	case EAI_ADDRFAMILY :
-error = @symbol(unknownHostForProtocol);
+	    error = @symbol(unknownHostForProtocol);
-break;
+	    break;
 #endif
 #ifdef EAI_NODATA
-case EAI_NODATA:
+	case EAI_NODATA:
-error = @symbol(noAddress);
+	    error = @symbol(noAddress);
-break;
+	    break;
 #endif
-case EAI_MEMORY:
+	case EAI_MEMORY:
-error = @symbol(allocationFailure);
+	    error = @symbol(allocationFailure);
-break;
+	    break;
-case EAI_FAIL:
+	case EAI_FAIL:
-error = @symbol(permanentFailure);
+	    error = @symbol(permanentFailure);
-break;
+	    break;
-case EAI_AGAIN:
+	case EAI_AGAIN:
-error = @symbol(tryAgain);
+	    error = @symbol(tryAgain);
-break;
+	    break;
-case EAI_SYSTEM:
+	case EAI_SYSTEM:
-error = @symbol(systemError);
+	    error = @symbol(systemError);
-break;
+	    break;
-default:
+	default:
-error = @symbol(unknownError);
+	    error = @symbol(unknownError);
-}
+	}
-errorString = __MKSTRING(gai_strerror(ret));
+	errorString = __MKSTRING(gai_strerror(ret));
-goto err;
+	goto err;
 }
 for (cnt=0, infop=info; infop; infop=infop->ai_next)
-cnt++;
+	cnt++;
 result = __ARRAY_NEW_INT(cnt);
 if (result == nil) {
-error = @symbol(allocationFailure);
+	error = @symbol(allocationFailure);
-goto err;
+	goto err;
 }
 for (infop=info, cnt=0; infop; infop=infop->ai_next, cnt++) {
-OBJ o, resp;
+	OBJ o, resp;
-resp = __ARRAY_NEW_INT(6);
+	resp = __ARRAY_NEW_INT(6);
-if (resp == nil) {
+	if (resp == nil) {
-error = @symbol(allocationFailure);
+	    error = @symbol(allocationFailure);
-goto err;
+	    goto err;
-}
+	}
-__ArrayInstPtr(result)->a_element[cnt] = resp; __STORE(result, resp);
+	__ArrayInstPtr(result)->a_element[cnt] = resp; __STORE(result, resp);
-__ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(infop->ai_flags);
+	__ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(infop->ai_flags);
-__ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
+	__ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
-__ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
+	__ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
-__ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(infop->ai_protocol);
+	__ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(infop->ai_protocol);
-__PROTECT__(resp);
+	__PROTECT__(resp);
-o = __BYTEARRAY_NEW_INT(infop->ai_addrlen);
+	o = __BYTEARRAY_NEW_INT(infop->ai_addrlen);
-__UNPROTECT__(resp);
+	__UNPROTECT__(resp);
-if (o == nil) {
+	if (o == nil) {
-error = @symbol(allocationFailure);
+	    error = @symbol(allocationFailure);
-goto err;
+	    goto err;
-}
+	}
-memcpy(__byteArrayVal(o), infop->ai_addr, infop->ai_addrlen);
+	memcpy(__byteArrayVal(o), infop->ai_addr, infop->ai_addrlen);
 __ArrayInstPtr(resp)->a_element[4] = o; __STORE(resp, o);
-if (infop->ai_canonname) {
+	if (infop->ai_canonname) {
-__PROTECT__(resp);
+	    __PROTECT__(resp);
-o = __MKSTRING(infop->ai_canonname);
+	    o = __MKSTRING(infop->ai_canonname);
-__UNPROTECT__(resp);
+	    __UNPROTECT__(resp);
-if (o == nil) {
+	    if (o == nil) {
-error = @symbol(allocationFailure);
+		error = @symbol(allocationFailure);
-goto err;
+		goto err;
-}
+	    }
-__ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
+	    __ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
-}
+	}
 }
 err:
 if (info) freeaddrinfo(info);
 char **addrpp;
 int port = 0;
 int i;
 if (__serviceName) {
-struct servent *sp;
+	struct servent *sp;
-char *__proto = 0;
+	char *__proto = 0;
-if (__isStringLike(protoArg))
+	if (__isStringLike(protoArg))
-__proto = __stringVal(protoArg);
+	    __proto = __stringVal(protoArg);
-sp = getservbyname(__serviceName, __proto);
+	sp = getservbyname(__serviceName, __proto);
-if (sp == NULL) {
+	if (sp == NULL) {
-errorString = @symbol(unknownService);
+	    errorString = @symbol(unknownService);
-error = __mkSmallInteger(-3);
+	    error = __mkSmallInteger(-3);
-goto err;
+	    goto err;
-}
+	}
-port = sp->s_port;
+	port = sp->s_port;
 }
 if (__hostName) {
 #  ifdef USE_H_ERRNO
-do {
+	do {
-if (hostName == nil) {
+	    if (hostName == nil) {
-__hostName = 0;
+		__hostName = 0;
-} else if (__isStringLike(hostName)) {
+	    } else if (__isStringLike(hostName)) {
-__hostName = __stringVal(hostName);
+		__hostName = __stringVal(hostName);
-}
+	    }
-/* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname
+	    /* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname
-* uses a static data area
+	     * uses a static data area
-*/
+	     */
-__BEGIN_INTERRUPTABLE__
+	    __BEGIN_INTERRUPTABLE__
-hp = gethostbyname(__hostName);
+	    hp = gethostbyname(__hostName);
-__END_INTERRUPTABLE__
+	    __END_INTERRUPTABLE__
-} while ((hp == NULL)
+	} while ((hp == NULL)
-&& (
+		  && (
-(h_errno == TRY_AGAIN)
+			(h_errno == TRY_AGAIN)
-|| errno == EINTR
+		      || errno == EINTR
 #   ifdef IRIX5_3
-|| (errno == ECONNREFUSED)
+		      || (errno == ECONNREFUSED)
 #   endif
-)
+		     )
-);
+	);
-if (hp == 0) {
+	if (hp == 0) {
-switch (h_errno) {
+	    switch (h_errno) {
-case HOST_NOT_FOUND:
+	    case HOST_NOT_FOUND:
-errorString = @symbol(unknownHost);
+		errorString = @symbol(unknownHost);
-break;
+		break;
-case NO_ADDRESS:
+	    case NO_ADDRESS:
-errorString = @symbol(noAddress);
+		errorString = @symbol(noAddress);
-break;
+		break;
-case NO_RECOVERY:
+	    case NO_RECOVERY:
-errorString = @symbol(permanentFailure);
+		errorString = @symbol(permanentFailure);
-break;
+		break;
-case TRY_AGAIN:
+	    case TRY_AGAIN:
-errorString = @symbol(tryAgain);
+		errorString = @symbol(tryAgain);
-break;
+		break;
-default:
+	    default:
-errorString = @symbol(unknownError);
+		errorString = @symbol(unknownError);
-break;
+		break;
-}
+	    }
-error = __mkSmallInteger(h_errno);
+	    error = __mkSmallInteger(h_errno);
-goto err;
+	    goto err;
-}
+	}
 #  else /* !USE_H_ERRNO */
-hp = gethostbyname(__hostName);
+	hp = gethostbyname(__hostName);
-if (hp == 0) {
+	if (hp == 0) {
-errorString = @symbol(unknownHost);
+	    errorString = @symbol(unknownHost);
-error = __mkSmallInteger(-1);
+	    error = __mkSmallInteger(-1);
-goto err;
+	    goto err;
-}
+	}
 #  endif /* !USE_H_ERRNO*/
-if (__isSmallInteger(domain) && hp->h_addrtype != __smallIntegerVal(domain)) {
+	if (__isSmallInteger(domain) && hp->h_addrtype != __smallIntegerVal(domain)) {
-errorString = @symbol(unknownHost);
+	    errorString = @symbol(unknownHost);
-error = __mkSmallInteger(-2);
+	    error = __mkSmallInteger(-2);
-goto err;
+	    goto err;
-}
+	}
-for (cnt = 0, addrpp = hp->h_addr_list; *addrpp; addrpp++)
+	for (cnt = 0, addrpp = hp->h_addr_list; *addrpp; addrpp++)
-cnt++;
+	    cnt++;
-addrpp = hp->h_addr_list;
+	addrpp = hp->h_addr_list;
 } else {
-cnt = 1;
+	cnt = 1;
 }
 result = __ARRAY_NEW_INT(cnt);
 if (result == nil) {
-error = @symbol(allocationFailure);
+	error = @symbol(allocationFailure);
-goto err;
+	goto err;
 }
 for (i = 0; i < cnt; i++) {
-OBJ o, resp;
+	OBJ o, resp;
-struct sockaddr_in *sa;
+	struct sockaddr_in *sa;
-resp = __ARRAY_NEW_INT(6);
+	resp = __ARRAY_NEW_INT(6);
-if (resp == nil) {
+	if (resp == nil) {
-error = @symbol(allocationFailure);
+	    error = @symbol(allocationFailure);
-goto err;
+	    goto err;
-}
+	}
-__ArrayInstPtr(result)->a_element[i] = resp; __STORE(result, resp);
+	__ArrayInstPtr(result)->a_element[i] = resp; __STORE(result, resp);
-__ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(0);
+	__ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(0);
-__ArrayInstPtr(resp)->a_element[2] = type; __STORE(result, type);
+	__ArrayInstPtr(resp)->a_element[2] = type; __STORE(result, type);
-__ArrayInstPtr(resp)->a_element[3] = proto; __STORE(result, proto);
+	__ArrayInstPtr(resp)->a_element[3] = proto; __STORE(result, proto);
-__PROTECT__(resp);
+	__PROTECT__(resp);
-o = __BYTEARRAY_NEW_INT(sizeof(*sa));
+	o = __BYTEARRAY_NEW_INT(sizeof(*sa));
-__UNPROTECT__(resp);
+	__UNPROTECT__(resp);
-if (o == nil) {
+	if (o == nil) {
-error = @symbol(allocationFailure);
+	    error = @symbol(allocationFailure);
-goto err;
+	    goto err;
-}
+	}
-__ArrayInstPtr(resp)->a_element[4] = o; __STORE(resp, o);
+	__ArrayInstPtr(resp)->a_element[4] = o; __STORE(resp, o);
-sa = (struct sockaddr_in *)__byteArrayVal(o);
+	sa = (struct sockaddr_in *)__byteArrayVal(o);
-sa->sin_port = port;
+	sa->sin_port = port;
-if (__hostName) {
+	if (__hostName) {
-sa->sin_family = hp->h_addrtype;
+	    sa->sin_family = hp->h_addrtype;
-memcpy(&sa->sin_addr, *addrpp, hp->h_length);
+	    memcpy(&sa->sin_addr, *addrpp, hp->h_length);
-__ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(hp->h_addrtype);
+	    __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(hp->h_addrtype);
-if (hp->h_name) {
+	    if (hp->h_name) {
-__PROTECT__(resp);
+		__PROTECT__(resp);
-o = __MKSTRING(hp->h_name);
+		o = __MKSTRING(hp->h_name);
-__UNPROTECT__(resp);
+		__UNPROTECT__(resp);
-if (o == nil) {
+		if (o == nil) {
-error = @symbol(allocationFailure);
+		    error = @symbol(allocationFailure);
-goto err;
+		    goto err;
-}
+		}
-__ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
+		__ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
-}
+	    }
-addrpp++;
+	    addrpp++;
-} else{
+	} else{
-__ArrayInstPtr(resp)->a_element[1] = domain; __STORE(resp, domain);
+	    __ArrayInstPtr(resp)->a_element[1] = domain; __STORE(resp, domain);
-}
+	}
 }
 err:;
 # endif /* ! AI_NUMERICHOST */
 }
 error = @symbol(notImplemented);
 #endif
 out:;
 %}.
 error notNil ifTrue:[
-errorString notNil ifTrue:[
+	errorString notNil ifTrue:[
-^ errorString.
+	    ^ errorString.
-].
+	].
-^ error.
+	^ error.
 ].
 ^ result.
 ! !
 !UnixOperatingSystem::SocketHandle methodsFor:'accepting'!
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.338 2013-12-17 16:46:05 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.339 2014-01-25 00:30:52 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.338 2013-12-17 16:46:05 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.339 2014-01-25 00:30:52 cg Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'

branch	jv
changeset 18117	eb433f2c42b2
parent 18115	26ac4840e5d0
parent 15906	8bbbcd3b5765
child 18120	e3a375d5f6a8