use arrayVal & byteArrayVal macros
authorClaus Gittinger <cg@exept.de>
Thu, 11 Apr 2002 11:44:08 +0200
changeset 6495 a8d7ed8fae59
parent 6494 5b3d8667c22a
child 6496 639f2b748424
use arrayVal & byteArrayVal macros
UnixOperatingSystem.st
--- a/UnixOperatingSystem.st	Thu Apr 11 11:26:07 2002 +0200
+++ b/UnixOperatingSystem.st	Thu Apr 11 11:44:08 2002 +0200
@@ -937,43 +937,43 @@
  */
 union sockaddr_u {
 #ifdef AF_UNIX
-        struct sockaddr_un un;
+	struct sockaddr_un un;
 #endif
 #ifdef AF_INET
-        struct sockaddr_in in;
+	struct sockaddr_in in;
 #endif
 #ifdef AF_INET6
-        struct sockaddr_in6 in6;
+	struct sockaddr_in6 in6;
 #endif
 #ifdef AF_APPLETALK
-        struct sockaddr_at at;
+	struct sockaddr_at at;
 #endif
 #ifdef AF_DECNET
-        struct sockaddr_dn dn;
+	struct sockaddr_dn dn;
 #endif
 #ifdef AF_X25
-        struct sockaddr_x25 x25;
+	struct sockaddr_x25 x25;
 #endif
 #ifdef AF_AX25
-        struct sockaddr_ax25 ax25;
+	struct sockaddr_ax25 ax25;
 #endif
 #ifdef AF_IPX
-        struct sockaddr_ipx ipx;
+	struct sockaddr_ipx ipx;
 #endif
 #ifdef AF_NETBIOS
-        struct sockaddr_nb nb;
+	struct sockaddr_nb nb;
 #endif
 #ifdef AF_ATM
-        struct sockaddr_atm atm;
+	struct sockaddr_atm atm;
 #endif
 #ifdef AF_BAN
-        struct sockaddr_vns vns;
+	struct sockaddr_vns vns;
 #endif
 #ifdef AF_VOICEVIEW
-        struct sockaddr_vv vv;
+	struct sockaddr_vv vv;
 #endif
 #ifdef AF_IRDA
-        struct sockaddr_irda irda;
+	struct sockaddr_irda irda;
 #endif
 };
 
@@ -998,54 +998,54 @@
 #ifdef LINUX
 
 # define GETHOSTBYNAME(hp, name) \
-        hp = gethostbyname((char *) name);
+	hp = gethostbyname((char *) name);
 
 # define GETHOSTBYADDR(hp, addr, alen, af) \
-        hp = gethostbyaddr(addr, alen, af);
+	hp = gethostbyaddr(addr, alen, af);
 
 #else
 
 # ifdef IRIX5_3
 #  define GETHOSTBYNAME(hp, name) \
-        do { \
-            __BEGIN_INTERRUPTABLE__  \
-            hp = gethostbyname((char *) name); \
-            __END_INTERRUPTABLE__ \
-        } while ((hp == NULL) && \
-                 ((h_errno == TRY_AGAIN) || (errno == ECONNREFUSED)));
+	do { \
+	    __BEGIN_INTERRUPTABLE__  \
+	    hp = gethostbyname((char *) name); \
+	    __END_INTERRUPTABLE__ \
+	} while ((hp == NULL) && \
+		 ((h_errno == TRY_AGAIN) || (errno == ECONNREFUSED)));
 
 #  define GETHOSTBYADDR(hp, addr, alen, af) \
-        do { \
-            __BEGIN_INTERRUPTABLE__ \
-            hp = gethostbyaddr(addr, alen, af); \
-            __END_INTERRUPTABLE__ \
-        } while ((hp == NULL) && \
-                ((h_errno == TRY_AGAIN) || (errno == ECONNREFUSED)));
+	do { \
+	    __BEGIN_INTERRUPTABLE__ \
+	    hp = gethostbyaddr(addr, alen, af); \
+	    __END_INTERRUPTABLE__ \
+	} while ((hp == NULL) && \
+		((h_errno == TRY_AGAIN) || (errno == ECONNREFUSED)));
 # else
 #  ifdef USE_H_ERRNO
 #   define GETHOSTBYNAME(hp, name) \
-        do { \
-            __BEGIN_INTERRUPTABLE__  \
-            hp = gethostbyname((char *) name); \
-            __END_INTERRUPTABLE__ \
-        } while ((hp == NULL) && (h_errno == TRY_AGAIN));
+	do { \
+	    __BEGIN_INTERRUPTABLE__  \
+	    hp = gethostbyname((char *) name); \
+	    __END_INTERRUPTABLE__ \
+	} while ((hp == NULL) && (h_errno == TRY_AGAIN));
 
 #   define GETHOSTBYADDR(hp, addr, alen, af) \
-        do { \
-            __BEGIN_INTERRUPTABLE__  \
-            hp = gethostbyaddr(addr, alen, af); \
-            __END_INTERRUPTABLE__ \
-        } while ((hp == NULL) && (h_errno == TRY_AGAIN));
+	do { \
+	    __BEGIN_INTERRUPTABLE__  \
+	    hp = gethostbyaddr(addr, alen, af); \
+	    __END_INTERRUPTABLE__ \
+	} while ((hp == NULL) && (h_errno == TRY_AGAIN));
 #  else
 #   define GETHOSTBYNAME(hp, name) \
-        __BEGIN_INTERRUPTABLE__  \
-        hp = gethostbyname((char *) name); \
-        __END_INTERRUPTABLE__ 
+	__BEGIN_INTERRUPTABLE__  \
+	hp = gethostbyname((char *) name); \
+	__END_INTERRUPTABLE__ 
 
 #   define GETHOSTBYADDR(hp, addr, alen, af) \
-        __BEGIN_INTERRUPTABLE__ \
-        hp = gethostbyaddr(addr, alen, af); \
-        __END_INTERRUPTABLE__
+	__BEGIN_INTERRUPTABLE__ \
+	hp = gethostbyaddr(addr, alen, af); \
+	__END_INTERRUPTABLE__
 #  endif
 # endif
 #endif
@@ -2320,488 +2320,488 @@
     sym = @symbol(ERROR_OTHER);
 
     if (__isSmallInteger(errNr)) {
-        switch ( __intVal(errNr)) {
-            /*
-             * POSIX errnos - these should be defined
-             */
+	switch ( __intVal(errNr)) {
+	    /*
+	     * POSIX errnos - these should be defined
+	     */
 #ifdef EPERM
-            case EPERM:
-                sym = @symbol(EPERM);
-                typ = @symbol(noPermissionsSignal);
-                break;
+	    case EPERM:
+		sym = @symbol(EPERM);
+		typ = @symbol(noPermissionsSignal);
+		break;
 #endif
 #ifdef ENOENT
-            case ENOENT:
-                sym = @symbol(ENOENT);
-                typ = @symbol(nonexistentSignal);
-                break;
+	    case ENOENT:
+		sym = @symbol(ENOENT);
+		typ = @symbol(nonexistentSignal);
+		break;
 #endif
 #ifdef ESRCH
-            case ESRCH:
-                sym = @symbol(ESRCH);
-                typ = @symbol(unavailableReferentSignal);
-                break;
+	    case ESRCH:
+		sym = @symbol(ESRCH);
+		typ = @symbol(unavailableReferentSignal);
+		break;
 #endif
 #ifdef EINTR
-            case EINTR:
-                sym = @symbol(EINTR);
-                typ = @symbol(transientErrorSignal);
-                break;
+	    case EINTR:
+		sym = @symbol(EINTR);
+		typ = @symbol(transientErrorSignal);
+		break;
 #endif
 #ifdef EIO
-            case EIO:
-                sym = @symbol(EIO);
-                typ = @symbol(transferFaultSignal);
-                break;
+	    case EIO:
+		sym = @symbol(EIO);
+		typ = @symbol(transferFaultSignal);
+		break;
 #endif
 #ifdef ENXIO
-            case ENXIO:
-                sym = @symbol(ENXIO);
-                typ = @symbol(unavailableReferentSignal);
-                break;
+	    case ENXIO:
+		sym = @symbol(ENXIO);
+		typ = @symbol(unavailableReferentSignal);
+		break;
 #endif
 #ifdef E2BIG
-            case E2BIG:
-                sym = @symbol(E2BIG);
-                typ = @symbol(invalidArgumentsSignal);
-                break;
+	    case E2BIG:
+		sym = @symbol(E2BIG);
+		typ = @symbol(invalidArgumentsSignal);
+		break;
 #endif
 #ifdef ENOEXEC
-            case ENOEXEC:
-                sym = @symbol(ENOEXEC);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOEXEC:
+		sym = @symbol(ENOEXEC);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EBADF
-            case EBADF:
-                sym = @symbol(EBADF);
-                typ = @symbol(badAccessorSignal);
-                break;
+	    case EBADF:
+		sym = @symbol(EBADF);
+		typ = @symbol(badAccessorSignal);
+		break;
 #endif
 #ifdef ECHILD
-            case ECHILD:
-                sym = @symbol(ECHILD);
-                typ = @symbol(informationSignal);
-                break;
+	    case ECHILD:
+		sym = @symbol(ECHILD);
+		typ = @symbol(informationSignal);
+		break;
 #endif
 #if !defined(EWOULDBLOCK) && defined(EAGAIN) && (EWOULDBLOCK != EAGAIN)
-            case EAGAIN:
-                sym = @symbol(EAGAIN);
-                typ = @symbol(notReadySignal);
-                break;
+	    case EAGAIN:
+		sym = @symbol(EAGAIN);
+		typ = @symbol(notReadySignal);
+		break;
 #endif
 #ifdef ENOMEM
-            case ENOMEM:
-                sym = @symbol(ENOMEM);
-                typ = @symbol(noMemorySignal);
-                break;
+	    case ENOMEM:
+		sym = @symbol(ENOMEM);
+		typ = @symbol(noMemorySignal);
+		break;
 #endif
 #ifdef EACCES
-            case EACCES:
-                sym = @symbol(EACCES);
-                typ = @symbol(noPermissionsSignal);
-                break;
+	    case EACCES:
+		sym = @symbol(EACCES);
+		typ = @symbol(noPermissionsSignal);
+		break;
 #endif
 #ifdef EFAULT
-            case EFAULT:
-                sym = @symbol(EFAULT);
-                typ = @symbol(invalidArgumentsSignal);
-                break;
+	    case EFAULT:
+		sym = @symbol(EFAULT);
+		typ = @symbol(invalidArgumentsSignal);
+		break;
 #endif
 #ifdef EBUSY
-            case EBUSY:
-                sym = @symbol(EBUSY);
-                typ = @symbol(unavailableReferentSignal);
-                break;
+	    case EBUSY:
+		sym = @symbol(EBUSY);
+		typ = @symbol(unavailableReferentSignal);
+		break;
 #endif
 #ifdef EEXIST
-            case EEXIST:
-                sym = @symbol(EEXIST);
-                typ = @symbol(existingReferentSignal);
-                break;
+	    case EEXIST:
+		sym = @symbol(EEXIST);
+		typ = @symbol(existingReferentSignal);
+		break;
 #endif
 #ifdef EXDEV
-            case EXDEV:
-                sym = @symbol(EXDEV);
-                typ = @symbol(inappropriateReferentSignal);
-                break;
+	    case EXDEV:
+		sym = @symbol(EXDEV);
+		typ = @symbol(inappropriateReferentSignal);
+		break;
 #endif
 #ifdef ENODEV
-            case ENODEV:
-                sym = @symbol(ENODEV);
-                typ = @symbol(inaccessibleSignal);
-                break;
+	    case ENODEV:
+		sym = @symbol(ENODEV);
+		typ = @symbol(inaccessibleSignal);
+		break;
 #endif
 #ifdef ENOTDIR
-            case ENOTDIR:
-                sym = @symbol(ENOTDIR);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOTDIR:
+		sym = @symbol(ENOTDIR);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EISDIR
-            case EISDIR:
-                sym = @symbol(EISDIR);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case EISDIR:
+		sym = @symbol(EISDIR);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EINVAL
-            case EINVAL:
-                sym = @symbol(EINVAL);
-                typ = @symbol(invalidArgumentsSignal);
-                break;
+	    case EINVAL:
+		sym = @symbol(EINVAL);
+		typ = @symbol(invalidArgumentsSignal);
+		break;
 #endif
 #ifdef ENFILE
-            case ENFILE:
-                sym = @symbol(ENFILE);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case ENFILE:
+		sym = @symbol(ENFILE);
+		typ = @symbol(noResourcesSignal);
+		break;
 #endif
 #ifdef EMFILE
-            case EMFILE:
-                sym = @symbol(EMFILE);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case EMFILE:
+		sym = @symbol(EMFILE);
+		typ = @symbol(noResourcesSignal);
+		break;
 #endif
 #ifdef ENOTTY
-            case ENOTTY:
-                sym = @symbol(ENOTTY);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOTTY:
+		sym = @symbol(ENOTTY);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EFBIG
-            case EFBIG:
-                sym = @symbol(EFBIG);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case EFBIG:
+		sym = @symbol(EFBIG);
+		typ = @symbol(noResourcesSignal);
+		break;
 #endif
 #ifdef ENOSPC
-            case ENOSPC:
-                sym = @symbol(ENOSPC);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case ENOSPC:
+		sym = @symbol(ENOSPC);
+		typ = @symbol(noResourcesSignal);
+		break;
 #endif
 #ifdef ESPIPE
-            case ESPIPE:
-                sym = @symbol(ESPIPE);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ESPIPE:
+		sym = @symbol(ESPIPE);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EROFS
-            case EROFS:
-                sym = @symbol(EROFS);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case EROFS:
+		sym = @symbol(EROFS);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EMLINK
-            case EMLINK:
-                sym = @symbol(EMLINK);
-                typ = @symbol(rangeErrorSignal);
-                break;
+	    case EMLINK:
+		sym = @symbol(EMLINK);
+		typ = @symbol(rangeErrorSignal);
+		break;
 #endif
 #ifdef EPIPE
-            case EPIPE:
-                sym = @symbol(EPIPE);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case EPIPE:
+		sym = @symbol(EPIPE);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef EDOM
-            case EDOM:
-                sym = @symbol(EDOM);
-                typ = @symbol(rangeErrorSignal);
-                break;
+	    case EDOM:
+		sym = @symbol(EDOM);
+		typ = @symbol(rangeErrorSignal);
+		break;
 #endif
 #ifdef ERANGE
-            case ERANGE:
-                sym = @symbol(ERANGE);
-                typ = @symbol(rangeErrorSignal);
-                break;
+	    case ERANGE:
+		sym = @symbol(ERANGE);
+		typ = @symbol(rangeErrorSignal);
+		break;
 #endif
 #ifdef EDEADLK
 # if EDEADLK != EWOULDBLOCK
-            case EDEADLK:
-                sym = @symbol(EDEADLK);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case EDEADLK:
+		sym = @symbol(EDEADLK);
+		typ = @symbol(noResourcesSignal);
+		break;
 # endif
 #endif
 #ifdef ENAMETOOLONG
-            case ENAMETOOLONG:
-                sym = @symbol(ENAMETOOLONG);
-                typ = @symbol(rangeErrorSignal);
-                break;
+	    case ENAMETOOLONG:
+		sym = @symbol(ENAMETOOLONG);
+		typ = @symbol(rangeErrorSignal);
+		break;
 #endif
 #ifdef ENOLCK
-            case ENOLCK:
-                sym = @symbol(ENOLCK);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOLCK:
+		sym = @symbol(ENOLCK);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef ENOSYS
-            case ENOSYS:
-                sym = @symbol(ENOSYS);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOSYS:
+		sym = @symbol(ENOSYS);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST)
-            case ENOTEMPTY:
-                sym = @symbol(ENOTEMPTY);
-                typ = @symbol(inappropriateReferentSignal);
-                break;
+	    case ENOTEMPTY:
+		sym = @symbol(ENOTEMPTY);
+		typ = @symbol(inappropriateReferentSignal);
+		break;
 #endif
 #ifdef EILSEQ
-            case EILSEQ:
-                sym = @symbol(EILSEQ);
-                typ = @symbol(transferFaultSignal);
-                break;
-#endif
-            /*
-             * XPG3 errnos - defined on most systems
-             */
+	    case EILSEQ:
+		sym = @symbol(EILSEQ);
+		typ = @symbol(transferFaultSignal);
+		break;
+#endif
+	    /*
+	     * XPG3 errnos - defined on most systems
+	     */
 #ifdef ENOTBLK
-            case ENOTBLK:
-                sym = @symbol(ENOTBLK);
-                typ = @symbol(inappropriateReferentSignal);
-                break;
+	    case ENOTBLK:
+		sym = @symbol(ENOTBLK);
+		typ = @symbol(inappropriateReferentSignal);
+		break;
 #endif
 #ifdef ETXTBSY
-            case ETXTBSY:
-                sym = @symbol(ETXTBSY);
-                typ = @symbol(inaccessibleSignal);
-                break;
-#endif
-            /*
-             * some others
-             */
+	    case ETXTBSY:
+		sym = @symbol(ETXTBSY);
+		typ = @symbol(inaccessibleSignal);
+		break;
+#endif
+	    /*
+	     * some others
+	     */
 #ifdef EWOULDBLOCK
-            case EWOULDBLOCK:
-                sym = @symbol(EWOULDBLOCK);
-                typ = @symbol(notReadySignal);
-                break;
+	    case EWOULDBLOCK:
+		sym = @symbol(EWOULDBLOCK);
+		typ = @symbol(notReadySignal);
+		break;
 #endif
 #ifdef ENOMSG
-            case ENOMSG:
-                sym = @symbol(ENOMSG);
-                typ = @symbol(noDataSignal);
-                break;
+	    case ENOMSG:
+		sym = @symbol(ENOMSG);
+		typ = @symbol(noDataSignal);
+		break;
 #endif
 #ifdef ELOOP
-            case ELOOP:
-                sym = @symbol(ELOOP);
-                typ = @symbol(rangeErrorSignal);
-                break;
-#endif
-
-            /*
-             * some stream errors
-             */
+	    case ELOOP:
+		sym = @symbol(ELOOP);
+		typ = @symbol(rangeErrorSignal);
+		break;
+#endif
+
+	    /*
+	     * some stream errors
+	     */
 #ifdef ETIME
-            case ETIME:
-                sym = @symbol(ETIME);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ETIME:
+		sym = @symbol(ETIME);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ENOSR
-            case ENOSR:
-                sym = @symbol(ENOSR);
-                typ = @symbol(noResourcesSignal);
-                break;
+	    case ENOSR:
+		sym = @symbol(ENOSR);
+		typ = @symbol(noResourcesSignal);
+		break;
 #endif
 #ifdef ENOSTR
-            case ENOSTR:
-                sym = @symbol(ENOSTR);
-                typ = @symbol(inappropriateReferentSignal);
-                break;
+	    case ENOSTR:
+		sym = @symbol(ENOSTR);
+		typ = @symbol(inappropriateReferentSignal);
+		break;
 #endif
 #ifdef ECOMM
-            case ECOMM:
-                sym = @symbol(ECOMM);
-                typ = @symbol(transferFaultSignal);
-                break;
+	    case ECOMM:
+		sym = @symbol(ECOMM);
+		typ = @symbol(transferFaultSignal);
+		break;
 #endif
 #ifdef EPROTO
-            case EPROTO:
-                sym = @symbol(EPROTO);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
-#endif
-            /*
-             * nfs errors
-             */
+	    case EPROTO:
+		sym = @symbol(EPROTO);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
+#endif
+	    /*
+	     * nfs errors
+	     */
 #ifdef ESTALE
-            case ESTALE:
-                sym = @symbol(ESTALE);
-                typ = @symbol(unavailableReferentSignal);
-                break;
+	    case ESTALE:
+		sym = @symbol(ESTALE);
+		typ = @symbol(unavailableReferentSignal);
+		break;
 #endif
 #ifdef EREMOTE
-            case EREMOTE:
-                sym = @symbol(EREMOTE);
-                typ = @symbol(rangeErrorSignal);
-                break;
-#endif
-            /*
-             * some networking errors
-             */
+	    case EREMOTE:
+		sym = @symbol(EREMOTE);
+		typ = @symbol(rangeErrorSignal);
+		break;
+#endif
+	    /*
+	     * some networking errors
+	     */
 #ifdef EINPROGRESS
-            case EINPROGRESS:
-                sym = @symbol(EINPROGRESS);
-                typ = @symbol(operationStartedSignal);
-                break;
+	    case EINPROGRESS:
+		sym = @symbol(EINPROGRESS);
+		typ = @symbol(operationStartedSignal);
+		break;
 #endif
 #ifdef EALREADY
-            case EALREADY:
-                sym = @symbol(EALREADY);
-                typ = @symbol(operationStartedSignal);
-                break;
+	    case EALREADY:
+		sym = @symbol(EALREADY);
+		typ = @symbol(operationStartedSignal);
+		break;
 #endif
 #ifdef ENOTSOCK
-            case ENOTSOCK:
-                sym = @symbol(ENOTSOCK);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case ENOTSOCK:
+		sym = @symbol(ENOTSOCK);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EDESTADDRREQ
-            case EDESTADDRREQ:
-                sym = @symbol(EDESTADDRREQ);
-                typ = @symbol(underspecifiedSignal);
-                break;
+	    case EDESTADDRREQ:
+		sym = @symbol(EDESTADDRREQ);
+		typ = @symbol(underspecifiedSignal);
+		break;
 #endif
 #ifdef EMSGSIZE
-            case EMSGSIZE:
-                sym = @symbol(EMSGSIZE);
-                typ = @symbol(rangeErrorSignal);
-                break;
+	    case EMSGSIZE:
+		sym = @symbol(EMSGSIZE);
+		typ = @symbol(rangeErrorSignal);
+		break;
 #endif
 #ifdef EPROTOTYPE
-            case EPROTOTYPE:
-                sym = @symbol(EPROTOTYPE);
-                typ = @symbol(wrongSubtypeForOperationSignal);
-                break;
+	    case EPROTOTYPE:
+		sym = @symbol(EPROTOTYPE);
+		typ = @symbol(wrongSubtypeForOperationSignal);
+		break;
 #endif
 #ifdef ENOPROTOOPT
-            case ENOPROTOOPT:
-                sym = @symbol(ENOPROTOOPT);
-                typ = @symbol(unsupportedOperationSignal);
-                break;
+	    case ENOPROTOOPT:
+		sym = @symbol(ENOPROTOOPT);
+		typ = @symbol(unsupportedOperationSignal);
+		break;
 #endif
 #ifdef EPROTONOSUPPORT
-            case EPROTONOSUPPORT:
-                sym = @symbol(EPROTONOSUPPORT);
-                typ = @symbol(unsupportedOperationSignal);
-                break;
+	    case EPROTONOSUPPORT:
+		sym = @symbol(EPROTONOSUPPORT);
+		typ = @symbol(unsupportedOperationSignal);
+		break;
 #endif
 #ifdef ESOCKTNOSUPPORT
-            case ESOCKTNOSUPPORT:
-                sym = @symbol(ESOCKTNOSUPPORT);
-                typ = @symbol(unsupportedOperationSignal);
-                break;
+	    case ESOCKTNOSUPPORT:
+		sym = @symbol(ESOCKTNOSUPPORT);
+		typ = @symbol(unsupportedOperationSignal);
+		break;
 #endif
 #ifdef EOPNOTSUPP
-            case EOPNOTSUPP:
-                sym = @symbol(EOPNOTSUPP);
-                typ = @symbol(inappropriateOperationSignal);
-                break;
+	    case EOPNOTSUPP:
+		sym = @symbol(EOPNOTSUPP);
+		typ = @symbol(inappropriateOperationSignal);
+		break;
 #endif
 #ifdef EPFNOSUPPORT
-            case EPFNOSUPPORT:
-                sym = @symbol(EPFNOSUPPORT);
-                typ = @symbol(unsupportedOperationSignal);
-                break;
+	    case EPFNOSUPPORT:
+		sym = @symbol(EPFNOSUPPORT);
+		typ = @symbol(unsupportedOperationSignal);
+		break;
 #endif
 #ifdef EAFNOSUPPORT
-            case EAFNOSUPPORT:
-                sym = @symbol(EAFNOSUPPORT);
-                typ = @symbol(unsupportedOperationSignal);
-                break;
+	    case EAFNOSUPPORT:
+		sym = @symbol(EAFNOSUPPORT);
+		typ = @symbol(unsupportedOperationSignal);
+		break;
 #endif
 #ifdef EADDRINUSE
-            case EADDRINUSE:
-                sym = @symbol(EADDRINUSE);
-                typ = @symbol(existingReferentSignal);
-                break;
+	    case EADDRINUSE:
+		sym = @symbol(EADDRINUSE);
+		typ = @symbol(existingReferentSignal);
+		break;
 #endif
 #ifdef EADDRNOTAVAIL
-            case EADDRNOTAVAIL:
-                sym = @symbol(EADDRNOTAVAIL);
-                typ = @symbol(noPermissionsSignal);
-                break;
+	    case EADDRNOTAVAIL:
+		sym = @symbol(EADDRNOTAVAIL);
+		typ = @symbol(noPermissionsSignal);
+		break;
 #endif
 #ifdef ETIMEDOUT
-            case ETIMEDOUT:
-                sym = @symbol(ETIMEDOUT);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ETIMEDOUT:
+		sym = @symbol(ETIMEDOUT);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ECONNREFUSED
-            case ECONNREFUSED:
-                sym = @symbol(ECONNREFUSED);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ECONNREFUSED:
+		sym = @symbol(ECONNREFUSED);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ENETDOWN
-            case ENETDOWN:
-                sym = @symbol(ENETDOWN);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ENETDOWN:
+		sym = @symbol(ENETDOWN);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ENETUNREACH
-            case ENETUNREACH:
-                sym = @symbol(ENETUNREACH);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ENETUNREACH:
+		sym = @symbol(ENETUNREACH);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ENETRESET
-            case ENETRESET:
-                sym = @symbol(ENETRESET);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ENETRESET:
+		sym = @symbol(ENETRESET);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ECONNABORTED
-            case ECONNABORTED:
-                sym = @symbol(ECONNABORTED);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ECONNABORTED:
+		sym = @symbol(ECONNABORTED);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef ECONNRESET
-            case ECONNRESET:
-                sym = @symbol(ECONNRESET);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case ECONNRESET:
+		sym = @symbol(ECONNRESET);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef EISCONN
-            case EISCONN:
-                sym = @symbol(EISCONN);
-                typ = @symbol(unpreparedOperationSignal);
-                break;
+	    case EISCONN:
+		sym = @symbol(EISCONN);
+		typ = @symbol(unpreparedOperationSignal);
+		break;
 #endif
 #ifdef ENOTCONN
-            case ENOTCONN:
-                sym = @symbol(ENOTCONN);
-                typ = @symbol(unpreparedOperationSignal);
-                break;
+	    case ENOTCONN:
+		sym = @symbol(ENOTCONN);
+		typ = @symbol(unpreparedOperationSignal);
+		break;
 #endif
 #ifdef ESHUTDOWN
-            case ESHUTDOWN:
-                sym = @symbol(ESHUTDOWN);
-                typ = @symbol(unpreparedOperationSignal);
-                break;
+	    case ESHUTDOWN:
+		sym = @symbol(ESHUTDOWN);
+		typ = @symbol(unpreparedOperationSignal);
+		break;
 #endif
 #ifdef EHOSTDOWN
-            case EHOSTDOWN:
-                sym = @symbol(EHOSTDOWN);
-                typ = @symbol(peerFaultSignal);
-                break;
+	    case EHOSTDOWN:
+		sym = @symbol(EHOSTDOWN);
+		typ = @symbol(peerFaultSignal);
+		break;
 #endif
 #ifdef EHOSTUNREACH
-            case EHOSTUNREACH:
-                sym = @symbol(EHOSTUNREACH);
-                typ = @symbol(peerFaultSignal);
-                break;
-#endif
-
-            default:
-                break;
-        }
+	    case EHOSTUNREACH:
+		sym = @symbol(EHOSTUNREACH);
+		typ = @symbol(peerFaultSignal);
+		break;
+#endif
+
+	    default:
+		break;
+	}
     }
 %}.
     holder := OSErrorHolder new.
