--- a/UnixOperatingSystem.st Tue Mar 30 20:58:40 2004 +0200
+++ b/UnixOperatingSystem.st Wed Mar 31 11:56:38 2004 +0200
@@ -127,7 +127,7 @@
* already block against multiple inclusion, some
* do not. Therefore, this is done here again.
* (it does not hurt)
- */
+ */
#ifdef WANT_REALPATH
@@ -315,8 +315,8 @@
# include <sys/timeb.h>
# endif
-/*
- * posix systems should define these ...
+/*
+ * posix systems should define these ...
* but on some (older) systems, they are not.
*/
# ifndef S_IXUSR
@@ -453,7 +453,7 @@
* some (old ?) systems do not define this ...
*/
#if !defined(R_OK) && !defined(_AIX)
-# define R_OK 4 /* Test for Read permission */
+# define R_OK 4 /* Test for Read permission */
# define W_OK 2 /* Test for Write permission */
# define X_OK 1 /* Test for eXecute permission */
# define F_OK 0 /* Test for existence of File */
@@ -503,7 +503,7 @@
# define TIMEZONE(tmPtr) ((tmPtr)->tm_isdst == 0 ? timezone : timezone-3600)
# endif /*!HAS_ALTZONE*/
# endif
-#endif
+#endif
#ifndef CONST
# ifdef __GNUC__
# define CONST const
@@ -560,8 +560,8 @@
%{
/*
- * some systems' system() is broken in that it does not correctly
- * handle EINTR and returns failure even though it actually succeeded.
+ * some systems' system() is broken in that it does not correctly
+ * handle EINTR and returns failure even though it actually succeeded.
* (LINUX is one of them)
* Here is a fixed version. If you encounter EINTR returns from
* UnixOperatingSystem>>executeCommand, you ought to define WANT_SYSTEM
@@ -794,7 +794,7 @@
#else
new_path = getwd(new_path);
#endif
- if (new_path == NULL)
+ if (new_path == NULL)
return(NULL);
new_path += strlen(new_path);
@@ -909,7 +909,7 @@
"
this class realizes access to most (all ?) required operating system services;
some of it is very specific for unix, so do not depend on
- things available here in your applications
+ things available here in your applications
- some may not be found in other OS's or be slightly different ...
(On the other hand: I do not want to hide all features
@@ -943,7 +943,7 @@
"
various queries
[exBegin]
- Transcript
+ Transcript
showCR:'hello ' , (OperatingSystem getLoginName)
[exEnd]
@@ -956,19 +956,19 @@
[exEnd]
[exBegin]
- Transcript
+ Transcript
showCR:'this machine is called ' , OperatingSystem getHostName
[exEnd]
[exBegin]
- Transcript
+ Transcript
showCR:('this machine is in the '
, OperatingSystem getDomainName
, ' domain')
[exEnd]
[exBegin]
- Transcript
+ Transcript
showCR:('this machine''s CPU is a '
, OperatingSystem getCPUType
)
@@ -980,7 +980,7 @@
Transcript showCR:'... done.'.
[exEnd]
- locking a file
+ locking a file
(should be executed on two running smalltalks - not in two threads):
[exBegin]
|f|
@@ -990,7 +990,7 @@
10 timesRepeat:[
'about to lock ...' printCR.
[
- OperatingSystem
+ OperatingSystem
lockFD:(f fileDescriptor)
shared:false
blocking:false
@@ -1001,7 +1001,7 @@
'LOCKED ...' printCR.
Delay waitForSeconds:10.
'unlock ...' printCR.
- (OperatingSystem
+ (OperatingSystem
unlockFD:(f fileDescriptor)) printCR.
Delay waitForSeconds:3.
]
@@ -1535,7 +1535,7 @@
signalNamed:signalName
"return the signal number for a named signal (must be a symbol)
Return 0 if that signal is not supported by the OS
- (NOTICE: the numeric value is not the same across unix-systems,
+ (NOTICE: the numeric value is not the same across unix-systems,
therefore do not remember or hardcode those numbers in the application)"
%{ /* NOCONTEXT */
@@ -1793,7 +1793,7 @@
!
errorHolderForNumber:errNr
- "return an osErrorHolder for the given error number (as returned by a system call)."
+ "return an osErrorHolder for the given error number (as returned by a system call)."
|sym typ holder|
@@ -1807,513 +1807,513 @@
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 EOVERFLOW
- case EOVERFLOW:
- sym = @symbol(EOVERFLOW);
- typ = @symbol(rangeErrorSignal);
- break;
+ case EOVERFLOW:
+ sym = @symbol(EOVERFLOW);
+ typ = @symbol(rangeErrorSignal);
+ 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;
+ case EHOSTUNREACH:
+ sym = @symbol(EHOSTUNREACH);
+ typ = @symbol(peerFaultSignal);
+ break;
#endif
#ifdef EDQUOT
- case EDQUOT:
- sym = @symbol(EDQUOT);
- typ = @symbol(noResourcesSignal);
- break;
+ case EDQUOT:
+ sym = @symbol(EDQUOT);
+ typ = @symbol(noResourcesSignal);
+ break;
#endif
#ifdef ENOMEDIUM
- case ENOMEDIUM:
- sym = @symbol(ENOMEDIUM);
- typ = @symbol(noResourcesSignal);
- break;
+ case ENOMEDIUM:
+ sym = @symbol(ENOMEDIUM);
+ typ = @symbol(noResourcesSignal);
+ break;
#endif
#ifdef EMEDIUMTYPE
- case EMEDIUMTYPE:
- sym = @symbol(EMEDIUMTYPE);
- typ = @symbol(noResourcesSignal);
- break;
-#endif
-
- default:
- break;
- }
+ case EMEDIUMTYPE:
+ sym = @symbol(EMEDIUMTYPE);
+ typ = @symbol(noResourcesSignal);
+ break;
+#endif
+
+ default:
+ break;
+ }
}
%}.
holder := OSErrorHolder new.
@@ -2321,8 +2321,8 @@
^ holder
"
- OperatingSystem errorHolderForNumber:4
- self errorHolderForNumber:(self errorNumberFor:#EPERM)
+ OperatingSystem errorHolderForNumber:4
+ self errorHolderForNumber:(self errorNumberFor:#EPERM)
self errorHolderForNumber:(self errorNumberFor:#EIO)
self errorHolderForNumber:(self errorNumberFor:#ENXIO)
self errorHolderForNumber:(self errorNumberFor:#EOVERFLOW)
@@ -2342,229 +2342,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
@@ -2573,13 +2573,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
@@ -2588,25 +2588,25 @@
*/
#ifdef EWOULDBLOCK
if (sym == @symbol(EWOULDBLOCK)) {
- RETURN ( __MKSMALLINT(EWOULDBLOCK) );
+ RETURN ( __MKSMALLINT(EWOULDBLOCK) );
}
#endif
#ifdef EOVERFLOW
if (sym == @symbol(EOVERFLOW)) {
- RETURN ( __MKSMALLINT(EOVERFLOW) );
+ RETURN ( __MKSMALLINT(EOVERFLOW) );
}
#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
@@ -2615,31 +2615,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
@@ -2648,13 +2648,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
@@ -2663,178 +2663,178 @@
*/
#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
#ifdef EREMOTEIO
if (sym == @symbol(EREMOTEIO)) {
- RETURN ( __MKSMALLINT(EREMOTEIO) );
+ RETURN ( __MKSMALLINT(EREMOTEIO) );
}
#endif
#ifdef EDQUOT
if (sym == @symbol(EDQUOT)) {
- RETURN ( __MKSMALLINT(EDQUOT) );
+ RETURN ( __MKSMALLINT(EDQUOT) );
}
#endif
#ifdef ENOMEDIUM
if (sym == @symbol(ENOMEDIUM)) {
- RETURN ( __MKSMALLINT(ENOMEDIUM) );
+ RETURN ( __MKSMALLINT(ENOMEDIUM) );
}
#endif
#ifdef EMEDIUMTYPE
if (sym == @symbol(EMEDIUMTYPE)) {
- RETURN ( __MKSMALLINT(EMEDIUMTYPE) );
+ RETURN ( __MKSMALLINT(EMEDIUMTYPE) );
}
#endif
@@ -2922,7 +2922,7 @@
# define __isArrayLike __isArray
#endif
- if (__isString(aCommandPath) &&
+ if (__isString(aCommandPath) &&
((argArray == nil) || __isArrayLike(argArray)) &&
((fdArray == nil) || __isArrayLike(fdArray))
) {
@@ -2942,7 +2942,7 @@
argv[i] = NULL;
/*
- * number of new items in environment ..
+ * number of new items in environment ..
*/
nNewEnv = 0;
if ((envArray != nil) && __isArrayLike(envArray)) {
@@ -2953,7 +2953,7 @@
_nEnv = environ;
} else {
_env = environ;
- /*
+ /*
* get size of environment
*/
nOldEnv = 0;
@@ -2973,7 +2973,7 @@
* at both ends - that should do it in any case.
* Someone with more know-how may want to fix this.
* getenv() searches for the first entry.
- * But maybe someone creates a Dictionary from the environment.
+ * But maybe someone creates a Dictionary from the environment.
* In this case the last entry would overwrite previous entries.
*/
_nEnv = (char **)malloc(sizeof(char *) * (nNewEnv + nOldEnv + nNewEnv + 1));
@@ -2988,8 +2988,8 @@
int i;
OBJ *t;
- for (i=0, t = __arrayVal(envArray);
- i < __arraySize(envArray);
+ for (i=0, t = __arrayVal(envArray);
+ i < __arraySize(envArray);
i++, t++) {
if (__isString(*t)) {
@@ -3000,9 +3000,9 @@
if (nOldEnv) {
/*
- * append old environment
+ * append old environment
*/
- for (eO = environ; *eO; *eN++ = *eO++)
+ for (eO = environ; *eO; *eN++ = *eO++)
continue;
}
@@ -3106,7 +3106,7 @@
chdir(__stringVal(dirName));
}
execve(__stringVal(aCommandPath), argv, _nEnv);
- /*
+ /*
* reached if command-path cannot be executed
*/
id = -1;
@@ -3172,7 +3172,7 @@
fork
"fork a new (HEAVY-weight) unix process.
Not supported with MSDOS & VMS systems.
- Dont confuse this with Block>>fork, which creates
+ Dont confuse this with Block>>fork, which creates
lightweight smalltalk processes. This method will return
0 to the child process, and a non-zero number (which is the childs
unix-process-id) to the parent (original) process.
@@ -3203,8 +3203,8 @@
"
!
-startProcess:aCommandString inputFrom:anExternalInStream outputTo:anExternalOutStream
- errorTo:anExternalErrStream auxFrom:anAuxiliaryStream
+startProcess:aCommandString inputFrom:anExternalInStream outputTo:anExternalOutStream
+ errorTo:anExternalErrStream auxFrom:anAuxiliaryStream
environment:anEvironmentDictionary inDirectory:dir
"start executing the OS command as specified by the argument, aCommandString
@@ -3223,7 +3223,7 @@
(in := anExternalInStream) isNil ifTrue:[
nullStream := Filename nullDevice readWriteStream.
- in := nullStream.
+ in := nullStream.
].
(out := anExternalOutStream) isNil ifTrue:[
nullStream isNil ifTrue:[nullStream := Filename nullDevice writeStream].
@@ -3272,7 +3272,7 @@
sema := Semaphore new.
pid := OperatingSystem startProcess:'sleep 10; grep drw' inputFrom:in outputTo:out errorTo:err.
- The following will no longer work. monitorPid has disappeared
+ The following will no longer work. monitorPid has disappeared
pid notNil ifTrue:[
Processor monitorPid:pid action:[:OSstatus | sema signal ].
@@ -3389,10 +3389,10 @@
"unix:
- OperatingSystem pathOfCommand:'fooBar'
- OperatingSystem pathOfCommand:'ls'
- OperatingSystem pathOfCommand:'cvs'
- OperatingSystem pathOfCommand:'stx'
+ OperatingSystem pathOfCommand:'fooBar'
+ OperatingSystem pathOfCommand:'ls'
+ OperatingSystem pathOfCommand:'cvs'
+ OperatingSystem pathOfCommand:'stx'
"
"windows:
@@ -3479,7 +3479,7 @@
self primitiveFailed
"
- OperatingSystem createDirectory:'foo'
+ OperatingSystem createDirectory:'foo'
"
"Modified: 20.12.1995 / 11:24:13 / stefan"
@@ -3519,7 +3519,7 @@
"/
"/ bad argument(s) given
"/
- ^ self primitiveFailed
+ ^ self primitiveFailed
"
OperatingSystem linkFile:'foo' to:'bar'
@@ -3553,7 +3553,7 @@
"/
"/ bad argument(s) given
"/
- ^ self primitiveFailed
+ ^ self primitiveFailed
].
"/
@@ -3567,7 +3567,7 @@
!
open:path attributes:attributes mode:modeInteger
- "open a file, return an os specific fileHandle.
+ "open a file, return an os specific fileHandle.
openmode is a symbol defining the way to open
valid modes are:
#O_RDONLY
@@ -3726,7 +3726,7 @@
!
removeDirectory:fullPathName
- "remove the directory named 'fullPathName'.
+ "remove the directory named 'fullPathName'.
The directory must be empty and you must have appropriate access rights.
Return true if successful, false if directory is not empty or no permission.
This is a lowLevel entry - use Filename protocol for compatibility."
@@ -3784,8 +3784,8 @@
!
renameFile:oldPath to:newPath
- "rename the file 'oldPath' to 'newPath'.
- Someone else has to care for the names to be correct and
+ "rename the file 'oldPath' to 'newPath'.
+ Someone else has to care for the names to be correct and
correct for the OS used - therefore, this should not be called
directlt. Instead, use Filename protocol to rename; this cares for
any invalid names.
@@ -3837,58 +3837,58 @@
int ret;
off_t truncateSize;
- if (!__isStringLike(aPathName))
- goto getOutOfHere;
+ if (!__isStringLike(aPathName))
+ goto getOutOfHere;
if (__isSmallInteger(newSize)) {
- truncateSize = __intVal(newSize);
- if (truncateSize < 0) {
- goto getOutOfHere;
- }
+ truncateSize = __intVal(newSize);
+ if (truncateSize < 0) {
+ goto getOutOfHere;
+ }
} else {
- truncateSize = __signedLongIntVal(newSize);
- if (truncateSize < 0) {
- goto getOutOfHere;
- }
- if (truncateSize == 0) {
- if (sizeof(truncateSize) == 8) {
- if (__signedLong64IntVal(newSize, &truncateSize) == 0 || truncateSize < 0) {
- goto getOutOfHere;
- }
- } else {
- goto getOutOfHere;
- }
- }
+ truncateSize = __signedLongIntVal(newSize);
+ if (truncateSize < 0) {
+ goto getOutOfHere;
+ }
+ if (truncateSize == 0) {
+ if (sizeof(truncateSize) == 8) {
+ if (__signedLong64IntVal(newSize, &truncateSize) == 0 || truncateSize < 0) {
+ goto getOutOfHere;
+ }
+ } else {
+ goto getOutOfHere;
+ }
+ }
}
#if defined(HAS_TRUNCATE)
- __BEGIN_INTERRUPTABLE__
- do {
- ret = truncate((char *) __stringVal(aPathName), truncateSize);
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = truncate((char *) __stringVal(aPathName), truncateSize);
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
#else
# ifdef HAS_FTRUNCATE
{
- int fd;
-
- do {
- fd = open((char *) __stringVal(aPathName), 2);
- } while (fd < 0 && errno == EINTR);
- if (fd < 0) {
- @global(LastErrorNumber) = __MKSMALLINT(errno);
- RETURN ( false );
- }
-
- ret = ftruncate(fd, truncateSize);
- close(fd);
+ int fd;
+
+ do {
+ fd = open((char *) __stringVal(aPathName), 2);
+ } while (fd < 0 && errno == EINTR);
+ if (fd < 0) {
+ @global(LastErrorNumber) = __MKSMALLINT(errno);
+ RETURN ( false );
+ }
+
+ ret = ftruncate(fd, truncateSize);
+ close(fd);
}
# endif /* HAS_FTRUNCATE */
#endif
if (ret < 0) {
- @global(LastErrorNumber) = __MKSMALLINT(errno);
- RETURN ( false );
- }
+ @global(LastErrorNumber) = __MKSMALLINT(errno);
+ RETURN ( false );
+ }
RETURN (true);
getOutOfHere:;
#endif
@@ -3899,7 +3899,7 @@
!UnixOperatingSystem class methodsFor:'file access rights'!
accessMaskFor:aSymbol
- "return the access bits mask for numbers as returned by
+ "return the access bits mask for numbers as returned by
OperatingSystem>>accessModeOf:
and expected by OperatingSystem>>changeAccessModeOf:to:.
Since these numbers are OS dependent, always use the mask
@@ -3958,7 +3958,7 @@
accessModeOf:aPathName
"return a number representing access rights rwxrwxrwx for owner,
group and others. Return nil if such a file does not exist.
- Notice that the returned number is OS dependent - use the
+ Notice that the returned number is OS dependent - use the
modeMasks as returned by OperatingSystem>>accessMaskFor:"
"
@@ -3998,7 +3998,7 @@
changeAccessModeOf:aPathName to:modeBits
"change the access rights of aPathName to the OS dependent modeBits.
You should construct this mask using accessMaskFor, to be OS
- independent. Return true if changed,
+ independent. Return true if changed,
false if such a file does not exist or change was not allowd."
%{
@@ -4027,15 +4027,15 @@
(such as returned by ExternalStream>>fileDescriptor).
On some systems, only advisory locks are available -
these depends on other accessors to also perform the locking operation.
- If they do not, they may still access the file
- (on some systems, locks are mandatory, on others, they are advisory).
+ If they do not, they may still access the file
+ (on some systems, locks are mandatory, on others, they are advisory).
The isSharedReadLock argument (if true) specifies if multiple readers
are to be allowed - if false, they are not.
On some systems, all locks are non-exclusive locks.
Returns true, if the lock was aquired, false otherwise.
- Notice, that not all OS's support these locks;
+ Notice, that not all OS's support these locks;
on some, this may simply be a no-op.
Also notice, that some systems block the process, to wait for the lock.
This can (again: on some systems) be avoided by passing a false blockIfLocked
@@ -4047,11 +4047,11 @@
int lockArg;
/*
- * claus: sigh - each one has a different interface ...
+ * claus: sigh - each one has a different interface ...
*/
#if defined(F_SETLK)
{
- /*
+ /*
* new fcntl(SETLK) interface;
* available on SYSV4 and Linux
*/
@@ -4079,7 +4079,7 @@
#else /* no F_SETLK available */
# if defined(LOCK_EX) && defined(LOCK_UN)
- /*
+ /*
* BSD 4.3 advisory locks
*/
lockArg = LOCK_EX;
@@ -4100,7 +4100,7 @@
# else /* no flock available */
# if defined(F_LOCK) && defined(F_UNLOCK)
- /*
+ /*
* SYSV3 advisory locks
*/
if (lockf(fd, F_LOCK, 0) != -1) {
@@ -4189,12 +4189,12 @@
unlockFD:aFileDescriptor
"clear a file lock on the file represented by aFileDescriptor,
which was previously aquired by #lockFD:.
- Return false, if the unlock failed
- (which may happens when a wrong fd is passed,
+ Return false, if the unlock failed
+ (which may happens when a wrong fd is passed,
no lock was set previously, or the systsem does not support locks).
- Notice, that not all OS's support file locks;
+ Notice, that not all OS's support file locks;
on some, this may simply be a no-op."
-
+
%{
if (__isSmallInteger(aFileDescriptor)) {
int fd = __intVal(aFileDescriptor);
@@ -4232,7 +4232,7 @@
# else /* no flock available */
# if defined(F_LOCK) && defined(F_UNLOCK)
- /*
+ /*
* SYSV3 advisory locks
*/
if (lockf(fd, F_UNLOCK, 0) != -1) {
@@ -4250,7 +4250,7 @@
caseSensitiveFilenames
"return true, if the OS has caseSensitive file naming.
- On MSDOS, this will return false;
+ On MSDOS, this will return false;
on a real OS, we return true."
^ true
@@ -4266,7 +4266,7 @@
|names n "{ Class: SmallInteger }" |
- names := pathName
+ names := pathName
asCollectionOfSubstringsSeparatedBy:self fileSeparator.
names := names asOrderedCollection.
"
@@ -4293,25 +4293,25 @@
"
cut off parent-dirs at end
"
- [(n > 2)
+ [(n > 2)
and:[(names endsWith:#('..'))
and:[((names at:(n - 1)) startsWith:'.') not ]]] whileTrue:[
names removeLast; removeLast.
n := n - 2.
].
- ^ names asStringWith:self fileSeparator
+ ^ names asStringWith:self fileSeparator
from:1
to:n
- compressTabs:false final:nil
-
- "
- OperatingSystem compressPath:'./..'
- OperatingSystem compressPath:'/foo/bar/baz/..'
- OperatingSystem compressPath:'foo/bar/baz/..'
- OperatingSystem compressPath:'foo/bar/baz/../'
- OperatingSystem compressPath:'foo/bar/baz/..///'
- OperatingSystem compressPath:'///foo/bar/baz/..///'
+ compressTabs:false final:nil
+
+ "
+ OperatingSystem compressPath:'./..'
+ OperatingSystem compressPath:'/foo/bar/baz/..'
+ OperatingSystem compressPath:'foo/bar/baz/..'
+ OperatingSystem compressPath:'foo/bar/baz/../'
+ OperatingSystem compressPath:'foo/bar/baz/..///'
+ OperatingSystem compressPath:'///foo/bar/baz/..///'
"
"Modified: 1.11.1996 / 20:13:48 / cg"
@@ -4329,7 +4329,7 @@
!
getDiskInfoOf:aDirectoryPath
- "return some disk info.
+ "return some disk info.
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):
@@ -4405,9 +4405,9 @@
!
getDriveList
- "return a list of volumes in the system.
- On unix, no such thing like a volume exists
- - there, a synthetic list with root, home & current is returned.
+ "return a list of volumes in the system.
+ On unix, no such thing like a volume exists
+ - there, a synthetic list with root, home & current is returned.
On MSDOS, a list of drive letters is returned.
On VMS, a list of volumes is returned."
@@ -4415,16 +4415,16 @@
"/ default: return array filled with
"/ root, home and current directories.
"/
- ^ Array
- with:'/'
- with:(self getHomeDirectory)
- with:(Filename currentDirectory pathName)
+ ^ Array
+ with:'/'
+ with:(self getHomeDirectory)
+ with:(Filename currentDirectory pathName)
"Modified: / 5.6.1998 / 18:35:35 / cg"
!
getMountedVolumes
- "return info about mounted volumes.
+ "return info about mounted volumes.
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):
@@ -4484,26 +4484,26 @@
"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.
- Return nil if such a file does not exist.
- For symbolic links (if supported by the OS),
+ Return nil if such a file does not exist.
+ For symbolic links (if supported by the OS),
the info of the pointed-to-file (i.e. the target) is returned;
use #linkInfoOf: to get info about the link itself.
"
@@ -4514,8 +4514,8 @@
int ret;
if (!__isStringLike(aPathName)) {
- error = @symbol(badArgument);
- goto out;
+ error = @symbol(badArgument);
+ goto out;
}
# ifdef TRACE_STAT_CALLS
@@ -4523,76 +4523,76 @@
# endif
__BEGIN_INTERRUPTABLE__
do {
- ret = stat((char *) __stringVal(aPathName), &buf);
+ ret = stat((char *) __stringVal(aPathName), &buf);
} while ((ret < 0) && (errno == EINTR));
__END_INTERRUPTABLE__
if (ret < 0) {
- error = __MKSMALLINT(errno);
- @global(LastErrorNumber) = error;
- goto out;
+ error = __MKSMALLINT(errno);
+ @global(LastErrorNumber) = error;
+ goto out;
}
switch (buf.st_mode & S_IFMT) {
- case S_IFDIR:
- type = @symbol(directory);
- break;
-
- case S_IFREG:
- type = @symbol(regular);
- break;
+ 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;
+ case S_IFIFO:
+ type = @symbol(fifo);
+ break;
+# endif
+ default:
+ type = @symbol(unknown);
+ break;
}
if (sizeof(buf.st_ino) == 8) {
- id = __MKUINT64(&buf.st_ino);
+ id = __MKUINT64(&buf.st_ino);
} else {
- id = __MKUINT(buf.st_ino);
+ id = __MKUINT(buf.st_ino);
}
mode = __MKSMALLINT(buf.st_mode & 0777);
uid = __MKSMALLINT(buf.st_uid);
gid = __MKSMALLINT(buf.st_gid);
nLink = __MKSMALLINT(buf.st_nlink);
if (sizeof(buf.st_size) == 8) {
- size = __MKINT64(&buf.st_size);
+ size = __MKINT64(&buf.st_size);
} else {
- size = __MKINT(buf.st_size);
+ size = __MKINT(buf.st_size);
}
aOStime = __MKUINT(buf.st_atime);
mOStime = __MKUINT(buf.st_mtime);
@@ -4601,28 +4601,28 @@
out:;
%}.
mode notNil ifTrue:[
- "/ now done lazy in FileStatusInfo
- "/ atime := Timestamp fromOSTime:(aOStime * 1000).
- "/ mtime := Timestamp fromOSTime:(mOStime * 1000).
- "/ ctime := Timestamp fromOSTime:(cOStime * 1000).
-
- ^ FileStatusInfo
- type:type
- mode:mode
- uid:uid
- gid:gid
- size:size
- id:id
- accessed:aOStime
- modified:mOStime
- statusChanged:cOStime
- path:nil
- numLinks:nLink.
+ "/ now done lazy in FileStatusInfo
+ "/ atime := Timestamp fromOSTime:(aOStime * 1000).
+ "/ mtime := Timestamp fromOSTime:(mOStime * 1000).
+ "/ ctime := Timestamp fromOSTime:(cOStime * 1000).
+
+ ^ FileStatusInfo
+ type:type
+ mode:mode
+ uid:uid
+ gid:gid
+ size:size
+ id:id
+ accessed:aOStime
+ modified:mOStime
+ statusChanged:cOStime
+ path:nil
+ numLinks:nLink.
].
error notNil ifTrue:[
- ^ nil.
- ].
-
+ ^ nil.
+ ].
+
^ self primitiveFailed
"
@@ -4723,7 +4723,7 @@
"
OperatingSystem isSymbolicLink:'Make.proto'
- OperatingSystem isSymbolicLink:'Makefile'
+ OperatingSystem isSymbolicLink:'Makefile'
"
!
@@ -4737,18 +4737,18 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for isValidPath\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 (false);
- }
- RETURN ( ret ? false : true );
+ printf("stat on '%s' for isValidPath\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 (false);
+ }
+ RETURN ( ret ? false : true );
}
%}.
^ self primitiveFailed
@@ -4784,25 +4784,25 @@
linkInfoOf:aPathName
"return some object filled with info for the file 'aPathName'
- IF aPathName is a symbolic link.
+ IF aPathName is a symbolic link.
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.
@@ -4813,7 +4813,7 @@
Return the info about the link itself,
on contrast to #infoOf:, which returns the info of the pointed to file
in case of a symbolic link."
-
+
|type mode uid gid size id nLink aOStime mOStime cOStime path|
%{ /* STACK: 1200 */
@@ -4823,98 +4823,98 @@
char pathBuffer[1024];
if (__isStringLike(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;
- }
-
- if (sizeof(buf.st_ino) == 8) {
- id = __MKUINT64(&buf.st_ino);
- } else {
- id = __MKUINT(buf.st_ino);
- }
- mode = __MKSMALLINT(buf.st_mode & 0777);
- uid = __MKSMALLINT(buf.st_uid);
- gid = __MKSMALLINT(buf.st_gid);
- nLink = __MKSMALLINT(buf.st_nlink);
- if (sizeof(buf.st_size) == 8) {
- size = __MKINT64(&buf.st_size);
- } else {
- size = __MKINT(buf.st_size);
- }
- aOStime = __MKUINT(buf.st_atime);
- mOStime = __MKUINT(buf.st_mtime);
- cOStime = __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;
+ }
+
+ if (sizeof(buf.st_ino) == 8) {
+ id = __MKUINT64(&buf.st_ino);
+ } else {
+ id = __MKUINT(buf.st_ino);
+ }
+ mode = __MKSMALLINT(buf.st_mode & 0777);
+ uid = __MKSMALLINT(buf.st_uid);
+ gid = __MKSMALLINT(buf.st_gid);
+ nLink = __MKSMALLINT(buf.st_nlink);
+ if (sizeof(buf.st_size) == 8) {
+ size = __MKINT64(&buf.st_size);
+ } else {
+ size = __MKINT(buf.st_size);
+ }
+ aOStime = __MKUINT(buf.st_atime);
+ mOStime = __MKUINT(buf.st_mtime);
+ cOStime = __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:[
- ^ FileStatusInfo
- type:type
- mode:mode
- uid:uid
- gid:gid
- size:size
- id:id
- accessed:aOStime
- modified:mOStime
- statusChanged:cOStime
- path:path
- numLinks:nLink.
+ ^ FileStatusInfo
+ type:type
+ mode:mode
+ uid:uid
+ gid:gid
+ size:size
+ id:id
+ accessed:aOStime
+ modified:mOStime
+ statusChanged:cOStime
+ path:path
+ numLinks:nLink.
].
^ self primitiveFailed
"
- OperatingSystem infoOf:'Make.proto'
- OperatingSystem linkInfoOf:'Make.proto'
-
- OperatingSystem infoOf:'resources/motif.style'
- OperatingSystem linkInfoOf:'resources/motif.style'
+ OperatingSystem infoOf:'Make.proto'
+ OperatingSystem linkInfoOf:'Make.proto'
+
+ OperatingSystem infoOf:'resources/motif.style'
+ OperatingSystem linkInfoOf:'resources/motif.style'
"
!
mountPoints
"return a collection of mountPoints (aka. topDirectories of mounted file systems).
- As this might be expensive on some systems,
+ As this might be expensive on some systems,
the info is cached for some time (5 minutes)"
CacheMountPointsTimeStamp notNil ifTrue:[
- Timestamp now > (CacheMountPointsTimeStamp addSeconds:5*60) ifTrue:[
- CacheMountPointsTimeStamp := CachedMountPoints := nil.
- ].
+ Timestamp now > (CacheMountPointsTimeStamp addSeconds:5*60) ifTrue:[
+ CacheMountPointsTimeStamp := CachedMountPoints := nil.
+ ].
].
CachedMountPoints notNil ifTrue:[ ^ CachedMountPoints ].
'/proc/mounts' asFilename exists ifTrue:[
- CachedMountPoints := self mountPointsFromProcFS.
- CacheMountPointsTimeStamp := Timestamp now.
- ^ CachedMountPoints
+ CachedMountPoints := self mountPointsFromProcFS.
+ CacheMountPointsTimeStamp := Timestamp now.
+ ^ CachedMountPoints
].
"/ TODO: add fallback code for other OS's (i.e. reading /etc/mtab)
- ^ #()
+ ^ #()
"
OperatingSystem mountPoints
@@ -4990,8 +4990,8 @@
OperatingSystem pathNameOf:'../smalltalk/../smalltalk'
OperatingSystem pathNameOf:'../../..'
OperatingSystem pathNameOf:'..'
- OperatingSystem pathNameOf:'/tmp////'
- OperatingSystem pathNameOf:'/foo/bar'
+ OperatingSystem pathNameOf:'/tmp////'
+ OperatingSystem pathNameOf:'/foo/bar'
OperatingSystem pathNameOf:'/foo/bar/'
OperatingSystem pathNameOf:'/foo/bar//'
"
@@ -5088,7 +5088,7 @@
For nonexistent files, nil is returned."
"could be implemented as:
- (self infoOf:aPathName) accessed
+ (self infoOf:aPathName) accessed
"
|osSeconds i|
%{
@@ -5098,18 +5098,18 @@
if (__isString(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for timeOfLastAccess\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);
- }
- osSeconds = __MKUINT(buf.st_atime);
+ printf("stat on '%s' for timeOfLastAccess\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);
+ }
+ osSeconds = __MKUINT(buf.st_atime);
}
%}.
osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
@@ -5124,11 +5124,11 @@
!
timeOfLastChange:aPathName
- "return the time, when the file was last changed.
+ "return the time, when the file was last changed.
For nonexistent files, nil is returned."
"could be implemented as:
- (self infoOf:aPathName) modified
+ (self infoOf:aPathName) modified
"
|osSeconds i|
@@ -5139,18 +5139,18 @@
if (__isString(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for timeOfLastChange\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 );
- }
- osSeconds = __MKUINT(buf.st_mtime);
+ printf("stat on '%s' for timeOfLastChange\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 );
+ }
+ osSeconds = __MKUINT(buf.st_mtime);
}
%}.
osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
@@ -5173,7 +5173,7 @@
"
this could have been implemented as:
- (self infoOf:aPathName) type
+ (self infoOf:aPathName) type
but for huge directory searches the code below is faster
"
@@ -5229,10 +5229,10 @@
^ nil.
"
- OperatingSystem typeOf:'/'
- OperatingSystem typeOf:'.'
- OperatingSystem typeOf:'Make.proto'
- OperatingSystem typeOf:'resources/motif.style'
+ OperatingSystem typeOf:'/'
+ OperatingSystem typeOf:'.'
+ OperatingSystem typeOf:'Make.proto'
+ OperatingSystem typeOf:'resources/motif.style'
"
!
@@ -5359,7 +5359,7 @@
disableTimer
"disable timer interrupts.
- WARNING:
+ WARNING:
the system will not operate correctly with timer interrupts
disabled, because no scheduling or timeouts are possible."
@@ -5389,9 +5389,9 @@
!
enableChildSignalInterrupts
- "enable childSignal interrupts
+ "enable childSignal interrupts
(SIGCHLD, if the architecture supports it).
- After enabling, these signals will send the message
+ After enabling, these signals will send the message
'childSignalInterrupt' to the ChildSignalInterruptHandler object."
self enableSignal:(self sigCHLD)
@@ -5768,7 +5768,7 @@
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;
+ dt.it_value.tv_usec = (millis % 1000) * 1000;
setitimer(ITIMER_REAL, &dt, 0);
RETURN (true);
}
@@ -5859,7 +5859,7 @@
Should be changed to use real profiling timer if available.
On systems, where no virtual timer is available, use the real timer
(which is of course less correct).
- OBSOLETE: the new messageTally runs as a high prio process, not using
+ OBSOLETE: the new messageTally runs as a high prio process, not using
spy interrupts."
%{ /* NOCONTEXT */
@@ -5898,7 +5898,7 @@
stopSpyTimer
"stop spy timing - disable spy timer.
- OBSOLETE: the new messageTally runs as a high prio process, not using
+ OBSOLETE: the new messageTally runs as a high prio process, not using
spy interrupts."
%{ /* NOCONTEXT */
@@ -5952,12 +5952,12 @@
"make a pipe, return array with two filedescriptors on success,
nil on failure.
This is a lowLevel entry, not for public use.
- See NonPositionableExternalStream>>makePTYPair for a more user-friendly,
+ See NonPositionableExternalStream>>makePTYPair for a more user-friendly,
public interface."
- |fdS fdM|
-
-%{
+ |fdS fdM|
+
+%{
/*
* Find a pseudo tty to use and open both sides.
* _fdM receives the master file descriptor while _fdS
@@ -6007,12 +6007,12 @@
if (_fdS < 0) {
(void)close(_fdM);
_fdS = _fdM = -1;
- }
+ }
#if defined(UNIXWARE) || defined(solaris)
else {
/* push terminal modules on stream */
- ioctl(_fdS, I_PUSH, "ptem");
- ioctl(_fdS, I_PUSH, "ldterm");
+ ioctl(_fdS, I_PUSH, "ptem");
+ ioctl(_fdS, I_PUSH, "ldterm");
}
#endif
} else {
@@ -6150,9 +6150,9 @@
This is a lowLevel entry, not for public use.
See ExternalStream>>makePipe for a more user-friendly, public interface."
- |fd1 fd2|
-
-%{
+ |fd1 fd2|
+
+%{
int fds[2];
if (pipe(fds) < 0) {
@@ -6169,14 +6169,14 @@
^ nil
!
-resetTerminalInputOutputModes:fd
+resetTerminalInputOutputModes:fd
"reset the terminal attributes"
%{
struct termios switcher;
printf("setMappingMaster fd:%d\n", __intVal(fd));
if (__isSmallInteger(fd)) {
- if (tcgetattr( __intVal(fd), &switcher) < 0) RETURN (false);
+ if (tcgetattr( __intVal(fd), &switcher) < 0) RETURN (false);
switcher.c_iflag = 0;
switcher.c_oflag = 0;
if (tcsetattr( __intVal(fd), TCSANOW, &switcher) >= 0) {
@@ -6234,7 +6234,7 @@
(words seventh = 'UDP') ifTrue:[
(words last endsWith:'domain') ifTrue:[
fd := Number readFrom:(words fourth copyWithoutLast:1).
-Transcript showCR:line.
+Transcript showCR:line.
OperatingSystem closeFd:fd.
]
]
@@ -6310,7 +6310,7 @@
name := hostName copyFrom:idx+1.
]
]
- ].
+ ].
name isNil ifTrue:[
'UnixOperatingSystem [warning]: cannot find out domainname' errorPrintCR.
name := 'unknown'.
@@ -6337,11 +6337,11 @@
extern char *getenv();
if (__isStringLike(aStringOrSymbol)) {
- env = getenv(__stringVal(aStringOrSymbol));
- if (env) {
- RETURN ( __MKSTRING(env) );
- }
- RETURN ( nil );
+ env = getenv(__stringVal(aStringOrSymbol));
+ if (env) {
+ RETURN ( __MKSTRING(env) );
+ }
+ RETURN ( nil );
}
%}.
^ self primitiveFailed
@@ -6431,9 +6431,9 @@
negativeSignSeparatedBySpaceFromCurrencySymbol <Boolean>
positiveSignPosition <Symbol>
- one of: #parenthesesAround,
- #signPrecedes,
- #signSuceeds,
+ one of: #parenthesesAround,
+ #signPrecedes,
+ #signSuceeds,
#signPrecedesCurrencySymbol,
#signSuceedsCurrencySymbol
@@ -6490,10 +6490,10 @@
negativeSign = conf->negative_sign;
intFractDigits = conf->int_frac_digits;
fractDigits = conf->frac_digits;
- csPosPrecedes = conf->p_cs_precedes;
- csNegPrecedes = conf->n_cs_precedes;
- csPosSepBySpace = conf->p_sep_by_space;
- csNegSepBySpace = conf->n_sep_by_space;
+ csPosPrecedes = conf->p_cs_precedes;
+ csNegPrecedes = conf->n_cs_precedes;
+ csPosSepBySpace = conf->p_sep_by_space;
+ csNegSepBySpace = conf->n_sep_by_space;
csPosSignPosition = conf->p_sign_posn;
csNegSignPosition = conf->n_sign_posn;
}
@@ -6508,10 +6508,10 @@
negativeSign =(char *)0;
intFractDigits = -1;
fractDigits = -1;
- csPosPrecedes = -1;
- csNegPrecedes = -1;
- csPosSepBySpace = -1;
- csNegSepBySpace = -1;
+ csPosPrecedes = -1;
+ csNegPrecedes = -1;
+ csPosSepBySpace = -1;
+ csNegSepBySpace = -1;
csPosSignPosition = -1;
csNegSignPosition = -1;
#endif
@@ -6651,8 +6651,8 @@
!
getNetworkMACAddresses
- "return a dictionary filled with
- key -> name of interface
+ "return a dictionary filled with
+ key -> name of interface
value -> the MAC adress (as ByteArray)
for each interface"
@@ -6667,7 +6667,7 @@
struct ifconf ifc;
struct ifreq *ifr;
struct ifreq ifreq;
- unsigned char buf[1024];
+ unsigned char buf[1024];
int n_ifs, i, countOfIf;
OBJ t;
@@ -6688,7 +6688,7 @@
ifc.ifc_len = sizeof (buf);
ifc.ifc_buf = (caddr_t) buf;
- if (ioctl (afinet_socket, SIOCGIFCONF, (caddr_t) &ifc) < 0) {
+ if (ioctl (afinet_socket, SIOCGIFCONF, (caddr_t) &ifc) < 0) {
close(afinet_socket);
error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
goto bad;
@@ -6717,26 +6717,26 @@
** Get Flags for this interface
*/
- memcpy(&ifreq, ifr, sizeof(ifreq));
+ memcpy(&ifreq, ifr, sizeof(ifreq));
if (ioctl (afinet_socket, SIOCGIFFLAGS, &ifreq) < 0) {
fprintf(stderr, "ioctl(SIOCGIFFLAGS) failed");
} else {
/*
** Get Hardware address for this interface
*/
- memcpy(&ifreq, ifr, sizeof(ifreq));
+ memcpy(&ifreq, ifr, sizeof(ifreq));
if (ioctl (afinet_socket, SIOCGIFHWADDR, &ifreq) >= 0) {
t = __MKBYTEARRAY(&ifreq.ifr_hwaddr.sa_data, IFHWADDRLEN);
__arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
t = __MKSTRING(&ifreq.ifr_ifrn.ifrn_name, IFNAMSIZ);
- __arrayVal(nameArray)[countOfIf] = t; __STORE(addressArray, t);
+ __arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
countOfIf += 1;
}
}
}
noOfIf = __mkSmallInteger(countOfIf);
-bad:
+bad:
if (afinet_socket >= 0)
close(afinet_socket);
#else
@@ -6829,14 +6829,14 @@
"return info on the system weare running on.
If the system supports the uname system call, that info is returned;
otherwise, some simulated info is returned.
-
+
WARNING:
Do not depend on the amount and contents of the returned information, some
systems may return more/less than others. Also, the contents depends on the
OS, for example, linux returns 'ix86', while WIN32 returns 'x86'.
This method is mainly provided to augment error reports with some system
- information.
+ information.
(in case of system/version specific OS errors, conditional workarounds and patches
may be based upon this info).
Also, applications could enable/disable buffering or otherwise reduce
@@ -6845,13 +6845,13 @@
but should NEVER DEPEND upon this in any way.
The returned info may (or may not) contain:
- #system -> some operating system identification (irix, Linux, nt, win32s ...)
+ #system -> some operating system identification (irix, Linux, nt, win32s ...)
#version -> OS version (some os version identification)
#release -> OS release (3.5, 1.2.1 ...)
#node -> some host identification (hostname)
#domain -> domain name (hosts domain)
#machine -> type of CPU (i586, mips ...)
-
+
those are currently returned on some machines (no warranty)
linux:
#totalRam -> total amount of memory available
@@ -6866,7 +6866,7 @@
#physicalRam -> total amount of physical memory
#cpuType -> type of cpu (more detailed than machine)
#numberOfCPUs -> number of cpus in box
-
+
solaris:
#physicalRam -> total amount of physical memory
#availableRam -> total available amount of physical memory (i.e. unused ram)
@@ -6895,7 +6895,7 @@
%{ /* STACK: 4096 */
#ifdef LINUX
# ifdef ELF /* old a.out unixes do not have this ... */
- /*
+ /*
* additional info available ...
*/
struct sysinfo infoBuffer;
@@ -7005,7 +7005,7 @@
# ifdef _SC_NPROCESSORS_ONLN
{
long val;
-
+
val = sysconf(_SC_NPROCESSORS_ONLN);
if (val > 0) {
numberOfCPUs = __MKINT(val);
@@ -7060,7 +7060,7 @@
# if defined(_SC_DCACHE_SZ)
{
long val;
-
+
val = sysconf(_SC_DCACHE_SZ);
if (val != -1) {
dCacheSize = __MKUINT(val);
@@ -7489,7 +7489,7 @@
This is almost the same as getOSType, but the returned string
is slightly different for some systems (i.e. iris vs. irix).
Dont depend on this - use getOSType. I dont really see a point
- here ...
+ here ...
(except for slight differences between next/mach and other machs)"
|sys|
@@ -7555,7 +7555,7 @@
will be added in the future."
%{ /* NOCONTEXT */
-
+
/*
* TODO: new systems provide a query function for this ... use it
*/
@@ -7608,7 +7608,7 @@
RETURN ( __MKSMALLINT(MAXPATHLEN) );
%}
"
- OperatingSystem maxPathLength
+ OperatingSystem maxPathLength
"
!
@@ -7704,7 +7704,7 @@
# if defined(HAS_SYSINFO) && defined(SI_HOSTNAME)
char buffer[256];
int ret;
-
+
if ((ret = sysinfo(SI_HOSTNAME, buffer, sizeof(buffer))) >= 0 && ret <= sizeof(buffer)) {
RETURN (__MKSTRING(buffer));
}
@@ -7712,7 +7712,7 @@
# endif
#endif
%}.
- ^ nil
+ ^ nil
"
OperatingSystem getHostName
@@ -7759,12 +7759,12 @@
^ false
"
- OperatingSystem supportsChildInterrupts
+ OperatingSystem supportsChildInterrupts
"
!
supportsIOInterrupts
- "return true, if the OS supports IO availability interrupts
+ "return true, if the OS supports IO availability interrupts
(i.e. SIGPOLL/SIGIO).
Currently, this mechanism does not work on all
@@ -7793,7 +7793,7 @@
^ false
"
- OperatingSystem supportsIOInterrupts
+ OperatingSystem supportsIOInterrupts
"
!
@@ -7811,7 +7811,7 @@
^ false
"
- OperatingSystem supportsNonBlockingIO
+ OperatingSystem supportsNonBlockingIO
"
!
@@ -7833,7 +7833,7 @@
^ true
"
- OperatingSystem supportsSelect
+ OperatingSystem supportsSelect
"
!
@@ -7854,7 +7854,7 @@
^ false
"
- OperatingSystem supportsSymbolicLinks
+ OperatingSystem supportsSymbolicLinks
"
! !
@@ -7862,7 +7862,7 @@
!UnixOperatingSystem class methodsFor:'path queries'!
defaultSystemPath
- "add additional directories to the systemPath
+ "add additional directories to the systemPath
(but only, if the major version is the same)"
|sysPath majorVersionNr releaseFile s v|
@@ -7920,15 +7920,15 @@
entries := OrderedCollection new.
('/proc/mounts' asFilename) readingLinesDo:[:eachLine |
- |items mountInfo|
-
- items := eachLine asCollectionOfWords.
- mountInfo := (MountInfo new
- mountPointPath:(items at:2)
- deviceOrRemotePath:(items at:1)
- fsType:(items at:3)
- attributeString:(items at:4)).
- entries add:mountInfo
+ |items mountInfo|
+
+ items := eachLine asCollectionOfWords.
+ mountInfo := (MountInfo new
+ mountPointPath:(items at:2)
+ deviceOrRemotePath:(items at:1)
+ fsType:(items at:3)
+ attributeString:(items at:4)).
+ entries add:mountInfo
].
^ entries
@@ -8032,7 +8032,7 @@
^ SocketHandle
!
-socketWithDomain:domainArg type:typeArg protocol:protocolArg
+socketWithDomain:domainArg type:typeArg protocol:protocolArg
"set up socket with domain, type and protocol number.
This is a low level entry; no binding, listening or connect
is done. Both arguments must be symbols from one of
@@ -8082,7 +8082,7 @@
!
computeOSTimeFromUTCYear:y month:m day:d hour:h minute:min second:s millisecond:millis
- "return the OS-dependent time for the given time and day.
+ "return the OS-dependent time for the given time and day.
The arguments are assumed to be in UTC Time"
^ self
@@ -8097,7 +8097,7 @@
!
computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis
- "return the OS-dependent time for the given time and day.
+ "return the OS-dependent time for the given time and day.
The arguments are assumed to be in localtime including
any daylight saving adjustings."
@@ -8109,7 +8109,7 @@
!
computeOSTimeFromYear:y month:m day:d hour:h minute:min seconds:s millis:millis utc:utcBoolean
- "return the OS-dependent time for the given time and day.
+ "return the OS-dependent time for the given time and day.
If utcBoolean is true, the arguments are assumed to be in UTC;
otherwise, in localtime including any daylight saving adjustings."
@@ -8119,7 +8119,7 @@
struct tm tm;
TIME_T t;
- if (__bothSmallInteger(y, m)
+ if (__bothSmallInteger(y, m)
&& __bothSmallInteger(d, h)
&& __bothSmallInteger(min, s)) {
tm.tm_hour = __intVal(h);
@@ -8140,17 +8140,17 @@
%}.
osSeconds notNil ifTrue:[
^ osSeconds * 1000 + millis
- ].
+ ].
^ self primitiveFailed
"
- OperatingSystem computeOSTimeFromYear:1970 month:1 day:1 hour:0 minute:0 seconds:0 millis:0 utc:true
- OperatingSystem computeOSTimeFromYear:1970 month:1 day:1 hour:0 minute:0 seconds:0 millis:0 utc:false
+ OperatingSystem computeOSTimeFromYear:1970 month:1 day:1 hour:0 minute:0 seconds:0 millis:0 utc:true
+ OperatingSystem computeOSTimeFromYear:1970 month:1 day:1 hour:0 minute:0 seconds:0 millis:0 utc:false
"
!
computeTimePartsOf:osTime for:aBlock
- "compute hours, minutes, seconds and milliseconds from the local osTime
+ "compute hours, minutes, seconds and milliseconds from the local osTime
and evaluate the argument, a 4-arg block with these.
Conversion is to localtime including any daylight saving adjustments."
@@ -8174,7 +8174,7 @@
!
computeUTCTimePartsOf:osTime for:aBlock
- "compute hours, minutes, seconds and milliseconds from the osTime
+ "compute hours, minutes, seconds and milliseconds from the osTime
and evaluate the argument, a 4-arg block with these.
Conversion is to UTC."
@@ -8203,7 +8203,7 @@
!
getMicrosecondTime
- "This returns the microsecond timers value - if available.
+ "This returns the microsecond timers value - if available.
On some machines, times with this precision may not be available,
on those, the returned value may be rounded towards some internal
clock resolution value."
@@ -8227,7 +8227,7 @@
# ifndef HAVE_TIME
# if defined(SYSV) && defined(HZ)
- /*
+ /*
* sys5 time - in ticks
*/
long ticks;
@@ -8243,7 +8243,7 @@
#endif
#ifndef HAVE_TIME
- /* assume HAS_GETTIMEOFDAY
+ /* assume HAS_GETTIMEOFDAY
* - will result in a linkage error
* if not fixed.
*/
@@ -8276,10 +8276,10 @@
!
getMillisecondTime
- "This returns the millisecond timers value.
+ "This returns the millisecond timers value.
The range is limited to 0..1fffffff (i.e. the SmallInteger range) to avoid
LargeInteger arithmetic when doing timeouts and delays.
- Since this value is wrapping around in regular intervals, this can only be used for
+ Since this value is wrapping around in regular intervals, this can only be used for
short relative time deltas.
Use the millisecondTimeXXX:-methods to compare and add time deltas - these know about the wrap.
@@ -8306,7 +8306,7 @@
# ifndef HAVE_TIME
# if defined(SYSV) && defined(HZ)
- /*
+ /*
* sys5 time
*/
long ticks;
@@ -8320,7 +8320,7 @@
#endif
#ifndef HAVE_TIME
- /* assume HAS_GETTIMEOFDAY
+ /* assume HAS_GETTIMEOFDAY
* - will result in a linkage error
* if not fixed.
*/
@@ -8346,7 +8346,7 @@
"This returns the OS time.
The base of the returned value is not consistent across
different OS's - some return the number of millis since jan, 1st 1970;
- others since 1900. The Time classes are prepared for this, and
+ others since 1900. The Time classes are prepared for this, and
converts as appropriate (by using my fromOSTime: conversion methods).
Dont use this method in application code since it is an internal (private)
@@ -8358,9 +8358,9 @@
time := self primGetOSTime.
time class == Array ifTrue:[
- seconds := time at:1.
- millis := time at:2.
- time := (seconds * 1000) + millis
+ seconds := time at:1.
+ millis := time at:2.
+ time := (seconds * 1000) + millis
].
^ time
@@ -8375,7 +8375,7 @@
"This returns the OS time.
The base of the returned value is not consistent across
different OS's - some return the number of millis since jan, 1st 1970;
- others since 1900. The Time classes are prepared for this, and
+ others since 1900. The Time classes are prepared for this, and
converts as appropriate (by using my fromOSTime: conversion methods).
Dont use this method in application code since it is an internal (private)
@@ -8387,14 +8387,14 @@
long t;
long _secs, _millis;
-#if !defined(HAS_GETTIMEOFDAY)
+#if !defined(HAS_GETTIMEOFDAY)
# if defined(HAS_FTIME)
{
- struct timeb timebuffer;
-
- ftime(&timebuffer);
- _secs = timebuffer.time;
- _millis = timebuffer.millitm;
+ struct timeb timebuffer;
+
+ ftime(&timebuffer);
+ _secs = timebuffer.time;
+ _millis = timebuffer.millitm;
}
# define HAVE_TIME
# endif /* HAS_FTIME */
@@ -8402,19 +8402,19 @@
# ifndef HAVE_TIME
# if defined(SYSV) && defined(HZ)
{
- /*
- * sys5 time; we have to fake the information
- * the returned value is inexact.
- */
- long ticks;
- struct tms tb;
-
- _secs = time(0); /* seconds since 1970 ... */
-
- ticks = times(&tb);
- t = (ticks * 1000) / HZ;
- t = t % 1000;
- _millis = __MKSMALLINT(t);
+ /*
+ * sys5 time; we have to fake the information
+ * the returned value is inexact.
+ */
+ long ticks;
+ struct tms tb;
+
+ _secs = time(0); /* seconds since 1970 ... */
+
+ ticks = times(&tb);
+ t = (ticks * 1000) / HZ;
+ t = t % 1000;
+ _millis = __MKSMALLINT(t);
}
# define HAVE_TIME
# endif /* OLD SYSV stuff */
@@ -8428,21 +8428,21 @@
*/
{
- /*
- * bsd time
- */
- struct timeval tb;
- /* struct timezone tzb; */
-
- gettimeofday(&tb, NULL /* &tzb */);
-
- _secs = tb.tv_sec;
- _millis = tb.tv_usec / 1000;
- }
-#endif
-
- /*
- * mhmh long-long stuff seems not to work correctly
+ /*
+ * bsd time
+ */
+ struct timeval tb;
+ /* struct timezone tzb; */
+
+ gettimeofday(&tb, NULL /* &tzb */);
+
+ _secs = tb.tv_sec;
+ _millis = tb.tv_usec / 1000;
+ }
+#endif
+
+ /*
+ * mhmh long-long stuff seems not to work correctly
* on all machines (sparc)
* being conservative here ...
*/
@@ -8453,38 +8453,38 @@
#ifdef alpha64
{
- unsigned INT _lsecs, _lmillis, rslt;
-
- _lsecs = (INT)_secs;
- _lmillis = (INT)_millis;
- rslt = _lsecs * 1000 + _lmillis;
- RETURN (__MKUINT(rslt));
+ unsigned INT _lsecs, _lmillis, rslt;
+
+ _lsecs = (INT)_secs;
+ _lmillis = (INT)_millis;
+ rslt = _lsecs * 1000 + _lmillis;
+ RETURN (__MKUINT(rslt));
}
#else
# ifdef HAS_LONGLONG
{
- unsigned long long _lsecs, _lmillis, rslt;
- unsigned low, hi;
-
- _lsecs = (long long)_secs;
- _lmillis = (long long)_millis;
- rslt = _lsecs * 1000 + _lmillis;
- low = rslt & 0xFFFFFFFF;
- hi = rslt >> 32;
- RETURN (__MKLARGEINT64(1, low, hi));
+ unsigned long long _lsecs, _lmillis, rslt;
+ unsigned low, hi;
+
+ _lsecs = (long long)_secs;
+ _lmillis = (long long)_millis;
+ rslt = _lsecs * 1000 + _lmillis;
+ low = rslt & 0xFFFFFFFF;
+ hi = rslt >> 32;
+ RETURN (__MKLARGEINT64(1, low, hi));
}
# else
{
- OBJ seconds, millis, rslt;
-
- seconds = __MKUINT(_secs);
- __PROTECT__(seconds);
- millis = __MKUINT(_millis);
- __PROTECT__(millis);
- rslt = __ARRAY_WITH2(seconds, millis);
- __UNPROTECT__(millis);
- __UNPROTECT__(seconds);
- RETURN ( rslt );
+ OBJ seconds, millis, rslt;
+
+ seconds = __MKUINT(_secs);
+ __PROTECT__(seconds);
+ millis = __MKUINT(_millis);
+ __PROTECT__(millis);
+ rslt = __ARRAY_WITH2(seconds, millis);
+ __UNPROTECT__(millis);
+ __UNPROTECT__(seconds);
+ RETURN ( rslt );
}
# endif /* long long */
#endif /* alpha64 */
@@ -8502,7 +8502,7 @@
"cease ANY action for some time. This suspends the whole smalltalk
(unix-) process for some time if running threadless;
- if running with threads (which is the default), this will
+ if running with threads (which is the default), this will
only block until the next clock tick and return with the next
timer interrupt.
Use either OperatingSystem>>millisecondDelay: (which makes all
@@ -8531,7 +8531,7 @@
OS-second value.
An internal helper"
- |year month day hours minutes seconds utcOffset
+ |year month day hours minutes seconds utcOffset
dst yDay wDay info|
%{
@@ -8543,27 +8543,27 @@
/* try cache */
{
- OBJ lastSeconds, lastTimeInfo;
-
- lastSeconds = @global(LastTimeInfoSeconds);
- if (lastSeconds
- && (__longIntVal(lastSeconds) == t)
- && (@global(LastTimeInfoMilliseconds) == osMilliseconds)
- && (@global(LastTimeInfoIsLocal) == isLocalTime)
- ) {
- lastTimeInfo = @global(LastTimeInfo);
- if (lastTimeInfo != nil) {
- RETURN (lastTimeInfo);
- }
- }
+ OBJ lastSeconds, lastTimeInfo;
+
+ lastSeconds = @global(LastTimeInfoSeconds);
+ if (lastSeconds
+ && (__longIntVal(lastSeconds) == t)
+ && (@global(LastTimeInfoMilliseconds) == osMilliseconds)
+ && (@global(LastTimeInfoIsLocal) == isLocalTime)
+ ) {
+ lastTimeInfo = @global(LastTimeInfo);
+ if (lastTimeInfo != nil) {
+ RETURN (lastTimeInfo);
+ }
+ }
}
tt = (TIME_T)t;
if (isLocalTime == true) {
- tmPtr = localtime(&tt);
+ tmPtr = localtime(&tt);
} else {
- tmPtr = gmtime(&tt);
+ tmPtr = gmtime(&tt);
}
hours = __MKSMALLINT(tmPtr->tm_hour);
minutes = __MKSMALLINT(tmPtr->tm_min);
@@ -8580,30 +8580,30 @@
%}.
info := self timeInfoClass new.
info
- year:year
- month:month
- day:day
- hours:hours
- minutes:minutes
- seconds:seconds
- milliseconds:osMilliseconds
- utcOffset:utcOffset
- dst:dst
- dayInYear:yDay
- dayInWeek:wDay.
+ year:year
+ month:month
+ day:day
+ hours:hours
+ minutes:minutes
+ seconds:seconds
+ milliseconds:osMilliseconds
+ utcOffset:utcOffset
+ dst:dst
+ dayInYear:yDay
+ dayInWeek:wDay.
%{
- @global(LastTimeInfo) = info; __GSTORE(info);
- @global(LastTimeInfoSeconds) = osSeconds; __GSTORE(osSeconds);
- @global(LastTimeInfoMilliseconds) = osMilliseconds; __GSTORE(osMilliseconds);
- @global(LastTimeInfoIsLocal) = isLocalTime; __GSTORE(isLocalTime);
+ @global(LastTimeInfo) = info; __GSTORE(info);
+ @global(LastTimeInfoSeconds) = osSeconds; __GSTORE(osSeconds);
+ @global(LastTimeInfoMilliseconds) = osMilliseconds; __GSTORE(osMilliseconds);
+ @global(LastTimeInfoIsLocal) = isLocalTime; __GSTORE(isLocalTime);
%}.
^ info
"
- OperatingSystem timeInfoFromSeconds:0 localTime:false
- OperatingSystem timeInfoFromSeconds:3600 localTime:false
+ OperatingSystem timeInfoFromSeconds:0 localTime:false
+ OperatingSystem timeInfoFromSeconds:3600 localTime:false
"
! !
@@ -8667,10 +8667,10 @@
^ self getUserNameFromID:userID
"
- OperatingSystem getFullUserNameFromID:0
- OperatingSystem getFullUserNameFromID:(OperatingSystem getUserID)
-
- OperatingSystem getUserNameFromID:(OperatingSystem getUserID)
+ OperatingSystem getFullUserNameFromID:0
+ OperatingSystem getFullUserNameFromID:(OperatingSystem getUserID)
+
+ OperatingSystem getUserNameFromID:(OperatingSystem getUserID)
"
"Modified: 15.7.1996 / 12:44:21 / cg"
@@ -8747,32 +8747,32 @@
char *name = (char *)0;
if (firstCall) {
- /*
- * try a few common environment variables ...
- */
- name = getenv("LOGNAME");
- if (! name || (name[0] == 0)) {
- name = getlogin();
- if (! name || (name[0] == 0) ) {
- name = getenv("LOGIN");
- if (! name || (name[0] == 0) ) {
- name = getenv("USER");
- }
- }
- }
- if (name && (strlen(name) < sizeof(cachedName))) {
- strcpy(cachedName, name);
- firstCall = 0;
- }
+ /*
+ * try a few common environment variables ...
+ */
+ name = getenv("LOGNAME");
+ if (! name || (name[0] == 0)) {
+ name = getlogin();
+ if (! name || (name[0] == 0) ) {
+ name = getenv("LOGIN");
+ if (! name || (name[0] == 0) ) {
+ name = getenv("USER");
+ }
+ }
+ }
+ if (name && (strlen(name) < sizeof(cachedName))) {
+ strcpy(cachedName, name);
+ firstCall = 0;
+ }
} else {
- name = cachedName;
+ name = cachedName;
}
/*
* nope - I really font know who you are.
*/
if (! name || (name[0] == 0) ) {
- name = "you";
+ name = "you";
}
RETURN ( __MKSTRING(name) );
@@ -8828,7 +8828,7 @@
"
OperatingSystem getUserNameFromID:0
OperatingSystem getUserNameFromID:100
- OperatingSystem getUserNameFromID:9991
+ OperatingSystem getUserNameFromID:9991
"
!
@@ -8838,7 +8838,7 @@
"return a dictionary filled with userinfo. The argument can be either
a string with the users name or its numeric id.
Notice, that not all systems provide (all of) this info;
- DOS systems return nothing;
+ DOS systems return nothing;
non-SYSV4 systems have no age/comment.
Portable applications may want to check the systemType and NOT depend
on all keys to be present in the returned dictionary.
@@ -8855,42 +8855,42 @@
int ret;
if (__isStringLike(aNameOrID)) {
- buf = getpwnam(__stringVal(aNameOrID));
+ buf = getpwnam(__stringVal(aNameOrID));
} else if (__isSmallInteger(aNameOrID)) {
- buf = getpwuid(__intVal(aNameOrID));
+ buf = getpwuid(__intVal(aNameOrID));
} else {
- buf = (struct passwd *)0;
+ buf = (struct passwd *)0;
}
if (buf) {
- name = __MKSTRING(buf->pw_name);
+ name = __MKSTRING(buf->pw_name);
# ifndef NO_PWD_PASSWD
- passw = __MKSTRING(buf->pw_passwd);
+ passw = __MKSTRING(buf->pw_passwd);
# endif
# ifdef SYSV4
- age = __MKSTRING(buf->pw_age);
- comment = __MKSTRING(buf->pw_comment);
-# endif
- dir = __MKSTRING(buf->pw_dir);
+ age = __MKSTRING(buf->pw_age);
+ comment = __MKSTRING(buf->pw_comment);
+# endif
+ dir = __MKSTRING(buf->pw_dir);
# ifndef NO_PWD_GECOS
- gecos = __MKSTRING(buf->pw_gecos);
-# endif
- shell = __MKSTRING(buf->pw_shell);
-
- uid = __MKSMALLINT(buf->pw_uid);
- gid = __MKSMALLINT(buf->pw_gid);
+ gecos = __MKSTRING(buf->pw_gecos);
+# endif
+ shell = __MKSTRING(buf->pw_shell);
+
+ uid = __MKSMALLINT(buf->pw_uid);
+ gid = __MKSMALLINT(buf->pw_gid);
}
# endif /* has PWD */
%}.
info := IdentityDictionary new.
name isNil ifTrue:[
- aNameOrID == self getUserID ifTrue:[
- name := self getLoginName
- ].
+ aNameOrID == self getUserID ifTrue:[
+ name := self getLoginName
+ ].
].
name notNil ifTrue:[
- info at:#name put:name.
+ info at:#name put:name.
] ifFalse:[
- info at:#name put:'unknown'
+ info at:#name put:'unknown'
].
passw notNil ifTrue:[info at:#passwd put:passw].
age notNil ifTrue:[info at:#age put:age].
@@ -8898,9 +8898,9 @@
gecos notNil ifTrue:[info at:#gecos put:gecos].
shell notNil ifTrue:[info at:#shell put:shell].
dir isNil ifTrue:[
- aNameOrID == self getUserID ifTrue:[
- dir := self getHomeDirectory
- ]
+ aNameOrID == self getUserID ifTrue:[
+ dir := self getHomeDirectory
+ ]
].
dir notNil ifTrue:[info at:#dir put:dir].
uid notNil ifTrue:[info at:#uid put:uid].
@@ -8910,8 +8910,8 @@
"
OperatingSystem userInfoOf:'root'
OperatingSystem userInfoOf:1
- OperatingSystem userInfoOf:'claus'
- OperatingSystem userInfoOf:'fooBar'
+ OperatingSystem userInfoOf:'claus'
+ OperatingSystem userInfoOf:'fooBar'
OperatingSystem userInfoOf:(OperatingSystem getUserID)
"
! !
@@ -8937,9 +8937,9 @@
"get status changes from child processes.
Return an OSProcessStatus or nil, if no process has terminated.
- If blocking is true, we wait until a process changed state,
+ If blocking is true, we wait until a process changed state,
otherwise we return immediately.
- Note that win32 needs to know the HANDLE of the process on which
+ Note that win32 needs to know the HANDLE of the process on which
it waits. In case of an error, THIS ALWAYS WAITS and then times out."
|pid status code core|
@@ -9031,7 +9031,7 @@
#if defined(WIFCONTINUED)
else if (WIFCONTINUED(s)) {
status = @symbol(continue);
- }
+ }
#endif
}
done: ;
@@ -9077,10 +9077,10 @@
# endif
# if defined(DELAY_FLAG)
if (__isSmallInteger(fd)) {
- int f = __intVal(fd);
-
- flags = fcntl(f, F_GETFL, 0);
- RETURN ((flags & DELAY_FLAG) ? false : true );
+ int f = __intVal(fd);
+
+ flags = fcntl(f, F_GETFL, 0);
+ RETURN ((flags & DELAY_FLAG) ? false : true );
}
# undef DELAY_FLAG
# endif
@@ -9115,7 +9115,7 @@
!
readCheck:fd
- "return true, if data is available on a filedescriptor
+ "return true, if data is available on a filedescriptor
(i.e. read is possible without blocking).
This depends on a working select or FIONREAD to be provided by the OS."
@@ -9137,13 +9137,13 @@
^ super readCheck:fd
!
-selectOnAnyReadable:readFdArray writable:writeFdArray exception:exceptFdArray
- readableInto:readableResultFdArray writableInto:writableResultFdArray
+selectOnAnyReadable:readFdArray writable:writeFdArray exception:exceptFdArray
+ readableInto:readableResultFdArray writableInto:writableResultFdArray
exceptionInto:exceptionResultFdArray
withTimeOut:millis
- "wait for any fd in readFdArray (an Array of integers) to become ready for reading,
- writeFdArray to become ready for writing,
+ "wait for any fd in readFdArray (an Array of integers) to become ready for reading,
+ writeFdArray to become ready for writing,
or exceptFdArray to arrive exceptional data (i.e. out-of-band data).
Timeout after t milliseconds or - if the timeout time is 0 - immediately..
Empty fd-sets will always wait. Zero time can be used to poll file-
@@ -9175,19 +9175,19 @@
if (readableResultFdArray != nil) {
if (! __isArrayLike(readableResultFdArray)) {
- goto fail;
+ goto fail;
}
resultSizeReadable = __arraySize(readableResultFdArray);
}
if (writableResultFdArray != nil) {
if (! __isArrayLike(writableResultFdArray)) {
- goto fail;
+ goto fail;
}
resultSizeWritable = __arraySize(writableResultFdArray);
}
if (exceptionResultFdArray != nil) {
if (! __isArrayLike(exceptionResultFdArray)) {
- goto fail;
+ goto fail;
}
resultSizeException = __arraySize(exceptionResultFdArray);
}
@@ -9201,7 +9201,7 @@
int i, count;
if (! __isArrayLike(readFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(readFdArray);
@@ -9236,7 +9236,7 @@
int i, count;
if (! __isArrayLike(writeFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(writeFdArray);
for (i=0; i<count;i++) {
@@ -9253,7 +9253,7 @@
f = __intVal(fd);
if ((unsigned)f < FD_SETSIZE) {
- FD_SET(f, &wset);
+ FD_SET(f, &wset);
if (f > maxF) maxF = f;
numFds++;
} else {
@@ -9270,7 +9270,7 @@
int i, count;
if (! __isArrayLike(exceptFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(exceptFdArray);
for (i=0; i<count;i++) {
@@ -9287,7 +9287,7 @@
f = __intVal(fd);
if ((unsigned)f < FD_SETSIZE) {
- FD_SET(f, &eset);
+ FD_SET(f, &eset);
if (f > maxF) maxF = f;
numFds++;
} else {
@@ -9316,7 +9316,7 @@
errno = 0;
if (t == 0) {
- /*
+ /*
* if there is no timeout time, we can stay here interruptable.
*/
do {
@@ -9325,7 +9325,7 @@
} else {
do {
ret = select(maxF+1, &rset, &wset, &eset, &wt);
- /*
+ /*
* for now: dont loop; if we did, we had to adjust the vt-timeval;
* could otherwise stay in this loop forever ...
* Premature ret (before the time expired) must be handled by the caller.
@@ -9373,7 +9373,7 @@
if (cntE < resultSizeException) {
__resultE[cntE] = nil;
}
-
+
RETURN (__MKSMALLINT(cntR+cntW+cntE));
} else {
if (ret < 0) {
@@ -9406,8 +9406,8 @@
!
selectOnAnyReadable:readFdArray writable:writeFdArray exception:exceptFdArray withTimeOut:millis
- "wait for any fd in readFdArray (an Array of integers) to become ready for reading,
- writeFdArray to become ready for writing,
+ "wait for any fd in readFdArray (an Array of integers) to become ready for reading,
+ writeFdArray to become ready for writing,
or exceptFdArray to arrive exceptional data (i.e. out-of-band data).
Timeout after t milliseconds or, if the timeout time is 0, immediately..
Empty fd-sets will always wait. Zero time can be used to poll file-
@@ -9435,7 +9435,7 @@
maxF = -1;
if (__isNonNilObject(readFdArray)) {
if (! __isArrayLike(readFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(readFdArray);
@@ -9464,7 +9464,7 @@
if (__isNonNilObject(writeFdArray)) {
if (! __isArrayLike(writeFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(writeFdArray);
for (i=0; i<count;i++) {
@@ -9477,7 +9477,7 @@
} else {
f = __intVal(fd);
if ((unsigned)f < FD_SETSIZE) {
- FD_SET(f, &wset);
+ FD_SET(f, &wset);
if (f > maxF) maxF = f;
numFds++;
} else {
@@ -9492,7 +9492,7 @@
if (__isNonNilObject(exceptFdArray)) {
if (! __isArrayLike(exceptFdArray)) {
- goto fail;
+ goto fail;
}
count = __arraySize(exceptFdArray);
for (i=0; i<count;i++) {
@@ -9505,7 +9505,7 @@
} else {
f = __intVal(fd);
if ((unsigned)f < FD_SETSIZE) {
- FD_SET(f, &eset);
+ FD_SET(f, &eset);
if (f > maxF) maxF = f;
numFds++;
} else {
@@ -9534,7 +9534,7 @@
errno = 0;
if (t == 0) {
- /*
+ /*
* if there is no timeout time, we can stay here interruptable.
*/
do {
@@ -9543,7 +9543,7 @@
} else {
do {
ret = select(maxF+1, &rset, &wset, &eset, &wt);
- /*
+ /*
* for now: dont loop; if we did, we had to adjust the vt-timeval;
* could otherwise stay in this loop forever ...
* Premature ret (before the time expired) must be handled by the caller.
@@ -9618,17 +9618,17 @@
# endif
# if defined(DELAY_FLAG)
if (__isSmallInteger(fd)) {
- int f = __intVal(fd);
-
- flags = fcntl(f, F_GETFL, 0);
- if (aBoolean == true) {
- ret = fcntl(f, F_SETFL, flags & ~DELAY_FLAG);
- } else if (aBoolean == false) {
- ret = fcntl(f, F_SETFL, flags | DELAY_FLAG);
- }
- if (ret >= 0) {
- RETURN ((flags & DELAY_FLAG) ? false : true );
- }
+ int f = __intVal(fd);
+
+ flags = fcntl(f, F_GETFL, 0);
+ if (aBoolean == true) {
+ ret = fcntl(f, F_SETFL, flags & ~DELAY_FLAG);
+ } else if (aBoolean == false) {
+ ret = fcntl(f, F_SETFL, flags | DELAY_FLAG);
+ }
+ if (ret >= 0) {
+ RETURN ((flags & DELAY_FLAG) ? false : true );
+ }
}
# undef DELAY_FLAG
# endif
@@ -9663,7 +9663,7 @@
initialize
OpenFiles := WeakArray new:10.
- OpenFiles addDependent:self.
+ OpenFiles addDependent:self.
"self initialize"
@@ -9844,7 +9844,7 @@
RETURN (__mkSmallInteger(nRead));
}
-bad: ;
+bad: ;
%}.
^ self error:error.
@@ -9978,7 +9978,7 @@
RETURN (__mkSmallInteger(nWritten));
}
-bad: ;
+bad: ;
%}.
^ self error:error
@@ -10027,54 +10027,54 @@
OBJ rslt;
if (! __isSmallInteger(__INST(fd))) {
- error = @symbol(errorNotOpen);
- goto bad;
+ error = @symbol(errorNotOpen);
+ goto bad;
}
if (__isSmallInteger(newPosition)) {
- pos = __smallIntegerVal(newPosition);
+ pos = __smallIntegerVal(newPosition);
} else {
- pos = __signedLongIntVal(newPosition);
- if (pos < 0 && (sizeof(pos) < 8 || __signedLong64IntVal(newPosition, &pos) == 0)) {
- error = @symbol(badArgument1);
- goto bad;
- }
+ pos = __signedLongIntVal(newPosition);
+ if (pos < 0 && (sizeof(pos) < 8 || __signedLong64IntVal(newPosition, &pos) == 0)) {
+ 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;
}
if (sizeof(ret) == 8) {
- rslt = __MKINT64 (&ret);
+ rslt = __MKINT64 (&ret);
} else {
- rslt = __MKINT(ret);
+ rslt = __MKINT(ret);
}
RETURN (rslt);
-bad: ;
+bad: ;
%}.
^ self error:error.
@@ -10113,7 +10113,7 @@
nil if no data is available."
|err|
-%{
+%{
int ret, flags;
#if defined(F_GETFL) && defined(F_SETFL)
@@ -10135,7 +10135,7 @@
ret = fcntl(f, F_SETFL, flags | DELAY);
}
if (ret >= 0) {
- RETURN(__MKSMALLINT(flags));
+ RETURN(__MKSMALLINT(flags));
} else {
err = __MKSMALLINT(errno);
}
@@ -10184,7 +10184,7 @@
!UnixOperatingSystem::FileDescriptorHandle methodsFor:'queries'!
canReadWithoutBlocking
- "return true, if data is available on a filedescriptor
+ "return true, if data is available on a filedescriptor
(i.e. read is possible without blocking).
This depends on a working select or FIONREAD to be provided by the OS."
@@ -10365,10 +10365,10 @@
!UnixOperatingSystem::FileDescriptorHandle methodsFor:'waiting'!
-readWaitWithTimeoutMs:timeout
+readWaitWithTimeoutMs:timeout
"suspend the current process, until the receiver
- becomes ready for reading or a timeout (in milliseconds) expired.
- If data is already available, return immediate.
+ becomes ready for reading or a timeout (in milliseconds) expired.
+ If data is already available, return immediate.
Return true if a timeout occured (i.e. false, if data is available).
The other threads are not affected by the wait."
@@ -10382,7 +10382,7 @@
inputSema := Semaphore new name:'readWait'.
[
timeout notNil ifTrue:[
- Processor signal:inputSema afterMilliseconds:timeout
+ Processor signal:inputSema afterMilliseconds:timeout
].
Processor signal:inputSema onInput:fd.
Processor activeProcess state:#ioWait.
@@ -10400,9 +10400,9 @@
writeWaitWithTimeoutMs:timeout
"suspend the current process, until the receiver
- becomes ready for writing or a timeout (in seconds) expired.
+ becomes ready for writing or a timeout (in seconds) expired.
Return true if a timeout occured (i.e. false, if data is available).
- Return immediate if the receiver is already ready.
+ Return immediate if the receiver is already ready.
The other threads are not affected by the wait."
|outputSema canWrite wasBlocked|
@@ -10460,8 +10460,8 @@
"return accessed"
accessed isInteger ifTrue:[
- "/ lazy time conversion
- accessed := Timestamp fromOSTime:(accessed * 1000).
+ "/ lazy time conversion
+ accessed := Timestamp fromOSTime:(accessed * 1000).
].
^ accessed
!
@@ -10519,8 +10519,8 @@
"return modified"
modified isInteger ifTrue:[
- "/ lazy time conversion
- modified := Timestamp fromOSTime:(modified * 1000).
+ "/ lazy time conversion
+ modified := Timestamp fromOSTime:(modified * 1000).
].
^ modified
!
@@ -10564,8 +10564,8 @@
statusChangeTime
statusChanged isInteger ifTrue:[
- "/ lazy time conversion
- statusChanged := Timestamp fromOSTime:(statusChanged * 1000).
+ "/ lazy time conversion
+ statusChanged := Timestamp fromOSTime:(statusChanged * 1000).
].
^ statusChanged
!
@@ -10643,7 +10643,7 @@
^ mountPointPath
!
-mountPointPath:mountPointArg deviceOrRemotePath:deviceOrRemotePathArg fsType:fsTypeArg attributeString:attributeStringArg
+mountPointPath:mountPointArg deviceOrRemotePath:deviceOrRemotePathArg fsType:fsTypeArg attributeString:attributeStringArg
"set instance variables (automatically generated)"
mountPointPath := mountPointArg.
@@ -10655,9 +10655,9 @@
!UnixOperatingSystem::MountInfo methodsFor:'printing'!
printOn:aStream
- aStream
- nextPutAll:'MountInfo for ';
- nextPutAll:mountPointPath.
+ aStream
+ nextPutAll:'MountInfo for ';
+ nextPutAll:mountPointPath.
! !
!UnixOperatingSystem::MountInfo methodsFor:'queries'!
@@ -10879,9 +10879,9 @@
^ protocolCode
"
- self protocolCodeOf:#tcp
- self protocolCodeOf:#udp
- self protocolCodeOf:#raw
+ self protocolCodeOf:#tcp
+ self protocolCodeOf:#udp
+ self protocolCodeOf:#raw
"
!
@@ -10897,7 +10897,7 @@
].
].
-%{
+%{
#ifndef NO_SOCKET
struct protoent *protoent = 0;
@@ -10936,9 +10936,9 @@
!UnixOperatingSystem::SocketHandle class methodsFor:'queries'!
-getAddressInfo:hostName serviceName:serviceName domain:domainArg type:typeArg protocol:protoArg flags:flags
+getAddressInfo:hostName serviceName:serviceName domain:domainArg type:typeArg protocol:protoArg flags:flags
"answer an Array of socket addresses for serviceName on hostName
- Domain, type, protocol may be nil or specify a hint for the socket
+ Domain, type, protocol may be nil or specify a hint for the socket
addresses to be returned."
|error errorString result domain type proto|
@@ -10951,34 +10951,34 @@
#undef xxAI_NUMERICHOST /* remove xx to test gethost...() path */
-#if !defined(NO_SOCKET)
+#if !defined(NO_SOCKET)
char *__hostName, *__serviceName;
int ret, cnt = 0;
if (hostName == nil) {
- __hostName = 0;
+ __hostName = 0;
} else if (__isString(hostName) || __isSymbol(hostName)) {
- __hostName = __stringVal(hostName);
+ __hostName = __stringVal(hostName);
} else {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (serviceName == nil) {
- __serviceName = 0;
+ __serviceName = 0;
} else if (__isString(serviceName) || __isSymbol(serviceName)) {
- __serviceName = __stringVal(serviceName);
+ __serviceName = __stringVal(serviceName);
} else {
- error = @symbol(badArgument2);
- goto err;
+ error = @symbol(badArgument2);
+ goto err;
}
if (__hostName == 0 && __serviceName == 0) {
- error = @symbol(badArgument);
- goto err;
+ error = @symbol(badArgument);
+ goto err;
}
{
# if defined(AI_NUMERICHOST)
- /*
+ /*
* Use getaddrinfo()
*/
struct addrinfo hints;
@@ -10986,105 +10986,102 @@
memset(&hints, 0, sizeof(hints));
if (__isSmallInteger(domain))
- hints.ai_family = __intVal(domain);
+ hints.ai_family = __intVal(domain);
if (__isSmallInteger(type))
- hints.ai_socktype = __intVal(type);
+ hints.ai_socktype = __intVal(type);
if (__isSmallInteger(proto))
- hints.ai_protocol = __intVal(proto);
+ hints.ai_protocol = __intVal(proto);
do {
- __BEGIN_INTERRUPTABLE__
- ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
- __END_INTERRUPTABLE__
+ __BEGIN_INTERRUPTABLE__
+ ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
+ __END_INTERRUPTABLE__
} while (ret == EAI_SYSTEM && errno == EINTR);
if (ret != 0) {
- switch (ret) {
- case EAI_FAMILY:
- error = @symbol(badProtocol);
- break;
- case EAI_SOCKTYPE:
- error = @symbol(badSocketType);
- break;
- case EAI_BADFLAGS:
- error = @symbol(badFlags);
- break;
- case EAI_NONAME:
- error = @symbol(unknownHost);
- break;
- case EAI_SERVICE:
- error = @symbol(unknownService);
- break;
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
- case EAI_MEMORY:
- error = @symbol(allocationFailure);
- break;
- case EAI_FAIL:
- error = @symbol(permanentFailure);
- break;
- case EAI_AGAIN:
- error = @symbol(tryAgain);
- break;
- case EAI_SYSTEM:
- error = @symbol(systemError);
- break;
- default:
- error = @symbol(unknownError);
- }
- errorString = __MKSTRING(gai_strerror(ret));
- goto err;
- }
+ switch (ret) {
+ case EAI_FAMILY:
+ error = @symbol(badProtocol);
+ break;
+ case EAI_SOCKTYPE:
+ error = @symbol(badSocketType);
+ break;
+ case EAI_BADFLAGS:
+ error = @symbol(badFlags);
+ break;
+ case EAI_NONAME:
+ error = @symbol(unknownHost);
+ break;
+ case EAI_SERVICE:
+ error = @symbol(unknownService);
+ break;
+ case EAI_ADDRFAMILY :
+ error = @symbol(unknownHostForProtocol);
+ break;
+ case EAI_NODATA:
+ error = @symbol(noAddress);
+ break;
+ case EAI_MEMORY:
+ error = @symbol(allocationFailure);
+ break;
+ case EAI_FAIL:
+ error = @symbol(permanentFailure);
+ break;
+ case EAI_AGAIN:
+ error = @symbol(tryAgain);
+ break;
+ case EAI_SYSTEM:
+ error = @symbol(systemError);
+ break;
+ default:
+ error = @symbol(unknownError);
+ }
+ errorString = __MKSTRING(gai_strerror(ret));
+ goto err;
+ }
for (cnt=0, infop=info; infop; infop=infop->ai_next)
- cnt++;
+ cnt++;
result = __ARRAY_NEW_INT(cnt);
if (result == nil) {
- error = @symbol(allocationFailure);
- goto err;
+ error = @symbol(allocationFailure);
+ goto err;
}
for (infop=info, cnt=0; infop; infop=infop->ai_next, cnt++) {
- OBJ o, resp;
-
- resp = __ARRAY_NEW_INT(6);
- if (resp == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
-
- __ArrayInstPtr(result)->a_element[cnt] = resp;
- __STORE(result, resp);
-
- __ArrayInstPtr(resp)->a_element[0] = __MKSMALLINT(infop->ai_flags);
- __ArrayInstPtr(resp)->a_element[1] = __MKSMALLINT(infop->ai_family);
- __ArrayInstPtr(resp)->a_element[2] = __MKSMALLINT(infop->ai_socktype);
- __ArrayInstPtr(resp)->a_element[3] = __MKSMALLINT(infop->ai_protocol);
-
- __PROTECT__(resp);
- o = __BYTEARRAY_NEW_INT(infop->ai_addrlen);
- __UNPROTECT__(resp);
- if (o == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
- memcpy(__byteArrayVal(o), infop->ai_addr, infop->ai_addrlen);
- __ArrayInstPtr(resp)->a_element[4] = o;
- __STORE(resp, o);
-
- if (infop->ai_canonname) {
- __PROTECT__(resp);
- o = __MKSTRING(infop->ai_canonname);
- __UNPROTECT__(resp);
- if (o == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
- __ArrayInstPtr(resp)->a_element[5] = o;
- __STORE(resp, o);
- }
+ OBJ o, resp;
+
+ resp = __ARRAY_NEW_INT(6);
+ if (resp == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+
+ __ArrayInstPtr(result)->a_element[cnt] = resp; __STORE(result, resp);
+
+ __ArrayInstPtr(resp)->a_element[0] = __MKSMALLINT(infop->ai_flags);
+ __ArrayInstPtr(resp)->a_element[1] = __MKSMALLINT(infop->ai_family);
+ __ArrayInstPtr(resp)->a_element[2] = __MKSMALLINT(infop->ai_socktype);
+ __ArrayInstPtr(resp)->a_element[3] = __MKSMALLINT(infop->ai_protocol);
+
+ __PROTECT__(resp);
+ o = __BYTEARRAY_NEW_INT(infop->ai_addrlen);
+ __UNPROTECT__(resp);
+ if (o == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+ memcpy(__byteArrayVal(o), infop->ai_addr, infop->ai_addrlen);
+ __ArrayInstPtr(resp)->a_element[4] = o; __STORE(resp, o);
+
+ if (infop->ai_canonname) {
+ __PROTECT__(resp);
+ o = __MKSTRING(infop->ai_canonname);
+ __UNPROTECT__(resp);
+ if (o == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+ __ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
+ }
}
err:
@@ -11092,7 +11089,7 @@
# else /* ! AI_NUMERICHOST =============================================================*/
- /*
+ /*
* Use getservbyname() / gethostByName()
*/
struct hostent *hp;
@@ -11101,137 +11098,131 @@
int i;
if (__serviceName) {
- struct servent *sp;
- char *__proto = 0;
-
- if (__isString(protoArg) || __isSymbol(protoArg))
- __proto = __stringVal(protoArg);
-
- sp = getservbyname(__serviceName, __proto);
- if (sp == NULL) {
- errorString = @symbol(unknownService);
- error = __mkSmallInteger(-3);
- goto err;
- }
- port = sp->s_port;
+ struct servent *sp;
+ char *__proto = 0;
+
+ if (__isString(protoArg) || __isSymbol(protoArg))
+ __proto = __stringVal(protoArg);
+
+ sp = getservbyname(__serviceName, __proto);
+ if (sp == NULL) {
+ errorString = @symbol(unknownService);
+ error = __mkSmallInteger(-3);
+ goto err;
+ }
+ port = sp->s_port;
}
if (__hostName) {
# ifdef USE_H_ERRNO
- do {
- /* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname
- * uses a static data area
- */
- __BEGIN_INTERRUPTABLE__
- hp = gethostbyname(__hostName);
- __END_INTERRUPTABLE__
- } while ((hp == NULL)
- && (
- (h_errno == TRY_AGAIN)
- || errno == EINTR
+ do {
+ /* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname
+ * uses a static data area
+ */
+ __BEGIN_INTERRUPTABLE__
+ hp = gethostbyname(__hostName);
+ __END_INTERRUPTABLE__
+ } while ((hp == NULL)
+ && (
+ (h_errno == TRY_AGAIN)
+ || errno == EINTR
# ifdef IRIX5_3
- || (errno == ECONNREFUSED)
+ || (errno == ECONNREFUSED)
# endif
- )
- );
- if (hp == 0) {
- switch (h_errno) {
- case HOST_NOT_FOUND:
- errorString = @symbol(unknownHost);
- break;
- case NO_ADDRESS:
- errorString = @symbol(noAddress);
- break;
- case NO_RECOVERY:
- errorString = @symbol(permanentFailure);
- break;
- case TRY_AGAIN:
- errorString = @symbol(tryAgain);
- break;
- default:
- errorString = @symbol(unknownError);
- break;
- }
- error = __mkSmallInteger(h_errno);
- goto err;
- }
+ )
+ );
+ if (hp == 0) {
+ switch (h_errno) {
+ case HOST_NOT_FOUND:
+ errorString = @symbol(unknownHost);
+ break;
+ case NO_ADDRESS:
+ errorString = @symbol(noAddress);
+ break;
+ case NO_RECOVERY:
+ errorString = @symbol(permanentFailure);
+ break;
+ case TRY_AGAIN:
+ errorString = @symbol(tryAgain);
+ break;
+ default:
+ errorString = @symbol(unknownError);
+ break;
+ }
+ error = __mkSmallInteger(h_errno);
+ goto err;
+ }
# else /* !USE_H_ERRNO */
- hp = gethostbyname(__hostName);
- if (hp == 0) {
- errorString = @symbol(unknownHost);
- error = __mkSmallInteger(-1);
- goto err;
- }
+ hp = gethostbyname(__hostName);
+ if (hp == 0) {
+ errorString = @symbol(unknownHost);
+ error = __mkSmallInteger(-1);
+ goto err;
+ }
# endif /* !USE_H_ERRNO*/
- if (__isSmallInteger(domain) && hp->h_addrtype != __smallIntegerVal(domain)) {
- errorString = @symbol(unknownHost);
- error = __mkSmallInteger(-2);
- goto err;
- }
-
- for (cnt = 0, addrpp = hp->h_addr_list; *addrpp; addrpp++)
- cnt++;
- addrpp = hp->h_addr_list;
+ if (__isSmallInteger(domain) && hp->h_addrtype != __smallIntegerVal(domain)) {
+ errorString = @symbol(unknownHost);
+ error = __mkSmallInteger(-2);
+ goto err;
+ }
+
+ for (cnt = 0, addrpp = hp->h_addr_list; *addrpp; addrpp++)
+ cnt++;
+ addrpp = hp->h_addr_list;
} else {
- cnt = 1;
+ cnt = 1;
}
result = __ARRAY_NEW_INT(cnt);
if (result == nil) {
- error = @symbol(allocationFailure);
- goto err;
+ error = @symbol(allocationFailure);
+ goto err;
}
for (i = 0; i < cnt; i++) {
- OBJ o, resp;
- struct sockaddr_in *sa;
-
- resp = __ARRAY_NEW_INT(6);
- if (resp == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
-
- __ArrayInstPtr(result)->a_element[i] = resp;
- __STORE(result, resp);
- __ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(0);
- __ArrayInstPtr(resp)->a_element[2] = type;
- __STORE(result, type);
- __ArrayInstPtr(resp)->a_element[3] = proto;
- __STORE(result, proto);
- __PROTECT__(resp);
- o = __BYTEARRAY_NEW_INT(sizeof(*sa));
- __UNPROTECT__(resp);
- if (o == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
- __ArrayInstPtr(resp)->a_element[4] = o;
- __STORE(resp, o);
- sa = (struct sockaddr_in *)__byteArrayVal(o);
- sa->sin_port = port;
-
- if (__hostName) {
- sa->sin_family = hp->h_addrtype;
- memcpy(&sa->sin_addr, *addrpp, hp->h_length);
- __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(hp->h_addrtype);
- if (hp->h_name) {
- __PROTECT__(resp);
- o = __MKSTRING(hp->h_name);
- __UNPROTECT__(resp);
- if (o == nil) {
- error = @symbol(allocationFailure);
- goto err;
- }
- __ArrayInstPtr(resp)->a_element[5] = o;
- __STORE(resp, o);
- }
- addrpp++;
- } else{
- __ArrayInstPtr(resp)->a_element[1] = domain;
- __STORE(resp, domain);
- }
+ OBJ o, resp;
+ struct sockaddr_in *sa;
+
+ resp = __ARRAY_NEW_INT(6);
+ if (resp == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+
+ __ArrayInstPtr(result)->a_element[i] = resp; __STORE(result, resp);
+ __ArrayInstPtr(resp)->a_element[0] = __mkSmallInteger(0);
+ __ArrayInstPtr(resp)->a_element[2] = type; __STORE(result, type);
+ __ArrayInstPtr(resp)->a_element[3] = proto; __STORE(result, proto);
+ __PROTECT__(resp);
+ o = __BYTEARRAY_NEW_INT(sizeof(*sa));
+ __UNPROTECT__(resp);
+ if (o == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+ __ArrayInstPtr(resp)->a_element[4] = o; __STORE(resp, o);
+ sa = (struct sockaddr_in *)__byteArrayVal(o);
+ sa->sin_port = port;
+
+ if (__hostName) {
+ sa->sin_family = hp->h_addrtype;
+ memcpy(&sa->sin_addr, *addrpp, hp->h_length);
+ __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(hp->h_addrtype);
+ if (hp->h_name) {
+ __PROTECT__(resp);
+ o = __MKSTRING(hp->h_name);
+ __UNPROTECT__(resp);
+ if (o == nil) {
+ error = @symbol(allocationFailure);
+ goto err;
+ }
+ __ArrayInstPtr(resp)->a_element[5] = o; __STORE(resp, o);
+ }
+ addrpp++;
+ } else{
+ __ArrayInstPtr(resp)->a_element[1] = domain; __STORE(resp, domain);
+ }
}
err:;
@@ -11242,48 +11233,48 @@
#endif
%}.
error notNil ifTrue:[
- NameLookupError raiseWith:error errorString:errorString.
- ].
- 1 to:result size do:[:i |
- |entry dom info|
-
- info := SocketAddressInfo new.
- entry := result at:i.
- info flags:(entry at:1).
- info domain:(dom := OperatingSystem domainSymbolOf:(entry at:2)).
- info type:(OperatingSystem socketTypeSymbolOf:(entry at:3)).
- info protocol:(self protocolSymbolOf:(entry at:4)).
- info socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5)).
- info canonicalName:(entry at:6).
- result at:i put:info
+ NameLookupError raiseWith:error errorString:errorString.
+ ].
+ 1 to:result size do:[:i |
+ |entry dom info|
+
+ info := SocketAddressInfo new.
+ entry := result at:i.
+ info flags:(entry at:1).
+ info domain:(dom := OperatingSystem domainSymbolOf:(entry at:2)).
+ info type:(OperatingSystem socketTypeSymbolOf:(entry at:3)).
+ info protocol:(self protocolSymbolOf:(entry at:4)).
+ info socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5)).
+ info canonicalName:(entry at:6).
+ result at:i put:info
].
^ result
"
- self getAddressInfo:'localhost' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
- self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:nil flags:nil
- self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:#tcp flags:nil
- self getAddressInfo:'blurb.exept.de' serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
- self getAddressInfo:'1.2.3.4' serviceName:'bla'
- domain:#inet type:nil protocol:nil flags:nil
- self getAddressInfo:'localhost' serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
- self getAddressInfo:nil serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
- self getAddressInfo:nil serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
- self getAddressInfo:'www.google.de' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
- self getAddressInfo:'smc1' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
- "
-!
-
-getNameInfo:socketAddress wantHostName:wantHostName wantServiceName:wantServiceName datagram:useDatagram flags:flags
+ self getAddressInfo:'localhost' serviceName:nil
+ domain:nil type:nil protocol:nil flags:nil
+ self getAddressInfo:'localhost' serviceName:nil
+ domain:#inet type:#stream protocol:nil flags:nil
+ self getAddressInfo:'localhost' serviceName:nil
+ domain:#inet type:#stream protocol:#tcp flags:nil
+ self getAddressInfo:'blurb.exept.de' serviceName:nil
+ domain:#inet type:nil protocol:nil flags:nil
+ self getAddressInfo:'1.2.3.4' serviceName:'bla'
+ domain:#inet type:nil protocol:nil flags:nil
+ self getAddressInfo:'localhost' serviceName:'echo'
+ domain:#inet type:nil protocol:nil flags:nil
+ self getAddressInfo:nil serviceName:'echo'
+ domain:#inet type:nil protocol:nil flags:nil
+ self getAddressInfo:nil serviceName:nil
+ domain:#inet type:nil protocol:nil flags:nil
+ self getAddressInfo:'www.google.de' serviceName:nil
+ domain:nil type:nil protocol:nil flags:nil
+ self getAddressInfo:'smc1' serviceName:nil
+ domain:nil type:nil protocol:nil flags:nil
+ "
+!
+
+getNameInfo:socketAddress wantHostName:wantHostName wantServiceName:wantServiceName datagram:useDatagram flags:flags
"answer an Array containing the hostName and serviceName
in socketAddress.
This is the generic version of getHostByAddr, however, if supported by the OS,
@@ -11341,12 +11332,12 @@
if (useDatagram == true) {
__flags |= NI_DGRAM;
}
-
+
{
bp = (char *)(__byteArrayVal(socketAddress));
bp += nInstBytes;
__BEGIN_INTERRUPTABLE__
- ret = getnameinfo((struct sockaddr *)bp, sockAddrSize,
+ ret = getnameinfo((struct sockaddr *)bp, sockAddrSize,
hp, hsz, sp, ssz, __flags);
__END_INTERRUPTABLE__
} while (ret == EAI_SYSTEM && errno == EINTR);
@@ -11390,7 +11381,7 @@
}
errorString = __MKSTRING(gai_strerror(ret));
goto err;
- }
+ }
# else /* ! NI_NUMERICHOST */
{
/*
@@ -11405,7 +11396,7 @@
bp = (char *)(__byteArrayVal(socketAddress));
bp += nInstBytes;
sa = (struct sockaddr_in *)bp;
-
+
if (sp) {
struct servent *servp;
char *__proto = 0;
@@ -11425,7 +11416,7 @@
*/
hostp = gethostbyaddr((char *)&sa->sin_addr, sockAddrSize, sa->sin_family);
/* __END_INTERRUPTABLE__ */
- } while ((hostp == NULL)
+ } while ((hostp == NULL)
&& ((h_errno == TRY_AGAIN)
|| errno == EINTR
# ifdef IRIX5_3
@@ -11453,7 +11444,7 @@
}
error = __mkSmallInteger(h_errno);
goto err;
- }
+ }
# else /* !USE_H_ERRNO */
hostp = gethostbyaddr(sa->sin_addr, sockAddrSize, sa->sin_family);
if (hostp == 0) {
@@ -11467,9 +11458,9 @@
}
# endif /* ! NI_NUMERICHOST */
- if (hp)
+ if (hp)
hostName = __MKSTRING(hp);
- if (sp)
+ if (sp)
serviceName = __MKSTRING(sp);
err:;
#else
@@ -11485,14 +11476,14 @@
"
self getNameInfo:
- (self getAddressInfo:'localhost' serviceName:'echo'
+ (self getAddressInfo:'localhost' serviceName:'echo'
domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ wantHostName:true wantServiceName:true datagram:false flags:0
self getNameInfo:
- (self getAddressInfo:'exept.exept.de' serviceName:'echo'
+ (self getAddressInfo:'exept.exept.de' serviceName:'echo'
domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ wantHostName:true wantServiceName:true datagram:false flags:0
"
! !
@@ -11517,7 +11508,7 @@
error = @symbol(badFd);
goto err;
}
- if (peerOrNil != nil &&
+ if (peerOrNil != nil &&
(!__isNonNilObject(peerOrNil) ||
(__intVal(__ClassInstPtr(__qClass(peerOrNil))->c_flags) & ARRAYMASK) != BYTEARRAY)) {
error = @symbol(badArgument2);
@@ -11572,7 +11563,7 @@
!UnixOperatingSystem::SocketHandle methodsFor:'binding'!
bindTo:socketAddress
- "low level bind -
+ "low level bind -
Set the local address of the socket"
|error|
@@ -11642,8 +11633,8 @@
}
sock = __smallIntegerVal(__INST(fd));
- /*
- * (dis-) connect by connecting to AF_UNSPEC socket
+ /*
+ * (dis-) connect by connecting to AF_UNSPEC socket
*/
again:
ret = connect(sock, &sockaddr, sizeof(sockaddr));
@@ -11671,7 +11662,7 @@
].
!
-connectTo:socketAddress
+connectTo:socketAddress
"low level connect; connect to a socket address.
Return true if connection has been established,
false, when the connection has been initiated but not yet
@@ -11713,7 +11704,7 @@
# if defined(EINPROGRESS) || defined(EALREADY)
# ifdef EINPROGRESS
- case EINPROGRESS:
+ case EINPROGRESS:
# endif
# ifdef EALREADY
case EALREADY:
@@ -11746,7 +11737,7 @@
!UnixOperatingSystem::SocketHandle methodsFor:'datagram transmission'!
-receiveFrom:socketAddress buffer:aDataBuffer start:startIndex for:nBytes flags:flags
+receiveFrom:socketAddress buffer:aDataBuffer start:startIndex for:nBytes flags:flags
"receive datagramm data - put address of originating host into
anAddressBuffer, data into aBuffer. For ST-80 compatibility,
the addressBuffer may be a non-ByteArray; then, it must understand
@@ -11856,7 +11847,7 @@
^ self error:error.
!
-sendTo:socketAddress buffer:aDataBuffer start:startIndex for:maxBytes flags:flags
+sendTo:socketAddress buffer:aDataBuffer start:startIndex for:maxBytes flags:flags
"send datagramm data - fetch address of destination host from
anAddressBuffer, data from aDataBuffer starting at startIndex,
sending count bytes.
@@ -11982,13 +11973,13 @@
!UnixOperatingSystem::SocketHandle methodsFor:'initialization'!
-domain:domainArg type:typeArg protocol:protocolArg
+domain:domainArg type:typeArg protocol:protocolArg
"set up socket with domain, type and protocol number.
- This is a low level entry; no binding, listening or connect is done.
+ This is a low level entry; no binding, listening or connect is done.
All arguments must be symbols from one of
- domainArg: #AF_INET, #AF_UNIX, #AF_APPLETALK (#inet, #unix, #appletalk, #x25) ..
- type: #SOCK_STREAM, #SOCK_DGRAM (#stream, #datagram, #raw) ..
- protocol: #tcp, #udp, #raw ..
+ domainArg: #AF_INET, #AF_UNIX, #AF_APPLETALK (#inet, #unix, #appletalk, #x25) ..
+ type: #SOCK_STREAM, #SOCK_DGRAM (#stream, #datagram, #raw) ..
+ protocol: #tcp, #udp, #raw ..
"
|error domainCode typeCode protocolNumber|
@@ -12008,11 +11999,11 @@
error = @symbol(internalError);
goto err;
}
- if (! __isSmallInteger(domainCode)) {
+ if (! __isSmallInteger(domainCode)) {
error = @symbol(badArgument1);
goto err;
}
- if (! __isSmallInteger(typeArg)) {
+ if (! __isSmallInteger(typeArg)) {
error = @symbol(badArgument2);
goto err;
}
@@ -12023,7 +12014,7 @@
}
proto = __smallIntegerVal(protocolNumber);
}
- dom = __smallIntegerVal(domainCode);
+ dom = __smallIntegerVal(domainCode);
/*
* get socket-type and protocol-type
@@ -12036,7 +12027,7 @@
if (errno == EINTR) {
__HANDLE_INTERRUPTS__;
goto againSocket;
- } else
+ } else
# if defined(EPROTONOSUPPORT) /* for SGI */
if (errno == EPROTONOSUPPORT && proto != 0) {
proto = 0;
@@ -12067,8 +12058,8 @@
!UnixOperatingSystem::SocketHandle methodsFor:'misc'!
-getOptionsLevel:level name:name
- "answer a ByteArray containing the socket option value
+getOptionsLevel:level name:name
+ "answer a ByteArray containing the socket option value
named name at level"
|error bytes size|
@@ -12111,7 +12102,7 @@
^ bytes copyTo:size
!
-listenFor:aNumber
+listenFor:aNumber
"start listening.
aNumber is the number of connect indications queues
by the operating system"
@@ -12153,7 +12144,7 @@
^ nil
!
-setOptionsLevel:level name:name value:value
+setOptionsLevel:level name:name value:value
"set the socket option name at level to value.
Value may be one of SmallInteger, ByteArray or nil"
@@ -12176,7 +12167,7 @@
} else {
error = @symbol(badArgument1);
goto err;
- }
+ }
if (__isSmallInteger(name)) {
__name = __smallIntegerVal(name);
@@ -12185,7 +12176,7 @@
} else {
error = @symbol(badArgument2);
goto err;
- }
+ }
if (__isSmallInteger(value)) {
intval = __intVal(value);
@@ -12212,12 +12203,12 @@
^ nil.
!
-shutdown:anInteger
+shutdown:anInteger
"inform the socket that no more I/O will happen.
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
+ Pending data is discarded. This is faster tha
close, which may wait until pending (written)
data has been read by the other side"
@@ -12319,7 +12310,7 @@
__sockaddr_size = __byteArraySize(socketAddress);
__sock = __smallIntegerVal(__INST(fd));
- __ret = getpeername(__sock, (struct sockaddr *)__byteArrayVal(socketAddress),
+ __ret = getpeername(__sock, (struct sockaddr *)__byteArrayVal(socketAddress),
&__sockaddr_size);
if (__ret < 0) {
error = __mkSmallInteger(errno);
@@ -12336,7 +12327,7 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.206 2004-03-20 15:26:02 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.207 2004-03-31 09:56:38 cg Exp $'
! !
UnixOperatingSystem initialize!