@@ -2829,229 +2829,229 @@
      */
 #ifdef EPERM
     if (sym == @symbol(EPERM)) {
-        RETURN ( __MKSMALLINT(EPERM) );
+	RETURN ( __MKSMALLINT(EPERM) );
     }
 #endif
 
 #ifdef ENOENT
     if (sym == @symbol(ENOENT)) {
-        RETURN ( __MKSMALLINT(ENOENT) );
+	RETURN ( __MKSMALLINT(ENOENT) );
     }
 #endif
 
 #ifdef ESRCH
     if (sym == @symbol(ESRCH)) {
-        RETURN ( __MKSMALLINT(ESRCH) );
+	RETURN ( __MKSMALLINT(ESRCH) );
     }
 #endif
 
 #ifdef EINTR
     if (sym == @symbol(EINTR)) {
-        RETURN ( __MKSMALLINT(EINTR) );
+	RETURN ( __MKSMALLINT(EINTR) );
     }
 #endif
 
 #ifdef EIO
     if (sym == @symbol(EIO)) {
-        RETURN ( __MKSMALLINT(EIO) );
+	RETURN ( __MKSMALLINT(EIO) );
     }
 #endif
 
 #ifdef ENXIO
     if (sym == @symbol(ENXIO)) {
-        RETURN ( __MKSMALLINT(ENXIO) );
+	RETURN ( __MKSMALLINT(ENXIO) );
     }
 #endif
 
 #ifdef E2BIG
     if (sym == @symbol(E2BIG)) {
-        RETURN ( __MKSMALLINT(E2BIG) );
+	RETURN ( __MKSMALLINT(E2BIG) );
     }
 #endif
 
 #ifdef ENOEXEC
     if (sym == @symbol(ENOEXEC)) {
-        RETURN ( __MKSMALLINT(ENOEXEC) );
+	RETURN ( __MKSMALLINT(ENOEXEC) );
     }
 #endif
 
 #ifdef EBADF
     if (sym == @symbol(EBADF)) {
-        RETURN ( __MKSMALLINT(EBADF) );
+	RETURN ( __MKSMALLINT(EBADF) );
     }
 #endif
 
 #ifdef ECHILD
     if (sym == @symbol(ECHILD)) {
-        RETURN ( __MKSMALLINT(ECHILD) );
+	RETURN ( __MKSMALLINT(ECHILD) );
     }
 #endif
 
 #if defined(EAGAIN)
     if (sym == @symbol(EAGAIN)) {
-        RETURN ( __MKSMALLINT(EAGAIN) );
+	RETURN ( __MKSMALLINT(EAGAIN) );
     }
 #endif
 
 #ifdef ENOMEM
     if (sym == @symbol(ENOMEM)) {
-        RETURN ( __MKSMALLINT(ENOMEM) );
+	RETURN ( __MKSMALLINT(ENOMEM) );
     }
 #endif
 
 #ifdef EACCES
     if (sym == @symbol(EACCES)) {
-        RETURN ( __MKSMALLINT(EACCES) );
+	RETURN ( __MKSMALLINT(EACCES) );
     }
 #endif
 
 #ifdef EFAULT
     if (sym == @symbol(EFAULT)) {
-        RETURN ( __MKSMALLINT(EFAULT) );
+	RETURN ( __MKSMALLINT(EFAULT) );
     }
 #endif
 
 #ifdef EBUSY
     if (sym == @symbol(EBUSY)) {
-        RETURN ( __MKSMALLINT(EBUSY) );
+	RETURN ( __MKSMALLINT(EBUSY) );
     }
 #endif
 
 #ifdef EXDEV
     if (sym == @symbol(EXDEV)) {
-        RETURN ( __MKSMALLINT(EXDEV) );
+	RETURN ( __MKSMALLINT(EXDEV) );
     }
 #endif
 
 #ifdef ENODEV
     if (sym == @symbol(ENODEV)) {
-        RETURN ( __MKSMALLINT(ENODEV) );
+	RETURN ( __MKSMALLINT(ENODEV) );
     }
 #endif
 
 #ifdef ENOTDIR
     if (sym == @symbol(ENOTDIR)) {
-        RETURN ( __MKSMALLINT(ENOTDIR) );
+	RETURN ( __MKSMALLINT(ENOTDIR) );
     }
 #endif
 
 #ifdef EISDIR
     if (sym == @symbol(EISDIR)) {
-        RETURN ( __MKSMALLINT(EISDIR) );
+	RETURN ( __MKSMALLINT(EISDIR) );
     }
 #endif
 
 #ifdef EINVAL
     if (sym == @symbol(EINVAL)) {
-        RETURN ( __MKSMALLINT(EINVAL) );
+	RETURN ( __MKSMALLINT(EINVAL) );
     }
 #endif
 
 #ifdef ENFILE
     if (sym == @symbol(ENFILE)) {
-        RETURN ( __MKSMALLINT(ENFILE) );
+	RETURN ( __MKSMALLINT(ENFILE) );
     }
 #endif
 
 #ifdef EMFILE
     if (sym == @symbol(EMFILE)) {
-        RETURN ( __MKSMALLINT(EMFILE) );
+	RETURN ( __MKSMALLINT(EMFILE) );
     }
 #endif
 
 #ifdef ENOTTY
     if (sym == @symbol(ENOTTY)) {
-        RETURN ( __MKSMALLINT(ENOTTY) );
+	RETURN ( __MKSMALLINT(ENOTTY) );
     }
 #endif
 
 #ifdef EFBIG
     if (sym == @symbol(EFBIG)) {
-        RETURN ( __MKSMALLINT(EFBIG) );
+	RETURN ( __MKSMALLINT(EFBIG) );
     }
 #endif
 
 #ifdef ENOSPC
     if (sym == @symbol(ENOSPC)) {
-        RETURN ( __MKSMALLINT(ENOSPC) );
+	RETURN ( __MKSMALLINT(ENOSPC) );
     }
 #endif
 
 #ifdef ESPIPE
     if (sym == @symbol(ESPIPE)) {
-        RETURN ( __MKSMALLINT(ESPIPE) );
+	RETURN ( __MKSMALLINT(ESPIPE) );
     }
 #endif
 
 #ifdef EROFS
     if (sym == @symbol(EROFS)) {
-        RETURN ( __MKSMALLINT(EROFS) );
+	RETURN ( __MKSMALLINT(EROFS) );
     }
 #endif
 
 #ifdef EMLINK
     if (sym == @symbol(EMLINK)) {
-        RETURN ( __MKSMALLINT(EMLINK) );
+	RETURN ( __MKSMALLINT(EMLINK) );
     }
 #endif
 
 #ifdef EPIPE
     if (sym == @symbol(EPIPE)) {
-        RETURN ( __MKSMALLINT(EPIPE) );
+	RETURN ( __MKSMALLINT(EPIPE) );
     }
 #endif
 
 #ifdef EDOM
     if (sym == @symbol(EDOM)) {
-        RETURN ( __MKSMALLINT(EDOM) );
+	RETURN ( __MKSMALLINT(EDOM) );
     }
 #endif
 
 #ifdef ERANGE
     if (sym == @symbol(ERANGE)) {
-        RETURN ( __MKSMALLINT(ERANGE) );
+	RETURN ( __MKSMALLINT(ERANGE) );
     }
 #endif
 
 #ifdef EDEADLK
     if (sym == @symbol(EDEADLK)) {
-        RETURN ( __MKSMALLINT(EDEADLK) );
+	RETURN ( __MKSMALLINT(EDEADLK) );
     }
 #endif
 
 #ifdef ENAMETOOLONG
     if (sym == @symbol(ENAMETOOLONG)) {
-        RETURN ( __MKSMALLINT(ENAMETOOLONG) );
+	RETURN ( __MKSMALLINT(ENAMETOOLONG) );
     }
 #endif
 
 #ifdef ENOLCK
     if (sym == @symbol(ENOLCK)) {
-        RETURN ( __MKSMALLINT(ENOLCK) );
+	RETURN ( __MKSMALLINT(ENOLCK) );
     }
 #endif
 
 #ifdef ENOSYS
     if (sym == @symbol(ENOSYS)) {
-        RETURN ( __MKSMALLINT(ENOSYS) );
+	RETURN ( __MKSMALLINT(ENOSYS) );
     }
 #endif
 
 #ifdef ENOTEMPTY
     if (sym == @symbol(ENOTEMPTY)) {
-        RETURN ( __MKSMALLINT(ENOTEMPTY) );
+	RETURN ( __MKSMALLINT(ENOTEMPTY) );
     }
 #endif
 
 #ifdef EEXIST
     if (sym == @symbol(EEXIST)) {
-        RETURN ( __MKSMALLINT(EEXIST) );
+	RETURN ( __MKSMALLINT(EEXIST) );
     }
 #endif
 
 #ifdef EILSEQ
     if (sym == @symbol(EILSEQ)) {
-        RETURN ( __MKSMALLINT(EILSEQ) );
+	RETURN ( __MKSMALLINT(EILSEQ) );
     }
 #endif
 
@@ -3060,13 +3060,13 @@
      */
 #ifdef ENOTBLK
     if (sym == @symbol(ENOTBLK)) {
-        RETURN ( __MKSMALLINT(ENOTBLK) );
+	RETURN ( __MKSMALLINT(ENOTBLK) );
     }
 #endif
 
 #ifdef ETXTBSY
     if (sym == @symbol(ETXTBSY)) {
-        RETURN ( __MKSMALLINT(ETXTBSY) );
+	RETURN ( __MKSMALLINT(ETXTBSY) );
     }
 #endif
 
@@ -3075,19 +3075,19 @@
      */
 #ifdef EWOULDBLOCK
     if (sym == @symbol(EWOULDBLOCK)) {
-        RETURN ( __MKSMALLINT(EWOULDBLOCK) );
+	RETURN ( __MKSMALLINT(EWOULDBLOCK) );
     }
 #endif
 
 #ifdef ENOMSG
     if (sym == @symbol(ENOMSG)) {
-        RETURN ( __MKSMALLINT(ENOMSG) );
+	RETURN ( __MKSMALLINT(ENOMSG) );
     }
 #endif
 
 #ifdef ELOOP
     if (sym == @symbol(ELOOP)) {
-        RETURN ( __MKSMALLINT(ELOOP) );
+	RETURN ( __MKSMALLINT(ELOOP) );
     }
 #endif
 
@@ -3096,31 +3096,31 @@
      */
 #ifdef ETIME
     if (sym == @symbol(ETIME)) {
-        RETURN ( __MKSMALLINT(ETIME) );
+	RETURN ( __MKSMALLINT(ETIME) );
     }
 #endif
 
 #ifdef ENOSR
     if (sym == @symbol(ENOSR)) {
-        RETURN ( __MKSMALLINT(ENOSR) );
+	RETURN ( __MKSMALLINT(ENOSR) );
     }
 #endif
 
 #ifdef ENOSTR
     if (sym == @symbol(ENOSTR)) {
-        RETURN ( __MKSMALLINT(ENOSTR) );
+	RETURN ( __MKSMALLINT(ENOSTR) );
     }
 #endif
 
 #ifdef ECOMM
     if (sym == @symbol(ECOMM)) {
-        RETURN ( __MKSMALLINT(ECOMM) );
+	RETURN ( __MKSMALLINT(ECOMM) );
     }
 #endif
 
 #ifdef EPROTO
     if (sym == @symbol(EPROTO)) {
-        RETURN ( __MKSMALLINT(EPROTO) );
+	RETURN ( __MKSMALLINT(EPROTO) );
     }
 #endif
 
@@ -3129,13 +3129,13 @@
      */
 #ifdef ESTALE
     if (sym == @symbol(ESTALE)) {
-        RETURN ( __MKSMALLINT(ESTALE) );
+	RETURN ( __MKSMALLINT(ESTALE) );
     }
 #endif
 
 #ifdef EREMOTE
     if (sym == @symbol(EREMOTE)) {
-        RETURN ( __MKSMALLINT(EREMOTE) );
+	RETURN ( __MKSMALLINT(EREMOTE) );
     }
 #endif
 
@@ -3144,157 +3144,157 @@
      */
 #ifdef EINPROGRESS
     if (sym == @symbol(EINPROGRESS)) {
-        RETURN ( __MKSMALLINT(EINPROGRESS) );
+	RETURN ( __MKSMALLINT(EINPROGRESS) );
     }
 #endif
 
 #ifdef EALREADY
     if (sym == @symbol(EALREADY)) {
-        RETURN ( __MKSMALLINT(EALREADY) );
+	RETURN ( __MKSMALLINT(EALREADY) );
     }
 #endif
 
 #ifdef ENOTSOCK
     if (sym == @symbol(ENOTSOCK)) {
-        RETURN ( __MKSMALLINT(ENOTSOCK) );
+	RETURN ( __MKSMALLINT(ENOTSOCK) );
     }
 #endif
 
 #ifdef EDESTADDRREQ
     if (sym == @symbol(EDESTADDRREQ)) {
-        RETURN ( __MKSMALLINT(EDESTADDRREQ) );
+	RETURN ( __MKSMALLINT(EDESTADDRREQ) );
     }
 #endif
 
 #ifdef EMSGSIZE
     if (sym == @symbol(EMSGSIZE)) {
-        RETURN ( __MKSMALLINT(EMSGSIZE) );
+	RETURN ( __MKSMALLINT(EMSGSIZE) );
     }
 #endif
 
 #ifdef EPROTOTYPE
     if (sym == @symbol(EPROTOTYPE)) {
-        RETURN ( __MKSMALLINT(EPROTOTYPE) );
+	RETURN ( __MKSMALLINT(EPROTOTYPE) );
     }
 #endif
 
 #ifdef ENOPROTOOPT
     if (sym == @symbol(ENOPROTOOPT)) {
-        RETURN ( __MKSMALLINT(ENOPROTOOPT) );
+	RETURN ( __MKSMALLINT(ENOPROTOOPT) );
     }
 #endif
 
 #ifdef EPROTONOSUPPORT
     if (sym == @symbol(EPROTONOSUPPORT)) {
-        RETURN ( __MKSMALLINT(EPROTONOSUPPORT) );
+	RETURN ( __MKSMALLINT(EPROTONOSUPPORT) );
     }
 #endif
 
 #ifdef ESOCKTNOSUPPORT
     if (sym == @symbol(ESOCKTNOSUPPORT)) {
-        RETURN ( __MKSMALLINT(ESOCKTNOSUPPORT) );
+	RETURN ( __MKSMALLINT(ESOCKTNOSUPPORT) );
     }
 #endif
 
 #ifdef EOPNOTSUPP
     if (sym == @symbol(EOPNOTSUPP)) {
-        RETURN ( __MKSMALLINT(EOPNOTSUPP) );
+	RETURN ( __MKSMALLINT(EOPNOTSUPP) );
     }
 #endif
 
 #ifdef EPFNOSUPPORT
     if (sym == @symbol(EPFNOSUPPORT)) {
-        RETURN ( __MKSMALLINT(EPFNOSUPPORT) );
+	RETURN ( __MKSMALLINT(EPFNOSUPPORT) );
     }
 #endif
 
 #ifdef EAFNOSUPPORT
     if (sym == @symbol(EAFNOSUPPORT)) {
-        RETURN ( __MKSMALLINT(EAFNOSUPPORT) );
+	RETURN ( __MKSMALLINT(EAFNOSUPPORT) );
     }
 #endif
 
 #ifdef EADDRINUSE
     if (sym == @symbol(EADDRINUSE)) {
-        RETURN ( __MKSMALLINT(EADDRINUSE) );
+	RETURN ( __MKSMALLINT(EADDRINUSE) );
     }
 #endif
 
 #ifdef EADDRNOTAVAIL
     if (sym == @symbol(EADDRNOTAVAIL)) {
-        RETURN ( __MKSMALLINT(EADDRNOTAVAIL) );
+	RETURN ( __MKSMALLINT(EADDRNOTAVAIL) );
     }
 #endif
 
 #ifdef ETIMEDOUT
     if (sym == @symbol(ETIMEDOUT)) {
-        RETURN ( __MKSMALLINT(ETIMEDOUT) );
+	RETURN ( __MKSMALLINT(ETIMEDOUT) );
     }
 #endif
 
 #ifdef ECONNREFUSED
     if (sym == @symbol(ECONNREFUSED)) {
-        RETURN ( __MKSMALLINT(ECONNREFUSED) );
+	RETURN ( __MKSMALLINT(ECONNREFUSED) );
     }
 #endif
 
 #ifdef ENETDOWN
     if (sym == @symbol(ENETDOWN)) {
-        RETURN ( __MKSMALLINT(ENETDOWN) );
+	RETURN ( __MKSMALLINT(ENETDOWN) );
     }
 #endif
 
 #ifdef ENETUNREACH
     if (sym == @symbol(ENETUNREACH)) {
-        RETURN ( __MKSMALLINT(ENETUNREACH) );
+	RETURN ( __MKSMALLINT(ENETUNREACH) );
     }
 #endif
 
 #ifdef ENETRESET
     if (sym == @symbol(ENETRESET)) {
-        RETURN ( __MKSMALLINT(ENETRESET) );
+	RETURN ( __MKSMALLINT(ENETRESET) );
     }
 #endif
 
 #ifdef ECONNABORTED
     if (sym == @symbol(ECONNABORTED)) {
-        RETURN ( __MKSMALLINT(ECONNABORTED) );
+	RETURN ( __MKSMALLINT(ECONNABORTED) );
     }
 #endif
 
 #ifdef ECONNRESET
     if (sym == @symbol(ECONNRESET)) {
-        RETURN ( __MKSMALLINT(ECONNRESET) );
+	RETURN ( __MKSMALLINT(ECONNRESET) );
     }
 #endif
 
 #ifdef EISCONN
     if (sym == @symbol(EISCONN)) {
-        RETURN ( __MKSMALLINT(EISCONN) );
+	RETURN ( __MKSMALLINT(EISCONN) );
     }
 #endif
 
 #ifdef ENOTCONN
     if (sym == @symbol(ENOTCONN)) {
-        RETURN ( __MKSMALLINT(ENOTCONN) );
+	RETURN ( __MKSMALLINT(ENOTCONN) );
     }
 #endif
 
 #ifdef ESHUTDOWN
     if (sym == @symbol(ESHUTDOWN)) {
-        RETURN ( __MKSMALLINT(ESHUTDOWN) );
+	RETURN ( __MKSMALLINT(ESHUTDOWN) );
     }
 #endif
 
 #ifdef EHOSTDOWN
     if (sym == @symbol(EHOSTDOWN)) {
-        RETURN ( __MKSMALLINT(EHOSTDOWN) );
+	RETURN ( __MKSMALLINT(EHOSTDOWN) );
     }
 #endif
 
 #ifdef EHOSTUNREACH
     if (sym == @symbol(EHOSTUNREACH)) {
-        RETURN ( __MKSMALLINT(EHOSTUNREACH) );
+	RETURN ( __MKSMALLINT(EHOSTUNREACH) );
     }
 #endif
 %}.
@@ -4036,13 +4036,13 @@
     "open a file, return an os specific fileHandle. 
      openmode is a symbol defining the way to open
      valid modes are:
-        #O_RDONLY
-        #O_RDWR
-        #O_WRONLY
-        #O_CREAT
-        #O_APPEND
-        #O_SYNC
-        #O_LARGEFILE
+	#O_RDONLY
+	#O_RDWR
+	#O_WRONLY
+	#O_CREAT
+	#O_APPEND
+	#O_SYNC
+	#O_LARGEFILE
 
      This is a private entry, but maybe useful to open/create a file in a special mode,
      which is proprietrary to the operatingSystem."
@@ -4057,57 +4057,55 @@
     int n;
 
     if (!__isString(path)) {
-        error = @symbol(badArgument1);
-        goto err;
+	error = @symbol(badArgument1);
+	goto err;
     }
     if (!__isArray(attributes)) {
-        error = @symbol(badArgument2);
-        goto err;
+	error = @symbol(badArgument2);
+	goto err;
     }
     if (modeInteger == nil) {
-        mode = 0644;
+	mode = 0644;
     } else if (__isSmallInteger(modeInteger)) {
-        mode = __intVal(modeInteger);
+	mode = __intVal(modeInteger);
     } else {
-        error = @symbol(badArgument3);
-        goto err;
+	error = @symbol(badArgument3);
+	goto err;
     }
 
     nAttributes = __arraySize(attributes);
-    for (n = 0, ap = __ArrayInstPtr(attributes)->a_element; 
-         n < nAttributes; 
-         n++) {
-        OBJ attribute = ap[n];
-
-        if (attribute == @symbol(O_RDONLY)) {
-            openFlags |= O_RDONLY;
-        } else if (attribute == @symbol(O_RDWR)) {
-            openFlags |= O_RDWR;
-        } else if (attribute == @symbol(O_WRONLY)) {
-            openFlags |= O_WRONLY;
-        } else if (attribute == @symbol(O_CREAT)) {
-            openFlags |= O_CREAT;
-        } else if (attribute == @symbol(O_APPEND)) {
-            openFlags |= O_APPEND;
-        } else if (attribute == @symbol(O_EXCL)) {
-            openFlags |= O_EXCL;
-        } else if (attribute == @symbol(O_TRUNC)) {
-            openFlags |= O_TRUNC;
-        } else if (attribute == @symbol(O_LARGEFILE)) {
+    for (n = 0, ap = __arrayVal(attributes); n < nAttributes; n++) {
+	OBJ attribute = ap[n];
+
+	if (attribute == @symbol(O_RDONLY)) {
+	    openFlags |= O_RDONLY;
+	} else if (attribute == @symbol(O_RDWR)) {
+	    openFlags |= O_RDWR;
+	} else if (attribute == @symbol(O_WRONLY)) {
+	    openFlags |= O_WRONLY;
+	} else if (attribute == @symbol(O_CREAT)) {
+	    openFlags |= O_CREAT;
+	} else if (attribute == @symbol(O_APPEND)) {
+	    openFlags |= O_APPEND;
+	} else if (attribute == @symbol(O_EXCL)) {
+	    openFlags |= O_EXCL;
+	} else if (attribute == @symbol(O_TRUNC)) {
+	    openFlags |= O_TRUNC;
+	} else if (attribute == @symbol(O_LARGEFILE)) {
 #ifdef O_LARGEFILE
-            openFlags |= O_LARGEFILE;
+	    openFlags |= O_LARGEFILE;
 #else
-            error = @symbol(badArgument2);
-            goto err;
-#endif
-        } else if (attribute == @symbol(O_SYNC)) {
+	    error = @symbol(badArgument2);
+	    goto err;
+#endif
+	} else if (attribute == @symbol(O_SYNC)) {
 #ifdef O_SYNC
-            openFlags |= O_SYNC;
+	    openFlags |= O_SYNC;
 #else
-            error = @symbol(badArgument2);
-            goto err;
-#endif
-        }
+	    error = @symbol(badArgument2);
+	    goto err;
+#endif
+	}
     }
 
 #if defined(O_NONBLOCK)
@@ -4121,29 +4119,29 @@
 again:
     fd = open((char *) __stringVal(path), openFlags, mode);
     if (fd < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __mkSmallInteger(errno);
-            goto err;
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __mkSmallInteger(errno);
+	    goto err;
+	}
     }
     fileDescriptor = __mkSmallInteger(fd);
 err:;
 %}.
     ^ fileDescriptor notNil ifTrue:[
-        FileDescriptorHandle for:fileDescriptor.
+	FileDescriptorHandle for:fileDescriptor.
     ] ifFalse:[
-        (self errorHolderForNumber:error) reportError
+	(self errorHolderForNumber:error) reportError
     ].
 
     "
-        self open:'/etc/hosts' attributes:#(O_RDONLY) mode:nil
-        self open:'/tmp/xxzz' attributes:#(O_RDWR O_CREAT) mode:8r611
-        self open:'/etc/passwd' attributes:#(O_RDWR) mode:nil
-        self open:'/no one knows this file' attributes:#(O_RDONLY) mode:nil
-        self open:'foo/bar/baz' attributes:#(O_RDWR O_CREAT) mode:nil
+	self open:'/etc/hosts' attributes:#(O_RDONLY) mode:nil
+	self open:'/tmp/xxzz' attributes:#(O_RDWR O_CREAT) mode:8r611
+	self open:'/etc/passwd' attributes:#(O_RDWR) mode:nil
+	self open:'/no one knows this file' attributes:#(O_RDONLY) mode:nil
+	self open:'foo/bar/baz' attributes:#(O_RDWR O_CREAT) mode:nil
     "
 !
 
@@ -4785,8 +4783,8 @@
      The amountof information returned depends upon the OS, and is
      not guaranteed to be consistent across architectures.
      On unix, the information returned is (at least):
-        freeBytes
-        totalBytes
+	freeBytes
+	totalBytes
     "
 
     |p outputText keys values n info
@@ -4796,9 +4794,9 @@
     p isNil ifTrue:[^ nil].
 
     [
-        outputText := p contentsOfEntireFile.
+	outputText := p contentsOfEntireFile.
     ] ensure:[
-        p close.
+	p close.
     ].
 "/ Transcript showCR:outputText asString.
     outputText isNil ifTrue:[^ nil].
@@ -4825,22 +4823,22 @@
 
     n := Integer readFrom:(values at:capacityIdx) onError:nil.
     n notNil ifTrue:[
-        info at:#percentUsed put:n
+	info at:#percentUsed put:n
     ].
 
     n := Integer readFrom:(values at:availIdx) onError:nil.
     n notNil ifTrue:[
-        info at:#freeBytes put:(n * 1024)
+	info at:#freeBytes put:(n * 1024)
     ].
 
     n := Integer readFrom:(values at:usedIdx) onError:nil.
     n notNil ifTrue:[
-        info at:#usedBytes put:(n * 1024)
+	info at:#usedBytes put:(n * 1024)
     ].
 
     n := Integer readFrom:(values at:sizeIdx) onError:nil.
     n notNil ifTrue:[
-        info at:#totalBytes put:(n * 1024)
+	info at:#totalBytes put:(n * 1024)
     ].
 
     info at:#mountPoint put:(values at:mountIdx).
@@ -4880,8 +4878,8 @@
      The amount of information returned depends upon the OS, and is
      not guaranteed to be consistent across architectures.
      On unix, the information returned is (at least):
-        mountPoint - mount point
-        fileSystem - device or NFS-remotePath
+	mountPoint - mount point
+	fileSystem - device or NFS-remotePath
     "
 
     |p outputText keys values info infoEntry|
@@ -4890,9 +4888,9 @@
     p isNil ifTrue:[^ nil].
 
     [
-        outputText := p contentsOfEntireFile.
+	outputText := p contentsOfEntireFile.
     ] ensure:[
-        p close.
+	p close.
     ].
 "/ Transcript showCR:outputText asString.
     outputText isNil ifTrue:[^ nil].
@@ -4907,15 +4905,15 @@
     info := OrderedCollection new.
 
     outputText from:2 do:[:line |
-        values := line asCollectionOfWords.
-
-        values size >= 2 ifTrue:[
-
-            infoEntry := IdentityDictionary new.
-            infoEntry at:#mountPoint put:(values last).
-            infoEntry at:#fileSystem put:(values first).
-            info add:infoEntry.
-        ]
+	values := line asCollectionOfWords.
+
+	values size >= 2 ifTrue:[
+
+	    infoEntry := IdentityDictionary new.
+	    infoEntry at:#mountPoint put:(values last).
+	    infoEntry at:#fileSystem put:(values first).
+	    info add:infoEntry.
+	]
     ].
     ^ info
 
@@ -4936,21 +4934,21 @@
     "return some object filled with info for the file 'aPathName';
      the info (for which corresponding access methods are understood by
      the returned object) is:
-         type            - a symbol giving the files type
-         mode            - numeric access mode 
-         uid             - owners user id
-         gid             - owners group id
-         size            - files size
-         id              - files number (i.e. inode number)
-         accessed        - last access time (as Timestamp)
-         modified        - last modification time (as Timestamp)
-         statusChanged   - last status change time (as Timestamp)
-         alternativeName     - (windows only:) the MSDOS name of the file
-         recordFormatNumeric - (VMS only:) numeric value of the recordFormat
-         recordFormat        - (VMS only:) symbolic value of the recordFormat
-         recordAttributes    - (VMS only:) recordAttributes
-         fixedHeaderSize     - (VMS only:) fixed header size in a variable record format
-         recordSize          - (VMS only:) record size.
+	 type            - a symbol giving the files type
+	 mode            - numeric access mode 
+	 uid             - owners user id
+	 gid             - owners group id
+	 size            - files size
+	 id              - files number (i.e. inode number)
+	 accessed        - last access time (as Timestamp)
+	 modified        - last modification time (as Timestamp)
+	 statusChanged   - last status change time (as Timestamp)
+	 alternativeName     - (windows only:) the MSDOS name of the file
+	 recordFormatNumeric - (VMS only:) numeric value of the recordFormat
+	 recordFormat        - (VMS only:) symbolic value of the recordFormat
+	 recordAttributes    - (VMS only:) recordAttributes
+	 fixedHeaderSize     - (VMS only:) fixed header size in a variable record format
+	 recordSize          - (VMS only:) record size.
 
      Some of the fields may be returned as nil on systems which do not provide
      all of the information.
@@ -4970,97 +4968,97 @@
 
     if (__isString(aPathName)) {
 # ifdef TRACE_STAT_CALLS
-        printf("stat on '%s' for info\n", __stringVal(aPathName));
-# endif
-        __BEGIN_INTERRUPTABLE__
-        do {
-            ret = stat((char *) __stringVal(aPathName), &buf);
-        } while ((ret < 0) && (errno == EINTR));
-        __END_INTERRUPTABLE__
-
-        if (ret < 0) {
-            @global(LastErrorNumber) = __MKSMALLINT(errno);
-            RETURN ( nil );
-        }
-        switch (buf.st_mode & S_IFMT) {
-            case S_IFDIR:
-                type = @symbol(directory);
-                break;
-
-            case S_IFREG:
-                type = @symbol(regular);
-                break;
+	printf("stat on '%s' for info\n", __stringVal(aPathName));
+# endif
+	__BEGIN_INTERRUPTABLE__
+	do {
+	    ret = stat((char *) __stringVal(aPathName), &buf);
+	} while ((ret < 0) && (errno == EINTR));
+	__END_INTERRUPTABLE__
+
+	if (ret < 0) {
+	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    RETURN ( nil );
+	}
+	switch (buf.st_mode & S_IFMT) {
+	    case S_IFDIR:
+		type = @symbol(directory);
+		break;
+
+	    case S_IFREG:
+		type = @symbol(regular);
+		break;
 # ifdef S_IFCHR
-            case S_IFCHR:
-                type = @symbol(characterSpecial);
-                break;
+	    case S_IFCHR:
+		type = @symbol(characterSpecial);
+		break;
 # endif
 # ifdef S_IFBLK
-            case S_IFBLK:
-                type = @symbol(blockSpecial);
-                break;
+	    case S_IFBLK:
+		type = @symbol(blockSpecial);
+		break;
 # endif
 # ifdef S_IFMPC
-            case S_IFMPC:
-                type = @symbol(multiplexedCharacterSpecial);
-                break;
+	    case S_IFMPC:
+		type = @symbol(multiplexedCharacterSpecial);
+		break;
 # endif
 # ifdef S_IFMPB
-            case S_IFMPB:
-                type = @symbol(multiplexedBlockSpecial);
-                break;
+	    case S_IFMPB:
+		type = @symbol(multiplexedBlockSpecial);
+		break;
 # endif
 # ifdef S_IFLNK
-            case S_IFLNK:
-                type = @symbol(symbolicLink);
-                break;
+	    case S_IFLNK:
+		type = @symbol(symbolicLink);
+		break;
 # endif
 # ifdef S_IFSOCK
-            case S_IFSOCK:
-                type = @symbol(socket);
-                break;
+	    case S_IFSOCK:
+		type = @symbol(socket);
+		break;
 # endif
 # ifdef S_IFIFO
-            case S_IFIFO:
-                type = @symbol(fifo);
-                break;
-# endif
-            default:
-                type = @symbol(unknown);
-                break;
-        }
-
-        ino = buf.st_ino;
-        id = __MKUINT(ino);
-
-        mode = __MKSMALLINT(buf.st_mode & 0777);
-        uid = __MKSMALLINT(buf.st_uid);
-        gid = __MKSMALLINT(buf.st_gid);
-        nLink = __MKSMALLINT(buf.st_nlink);
-        size = __MKUINT(buf.st_size);
-        aOStime = __MKUINT(buf.st_atime);
-        mOStime = __MKUINT(buf.st_mtime);
-        cOStime = __MKUINT(buf.st_ctime);
+	    case S_IFIFO:
+		type = @symbol(fifo);
+		break;
+# endif
+	    default:
+		type = @symbol(unknown);
+		break;
+	}
+
+	ino = buf.st_ino;
+	id = __MKUINT(ino);
+
+	mode = __MKSMALLINT(buf.st_mode & 0777);
+	uid = __MKSMALLINT(buf.st_uid);
+	gid = __MKSMALLINT(buf.st_gid);
+	nLink = __MKSMALLINT(buf.st_nlink);
+	size = __MKUINT(buf.st_size);
+	aOStime = __MKUINT(buf.st_atime);
+	mOStime = __MKUINT(buf.st_mtime);
+	cOStime = __MKUINT(buf.st_ctime);
     }
 %}.
     mode notNil ifTrue:[
-        atime := AbsoluteTime fromOSTime:(aOStime * 1000).
-        mtime := AbsoluteTime fromOSTime:(mOStime * 1000).
-        ctime := AbsoluteTime fromOSTime:(cOStime * 1000).
-
-        info := FileStatusInfo
-                    type:type 
-                    mode:mode 
-                    uid:uid 
-                    gid:gid 
-                    size:size 
-                    id:id 
-                    accessed:atime 
-                    modified:mtime 
-                    statusChanged:ctime
-                    path:nil
-                    numLinks:nLink.
-        ^ info
+	atime := AbsoluteTime fromOSTime:(aOStime * 1000).
+	mtime := AbsoluteTime fromOSTime:(mOStime * 1000).
+	ctime := AbsoluteTime fromOSTime:(cOStime * 1000).
+
+	info := FileStatusInfo
+		    type:type 
+		    mode:mode 
+		    uid:uid 
+		    gid:gid 
+		    size:size 
+		    id:id 
+		    accessed:atime 
+		    modified:mtime 
+		    statusChanged:ctime
+		    path:nil
+		    numLinks:nLink.
+	^ info
    ].
    ^ self primitiveFailed
 
@@ -5242,61 +5240,61 @@
     unsigned INT ino;
 
     if (__isString(aPathName)) {
-        __BEGIN_INTERRUPTABLE__
-        do {
-            ret = lstat((char *) __stringVal(aPathName), &buf);
-        } while ((ret < 0) && (errno == EINTR));
-        __END_INTERRUPTABLE__
-
-        if (ret < 0) {
-            @global(LastErrorNumber) = __MKSMALLINT(errno);
-            RETURN ( nil );
-        }
-        switch (buf.st_mode & S_IFMT) {
-            default:
-                RETURN ( nil ); /* not a symbolic link */
-
-            case S_IFLNK:
-                type = @symbol(symbolicLink);
-                break;
-        }
-
-        ino = buf.st_ino;
-        id = __MKUINT(ino);
-
-        mode = __MKSMALLINT(buf.st_mode & 0777);
-        nLink = __MKSMALLINT(buf.st_nlink);
-        uid = __MKSMALLINT(buf.st_uid);
-        gid = __MKSMALLINT(buf.st_gid);
-        size = __MKUINT(buf.st_size);
-        atime = __MKUINT(buf.st_atime);
-        mtime = __MKUINT(buf.st_mtime);
-        ctime = __MKUINT(buf.st_ctime);
-        if ((ret = readlink((char *) __stringVal(aPathName), pathBuffer, sizeof(pathBuffer))) < 0) {
-            @global(LastErrorNumber) = __MKSMALLINT(errno);
-            RETURN ( nil );
-        } 
-        pathBuffer[ret] = '\0';  /* readlink does not 0-terminate */
-        path = __MKSTRING(pathBuffer);
+	__BEGIN_INTERRUPTABLE__
+	do {
+	    ret = lstat((char *) __stringVal(aPathName), &buf);
+	} while ((ret < 0) && (errno == EINTR));
+	__END_INTERRUPTABLE__
+
+	if (ret < 0) {
+	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    RETURN ( nil );
+	}
+	switch (buf.st_mode & S_IFMT) {
+	    default:
+		RETURN ( nil ); /* not a symbolic link */
+
+	    case S_IFLNK:
+		type = @symbol(symbolicLink);
+		break;
+	}
+
+	ino = buf.st_ino;
+	id = __MKUINT(ino);
+
+	mode = __MKSMALLINT(buf.st_mode & 0777);
+	nLink = __MKSMALLINT(buf.st_nlink);
+	uid = __MKSMALLINT(buf.st_uid);
+	gid = __MKSMALLINT(buf.st_gid);
+	size = __MKUINT(buf.st_size);
+	atime = __MKUINT(buf.st_atime);
+	mtime = __MKUINT(buf.st_mtime);
+	ctime = __MKUINT(buf.st_ctime);
+	if ((ret = readlink((char *) __stringVal(aPathName), pathBuffer, sizeof(pathBuffer))) < 0) {
+	    @global(LastErrorNumber) = __MKSMALLINT(errno);
+	    RETURN ( nil );
+	} 
+	pathBuffer[ret] = '\0';  /* readlink does not 0-terminate */
+	path = __MKSTRING(pathBuffer);
     }
 #else
     RETURN ( nil );
 #endif
 %}.
     mode notNil ifTrue:[
-        info := IdentityDictionary new.
-        ^ FileStatusInfo
-            type:type 
-            mode:mode 
-            uid:uid 
-            gid:gid 
-            size:size 
-            id:id 
-            accessed:(AbsoluteTime fromOSTime:(atime * 1000)) 
-            modified:(AbsoluteTime fromOSTime:(mtime * 1000)) 
-            statusChanged:(AbsoluteTime fromOSTime:(ctime * 1000))
-            path:path
-            numLinks:nLink.
+	info := IdentityDictionary new.
+	^ FileStatusInfo
+	    type:type 
+	    mode:mode 
+	    uid:uid 
+	    gid:gid 
+	    size:size 
+	    id:id 
+	    accessed:(AbsoluteTime fromOSTime:(atime * 1000)) 
+	    modified:(AbsoluteTime fromOSTime:(mtime * 1000)) 
+	    statusChanged:(AbsoluteTime fromOSTime:(ctime * 1000))
+	    path:path
+	    numLinks:nLink.
    ].
    ^ self primitiveFailed
 
@@ -5814,73 +5812,73 @@
 #endif
 
     if (__isSmallInteger(fd)) {
-        if (firstCall) {
+	if (firstCall) {
 #ifdef HAS_SIGACTION
-            struct sigaction act = {0};
-
-            /*
-             * Do not add SA_RESTART here. A signal can cause a
-             * thread switch, another thread can do a garbage collect
-             * and restarted system calls may write into old
-             * (collected) addresses.
-             */
-
-            act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
-            sigemptyset(&act.sa_mask);
-            act.sa_handler = __signalIoInterrupt;
-            sigaction(THESIGNAL, &act, 0);
+	    struct sigaction act = {0};
+
+	    /*
+	     * Do not add SA_RESTART here. A signal can cause a
+	     * thread switch, another thread can do a garbage collect
+	     * and restarted system calls may write into old
+	     * (collected) addresses.
+	     */
+
+	    act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
+	    sigemptyset(&act.sa_mask);
+	    act.sa_handler = __signalIoInterrupt;
+	    sigaction(THESIGNAL, &act, 0);
 #else
 # ifdef HAS_SIGVEC
-            struct sigvec vec;
-
-            vec.sv_flags = SV_INTERRUPT;
-            sigemptyset(&vec.sv_mask);
-            vec.sv_handler = __signalIoInterrupt;
-            sigvec(THESIGNAL, &vec, NULL);
+	    struct sigvec vec;
+
+	    vec.sv_flags = SV_INTERRUPT;
+	    sigemptyset(&vec.sv_mask);
+	    vec.sv_handler = __signalIoInterrupt;
+	    sigvec(THESIGNAL, &vec, NULL);
 # else
-            signal(THESIGNAL, __signalIoInterrupt);
-# endif
-#endif
-            firstCall = 0;
-        }
+	    signal(THESIGNAL, __signalIoInterrupt);
+# endif
+#endif
+	    firstCall = 0;
+	}
 #undef THESIGNAL
 
-        f = __intVal(fd);
+	f = __intVal(fd);
 # if defined(SYSV4)
-        ret = ioctl(f, I_SETSIG, S_INPUT | S_HIPRI | S_ERROR | S_RDNORM | S_RDBAND | S_MSG | S_HANGUP);
+	ret = ioctl(f, I_SETSIG, S_INPUT | S_HIPRI | S_ERROR | S_RDNORM | S_RDBAND | S_MSG | S_HANGUP);
 # else /*! SYSV4*/
-        flags = fcntl(f, F_GETFL, 0);
-        /*
-         * if already set, there is no need for this syscall ...
-         */
-        if (flags & FASYNC) {
-            ret = flags;
-        } else {
-            ret = fcntl(f, F_SETFL, flags | FASYNC);
-            if (ret >= 0) ret = flags;
-        }
+	flags = fcntl(f, F_GETFL, 0);
+	/*
+	 * if already set, there is no need for this syscall ...
+	 */
+	if (flags & FASYNC) {
+	    ret = flags;
+	} else {
+	    ret = fcntl(f, F_SETFL, flags | FASYNC);
+	    if (ret >= 0) ret = flags;
+	}
 # endif /*!SYSV4*/
 
 #if defined(F_SETOWN) || defined(FIOSETOWN)
-        {
-            int pid;
-            int ok;
-
-            pid = getpid();
+	{
+	    int pid;
+	    int ok;
+
+	    pid = getpid();
 
 # if defined(F_SETOWN)
-            ok = fcntl(f, F_SETOWN, pid);
-            /* printf("F_SETOWN returns %d (%d)\n", ret, errno); */
+	    ok = fcntl(f, F_SETOWN, pid);
+	    /* printf("F_SETOWN returns %d (%d)\n", ret, errno); */
 # else
-            ok = ioctl(f, FIOSETOWN, &pid);
-            /* printf("FIOSETOWN returns %d (%d)\n", ret, errno); */
-# endif
-            if (ok < 0) {
-                ret = ok;
-            }
-        }
-#endif
-        RETURN ( __MKUINT(ret) );
+	    ok = ioctl(f, FIOSETOWN, &pid);
+	    /* printf("FIOSETOWN returns %d (%d)\n", ret, errno); */
+# endif
+	    if (ok < 0) {
+		ret = ok;
+	    }
+	}
+#endif
+	RETURN ( __MKUINT(ret) );
     }
 #endif
 %}.
@@ -5985,119 +5983,119 @@
      &&  (sigNr <= SIG_LIMIT)
 #endif
     ) {
-        /*
-         * standard signals are forced into standard handlers
-         * - all others go into general signalInterrupt
-         */
+	/*
+	 * standard signals are forced into standard handlers
+	 * - all others go into general signalInterrupt
+	 */
 #if defined(SIGPOLL) && defined(SIGIO)
-        if (sigNr == SIGPOLL)
-            sigNr = SIGIO;
-#endif
-        switch (sigNr) {
-            case 0:
-                /* enabling a non-supported signal */
-                RETURN (self);
+	if (sigNr == SIGPOLL)
+	    sigNr = SIGIO;
+#endif
+	switch (sigNr) {
+	    case 0:
+		/* enabling a non-supported signal */
+		RETURN (self);
 
 #ifdef SIGBREAK
-            case SIGBREAK:
+	    case SIGBREAK:
 #endif
 #ifdef SIGINT
-            case SIGINT:
+	    case SIGINT:
 #endif
 #ifdef SIGQUIT
-            case SIGQUIT:
+	    case SIGQUIT:
 #endif
 #if defined(SIGINT) || defined(SIGQUIT) || defined(SIGBREAK)
-                handler = __signalUserInterrupt;
-                break;
+		handler = __signalUserInterrupt;
+		break;
 #endif
 #ifdef SIGFPE
-            case SIGFPE:
-                handler = __signalFpExceptionInterrupt;
-                break;
+	    case SIGFPE:
+		handler = __signalFpExceptionInterrupt;
+		break;
 #endif
 
 #ifdef SIGPIPE
-            case SIGPIPE:
-                handler = __signalPIPEInterrupt;
-                break;
+	    case SIGPIPE:
+		handler = __signalPIPEInterrupt;
+		break;
 #endif
 #ifdef SIGBUS
-            case SIGBUS:
-                handler = __signalBUSInterrupt;
-                break;
+	    case SIGBUS:
+		handler = __signalBUSInterrupt;
+		break;
 #endif
 #ifdef SIGSEGV
-            case SIGSEGV:
-                handler = __signalSEGVInterrupt;
-                break;
+	    case SIGSEGV:
+		handler = __signalSEGVInterrupt;
+		break;
 #endif
 #ifdef SIGILL
-            case SIGILL:
-                handler = __signalTrapInterrupt;
-                break;
+	    case SIGILL:
+		handler = __signalTrapInterrupt;
+		break;
 #endif
 #ifdef SIGEMT
-            case SIGEMT:
-                handler = __signalTrapInterrupt;
-                break;
+	    case SIGEMT:
+		handler = __signalTrapInterrupt;
+		break;
 #endif
 #ifdef SIGIO
-            case SIGIO:
-                handler = __signalIoInterrupt;
-                break;
+	    case SIGIO:
+		handler = __signalIoInterrupt;
+		break;
 #endif
 
 #ifdef CHILD_SIGNAL
-            case CHILD_SIGNAL:
-                handler = __signalChildInterrupt;
-                break;
+	    case CHILD_SIGNAL:
+		handler = __signalChildInterrupt;
+		break;
 #endif
 #ifdef SIGALRM
-            case SIGALRM:
-                handler = __signalTimerInterrupt;
-                break;
-#endif
-
-            default:
-                handler = __signalInterrupt;
-                break;
-        }
-
-        {
+	    case SIGALRM:
+		handler = __signalTimerInterrupt;
+		break;
+#endif
+
+	    default:
+		handler = __signalInterrupt;
+		break;
+	}
+
+	{
 #ifdef HAS_SIGACTION
-            struct sigaction act = {0};
-
-            /*
-             * Do not add SA_RESTART here. A signal can cause a
-             * thread switch, another thread can do a garbage collect
-             * and restarted system calls may write into old
-             * (collected) addresses.
-             */
-
-            act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
-            sigemptyset(&act.sa_mask);
-            act.sa_handler = handler;
-            sigaction(sigNr, &act, 0);
+	    struct sigaction act = {0};
+
+	    /*
+	     * Do not add SA_RESTART here. A signal can cause a
+	     * thread switch, another thread can do a garbage collect
+	     * and restarted system calls may write into old
+	     * (collected) addresses.
+	     */
+
+	    act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
+	    sigemptyset(&act.sa_mask);
+	    act.sa_handler = handler;
+	    sigaction(sigNr, &act, 0);
 #else
 # ifdef HAS_SIGVEC
-            struct sigvec vec;
-
-            vec.sv_flags = SV_INTERRUPT;
-            sigemptyset(&vec.sv_mask);
-            vec.sv_handler = handler;
-            sigvec(sigNr, &vec, NULL);
+	    struct sigvec vec;
+
+	    vec.sv_flags = SV_INTERRUPT;
+	    sigemptyset(&vec.sv_mask);
+	    vec.sv_handler = handler;
+	    sigvec(sigNr, &vec, NULL);
 # else
-            (void) signal(sigNr, handler);
-# endif
-#endif
-        }
-
-        /*
-         * maybe, we should ret the old enable-status
-         * as boolean here ...
-         */
-        RETURN (self);
+	    (void) signal(sigNr, handler);
+# endif
+#endif
+	}
+
+	/*
+	 * maybe, we should ret the old enable-status
+	 * as boolean here ...
+	 */
+	RETURN (self);
     }
 %}.
 
@@ -6118,60 +6116,60 @@
 
 #ifdef SIGALRM
     {
-        static int firstCall = 1;
+	static int firstCall = 1;
 # ifndef __signalTimerInterrupt
-        extern void __signalTimerInterrupt(SIGHANDLER_ARG);
-# endif
-
-        if (firstCall) {
+	extern void __signalTimerInterrupt(SIGHANDLER_ARG);
+# endif
+
+	if (firstCall) {
 # ifdef HAS_SIGACTION
-            struct sigaction act = {0};
-
-            act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
-            sigemptyset(&act.sa_mask);
-            act.sa_handler = __signalTimerInterrupt;
-            sigaction(SIGALRM, &act, 0);
+	    struct sigaction act = {0};
+
+	    act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
+	    sigemptyset(&act.sa_mask);
+	    act.sa_handler = __signalTimerInterrupt;
+	    sigaction(SIGALRM, &act, 0);
 # else
 #  ifdef HAS_SIGVEC
-            struct sigvec vec;
-
-            vec.sv_flags = SV_INTERRUPT;
-            sigemptyset(&vec.sv_mask);
-            vec.sv_handler = __signalTimerInterrupt;
-            sigvec(SIGALRM, &vec, NULL);
+	    struct sigvec vec;
+
+	    vec.sv_flags = SV_INTERRUPT;
+	    sigemptyset(&vec.sv_mask);
+	    vec.sv_handler = __signalTimerInterrupt;
+	    sigvec(SIGALRM, &vec, NULL);
 #  else /* neither SIGACTION nor SIGVEC */
-            signal(SIGALRM, __signalTimerInterrupt);
+	    signal(SIGALRM, __signalTimerInterrupt);
 #  endif /* stupid system  */
 # endif
-            firstCall = 0;
-        }
+	    firstCall = 0;
+	}
     }
 #endif /* SIGALRM */
 
 
 #if defined(ITIMER_REAL) && !defined(NO_SETITIMER)
     {
-        struct itimerval dt;
-
-        dt.it_interval.tv_sec = 0;
-        dt.it_interval.tv_usec = 0;
-        dt.it_value.tv_sec = millis / 1000;
-        dt.it_value.tv_usec = (millis % 1000) * 1000;  
-        setitimer(ITIMER_REAL, &dt, 0);
-        RETURN (true);
+	struct itimerval dt;
+
+	dt.it_interval.tv_sec = 0;
+	dt.it_interval.tv_usec = 0;
+	dt.it_value.tv_sec = millis / 1000;
+	dt.it_value.tv_usec = (millis % 1000) * 1000;  
+	setitimer(ITIMER_REAL, &dt, 0);
+	RETURN (true);
     }
 #else /* no ITIMER_REAL */
 
 # ifdef USE_SLOW_ALARM
     {
-        /*
-         * last fallback - use alarm (which only gives 1 second resolution).
-         * If the system does not support any of the above, you have to life
-         * with this. The consequence is that pressing CTRL-C processing and
-         * thread switching will take place much delayed.
-         */
-        alarm(1);
-        RETURN(true);
+	/*
+	 * last fallback - use alarm (which only gives 1 second resolution).
+	 * If the system does not support any of the above, you have to life
+	 * with this. The consequence is that pressing CTRL-C processing and
+	 * thread switching will take place much delayed.
+	 */
+	alarm(1);
+	RETURN(true);
     }
 # endif
 #endif /* ITIMER_REAL */
@@ -6942,10 +6940,10 @@
 %{
 #ifdef NET_IF_SUPPORT
     typedef struct ifNames{
-        char nameIf[IFNAMSIZ];
+	char nameIf[IFNAMSIZ];
     } ifNames;
     typedef struct ifAdresses{
-        char hwdAdress[IFHWADDRLEN];
+	char hwdAdress[IFHWADDRLEN];
     } ifAdresses;
 
     ifNames namesOfIf[50];
@@ -6971,8 +6969,8 @@
     afinet_socket = socket(AF_INET, SOCK_DGRAM, 0);
     if (afinet_socket < 0)
     {
-        fprintf (stderr, "Cant open socket\n");
-        goto bad;
+	fprintf (stderr, "Cant open socket\n");
+	goto bad;
     }
 
     //
@@ -6984,14 +6982,14 @@
 
     if (ioctl (afinet_socket, (int) SIOCGIFCONF, (caddr_t) &ifc) < 0)
     {                                                 
-        fprintf (stderr, "ioctl(SIOCGIFCONF) failed\n");
-        close(afinet_socket);
-        goto bad;
+	fprintf (stderr, "ioctl(SIOCGIFCONF) failed\n");
+	close(afinet_socket);
+	goto bad;
     }
 
     n_ifs = ifc.ifc_len / sizeof (struct ifreq);
     if (n_ifs > 50) {
-         n_ifs = 50;
+	 n_ifs = 50;
     }
 
     last_ifr = (struct ifreq *) (ifc.ifc_buf + (n_ifs * sizeof (struct ifreq))); 
@@ -7006,42 +7004,42 @@
     countOfIf = 0;
 
     for (i=0, ifr = ifc.ifc_req; 
-         (ifr < last_ifr);
-         i++, ifr = (struct ifreq *)(( (char *) ifr ) + prev_size))          
+	 (ifr < last_ifr);
+	 i++, ifr = (struct ifreq *)(( (char *) ifr ) + prev_size))          
     {
 //        this_ifc_name = ifr->ifr_ifrn.ifrn_name;
 
-        //
-        // Get Flags for this interface
-        //
-
-        memcpy(&ifreq, ifr, sizeof(ifreq)); 
-        if (ioctl (afinet_socket,  SIOCGIFFLAGS, &ifreq) < 0)
-        {
-            fprintf(stderr, "Error ioctl(SIOCGIFFLAGS)\n");
-        } 
-        else 
-        {
+	//
+	// Get Flags for this interface
+	//
+
+	memcpy(&ifreq, ifr, sizeof(ifreq)); 
+	if (ioctl (afinet_socket,  SIOCGIFFLAGS, &ifreq) < 0)
+	{
+	    fprintf(stderr, "Error ioctl(SIOCGIFFLAGS)\n");
+	} 
+	else 
+	{
 //            this_ifc_flags = ifreq.ifr_ifru.ifru_flags;
 
-            //
-            // Get Hardware address for this interface
-            //
-
-            memcpy(&ifreq, ifr, sizeof(ifreq)); 
-            this_ifc_hashwaddr = 1;
-            if (ioctl (afinet_socket,  SIOCGIFHWADDR, &ifreq) < 0)
-            {
-                this_ifc_hashwaddr = 0;
-            }
-
-            if (this_ifc_hashwaddr)
-            {
-                memcpy(adressesOfIf[i].hwdAdress, &ifreq.ifr_hwaddr.sa_data, IFHWADDRLEN);
-                memcpy(namesOfIf[i].nameIf, &ifreq.ifr_ifrn.ifrn_name, IFNAMSIZ);
-                countOfIf += 1;
-            }
-        }
+	    //
+	    // Get Hardware address for this interface
+	    //
+
+	    memcpy(&ifreq, ifr, sizeof(ifreq)); 
+	    this_ifc_hashwaddr = 1;
+	    if (ioctl (afinet_socket,  SIOCGIFHWADDR, &ifreq) < 0)
+	    {
+		this_ifc_hashwaddr = 0;
+	    }
+
+	    if (this_ifc_hashwaddr)
+	    {
+		memcpy(adressesOfIf[i].hwdAdress, &ifreq.ifr_hwaddr.sa_data, IFHWADDRLEN);
+		memcpy(namesOfIf[i].nameIf, &ifreq.ifr_ifrn.ifrn_name, IFNAMSIZ);
+		countOfIf += 1;
+	    }
+	}
     }
 
     close(afinet_socket);
@@ -7054,26 +7052,26 @@
 %}.
 
     ok ifFalse:[
-        self primitiveFailed.
-        ^  nil
+	self primitiveFailed.
+	^  nil
     ].
     retDictionary := Dictionary new.
     count := 1.
     [count <= noOfIf] whileTrue:[
-        idx1 := (count-1) * 16 + 1.
-        idx2 := idx1 + 16 - 1.
-
-        name := arrayOfNames copyFrom:idx1 to:idx2.
-        (name indexOf:0) ~~ 0 ifTrue:[
-            name := name copyTo:(name indexOf:0)-1.
-        ].
-        name := name asString.
-        idx1 := (count-1)*6 + 1.
-        idx2 := idx1 + 6 - 1.
-        address := (arrayOfAdresses copyFrom:idx1 to:idx2).
-
-        retDictionary at:name put:address.
-        count := count + 1.        
+	idx1 := (count-1) * 16 + 1.
+	idx2 := idx1 + 16 - 1.
+
+	name := arrayOfNames copyFrom:idx1 to:idx2.
+	(name indexOf:0) ~~ 0 ifTrue:[
+	    name := name copyTo:(name indexOf:0)-1.
+	].
+	name := name asString.
+	idx1 := (count-1)*6 + 1.
+	idx2 := idx1 + 6 - 1.
+	address := (arrayOfAdresses copyFrom:idx1 to:idx2).
+
+	retDictionary at:name put:address.
+	count := count + 1.        
     ].
 
     ^ retDictionary
@@ -7119,7 +7117,7 @@
 
     if ((retVal = syssgi(SGI_SYSID, idBuffer)) == 0) {
 	arr = __BYTEARRAY_UNINITIALIZED_NEW_INT(MAXSYSIDSIZE);
-	bcopy(idBuffer, __ByteArrayInstPtr(arr)->ba_element, MAXSYSIDSIZE);
+	bcopy(idBuffer, __byteArrayVal(arr), MAXSYSIDSIZE);
 	RETURN (arr);
     }
 #endif
@@ -7129,7 +7127,7 @@
 
     runningId = gethostid();
     arr = __BYTEARRAY_UNINITIALIZED_NEW_INT(4);
-    *(int *)(__ByteArrayInstPtr(arr)->ba_element) = runningId;
+    *(int *)(__byteArrayVal(arr)) = runningId;
     RETURN (arr);
 #endif
 #if defined(HAS_SYSINFO) && defined(SI_HW_SERIAL)
@@ -8170,31 +8168,31 @@
 
     sysPath := super defaultSystemPath.
     #(
-        '/usr/local/lib/smalltalk'
-        '/usr/lib/smalltalk'
-        '/lib/smalltalk'
-        '/opt/smalltalk'
+	'/usr/local/lib/smalltalk'
+	'/usr/lib/smalltalk'
+	'/lib/smalltalk'
+	'/opt/smalltalk'
     ) do:[:d |
-        (d asFilename isDirectory) ifTrue:[
-            "/ try to guess a gnu-smalltalk; skip it
-            (d asFilename construct:'initialize.st') exists ifFalse:[
-                releaseFile := d asFilename construct:'RELEASE'.
-                releaseFile exists ifTrue:[
-                    s := releaseFile readStream.
-                    s notNil ifTrue:[
-                        v := Integer readFrom:s onError:-1.
-                        s close.
-                        v == majorVersionNr ifTrue:[
-                            sysPath add:d
-                        ] ifFalse:[
-                            ('UnixOperatingSystem [info]: ignore files in ' , d asFilename pathName , ' (RELEASE mismatch)') infoPrintCR.
-                        ]
-                    ] ifFalse:[
-                        ('UnixOperatingSystem [info]: ignore files in ' , d asFilename pathName , ' (RELEASE missing)') infoPrintCR.
-                    ]
-                ]
-            ]
-        ]
+	(d asFilename isDirectory) ifTrue:[
+	    "/ try to guess a gnu-smalltalk; skip it
+	    (d asFilename construct:'initialize.st') exists ifFalse:[
+		releaseFile := d asFilename construct:'RELEASE'.
+		releaseFile exists ifTrue:[
+		    s := releaseFile readStream.
+		    s notNil ifTrue:[
+			v := Integer readFrom:s onError:-1.
+			s close.
+			v == majorVersionNr ifTrue:[
+			    sysPath add:d
+			] ifFalse:[
+			    ('UnixOperatingSystem [info]: ignore files in ' , d asFilename pathName , ' (RELEASE mismatch)') infoPrintCR.
+			]
+		    ] ifFalse:[
+			('UnixOperatingSystem [info]: ignore files in ' , d asFilename pathName , ' (RELEASE missing)') infoPrintCR.
+		    ]
+		]
+	    ]
+	]
     ].
     ^ sysPath
 
@@ -8347,7 +8345,7 @@
      The arguments are assumed to be in UTC Time"
 
     ^ self
-        computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis utc:true
+	computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis utc:true
 
     "
      OperatingSystem computeOSTimeFromUTCYear:1970 month:1 day:1 hour:0 minute:0 second:0 millisecond:0
@@ -8363,7 +8361,7 @@
      any daylight saving adjustings."
 
     ^ self
-        computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis utc:false
+	computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis utc:false
     "
      OperatingSystem computeOSTimeFromYear:1970 month:1 day:1 hour:0 minute:0 seconds:0 millis:0
     "
@@ -8383,24 +8381,24 @@
     if (__bothSmallInteger(y, m) 
      && __bothSmallInteger(d, h)
      && __bothSmallInteger(min, s)) {
-        tm.tm_hour = __intVal(h);
-        tm.tm_min = __intVal(min);
-        tm.tm_sec = __intVal(s);
-
-        tm.tm_year = __intVal(y) - 1900;
-        tm.tm_mon = __intVal(m) - 1;
-        tm.tm_mday = __intVal(d);
-        tm.tm_isdst = -1;
-
-        t = mktime(&tm);
-        if (utcBoolean == true) {
-            t += TIMEZONE(&tm);
-        }
-        osSeconds = __MKUINT((INT)t);
+	tm.tm_hour = __intVal(h);
+	tm.tm_min = __intVal(min);
+	tm.tm_sec = __intVal(s);
+
+	tm.tm_year = __intVal(y) - 1900;
+	tm.tm_mon = __intVal(m) - 1;
+	tm.tm_mday = __intVal(d);
+	tm.tm_isdst = -1;
+
+	t = mktime(&tm);
+	if (utcBoolean == true) {
+	    t += TIMEZONE(&tm);
+	}
+	osSeconds = __MKUINT((INT)t);
     }
 %}.
     osSeconds notNil ifTrue:[
-        ^ osSeconds * 1000 + millis
+	^ osSeconds * 1000 + millis
     ].    
     ^ self primitiveFailed
 
@@ -8448,7 +8446,7 @@
 
     "
      OperatingSystem computeTimePartsOf:100 for:[:h :m :s :milli |
-        Transcript show:h; space; show:m; space; show:s; space; showCR:milli.
+	Transcript show:h; space; show:m; space; show:s; space; showCR:milli.
      ]
     "
 !
@@ -9385,13 +9383,13 @@
      */
 # if 0 && defined(FIONREAD)
     {
-        int n;
-
-        if (__isSmallInteger(fd)) {
-            if (ioctl(__intVal(fd), FIONREAD, &n) >= 0) {
-                RETURN (__MKINT(n));
-            }
-        }
+	int n;
+
+	if (__isSmallInteger(fd)) {
+	    if (ioctl(__intVal(fd), FIONREAD, &n) >= 0) {
+		RETURN (__MKINT(n));
+	    }
+	}
     }
 # endif /* FIONREAD */
 %}.
@@ -9409,11 +9407,11 @@
      */
 #if 0 && defined(FIONREAD)
     if (__isSmallInteger(fd)) {
-        int result = 0;
-
-        if (ioctl(__smallIntegerVal(fd), FIONREAD, &result) >= 0) {
-            RETURN(result > 0 ? true : false);
-        }
+	int result = 0;
+
+	if (ioctl(__smallIntegerVal(fd), FIONREAD, &result) >= 0) {
+	    RETURN(result > 0 ? true : false);
+	}
     }
 #endif /* FIONREAD */
 %}.
@@ -9650,14 +9648,14 @@
     "one of our registered handles has been collected"
 
     aspect == #ElementExpired ifTrue:[
-        OpenFiles keysAndValuesDo:[:fd :handle |
-            handle == 0 ifTrue:[
-                "Have to close the file descriptor"
-
-                OperatingSystem closeFd:fd.
-                OpenFiles at:fd put:nil.
-            ].
-        ].
+	OpenFiles keysAndValuesDo:[:fd :handle |
+	    handle == 0 ifTrue:[
+		"Have to close the file descriptor"
+
+		OperatingSystem closeFd:fd.
+		OpenFiles at:fd put:nil.
+	    ].
+	].
     ].
 
     "Created: 30.9.1997 / 12:57:35 / stefan"
@@ -9691,7 +9689,7 @@
     "got an error with anInteger as error number"
 
     anError isInteger ifTrue:[
-        ^ UnixOperatingSystem errorHolderForNumber:anError
+	^ UnixOperatingSystem errorHolderForNumber:anError
     ].
     self primitiveFailed:anError.
 ! !
@@ -9721,7 +9719,7 @@
     fd := aFileDescriptor.
     oldHandle := OpenFiles at:aFileDescriptor.
     (oldHandle notNil and:[oldHandle ~~ self]) ifTrue:[
-        oldHandle invalidate.
+	oldHandle invalidate.
     ].
     self register.
 
@@ -9749,102 +9747,102 @@
     int nInstBytes, objSize;
 
     if (! __isSmallInteger(__INST(fd))) {
-        error = @symbol(errorNotOpen);
-        goto bad;
+	error = @symbol(errorNotOpen);
+	goto bad;
     }
     if (! __bothSmallInteger(count, firstIndex)) {
-        error = @symbol(badArgument);
-        goto bad;
+	error = @symbol(badArgument);
+	goto bad;
     }
     fd = __smallIntegerVal(__INST(fd));
     cnt = __smallIntegerVal(count);
     offs = __smallIntegerVal(firstIndex) - 1;
 
     if (fd < 0) {
-        error = @symbol(internalError);
-        goto bad;
+	error = @symbol(internalError);
+	goto bad;
     }
     if (__isExternalBytes(aByteBuffer)) {
-        OBJ sz;
-
-        nInstBytes = 0;
-        extPtr = (char *)(__externalBytesAddress(aByteBuffer));
-        sz = __externalBytesSize(aByteBuffer);
-        if (__isSmallInteger(sz)) {
-            objSize = __smallIntegerVal(sz);
-        } else {
-            objSize = -1; /* unknown */
-        }
+	OBJ sz;
+
+	nInstBytes = 0;
+	extPtr = (char *)(__externalBytesAddress(aByteBuffer));
+	sz = __externalBytesSize(aByteBuffer);
+	if (__isSmallInteger(sz)) {
+	    objSize = __smallIntegerVal(sz);
+	} else {
+	    objSize = -1; /* unknown */
+	}
     } else {
-        OBJ oClass;
-        int nInstVars;
-
-        oClass = __Class(aByteBuffer);
-        switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-            case BYTEARRAY:
-            case WORDARRAY:
-            case LONGARRAY:
-            case SWORDARRAY:
-            case SLONGARRAY:
-            case FLOATARRAY:
-            case DOUBLEARRAY:
-                break;
-            default:
-                error = @symbol(badArgument1);
-                goto bad;
-        }
-        extPtr = (char *)0;
-        nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
-        nInstBytes = __OBJS2BYTES__(nInstVars);
-        objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
+	OBJ oClass;
+	int nInstVars;
+
+	oClass = __Class(aByteBuffer);
+	switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+	    case BYTEARRAY:
+	    case WORDARRAY:
+	    case LONGARRAY:
+	    case SWORDARRAY:
+	    case SLONGARRAY:
+	    case FLOATARRAY:
+	    case DOUBLEARRAY:
+		break;
+	    default:
+		error = @symbol(badArgument1);
+		goto bad;
+	}
+	extPtr = (char *)0;
+	nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
+	nInstBytes = __OBJS2BYTES__(nInstVars);
+	objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
     }
     if ((offs >= 0)
-        && (cnt >= 0)
-        && ((objSize == -1) || (objSize >= (cnt + offs)))) {
-        nRead = 0;
-
-        do {
-            int n;
-
-            if (extPtr) {
-                n = read(fd, extPtr+offs, cnt);
-            } else {
-                char *bp;
-
-                /*
-                 * on interrupt, anObject may be moved to another location.
-                 * So we recompute the byte-address here.
-                 */
-                bp = __ByteArrayInstPtr(aByteBuffer)->ba_element + nInstBytes;
-
-                n = read(fd, bp + offs, cnt);
-            }
-            if (n > 0) {
-                cnt -= n;
-                offs += n;
-                nRead += n;
-            } else if (n == 0) {
-                break;
-            } else if (n < 0) {
-                if (0
+	&& (cnt >= 0)
+	&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
+	nRead = 0;
+
+	do {
+	    int n;
+
+	    if (extPtr) {
+		n = read(fd, extPtr+offs, cnt);
+	    } else {
+		char *bp;
+
+		/*
+		 * on interrupt, anObject may be moved to another location.
+		 * So we recompute the byte-address here.
+		 */
+		bp = __byteArrayVal(aByteBuffer) + nInstBytes;
+
+		n = read(fd, bp + offs, cnt);
+	    }
+	    if (n > 0) {
+		cnt -= n;
+		offs += n;
+		nRead += n;
+	    } else if (n == 0) {
+		break;
+	    } else if (n < 0) {
+		if (0
 #ifdef EWOULDBLOCK
-                    || errno == EWOULDBLOCK
+		    || errno == EWOULDBLOCK
 #endif
 #ifdef EAGAIN
-                    || errno == EAGAIN
-#endif
-                ) {
-                     RETURN(nil);
-                }
-                if (errno != EINTR) {
-                     error = __mkSmallInteger(errno);
-                     goto bad;
-                }
-                __HANDLE_INTERRUPTS__;
-            }
-        } while (cnt > 0);
-
-        RETURN (__mkSmallInteger(nRead));
+		    || errno == EAGAIN
+#endif
+		) {
+		     RETURN(nil);
+		}
+		if (errno != EINTR) {
+		     error = __mkSmallInteger(errno);
+		     goto bad;
+		}
+		__HANDLE_INTERRUPTS__;
+	    }
+	} while (cnt > 0);
+
+	RETURN (__mkSmallInteger(nRead));
     }
 bad: ;   
 %}.
@@ -9883,102 +9881,102 @@
     int nInstBytes, objSize;
 
     if (! __isSmallInteger(__INST(fd))) {
-        error = @symbol(errorNotOpen);
-        goto bad;
+	error = @symbol(errorNotOpen);
+	goto bad;
     }
     if (! __bothSmallInteger(count, firstIndex)) {
-        error = @symbol(badArgument);
-        goto bad;
+	error = @symbol(badArgument);
+	goto bad;
     }
     fd = __smallIntegerVal(__INST(fd));
     cnt = __smallIntegerVal(count);
     offs = __smallIntegerVal(firstIndex) - 1;
 
     if (fd < 0) {
-        error = @symbol(internalError);
-        goto bad;
+	error = @symbol(internalError);
+	goto bad;
     }
     if (__isExternalBytes(aByteBuffer)) {
-        OBJ sz;
-
-        nInstBytes = 0;
-        extPtr = (char *)(__externalBytesAddress(aByteBuffer));
-        sz = __externalBytesSize(aByteBuffer);
-        if (__isSmallInteger(sz)) {
-            objSize = __smallIntegerVal(sz);
-        } else {
-            objSize = -1; /* unknown */
-        }
+	OBJ sz;
+
+	nInstBytes = 0;
+	extPtr = (char *)(__externalBytesAddress(aByteBuffer));
+	sz = __externalBytesSize(aByteBuffer);
+	if (__isSmallInteger(sz)) {
+	    objSize = __smallIntegerVal(sz);
+	} else {
+	    objSize = -1; /* unknown */
+	}
     } else {
-        OBJ oClass;
-        int nInstVars;
-
-        oClass = __Class(aByteBuffer);
-        switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-            case BYTEARRAY:
-            case WORDARRAY:
-            case LONGARRAY:
-            case SWORDARRAY:
-            case SLONGARRAY:
-            case FLOATARRAY:
-            case DOUBLEARRAY:
-                break;
-            default:
-                error = @symbol(badArgument1);
-                goto bad;
-        }
-        extPtr = (char *)0;
-        nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
-        nInstBytes = __OBJS2BYTES__(nInstVars);
-        objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
+	OBJ oClass;
+	int nInstVars;
+
+	oClass = __Class(aByteBuffer);
+	switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+	    case BYTEARRAY:
+	    case WORDARRAY:
+	    case LONGARRAY:
+	    case SWORDARRAY:
+	    case SLONGARRAY:
+	    case FLOATARRAY:
+	    case DOUBLEARRAY:
+		break;
+	    default:
+		error = @symbol(badArgument1);
+		goto bad;
+	}
+	extPtr = (char *)0;
+	nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
+	nInstBytes = __OBJS2BYTES__(nInstVars);
+	objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
     }
     if ((offs >= 0)
-        && (cnt >= 0)
-        && ((objSize == -1) || (objSize >= (cnt + offs)))) {
-        nWritten = 0;
-
-        do {
-            int n;
-
-            if (extPtr) {
-                n = write(fd, extPtr+offs, cnt);
-            } else {
-                char *bp;
-
-                /*
-                 * on interrupt, anObject may be moved to another location.
-                 * So we recompute the byte-address here.
-                 */
-                bp = __ByteArrayInstPtr(aByteBuffer)->ba_element + nInstBytes;
-
-                n = write(fd, bp + offs, cnt);
-            }
-            if (n > 0) {
-                cnt -= n;
-                offs += n;
-                nWritten += n;
-            } else if (n == 0) {
-                break;
-            } else if (n < 0) {
-                if (0
+	&& (cnt >= 0)
+	&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
+	nWritten = 0;
+
+	do {
+	    int n;
+
+	    if (extPtr) {
+		n = write(fd, extPtr+offs, cnt);
+	    } else {
+		char *bp;
+
+		/*
+		 * on interrupt, anObject may be moved to another location.
+		 * So we recompute the byte-address here.
+		 */
+		bp = __byteArrayVal(aByteBuffer) + nInstBytes;
+
+		n = write(fd, bp + offs, cnt);
+	    }
+	    if (n > 0) {
+		cnt -= n;
+		offs += n;
+		nWritten += n;
+	    } else if (n == 0) {
+		break;
+	    } else if (n < 0) {
+		if (0
 #ifdef EWOULDBLOCK
-                    || errno == EWOULDBLOCK
+		    || errno == EWOULDBLOCK
 #endif
 #ifdef EAGAIN
-                    || errno == EAGAIN
-#endif
-                ) {
-                     RETURN(nil);
-                }
-                if (errno != EINTR) {
-                     error = __mkSmallInteger(errno);
-                     goto bad;
-                }
-                __HANDLE_INTERRUPTS__;
-            }
-        } while (cnt > 0);
-
-        RETURN (__mkSmallInteger(nWritten));
+		    || errno == EAGAIN
+#endif
+		) {
+		     RETURN(nil);
+		}
+		if (errno != EINTR) {
+		     error = __mkSmallInteger(errno);
+		     goto bad;
+		}
+		__HANDLE_INTERRUPTS__;
+	    }
+	} while (cnt > 0);
+
+	RETURN (__mkSmallInteger(nWritten));
     }
 bad: ;   
 %}.
@@ -10018,40 +10016,40 @@
     __uint64__ pos64;
 
     if (! __isSmallInteger(__INST(fd))) {
-        error = @symbol(errorNotOpen);
-        goto bad;
+	error = @symbol(errorNotOpen);
+	goto bad;
     }
     if (__isSmallInteger(newPosition)) {
-        pos = __smallIntegerVal(newPosition);
+	pos = __smallIntegerVal(newPosition);
     } else if (__signedLong64IntVal(newPosition, &pos64) == 0) {
-        error = @symbol(badArgument1);
-        goto bad;
+	error = @symbol(badArgument1);
+	goto bad;
     }
     fd = __smallIntegerVal(__INST(fd));
     if (fd < 0) {
-        error = @symbol(internalError);
-        goto bad;
+	error = @symbol(internalError);
+	goto bad;
     }
     if (whence == @symbol(begin)) {
-        __whence = SEEK_SET;    
+	__whence = SEEK_SET;    
     } else if (whence == @symbol(current)) {
-        __whence = SEEK_CUR;    
+	__whence = SEEK_CUR;    
     } else if (whence == @symbol(end)) {
-        __whence = SEEK_END;    
+	__whence = SEEK_END;    
     } else {
-        error = @symbol(badArgument2);
-        goto bad;
+	error = @symbol(badArgument2);
+	goto bad;
     }
 
 again:
     ret = lseek(fd, pos, __whence);
     if (ret < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        }
-        error = __mkSmallInteger(errno);
-        goto bad;
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	}
+	error = __mkSmallInteger(errno);
+	goto bad;
     }
     /* RETURN (__mkInteger(ret)); */
     RETURN (__mkSmallInteger(ret));
@@ -10079,9 +10077,9 @@
      Experimental."
 
     ^ OperatingSystem selectOnAnyReadable:(Array with:fd)
-                      writable:(Array with:fd)
-                     exception:nil
-                   withTimeOut:millis
+		      writable:(Array with:fd)
+		     exception:nil
+		   withTimeOut:millis
 
     "Created: 1.10.1997 / 08:51:11 / stefan"
 !
@@ -10108,26 +10106,26 @@
 # endif
 # if defined(DELAY)
     if (__isSmallInteger(__INST(fd))) {
-        int f = __intVal(__INST(fd));
-
-        flags = fcntl(f, F_GETFL, 0);
-        if (aBoolean == true) {
-            ret = fcntl(f, F_SETFL, flags & ~DELAY);
-        } else {
-            ret = fcntl(f, F_SETFL, flags | DELAY);
-        }
-        if (ret >= 0) {
-            RETURN(__MKSMALLINT(flags)); 
-        } else {
-            err = __MKSMALLINT(errno);
-        }
+	int f = __intVal(__INST(fd));
+
+	flags = fcntl(f, F_GETFL, 0);
+	if (aBoolean == true) {
+	    ret = fcntl(f, F_SETFL, flags & ~DELAY);
+	} else {
+	    ret = fcntl(f, F_SETFL, flags | DELAY);
+	}
+	if (ret >= 0) {
+	    RETURN(__MKSMALLINT(flags)); 
+	} else {
+	    err = __MKSMALLINT(errno);
+	}
     }
 # undef DELAY
 # endif /* DELAY */
 #endif
 %}.
     err notNil ifTrue:[
-        self error:err
+	self error:err
     ].
     "
      fd argument not integer
@@ -10143,7 +10141,7 @@
 
 %{
     if (__isSmallInteger(anInteger)) {
-        __externalAddressVal(self) = (OBJ)(__smallIntegerVal(anInteger));
+	__externalAddressVal(self) = (OBJ)(__smallIntegerVal(anInteger));
     }
 %}
 
@@ -10161,65 +10159,65 @@
     int fd;
 
     if (__isSmallInteger(__INST(fd))) {
-        fd = __smallIntegerVal(__INST(fd));
-
-        /*
-         * if available, try FIONREAD first, which is usually done faster.
-         */
+	fd = __smallIntegerVal(__INST(fd));
+
+	/*
+	 * if available, try FIONREAD first, which is usually done faster.
+	 */
 # ifdef FIONREAD
-        {
-            int result = 0;
-
-            if (ioctl(fd, FIONREAD, &result) >= 0) {
-                RETURN(result > 0 ? true : false);
-            }
-        }
+	{
+	    int result = 0;
+
+	    if (ioctl(fd, FIONREAD, &result) >= 0) {
+		RETURN(result > 0 ? true : false);
+	    }
+	}
 # endif /* FIONREAD */
 
 # if defined(__VMS__) && defined(DOES_NOT_WORK_YET)
-        {
-            /*
-             * do a sys$qio ..
-             * fd here is suposed to be a channel nr.
-             */
-            struct IOSB iosb;
-            int status;
-            int channel;
-            struct typahdask sensebuf;
-
-            status = SYS$QIO(0, /* efn */
-                             fd,
-                             IO$_SENSEMODE | IO$M_TYPEAHDCNT,
-                             &iosb,
-                             0, /* ast */
-                             0, /* ast arg */
-                             &sensebuf,         /* data */
-                             sizeof(sensebuf),  /* data size */
-                             0, 0, 0, 0);
-            if (status != SS$_NORMAL) {
-                fprintf(stderr, "OS [info]: SYS$QIO failed on %d\n", fd);
-            } else {
-                fprintf(stderr, "sys$QIO -> %d\n", sensebuf.typcnt);
-            }
-        }
+	{
+	    /*
+	     * do a sys$qio ..
+	     * fd here is suposed to be a channel nr.
+	     */
+	    struct IOSB iosb;
+	    int status;
+	    int channel;
+	    struct typahdask sensebuf;
+
+	    status = SYS$QIO(0, /* efn */
+			     fd,
+			     IO$_SENSEMODE | IO$M_TYPEAHDCNT,
+			     &iosb,
+			     0, /* ast */
+			     0, /* ast arg */
+			     &sensebuf,         /* data */
+			     sizeof(sensebuf),  /* data size */
+			     0, 0, 0, 0);
+	    if (status != SS$_NORMAL) {
+		fprintf(stderr, "OS [info]: SYS$QIO failed on %d\n", fd);
+	    } else {
+		fprintf(stderr, "sys$QIO -> %d\n", sensebuf.typcnt);
+	    }
+	}
 # endif /* __VMS__ */
     }
 %}.
 
     OperatingSystem supportsSelect ifFalse:[
-        "/ mhmh - what should we do then ?
-        "/ For now, return true as if data was present,
-        "/ and let the thread fall into the read.
-        "/ It will then (hopefully) be desceduled there and
-        "/ effectively polling for input.
-
-        ^ true
+	"/ mhmh - what should we do then ?
+	"/ For now, return true as if data was present,
+	"/ and let the thread fall into the read.
+	"/ It will then (hopefully) be desceduled there and
+	"/ effectively polling for input.
+
+	^ true
     ].
 
     ^ (OperatingSystem selectOnAnyReadable:(Array with:fd)
-                       writable:nil
-                       exception:nil
-                       withTimeOut:0) == fd
+		       writable:nil
+		       exception:nil
+		       withTimeOut:0) == fd
 
     "
      |h n|
@@ -10242,18 +10240,18 @@
     "return true, if filedescriptor can be written without blocking"
 
     OperatingSystem supportsSelect ifFalse:[
-        "/ mhmh - what should we do then ?
-        "/ For now, return true as if data was present,
-        "/ and let the thread fall into the write.
-        "/ It will then (hopefully) be desceduled there and
-        "/ effectively polling for output.
-        ^ true
+	"/ mhmh - what should we do then ?
+	"/ For now, return true as if data was present,
+	"/ and let the thread fall into the write.
+	"/ It will then (hopefully) be desceduled there and
+	"/ effectively polling for output.
+	^ true
     ].
 
     ^ (OperatingSystem selectOnAnyReadable:nil
-                       writable:(Array with:fd)
-                       exception:nil
-                       withTimeOut:0) == fd
+		       writable:(Array with:fd)
+		       exception:nil
+		       withTimeOut:0) == fd
 !
 
 isValid
@@ -10272,13 +10270,13 @@
      */
 # if defined(FIONREAD)
     {
-        int n = 0;
-
-        if (__isSmallInteger(__INST(fd))) {
-            if (ioctl(__smallIntegerVal(__INST(fd)), FIONREAD, &n) >= 0) {
-                RETURN (__MKINT(n));
-            }
-        }
+	int n = 0;
+
+	if (__isSmallInteger(__INST(fd))) {
+	    if (ioctl(__smallIntegerVal(__INST(fd)), FIONREAD, &n) >= 0) {
+		RETURN (__MKINT(n));
+	    }
+	}
     }
 # endif /* FIONREAD */
 %}.
@@ -10302,17 +10300,17 @@
 
     sz := OpenFiles size.
     fd > sz ifTrue:[
-        "grow for more descriptors"
-        old := OpenFiles.
-        OpenFiles := WeakArray new:(sz * 2).
-        old removeDependent:(self class).
-        OpenFiles addDependent:(self class).
-        old keysAndValuesDo:[:index :elem|
-            "be careful to not overwrite new entries in OpenFiles"
-            elem notNil ifTrue:[
-                OpenFiles at:index put:elem.
-            ].
-        ].
+	"grow for more descriptors"
+	old := OpenFiles.
+	OpenFiles := WeakArray new:(sz * 2).
+	old removeDependent:(self class).
+	OpenFiles addDependent:(self class).
+	old keysAndValuesDo:[:index :elem|
+	    "be careful to not overwrite new entries in OpenFiles"
+	    elem notNil ifTrue:[
+		OpenFiles at:index put:elem.
+	    ].
+	].
     ].
     OpenFiles at:fd put:self.
 
@@ -10348,20 +10346,20 @@
     wasBlocked := OperatingSystem blockInterrupts.
     hasData := self canReadWithoutBlocking.
     hasData ifFalse:[
-        inputSema := Semaphore new name:'readWait'.
-        [
-            timeout notNil ifTrue:[
-                Processor signal:inputSema afterMilliseconds:timeout 
-            ].
-            Processor signal:inputSema onInput:fd.
-            Processor activeProcess state:#ioWait.
-            inputSema wait.
-            Processor disableSemaphore:inputSema.
-            hasData := self canReadWithoutBlocking.
-        ] ifCurtailed:[
-            Processor disableSemaphore:inputSema.
-            wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
-        ]
+	inputSema := Semaphore new name:'readWait'.
+	[
+	    timeout notNil ifTrue:[
+		Processor signal:inputSema afterMilliseconds:timeout 
+	    ].
+	    Processor signal:inputSema onInput:fd.
+	    Processor activeProcess state:#ioWait.
+	    inputSema wait.
+	    Processor disableSemaphore:inputSema.
+	    hasData := self canReadWithoutBlocking.
+	] ifCurtailed:[
+	    Processor disableSemaphore:inputSema.
+	    wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
+	]
     ].
     wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
     ^ hasData not
@@ -10381,20 +10379,20 @@
     wasBlocked := OperatingSystem blockInterrupts.
     canWrite := self canWriteWithoutBlocking.
     canWrite ifFalse:[
-        outputSema := Semaphore new name:'writeWait'.
-        [
-            timeout notNil ifTrue:[
-                Processor signal:outputSema afterMilliseconds:timeout
-            ].
-            Processor signal:outputSema onOutput:fd.
-            Processor activeProcess state:#ioWait.
-            outputSema wait.
-            Processor disableSemaphore:outputSema.
-            canWrite := self canWriteWithoutBlocking.
-        ] ifCurtailed:[
-            Processor disableSemaphore:outputSema.
-            wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
-        ]
+	outputSema := Semaphore new name:'writeWait'.
+	[
+	    timeout notNil ifTrue:[
+		Processor signal:outputSema afterMilliseconds:timeout
+	    ].
+	    Processor signal:outputSema onOutput:fd.
+	    Processor activeProcess state:#ioWait.
+	    outputSema wait.
+	    Processor disableSemaphore:outputSema.
+	    canWrite := self canWriteWithoutBlocking.
+	] ifCurtailed:[
+	    Processor disableSemaphore:outputSema.
+	    wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
+	]
     ].
     wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
     ^ canWrite not
@@ -10403,7 +10401,7 @@
 !UnixOperatingSystem::FilePointerHandle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.118 2002-03-15 09:34:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.119 2002-04-11 09:44:08 cg Exp $'
 ! !
 
 !UnixOperatingSystem::FilePointerHandle methodsFor:'release'!
@@ -10415,8 +10413,8 @@
     FILE *f = (FILE *)(__externalAddressVal(self));
 
     if (f) {
-        __externalAddressVal(self) = NULL;
-        fclose(f);
+	__externalAddressVal(self) = NULL;
+	fclose(f);
     }
 %}
 
@@ -10426,7 +10424,7 @@
 
 type:t mode:m uid:u gid:g size:s id:i accessed:aT modified:mT statusChanged:sT path:lP numLinks:nL
     ^ self basicNew
-        type:t mode:m uid:u gid:g size:s id:i accessed:aT modified:mT statusChanged:sT path:lP numLinks:nL
+	type:t mode:m uid:u gid:g size:s id:i accessed:aT modified:mT statusChanged:sT path:lP numLinks:nL
 ! !
 
 !UnixOperatingSystem::FileStatusInfo methodsFor:'accessing'!
@@ -10753,27 +10751,27 @@
      int code = -1;
 
      if (__isSmallInteger(aSymbolOrInteger) || aSymbolOrInteger == nil) {
-        RETURN(aSymbolOrInteger);
+	RETURN(aSymbolOrInteger);
      }
 #ifdef AF_INET
      else if (aSymbolOrInteger == @symbol(inet)) 
-        code = AF_INET;
+	code = AF_INET;
 #endif
 #ifdef AF_INET6
      else if (aSymbolOrInteger == @symbol(inet6))
-        code = AF_INET6;
+	code = AF_INET6;
 #endif
 #ifdef AF_UNIX
      else if (aSymbolOrInteger == @symbol(unix))
-        code = AF_UNIX;
+	code = AF_UNIX;
 #endif
 #ifdef AF_APPLETALK
      else if (aSymbolOrInteger == @symbol(appletalk))
-        code = AF_APPLETALK;
+	code = AF_APPLETALK;
 #endif
 
      if (code > 0)
-         domainCode = __MKSMALLINT(code);
+	 domainCode = __MKSMALLINT(code);
 %}.
 
     ^ domainCode.
@@ -10793,28 +10791,28 @@
 %{ /*NOCONTEXT*/            
 
     if (__isSmallInteger(anInteger)) {
-        switch(__intVal(anInteger)) {
+	switch(__intVal(anInteger)) {
 #ifdef AF_INET
-        case AF_INET:
-            domainSymbol = @symbol(inet);
-            break;
+	case AF_INET:
+	    domainSymbol = @symbol(inet);
+	    break;
 #endif
 #ifdef AF_INET6
-        case AF_INET6:
-            domainSymbol = @symbol(inet6);
-            break;
+	case AF_INET6:
+	    domainSymbol = @symbol(inet6);
+	    break;
 #endif
 #ifdef AF_UNIX
-        case AF_UNIX:
-            domainSymbol = @symbol(unix);
-            break;
+	case AF_UNIX:
+	    domainSymbol = @symbol(unix);
+	    break;
 #endif
 #ifdef AF_APPLETALK
-        case AF_APPLETALK:
-            domainSymbol = @symbol(appletalk);
-            break;
-#endif
-        }
+	case AF_APPLETALK:
+	    domainSymbol = @symbol(appletalk);
+	    break;
+#endif
+	}
     }
 %}.
 
@@ -10835,16 +10833,16 @@
 
 %{
     if (__isSmallInteger(aNameOrNumber) || aNameOrNumber == nil) {
-        RETURN(aNameOrNumber);
+	RETURN(aNameOrNumber);
     }
 %}.
 
     ProtocolCache notNil ifTrue:[
-        protocolCode := ProtocolCache at:aNameOrNumber asSymbol 
-                                      ifAbsent:[].
-        protocolCode notNil ifTrue:[
-            ^ protocolCode.
-        ].
+	protocolCode := ProtocolCache at:aNameOrNumber asSymbol 
+				      ifAbsent:[].
+	protocolCode notNil ifTrue:[
+	    ^ protocolCode.
+	].
     ].
 
 %{
@@ -10852,21 +10850,21 @@
     struct protoent *protoent = 0;
 
     if (__isString(aNameOrNumber) || __isSymbol(aNameOrNumber)) {
-        protoent = getprotobyname((char *) __stringVal(aNameOrNumber));
-        if (protoent) {
-            protocolCode = __MKSMALLINT(protoent->p_proto);
-            protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
-        }
+	protoent = getprotobyname((char *) __stringVal(aNameOrNumber));
+	if (protoent) {
+	    protocolCode = __MKSMALLINT(protoent->p_proto);
+	    protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
+	}
     }
 #endif /*NO_SOCKET*/
 %}.
 
     protocolSymbol notNil ifTrue:[
-        ProtocolCache isNil ifTrue:[
-            ProtocolCache := IdentityDictionary new.
-        ].
-        "beware of polluting the protocol cache with aliases"
-        ProtocolCache at:protocolSymbol put:protocolCode.
+	ProtocolCache isNil ifTrue:[
+	    ProtocolCache := IdentityDictionary new.
+	].
+	"beware of polluting the protocol cache with aliases"
+	ProtocolCache at:protocolSymbol put:protocolCode.
     ].
     ^ protocolCode
 
@@ -10883,11 +10881,11 @@
     |protocolSymbol|
 
     ProtocolCache notNil ifTrue:[
-        protocolSymbol := ProtocolCache keyAtIdentityValue:anInteger 
-                                        ifAbsent:[].
-        protocolSymbol notNil ifTrue:[
-            ^ protocolSymbol.
-        ].
+	protocolSymbol := ProtocolCache keyAtIdentityValue:anInteger 
+					ifAbsent:[].
+	protocolSymbol notNil ifTrue:[
+	    ^ protocolSymbol.
+	].
     ].
 
 %{ 
@@ -10895,19 +10893,19 @@
     struct protoent *protoent = 0;
 
     if (__isSmallInteger(anInteger)) {
-        protoent = getprotobynumber(__intVal(anInteger));
-        if (protoent) {
-            protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
-        }
+	protoent = getprotobynumber(__intVal(anInteger));
+	if (protoent) {
+	    protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
+	}
     }
 #endif /*NO_SOCKET*/
 %}.
 
     protocolSymbol notNil ifTrue:[
-        ProtocolCache isNil ifTrue:[
-            ProtocolCache := IdentityDictionary new.
-        ].
-        ProtocolCache at:protocolSymbol put:anInteger.
+	ProtocolCache isNil ifTrue:[
+	    ProtocolCache := IdentityDictionary new.
+	].
+	ProtocolCache at:protocolSymbol put:anInteger.
     ].
     ^ protocolSymbol
 
@@ -10929,23 +10927,23 @@
 
 #ifdef AF_INET
      if (aSymbol == @symbol(inet)) 
-        size = sizeof(struct sockaddr_in);
+	size = sizeof(struct sockaddr_in);
 #endif
 #ifdef AF_INET6      
      else if (aSymbol == @symbol(inet6))
-        size = sizeof(struct sockaddr_in6);
+	size = sizeof(struct sockaddr_in6);
 #endif
 #ifdef AF_UNIX
      else if (aSymbol == @symbol(unix))
-        size = sizeof(struct sockaddr_un);
+	size = sizeof(struct sockaddr_un);
 #endif
 #ifdef AF_APPLETALK
      else if (aSymbol == @symbol(appletalk))
-        size = sizeof(struct sockaddr_at);
+	size = sizeof(struct sockaddr_at);
 #endif
 
      if (size > 0)
-         socketSize = __MKSMALLINT(size);
+	 socketSize = __MKSMALLINT(size);
 %}.
     ^ socketSize
 !
@@ -10958,23 +10956,23 @@
      int code = -1;
 
      if (__isSmallInteger(aSymbolOrInteger) || aSymbolOrInteger == nil) {
-        RETURN(aSymbolOrInteger);
+	RETURN(aSymbolOrInteger);
      }
 #ifdef SOCK_STREAM
      else if (aSymbolOrInteger == @symbol(stream)) 
-        code = SOCK_STREAM;
+	code = SOCK_STREAM;
 #endif
 #ifdef SOCK_DGRAM
      if (aSymbolOrInteger == @symbol(datagram)) 
-        code = SOCK_DGRAM;
+	code = SOCK_DGRAM;
 #endif
 #ifdef SOCK_RAW
      if (aSymbolOrInteger == @symbol(raw)) 
-        code = SOCK_RAW;
+	code = SOCK_RAW;
 #endif
 
      if (code > 0)
-         typeCode = __MKSMALLINT(code);
+	 typeCode = __MKSMALLINT(code);
 %}.
 
     ^ typeCode.
@@ -10993,23 +10991,23 @@
 %{ /*NOCONTEXT*/            
 
     if (__isSmallInteger(anInteger)) {
-        switch(__intVal(anInteger)) {
+	switch(__intVal(anInteger)) {
 #ifdef SOCK_STREAM
-        case SOCK_STREAM:
-            socketTypeSymbol = @symbol(stream);
-            break;
+	case SOCK_STREAM:
+	    socketTypeSymbol = @symbol(stream);
+	    break;
 #endif
 #ifdef SOCK_DGRAM
-        case SOCK_DGRAM:
-            socketTypeSymbol = @symbol(datagram);
-            break;
+	case SOCK_DGRAM:
+	    socketTypeSymbol = @symbol(datagram);
+	    break;
 #endif
 #ifdef SOCK_RAW
-        case SOCK_RAW:
-            socketTypeSymbol = @symbol(raw);
-            break;
-#endif
-        }
+	case SOCK_RAW:
+	    socketTypeSymbol = @symbol(raw);
+	    break;
+#endif
+	}
     }
 %}.
 
@@ -11204,46 +11202,46 @@
     int alen;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (peerOrNil != nil && 
-        (!__isNonNilObject(peerOrNil) ||
-         (__intVal(__ClassInstPtr(__qClass(peerOrNil))->c_flags) & ARRAYMASK) != BYTEARRAY)) {
-        error = @symbol(badArgument2);
-        goto err;
+	(!__isNonNilObject(peerOrNil) ||
+	 (__intVal(__ClassInstPtr(__qClass(peerOrNil))->c_flags) & ARRAYMASK) != BYTEARRAY)) {
+	error = @symbol(badArgument2);
+	goto err;
     }
 
     sock = __smallIntegerVal(__INST(fd));
 
 again:
     if (peerOrNil == nil) {
-        alen = 0;
-        sap = 0;
+	alen = 0;
+	sap = 0;
     } else {
-        alen =  __byteArraySize(peerOrNil);
-        sap = (struct sockaddr *)__byteArrayVal(peerOrNil);
+	alen =  __byteArraySize(peerOrNil);
+	sap = (struct sockaddr *)__byteArrayVal(peerOrNil);
     }
     newSock = accept(sock, sap, &alen);
     if (newSock < 0) {
-        switch (errno) {
-        case EINTR:
-            __HANDLE_INTERRUPTS__;
-            goto again;
+	switch (errno) {
+	case EINTR:
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
 
 #ifdef EWOULDBLOCK
-        case EWOULDBLOCK:
+	case EWOULDBLOCK:
 #else
 #if defined(EAGAIN)
-        case EAGAIN:
-#endif
-#endif
-            RETURN(nil);
-
-        default:
-            error = __mkSmallInteger(errno);
-            goto err;
-        }
+	case EAGAIN:
+#endif
+#endif
+	    RETURN(nil);
+
+	default:
+	    error = __mkSmallInteger(errno);
+	    goto err;
+	}
     }
     newFd = __mkSmallInteger(newSock);
 
@@ -11251,9 +11249,9 @@
 #endif /* not NO_SOCKET */
 %}.
     error notNil ifTrue:[
-        self error:error.
+	self error:error.
     ] ifFalse:[
-        ^ self class for:newFd
+	^ self class for:newFd
     ]
 ! !
 
@@ -11272,13 +11270,13 @@
     int ret;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isNonNilObject(socketAddress) ||
-        (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
-        error = @symbol(badArgument1);
-        goto err;
+	(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
+	error = @symbol(badArgument1);
+	goto err;
     }
     sockaddr_size = __byteArraySize(socketAddress);
     sock = __smallIntegerVal(__INST(fd));
@@ -11286,26 +11284,26 @@
 again:
     ret = bind(sock, (struct sockaddr *)__byteArrayVal(socketAddress), sockaddr_size);
     if (ret < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __mkSmallInteger(errno);
-            goto err;
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __mkSmallInteger(errno);
+	    goto err;
+	}
     }
 
     err:;
 #endif /* NO_SOCKET */
 %}.
     error notNil ifTrue:[
-        self error:error.
+	self error:error.
     ].
 
     "
      (Socket domain:#inet type:#stream)
-         bindTo:(IPSocketAddress hostAddress:IPSocketAddress anyAddress port:9999)
-         reuseAddress:false ;
+	 bindTo:(IPSocketAddress hostAddress:IPSocketAddress anyAddress port:9999)
+	 reuseAddress:false ;
      yourself
     "
 ! !
@@ -11324,8 +11322,8 @@
     struct sockaddr sockaddr = { AF_UNSPEC };
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     sock = __smallIntegerVal(__INST(fd));
 
@@ -11340,13 +11338,13 @@
 # ifdef EAGAIN
        case EAGAIN:
 # endif
-            __HANDLE_INTERRUPTS__;
-            goto again;
-
-        default:
-            error = __MKSMALLINT(errno);
-            break;
-        }
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+
+	default:
+	    error = __MKSMALLINT(errno);
+	    break;
+	}
     }
 
 err:;
@@ -11369,13 +11367,13 @@
     int sockaddr_size;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isNonNilObject(socketAddress) ||
-        (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
-        error = @symbol(badArgument1);
-        goto err;
+	(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
+	error = @symbol(badArgument1);
+	goto err;
     }
     sock = __smallIntegerVal(__INST(fd));
     sockaddr_size = __qSize(socketAddress);
@@ -11383,7 +11381,7 @@
 again:
     ret = connect(sock, (struct sockaddr *)__byteArrayVal(socketAddress), sockaddr_size);
     if (ret >= 0) {
-        RETURN(true)
+	RETURN(true)
     }
 
     switch(errno) {
@@ -11391,8 +11389,8 @@
 # ifdef EAGAIN
     case EAGAIN:
 # endif
-        __HANDLE_INTERRUPTS__;
-        goto again;
+	__HANDLE_INTERRUPTS__;
+	goto again;
 
 #if defined(EINPROGRESS) || defined(EALREADY)
 # ifdef EINPROGRESS
@@ -11401,29 +11399,29 @@
 # ifdef EALREADY
     case EALREADY:
 # endif
-        RETURN(false);
+	RETURN(false);
 #endif
 
     default:
-        error = __MKSMALLINT(errno);
-        break;
+	error = __MKSMALLINT(errno);
+	break;
     }
 
 err:;
 #endif /* NO_SOCKET */
 %}.
     error notNil ifTrue:[
-        self error:error.
-        ^ self
+	self error:error.
+	^ self
     ].
 
     "
      Socket newTCP connectTo:(IPSocketAddress hostAddress:IPSocketAddress local port:7)
-                   withTimeout:nil.
+		   withTimeout:nil.
      Socket newTCP connectTo:(IPSocketAddress hostAddress:IPSocketAddress local port:5768)
-                   withTimeout:nil.
+		   withTimeout:nil.
      Socket newTCP connectTo:(IPSocketAddress hostAddress:#[1 2 3 4] port:7)
-                   withTimeout:nil.
+		   withTimeout:nil.
     "
 ! !
 
@@ -11453,46 +11451,46 @@
     int __flags, __startIndex, __nBytes;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isSmallInteger(startIndex) ||
-        (__startIndex = __intVal(startIndex)-1) < 0) {
-        if (startIndex == nil) {
-            __startIndex = 0;
-        } else {
-            error = @symbol(badArgument3);
-            goto err;
-        }
+	(__startIndex = __intVal(startIndex)-1) < 0) {
+	if (startIndex == nil) {
+	    __startIndex = 0;
+	} else {
+	    error = @symbol(badArgument3);
+	    goto err;
+	}
     }
     if (__isSmallInteger(nBytes)) {
-        __nBytes = __intVal(nBytes);
+	__nBytes = __intVal(nBytes);
     } else if (nBytes == nil) {
-        __nBytes = -1;
+	__nBytes = -1;
     } else {
-        error = @symbol(badArgument4);
-        goto err;
+	error = @symbol(badArgument4);
+	goto err;
     }
     if (!__isInteger(flags)) {
-        error = @symbol(badArgument5);
-        goto err;
+	error = @symbol(badArgument5);
+	goto err;
     }
     __flags = __longIntVal(flags);
     sock = __smallIntegerVal(__INST(fd));
 
     oClass = __Class(aDataBuffer);
     switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-        case BYTEARRAY:
-        case WORDARRAY:
-        case SWORDARRAY:
-        case LONGARRAY:
-        case SLONGARRAY:
-        case FLOATARRAY:
-        case DOUBLEARRAY:
-            break;
-        default:
-            error = @symbol(badArgument2);
-            goto err;
+	case BYTEARRAY:
+	case WORDARRAY:
+	case SWORDARRAY:
+	case LONGARRAY:
+	case SLONGARRAY:
+	case FLOATARRAY:
+	case DOUBLEARRAY:
+	    break;
+	default:
+	    error = @symbol(badArgument2);
+	    goto err;
     }
 
     nInstVars = __intVal(_ClassInstPtr(oClass)->c_ninstvars);
@@ -11502,35 +11500,35 @@
     objSize -= __startIndex;
 
     if (__nBytes >= 0 &&__nBytes < objSize) {
-        objSize = __nBytes;
+	objSize = __nBytes;
     }
 
     if (socketAddress == nil) {
-        alen0 = 0;
+	alen0 = 0;
     } else {
-        if (!__isNonNilObject(socketAddress) ||
-            (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
-            error = @symbol(badArgument1);
-            goto err;
-        }
-        alen0 = __byteArraySize(socketAddress);
+	if (!__isNonNilObject(socketAddress) ||
+	    (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
+	    error = @symbol(badArgument1);
+	    goto err;
+	}
+	alen0 = __byteArraySize(socketAddress);
     }
     saPtr = (struct sockaddr *)0;
 
 again:
     alen = alen0;
     if (alen)
-        saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
+	saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
     cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
     n = recvfrom(sock, cp, objSize, __flags, saPtr, &alen);
     if (n < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __MKSMALLINT(errno);
-            goto err;
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __MKSMALLINT(errno);
+	    goto err;
+	}
     }
     RETURN (__mkSmallInteger(n));
 #endif
@@ -11561,64 +11559,64 @@
     int offs, __startIndex, __maxBytes;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isSmallInteger(startIndex) ||
-        (__startIndex = __intVal(startIndex)-1) < 0) {
-        if (startIndex == nil) {
-            __startIndex = 0;
-        } else {
-            error = @symbol(badArgument3);
-            goto err;
-        }
+	(__startIndex = __intVal(startIndex)-1) < 0) {
+	if (startIndex == nil) {
+	    __startIndex = 0;
+	} else {
+	    error = @symbol(badArgument3);
+	    goto err;
+	}
     }
     if (__isSmallInteger(maxBytes)) {
-        __maxBytes = __intVal(maxBytes);
+	__maxBytes = __intVal(maxBytes);
     } else if (maxBytes == nil) {
-        __maxBytes = -1;
+	__maxBytes = -1;
     } else {
-        error = @symbol(badArgument4);
-        goto err;
+	error = @symbol(badArgument4);
+	goto err;
     }
     if (!__isInteger(flags)) {
-        error = @symbol(badArgument5);
-        goto err;
+	error = @symbol(badArgument5);
+	goto err;
     }
     __flags = __longIntVal(flags);
     sock = __smallIntegerVal(__INST(fd));
 
     oClass = __Class(aDataBuffer);
     switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-        case BYTEARRAY:
-            offs = __startIndex;
-            break;
-        case WORDARRAY:
-        case SWORDARRAY:
-            offs = __startIndex * 2;
-            break;
-        case LONGARRAY:
-        case SLONGARRAY:
-            offs = __startIndex * 4;
-            break;
-        case LONGLONGARRAY:
-        case SLONGLONGARRAY:
-            offs = __startIndex * 8;
+	case BYTEARRAY:
+	    offs = __startIndex;
+	    break;
+	case WORDARRAY:
+	case SWORDARRAY:
+	    offs = __startIndex * 2;
+	    break;
+	case LONGARRAY:
+	case SLONGARRAY:
+	    offs = __startIndex * 4;
+	    break;
+	case LONGLONGARRAY:
+	case SLONGLONGARRAY:
+	    offs = __startIndex * 8;
 # ifdef __NEED_LONGLONG_ALIGN
-            offs += 4;
-# endif
-        case FLOATARRAY:
-            offs = __startIndex * sizeof(float);
-            break;
-        case DOUBLEARRAY:
-            offs = __startIndex * sizeof(double);
+	    offs += 4;
+# endif
+	case FLOATARRAY:
+	    offs = __startIndex * sizeof(float);
+	    break;
+	case DOUBLEARRAY:
+	    offs = __startIndex * sizeof(double);
 # ifdef __NEED_DOUBLE_ALIGN
-            offs += 4;
-# endif
-            break;
-        default:
-            error = @symbol(badArgument2);
-            goto err;
+	    offs += 4;
+# endif
+	    break;
+	default:
+	    error = @symbol(badArgument2);
+	    goto err;
     }
 
     nInstVars = __smallIntegerVal(_ClassInstPtr(oClass)->c_ninstvars);
@@ -11627,35 +11625,35 @@
 
     if (__maxBytes >= 0 && __maxBytes < objSize) {
 # ifdef DGRAM_DEBUG
-        printf("cut off ...\n");
-# endif
-        objSize = __maxBytes;
+	printf("cut off ...\n");
+# endif
+	objSize = __maxBytes;
     }
 
     if (socketAddress == nil) {
-        alen = 0;
+	alen = 0;
     } else {
-        if (! __isByteArray(socketAddress)) {
-            error = @symbol(badArgument1);
-            goto err;
-        }
-        alen = __byteArraySize(socketAddress);
+	if (! __isByteArray(socketAddress)) {
+	    error = @symbol(badArgument1);
+	    goto err;
+	}
+	alen = __byteArraySize(socketAddress);
     }
     saPtr = (struct sockaddr *)0;
 
 again:
     if (alen)
-        saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
+	saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
     cp = (char *)__InstPtr(aDataBuffer) + nInstBytes + offs;
     n = sendto(sock, cp, objSize, __flags, saPtr, alen);
     if (n < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __MKSMALLINT(errno);
-            goto err;
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __MKSMALLINT(errno);
+	    goto err;
+	}
     }
     RETURN (__mkSmallInteger(n));
 #endif
@@ -11677,7 +11675,7 @@
 
     domainCode := self class domainCodeOf:domainArg.
     protocolArg notNil ifTrue:[
-        protocolNumber := self class protocolCodeOf:protocolArg
+	protocolNumber := self class protocolCodeOf:protocolArg
     ].
 
 %{
@@ -11686,23 +11684,23 @@
     int on = 1;
 
     if (__INST(fd) != nil) {
-        error = @symbol(internalError);
-        goto err;
+	error = @symbol(internalError);
+	goto err;
     }
     if (! __isSmallInteger(domainCode)) { 
-        error = @symbol(badArgument1);
-        goto err;
+	error = @symbol(badArgument1);
+	goto err;
     }
     if (! __isSymbol(typeArg)) { 
-        error = @symbol(badArgument2);
-        goto err;
+	error = @symbol(badArgument2);
+	goto err;
     }
     if (protocolNumber != nil) {
-        if (!__isSmallInteger(protocolNumber)) {
-            error = @symbol(badArgument3);
-            goto err;
-        }
-        proto = __smallIntegerVal(protocolNumber);
+	if (!__isSmallInteger(protocolNumber)) {
+	    error = @symbol(badArgument3);
+	    goto err;
+	}
+	proto = __smallIntegerVal(protocolNumber);
     }
     dom = __smallIntegerVal(domainCode);    
 
@@ -11712,46 +11710,46 @@
 
 #ifdef SOCK_STREAM
     if (typeArg == @symbol(stream)) {
-        typ = SOCK_STREAM;
+	typ = SOCK_STREAM;
     } else
 #endif
 #ifdef SOCK_DGRAM
     if (typeArg == @symbol(datagram)) {
-        typ = SOCK_DGRAM;
+	typ = SOCK_DGRAM;
     } else 
 #endif
 #ifdef SOCK_RAW
     if (typeArg == @symbol(raw))
-        typ = SOCK_RAW;
+	typ = SOCK_RAW;
     else
 #endif
 #ifdef SOCK_SEQPACKET
     if (typeArg == @symbol(seqPacket))
-        typ = SOCK_SEQPACKET;
+	typ = SOCK_SEQPACKET;
     else
 #endif
     {
-        error = @symbol(badArgument2);
-        goto err;
+	error = @symbol(badArgument2);
+	goto err;
     }
 
 againSocket:
     sock = socket(dom, typ, proto);
     if (sock < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto againSocket;
-        } else 
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto againSocket;
+	} else 
 #if defined(EPROTONOSUPPORT) /* for SGI */
-        if (errno == EPROTONOSUPPORT && proto != 0) {
-            proto = 0;
-            goto againSocket;
-        } else
-#endif
-        {
-            error = __mkSmallInteger(errno);
-            goto err;
-        }
+	if (errno == EPROTONOSUPPORT && proto != 0) {
+	    proto = 0;
+	    goto againSocket;
+	} else
+#endif
+	{
+	    error = __mkSmallInteger(errno);
+	    goto err;
+	}
     }
     __INST(fd) = __mkSmallInteger(sock);
 
@@ -11761,7 +11759,7 @@
 #endif
 %}.
     error notNil ifTrue:[
-        ^ self error:error.
+	^ self error:error.
     ].
     self register.
 
@@ -11787,23 +11785,23 @@
     char *p;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__bothSmallInteger(level, name)) {
-        error = @symbol(badArgument);
-        goto err;
+	error = @symbol(badArgument);
+	goto err;
     }
     if (!__isByteArray(bytes)) {
-        error = @symbol(internalError);
-        goto err;
+	error = @symbol(internalError);
+	goto err;
     }
     p = __byteArrayVal(bytes);
     sz = __byteArraySize(bytes);
 
     sock = __smallIntegerVal(__INST(fd));
     if (getsockopt(sock, __smallIntegerVal(level), __smallIntegerVal(name), p, &sz) < 0) {
-        error = __mkSmallInteger(errno);
+	error = __mkSmallInteger(errno);
     }
     size = __mkSmallInteger(sz);
 
@@ -11811,7 +11809,7 @@
 #endif
 %}.
     error notNil ifTrue:[
-        ^ self error:error
+	^ self error:error
     ].
     ^ bytes copyTo:size
 !
@@ -11828,12 +11826,12 @@
     int sock, ret;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isSmallInteger(aNumber)) {
-        error = @symbol(badArgument1);
-        goto err;
+	error = @symbol(badArgument1);
+	goto err;
     }
 
     sock = __smallIntegerVal(__INST(fd));
@@ -11841,19 +11839,19 @@
 again:
     ret = listen(sock, __smallIntegerVal(aNumber));
     if (ret < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __mkSmallInteger(errno);
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __mkSmallInteger(errno);
+	}
     }
 
 err:;
 #endif
 %}.
     error notNil ifTrue:[
-        self error:error.
+	self error:error.
     ].
 !
 
@@ -11870,34 +11868,34 @@
     char *p;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__bothSmallInteger(level, name)) {
-        error = @symbol(badArgument);
-        goto err;
+	error = @symbol(badArgument);
+	goto err;
     }
     if (__isSmallInteger(value)) {
-        intval = __intVal(value);
-        p = (char *) &intval;
-        sz = sizeof(intval);
+	intval = __intVal(value);
+	p = (char *) &intval;
+	sz = sizeof(intval);
     } else if (__isByteArray(value)) {
-        p = __byteArrayVal(value);
-        sz = __byteArraySize(value);
+	p = __byteArrayVal(value);
+	sz = __byteArraySize(value);
     } else {
-        error = @symbol(badArgument3);
-        goto err;
+	error = @symbol(badArgument3);
+	goto err;
     }
 
     sock = __smallIntegerVal(__INST(fd));
     if (setsockopt(sock, __smallIntegerVal(level), __smallIntegerVal(name), p, sz) < 0) {
-        error = __mkSmallInteger(errno);
+	error = __mkSmallInteger(errno);
     }
 err:;
 #endif
 %}.
     error notNil ifTrue:[
-        ^ self error:error
+	^ self error:error
     ]
 !
 
@@ -11906,9 +11904,9 @@
      anInteger == 0   no reads will be performed
      anInteger == 1   no writes will be performed
      anInteger == 2   neither reads nor writes will be performed.
-                      Pending data is discarded. This is faster tha 
-                      close, which may wait until pending (written)
-                      data has been read by the other side"
+		      Pending data is discarded. This is faster tha 
+		      close, which may wait until pending (written)
+		      data has been read by the other side"
 
     |error|
 
@@ -11917,30 +11915,30 @@
     int ret;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isSmallInteger(anInteger)) {
-        error = @symbol(badArgument1);
-        goto err;
+	error = @symbol(badArgument1);
+	goto err;
     }
 
 again:
     ret = shutdown(__smallIntegerVal(__INST(fd)), __smallIntegerVal(anInteger));
     if (ret < 0) {
-        if (errno == EINTR) {
-            __HANDLE_INTERRUPTS__;
-            goto again;
-        } else {
-            error = __mkSmallInteger(errno);
-        }
+	if (errno == EINTR) {
+	    __HANDLE_INTERRUPTS__;
+	    goto again;
+	} else {
+	    error = __mkSmallInteger(errno);
+	}
     }
 
 err:;
 #endif /*NO_SOCKET*/
 %}.
     error notNil ifTrue:[
-        self error:error
+	self error:error
     ]
 ! !
 
@@ -11959,26 +11957,26 @@
     int ret;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isNonNilObject(socketAddress) ||
-        (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
-        error = @symbol(badArgument1);
-        goto err;
+	(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
+	error = @symbol(badArgument1);
+	goto err;
     }
     sockaddr_size = __byteArraySize(socketAddress);
 
     sock = __smallIntegerVal(__INST(fd));
     ret = getsockname(sock, (struct sockaddr *)__byteArrayVal(socketAddress), &sockaddr_size);
     if (ret < 0) {
-        error = __MKSMALLINT(errno);
+	error = __MKSMALLINT(errno);
     }
 err:;
 #endif /* NO_SOCKET */
 %}.
     error notNil ifTrue:[
-        ^ self error:error
+	^ self error:error
     ].
     ^ socketAddress
 !
@@ -11996,26 +11994,26 @@
     int ret;
 
     if (!__isSmallInteger(__INST(fd))) {
-        error = @symbol(badFd);
-        goto err;
+	error = @symbol(badFd);
+	goto err;
     }
     if (!__isNonNilObject(socketAddress) ||
-        (__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
-        error = @symbol(badArgument1);
-        goto err;
+	(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_flags) & ARRAYMASK) != BYTEARRAY) {
+	error = @symbol(badArgument1);
+	goto err;
     }
     sockaddr_size = __byteArraySize(socketAddress);
 
     sock = __smallIntegerVal(__INST(fd));
     ret = getpeername(sock, (struct sockaddr *)__byteArrayVal(socketAddress), &sockaddr_size);
     if (ret < 0) {
-        error = __mkSmallInteger(errno);
+	error = __mkSmallInteger(errno);
     }
 err:;
 #endif /* NO_SOCKET */
 %}.
     error notNil ifTrue:[
-        ^ self error:error
+	^ self error:error
     ].
     ^ socketAddress
 ! !
@@ -12023,6 +12021,6 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.118 2002-03-15 09:34:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.119 2002-04-11 09:44:08 cg Exp $'
 ! !
 UnixOperatingSystem initialize!