--- a/UnixOperatingSystem.st Fri Oct 07 13:58:26 2011 +0200
+++ b/UnixOperatingSystem.st Fri Oct 07 15:57:55 2011 +0200
@@ -328,17 +328,15 @@
# ifndef NO_SYS_PARAM_H
# include <sys/param.h>
# endif
+
# ifndef MAXPATHLEN
-# ifdef FILENAME_MAX /* i.e. MSDOS_LIKE */
-# define MAXPATHLEN FILENAME_MAX
+# ifdef MAX_PATH
+# define MAXPATHLEN PATH_MAX
# else
-# ifdef MAX_PATH
-# define MAXPATHLEN MAX_PATH
-# else
-# define MAXPATHLEN 1024
-# endif
+# define MAXPATHLEN 1024
# endif
# endif
+
# endif
# if defined(HAS_UNAME)
@@ -2819,29 +2817,29 @@
"Internal lowLevel entry for combined fork & exec;
If fork is false (chain a command):
- execute the OS command specified by the argument, aCommandPath, with
- arguments in argArray (no arguments, if nil).
- If successful, this method does not return and smalltalk is gone.
- If not successful, it does return.
- Normal use is with forkForCommand.
+ execute the OS command specified by the argument, aCommandPath, with
+ arguments in argArray (no arguments, if nil).
+ If successful, this method does not return and smalltalk is gone.
+ If not successful, it does return.
+ Normal use is with forkForCommand.
If fork is true (subprocess command execution):
- fork a child to do the above.
- The process id of the child process is returned; nil if the fork failed.
+ fork a child to do the above.
+ The process id of the child process is returned; nil if the fork failed.
fdColl contains the filedescriptors, to be used for the child (if fork is true).
- fdArray[1] = 15 -> use fd 15 as stdin.
- If an element of the array is set to nil, the corresponding filedescriptor
- will be closed for the child.
- fdArray[1] == StdIn for child
- fdArray[2] == StdOut for child
- fdArray[3] == StdErr for child
- on VMS, these must be channels as returned by createMailBox.
- All filedescriptors not present in fdColl will be closed for the child.
+ fdArray[1] = 15 -> use fd 15 as stdin.
+ If an element of the array is set to nil, the corresponding filedescriptor
+ will be closed for the child.
+ fdArray[1] == StdIn for child
+ fdArray[2] == StdOut for child
+ fdArray[3] == StdErr for child
+ on VMS, these must be channels as returned by createMailBox.
+ All filedescriptors not present in fdColl will be closed for the child.
If newPgrp is true, the subprocess will be established in a new process group.
- The processgroup will be equal to id.
- newPgrp is not used on WIN32 and VMS systems.
+ The processgroup will be equal to id.
+ newPgrp is not used on WIN32 and VMS systems.
environmentDictionary specifies environment variables which are passed differently from
the current environment. If non-nil, it must be a dictionary providing
@@ -2849,32 +2847,32 @@
To pass a variable as empty (i.e. unset), pass a nil value.
Notice: this used to be two separate ST-methods; however, in order to use
- vfork on some machines, it had to be merged into one, to avoid write
- accesses to ST/X memory from the vforked-child.
- The code below only does read accesses."
+ vfork on some machines, it had to be merged into one, to avoid write
+ accesses to ST/X memory from the vforked-child.
+ The code below only does read accesses."
|envArray argArray fdArray dirName cnt|
environmentDictionary size ~~ 0 ifTrue:[
- envArray := Array new:environmentDictionary size.
- cnt := 1.
- environmentDictionary keysAndValuesDo:[:key :val |
- val isNil ifTrue:[
- envArray at:cnt put:(key, '=')
- ] ifFalse:[
- envArray at:cnt put:(key, '=', val)
- ].
- cnt := cnt + 1.
- ].
+ envArray := Array new:environmentDictionary size.
+ cnt := 1.
+ environmentDictionary keysAndValuesDo:[:key :val |
+ val isNil ifTrue:[
+ envArray at:cnt put:(key, '=')
+ ] ifFalse:[
+ envArray at:cnt put:(key, '=', val)
+ ].
+ cnt := cnt + 1.
+ ].
].
argColl notNil ifTrue:[
- argArray := argColl asArray
+ argArray := argColl asArray
].
fdColl notNil ifTrue:[
- fdArray := fdColl asArray
+ fdArray := fdColl asArray
].
aDirectory notNil ifTrue:[
- dirName := aDirectory asFilename name
+ dirName := aDirectory asFilename name
].
%{ /* STACK: 16000 */
@@ -2885,210 +2883,210 @@
char **_env, **_nEnv;
if (__isStringLike(aCommandPath) &&
- ((argArray == nil) || __isArrayLike(argArray)) &&
- ((fdArray == nil) || __isArrayLike(fdArray))
+ ((argArray == nil) || __isArrayLike(argArray)) &&
+ ((fdArray == nil) || __isArrayLike(fdArray))
) {
- nargs = argArray == nil ? 0 : __arraySize(argArray);
- argv = (char **) malloc(sizeof(char *) * (nargs + 1));
- if (argv) {
- int nOldEnv, nNewEnv;
-
- for (i=0; i < nargs; i++) {
- arg = __ArrayInstPtr(argArray)->a_element[i];
- if (__isStringLike(arg)) {
- argv[i] = (char *) __stringVal(arg);
- } else {
- argv[i] = "";
- }
- }
- argv[i] = NULL;
-
- /*
- * number of new items in environment ..
- */
- nNewEnv = 0;
- if ((envArray != nil) && __isArrayLike(envArray)) {
- nNewEnv = __arraySize(envArray);
- }
-
- if (nNewEnv == 0) {
- _nEnv = environ;
- } else {
- _env = environ;
- /*
- * get size of environment
- */
- nOldEnv = 0;
- if (_env) {
- while (*_env) {
- nOldEnv++;
- _env++;
- }
- }
-
- /*
- * generate a new environment
- * I have not found a spec which defines if
- * items at the end overwrite previous definitions,
- * or if the first encountered definition is valid.
- * To be prepared for any case, simply add the new definitions
- * 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.
- * In this case the last entry would overwrite previous entries.
- */
- _nEnv = (char **)malloc(sizeof(char *) * (nNewEnv + nOldEnv + nNewEnv + 1));
- if (_nEnv) {
- char **eO, **eN;
-
- eN = _nEnv;
- if (nNewEnv) {
- /*
- * add new items at the front ...
- */
- int i;
- OBJ *t;
-
- for (i=0, t = __arrayVal(envArray);
- i < __arraySize(envArray);
- i++, t++) {
-
- if (__isStringLike(*t)) {
- *eN++ = (char *)__stringVal(*t);
- }
- }
- }
-
- if (nOldEnv) {
- /*
- * append old environment
- */
- for (eO = environ; *eO; *eN++ = *eO++)
- continue;
- }
-
- if (nNewEnv) {
- /*
- * append new items again at the end
- */
- for (eO = _nEnv, i=0; i<nNewEnv; i++) {
- *eN++ = *eO++;
- }
- }
- *eN = NULL;
- }
- }
-
- if (doFork == true) {
- /*
- * fork a subprocess.
- */
- int nfd;
-
- nfd = fdArray == nil ? 0 : __arraySize(fdArray);
- id = FORK ();
- if (id == 0) {
- /*
- ** In child.
- ** first: dup filedescriptors.
- */
- for (i = 0; i < nfd; i++) {
- OBJ fd;
- int rslt;
-
- fd = __arrayVal(fdArray)[i];
- if (__isSmallInteger(fd) && (__intVal(fd) != i)) {
- do {
- rslt = dup2(__intVal(fd), i);
- } while ((rslt < 0) && (errno == EINTR));
- }
- }
- /*
- ** Second: close descriptors
- ** marked as unwanted
- ** (extra loop to allow duping of low filedescriptor numbers to
- ** higher fd numbers)
- */
- for (i = 0; i < nfd; i++) {
- if (__arrayVal(fdArray)[i] == nil) {
- close(i);
- }
- }
-
- /*
- ** third: close all filedescriptors larger
- ** then the explicitely closed or duped
- ** filedescriptors
- */
+ nargs = argArray == nil ? 0 : __arraySize(argArray);
+ argv = (char **) malloc(sizeof(char *) * (nargs + 1));
+ if (argv) {
+ int nOldEnv, nNewEnv;
+
+ for (i=0; i < nargs; i++) {
+ arg = __ArrayInstPtr(argArray)->a_element[i];
+ if (__isStringLike(arg)) {
+ argv[i] = (char *) __stringVal(arg);
+ } else {
+ argv[i] = "";
+ }
+ }
+ argv[i] = NULL;
+
+ /*
+ * number of new items in environment ..
+ */
+ nNewEnv = 0;
+ if ((envArray != nil) && __isArrayLike(envArray)) {
+ nNewEnv = __arraySize(envArray);
+ }
+
+ if (nNewEnv == 0) {
+ _nEnv = environ;
+ } else {
+ _env = environ;
+ /*
+ * get size of environment
+ */
+ nOldEnv = 0;
+ if (_env) {
+ while (*_env) {
+ nOldEnv++;
+ _env++;
+ }
+ }
+
+ /*
+ * generate a new environment
+ * I have not found a spec which defines if
+ * items at the end overwrite previous definitions,
+ * or if the first encountered definition is valid.
+ * To be prepared for any case, simply add the new definitions
+ * 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.
+ * In this case the last entry would overwrite previous entries.
+ */
+ _nEnv = (char **)malloc(sizeof(char *) * (nNewEnv + nOldEnv + nNewEnv + 1));
+ if (_nEnv) {
+ char **eO, **eN;
+
+ eN = _nEnv;
+ if (nNewEnv) {
+ /*
+ * add new items at the front ...
+ */
+ int i;
+ OBJ *t;
+
+ for (i=0, t = __arrayVal(envArray);
+ i < __arraySize(envArray);
+ i++, t++) {
+
+ if (__isStringLike(*t)) {
+ *eN++ = (char *)__stringVal(*t);
+ }
+ }
+ }
+
+ if (nOldEnv) {
+ /*
+ * append old environment
+ */
+ for (eO = environ; *eO; *eN++ = *eO++)
+ continue;
+ }
+
+ if (nNewEnv) {
+ /*
+ * append new items again at the end
+ */
+ for (eO = _nEnv, i=0; i<nNewEnv; i++) {
+ *eN++ = *eO++;
+ }
+ }
+ *eN = NULL;
+ }
+ }
+
+ if (doFork == true) {
+ /*
+ * fork a subprocess.
+ */
+ int nfd;
+
+ nfd = fdArray == nil ? 0 : __arraySize(fdArray);
+ id = FORK ();
+ if (id == 0) {
+ /*
+ ** In child.
+ ** first: dup filedescriptors.
+ */
+ for (i = 0; i < nfd; i++) {
+ OBJ fd;
+ int rslt;
+
+ fd = __arrayVal(fdArray)[i];
+ if (__isSmallInteger(fd) && (__intVal(fd) != i)) {
+ do {
+ rslt = dup2(__intVal(fd), i);
+ } while ((rslt < 0) && (errno == EINTR));
+ }
+ }
+ /*
+ ** Second: close descriptors
+ ** marked as unwanted
+ ** (extra loop to allow duping of low filedescriptor numbers to
+ ** higher fd numbers)
+ */
+ for (i = 0; i < nfd; i++) {
+ if (__arrayVal(fdArray)[i] == nil) {
+ close(i);
+ }
+ }
+
+ /*
+ ** third: close all filedescriptors larger
+ ** then the explicitely closed or duped
+ ** filedescriptors
+ */
#ifndef OPEN_MAX
# define OPEN_MAX 256
#endif
- for ( ;i < OPEN_MAX; i++) {
- close(i);
- }
-
- if (newPgrp == true) {
+ for ( ;i < OPEN_MAX; i++) {
+ close(i);
+ }
+
+ if (newPgrp == true) {
#ifndef NEXT
- setsid();
+ setsid();
#endif
#if defined(TIOCSCTTY)
- ioctl(0, TIOCSCTTY, 0) ;
+ ioctl(0, TIOCSCTTY, 0) ;
#endif
#if defined(TIOCSPGRP)
- {
- int pgrp = getpid();
-
- ioctl(0, TIOCSPGRP, (char *)&pgrp);
- }
+ {
+ int pgrp = getpid();
+
+ ioctl(0, TIOCSPGRP, (char *)&pgrp);
+ }
#endif
#if defined(_POSIX_JOB_CONTROL)
- (void) setpgid(0, 0);
+ (void) setpgid(0, 0);
#else
# if defined(BSD) || defined(LINUX)
- (void) setpgrp(0);
-# endif
-#endif
- }
-
- if (dirName == nil || chdir((char *)__stringVal(dirName)) == 0) {
- execve((char *)__stringVal(aCommandPath), argv, _nEnv);
- }
- /* reached if chdir failed or aCommandPathh cannot be executed */
- _exit(127); /* POSIX 2 compatible exit value */
- }
- } else {
- /*
- * no subprocess (i.e. transfer to another program)
- */
- if (dirName == nil || chdir((char *)__stringVal(dirName)) == 0) {
- execve((char *)__stringVal(aCommandPath), argv, _nEnv);
- }
- /*
- * reached if chdir failed or command-path cannot be executed
- */
- id = -1;
- }
-
- if (nNewEnv && (_nEnv != NULL)) {
- /*
- * free new environment stuff
- */
- free(_nEnv);
- }
-
- free(argv);
-
- /*
- * In parent: succes or failure
- */
- if (id == -1) {
- RETURN (nil);
- } else {
- RETURN (__mkSmallInteger(id));
- }
- }
+ (void) setpgrp(0);
+# endif
+#endif
+ }
+
+ if (dirName == nil || chdir((char *)__stringVal(dirName)) == 0) {
+ execve((char *)__stringVal(aCommandPath), argv, _nEnv);
+ }
+ /* reached if chdir failed or aCommandPathh cannot be executed */
+ _exit(127); /* POSIX 2 compatible exit value */
+ }
+ } else {
+ /*
+ * no subprocess (i.e. transfer to another program)
+ */
+ if (dirName == nil || chdir((char *)__stringVal(dirName)) == 0) {
+ execve((char *)__stringVal(aCommandPath), argv, _nEnv);
+ }
+ /*
+ * reached if chdir failed or command-path cannot be executed
+ */
+ id = -1;
+ }
+
+ if (nNewEnv && (_nEnv != NULL)) {
+ /*
+ * free new environment stuff
+ */
+ free(_nEnv);
+ }
+
+ free(argv);
+
+ /*
+ * In parent: succes or failure
+ */
+ if (id == -1) {
+ RETURN (nil);
+ } else {
+ RETURN (__mkSmallInteger(id));
+ }
+ }
}
%}.
"
@@ -3104,9 +3102,9 @@
id := OperatingSystem fork.
id == 0 ifTrue:[
- 'I am the child'.
- OperatingSystem exec:'/bin/ls' withArguments:#('ls' '/tmp').
- 'not reached'.
+ 'I am the child'.
+ OperatingSystem exec:'/bin/ls' withArguments:#('ls' '/tmp').
+ 'not reached'.
]
"
"
@@ -3114,11 +3112,11 @@
id := OperatingSystem fork.
id == 0 ifTrue:[
- 'I am the child'.
- OperatingSystem
- exec:'/bin/sh'
- withArguments:#('sh' '-c' 'sleep 2;echo 1;sleep 2;echo 2').
- 'not reached'.
+ 'I am the child'.
+ OperatingSystem
+ exec:'/bin/sh'
+ withArguments:#('sh' '-c' 'sleep 2;echo 1;sleep 2;echo 2').
+ 'not reached'.
].
id printNL.
(Delay forSeconds:3.5) wait.
@@ -3416,10 +3414,10 @@
%{
if (__isStringLike(aPathName) && __isSmallInteger(umask)) {
- if (mkdir(__stringVal(aPathName), __smallIntegerVal(umask)) >= 0) {
- RETURN(true);
- }
- @global(LastErrorNumber) = __mkSmallInteger(errno);
+ if (mkdir(__stringVal(aPathName), __smallIntegerVal(umask)) >= 0) {
+ RETURN(true);
+ }
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
}
%}.
"/ could not create - if it already existed this is ok
@@ -3456,16 +3454,16 @@
int ret;
if (__isStringLike(oldPath) && __isStringLike(newPath)) {
- __BEGIN_INTERRUPTABLE__
- do {
- ret = link((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN (true);
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = link((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN (true);
}
%}.
"/
@@ -3488,24 +3486,24 @@
int ret;
if (__isStringLike(oldPath) && __isStringLike(newPath)) {
- __BEGIN_INTERRUPTABLE__
- do {
- ret = symlink((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN (true);
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = symlink((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN (true);
}
#endif
%}.
(oldPath isString not or:[newPath isString not]) ifTrue:[
- "/
- "/ bad argument(s) given
- "/
- ^ self primitiveFailed
+ "/
+ "/ bad argument(s) given
+ "/
+ ^ self primitiveFailed
].
"/
@@ -3522,13 +3520,13 @@
"open a file, return an os specific fileHandle.
openmode is a symbol defining the way to open
valid modes are:
- #O_RDONLY
- #O_RDWR
- #O_WRONLY
- #O_CREAT
- #O_APPEND
- #O_SYNC
- #O_LARGEFILE
+ #O_RDONLY
+ #O_RDWR
+ #O_WRONLY
+ #O_CREAT
+ #O_APPEND
+ #O_SYNC
+ #O_LARGEFILE
This is a private entry, but maybe useful to open/create a file in a special mode,
which is proprietrary to the operatingSystem."
@@ -3543,55 +3541,55 @@
int n;
if (!__isStringLike(path)) {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (!__isArrayLike(attributes)) {
- error = @symbol(badArgument2);
- goto err;
+ error = @symbol(badArgument2);
+ goto err;
}
if (modeInteger == nil) {
- mode = 0644;
+ mode = 0644;
} else if (__isSmallInteger(modeInteger)) {
- mode = __intVal(modeInteger);
+ mode = __intVal(modeInteger);
} else {
- error = @symbol(badArgument3);
- goto err;
+ error = @symbol(badArgument3);
+ goto err;
}
nAttributes = __arraySize(attributes);
for (n = 0, ap = __arrayVal(attributes); n < nAttributes; n++) {
- OBJ attribute = ap[n];
-
- if (attribute == @symbol(O_RDONLY)) {
- openFlags |= O_RDONLY;
- } else if (attribute == @symbol(O_RDWR)) {
- openFlags |= O_RDWR;
- } else if (attribute == @symbol(O_WRONLY)) {
- openFlags |= O_WRONLY;
- } else if (attribute == @symbol(O_CREAT)) {
- openFlags |= O_CREAT;
- } else if (attribute == @symbol(O_APPEND)) {
- openFlags |= O_APPEND;
- } else if (attribute == @symbol(O_EXCL)) {
- openFlags |= O_EXCL;
- } else if (attribute == @symbol(O_TRUNC)) {
- openFlags |= O_TRUNC;
- } else if (attribute == @symbol(O_LARGEFILE)) {
+ OBJ attribute = ap[n];
+
+ if (attribute == @symbol(O_RDONLY)) {
+ openFlags |= O_RDONLY;
+ } else if (attribute == @symbol(O_RDWR)) {
+ openFlags |= O_RDWR;
+ } else if (attribute == @symbol(O_WRONLY)) {
+ openFlags |= O_WRONLY;
+ } else if (attribute == @symbol(O_CREAT)) {
+ openFlags |= O_CREAT;
+ } else if (attribute == @symbol(O_APPEND)) {
+ openFlags |= O_APPEND;
+ } else if (attribute == @symbol(O_EXCL)) {
+ openFlags |= O_EXCL;
+ } else if (attribute == @symbol(O_TRUNC)) {
+ openFlags |= O_TRUNC;
+ } else if (attribute == @symbol(O_LARGEFILE)) {
#ifdef O_LARGEFILE
- openFlags |= O_LARGEFILE;
+ openFlags |= O_LARGEFILE;
#else
- error = @symbol(badArgument2);
- goto err;
-#endif
- } else if (attribute == @symbol(O_SYNC)) {
+ error = @symbol(badArgument2);
+ goto err;
+#endif
+ } else if (attribute == @symbol(O_SYNC)) {
#ifdef O_SYNC
- openFlags |= O_SYNC;
+ openFlags |= O_SYNC;
#else
- error = @symbol(badArgument2);
- goto err;
-#endif
- }
+ error = @symbol(badArgument2);
+ goto err;
+#endif
+ }
}
#if defined(O_NONBLOCK)
@@ -3603,29 +3601,29 @@
again:
fd = open((char *) __stringVal(path), openFlags, mode);
if (fd < 0) {
- if (errno == EINTR) {
- __HANDLE_INTERRUPTS__;
- goto again;
- } else {
- error = __mkSmallInteger(errno);
- goto err;
- }
+ if (errno == EINTR) {
+ __HANDLE_INTERRUPTS__;
+ goto again;
+ } else {
+ error = __mkSmallInteger(errno);
+ goto err;
+ }
}
fileDescriptor = __mkSmallInteger(fd);
err:;
%}.
^ fileDescriptor notNil ifTrue:[
- FileDescriptorHandle for:fileDescriptor.
+ FileDescriptorHandle for:fileDescriptor.
] ifFalse:[
- (self errorHolderForNumber:error) reportError
- ].
-
- "
- self open:'/etc/hosts' attributes:#(O_RDONLY) mode:nil
- self open:'/tmp/xxzz' attributes:#(O_RDWR O_CREAT) mode:8r611
- self open:'/etc/passwd' attributes:#(O_RDWR) mode:nil
- self open:'/no one knows this file' attributes:#(O_RDONLY) mode:nil
- self open:'foo/bar/baz' attributes:#(O_RDWR O_CREAT) mode:nil
+ (self errorHolderForNumber:error) reportError
+ ].
+
+ "
+ self open:'/etc/hosts' attributes:#(O_RDONLY) mode:nil
+ self open:'/tmp/xxzz' attributes:#(O_RDWR O_CREAT) mode:8r611
+ self open:'/etc/passwd' attributes:#(O_RDWR) mode:nil
+ self open:'/no one knows this file' attributes:#(O_RDONLY) mode:nil
+ self open:'foo/bar/baz' attributes:#(O_RDWR O_CREAT) mode:nil
"
!
@@ -3687,16 +3685,16 @@
int ret;
if (__isStringLike(fullPathName)) {
- __BEGIN_INTERRUPTABLE__
- do {
- ret = rmdir((char *) __stringVal(fullPathName));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN (true);
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = rmdir((char *) __stringVal(fullPathName));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN (true);
}
%}.
"/
@@ -3719,16 +3717,16 @@
int ret;
if (__isStringLike(fullPathName)) {
- __BEGIN_INTERRUPTABLE__
- do {
- ret = unlink((char *) __stringVal(fullPathName));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN (true);
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = unlink((char *) __stringVal(fullPathName));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN (true);
}
%}.
^ self primitiveFailed
@@ -3747,27 +3745,27 @@
if (__isStringLike(oldPath) && __isStringLike(newPath)) {
#if defined(HAS_RENAME)
- __BEGIN_INTERRUPTABLE__
- do {
- ret = rename((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = rename((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
#else
- ret = link((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
- if (ret >= 0) {
- ret = unlink((char *) __stringVal(oldPath));
- if (ret < 0) {
- eno = errno;
- unlink((char *) __stringVal(newPath));
- errno = eno;
- }
- }
-#endif
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN (true);
+ ret = link((char *) __stringVal(oldPath), (char *) __stringVal(newPath));
+ if (ret >= 0) {
+ ret = unlink((char *) __stringVal(oldPath));
+ if (ret < 0) {
+ eno = errno;
+ unlink((char *) __stringVal(newPath));
+ errno = eno;
+ }
+ }
+#endif
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN (true);
}
%}.
^ self primitiveFailed
@@ -3926,7 +3924,7 @@
"
this could have been implemented as:
- (self infoOf:aPathName) at:#mode
+ (self infoOf:aPathName) at:#mode
but for huge directory searches the code below is faster
"
@@ -3936,19 +3934,19 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for accessMode\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) = __mkSmallInteger(errno);
- RETURN ( nil );
- }
- RETURN ( __mkSmallInteger(buf.st_mode & 0777) );
+ printf("stat on '%s' for accessMode\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) = __mkSmallInteger(errno);
+ RETURN ( nil );
+ }
+ RETURN ( __mkSmallInteger(buf.st_mode & 0777) );
}
%}.
^ self primitiveFailed
@@ -3968,16 +3966,16 @@
int ret;
if (__isStringLike(aPathName) && __isSmallInteger(modeBits)) {
- __BEGIN_INTERRUPTABLE__
- do {
- ret = chmod((char *)__stringVal(aPathName), __intVal(modeBits));
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN ( true );
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = chmod((char *)__stringVal(aPathName), __intVal(modeBits));
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN ( true );
}
%}.
^ self primitiveFailed
@@ -4297,20 +4295,20 @@
|path|
%{ /* UNLIMITEDSTACK */
- char nameBuffer[MAXPATHLEN + 1];
-
- if (getcwd(nameBuffer, MAXPATHLEN)) {
- OBJ d;
-
- @global(CurrentDirectory) = d = __MKSTRING(nameBuffer);
- __GSTORE(d);
- RETURN (d);
- }
+ char nameBuffer[MAXPATHLEN + 1];
+
+ if (getcwd(nameBuffer, MAXPATHLEN)) {
+ OBJ d;
+
+ @global(CurrentDirectory) = d = __MKSTRING(nameBuffer);
+ __GSTORE(d);
+ RETURN (d);
+ }
%}.
^ self primitiveFailed
"
- self getCurrentDirectory
+ self getCurrentDirectory
"
!
@@ -4628,27 +4626,27 @@
int ret;
if (__isStringLike(aPathName)) {
- struct stat buf;
+ struct stat buf;
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for isDirectory\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) = __mkSmallInteger(errno);
- RETURN ( false );
- }
- RETURN ( ((buf.st_mode & S_IFMT) == S_IFDIR) ? true : false);
+ printf("stat on '%s' for isDirectory\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) = __mkSmallInteger(errno);
+ RETURN ( false );
+ }
+ RETURN ( ((buf.st_mode & S_IFMT) == S_IFDIR) ? true : false);
}
%}.
^ self primitiveFailed
"an alternative implementation would be:
- ^ (self infoOf:aPathName) type == #directory
+ ^ (self infoOf:aPathName) type == #directory
"
!
@@ -4661,17 +4659,17 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_ACCESS_CALLS
- printf("access on '%s' for executable\n", __stringVal(aPathName));
-# endif
- __BEGIN_INTERRUPTABLE__
- do {
- ret = access(__stringVal(aPathName), X_OK);
- } while ((ret < 0) && (errno == EINTR));
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- }
- RETURN ( ((ret == 0) ? true : false) );
+ printf("access on '%s' for executable\n", __stringVal(aPathName));
+# endif
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = access(__stringVal(aPathName), X_OK);
+ } while ((ret < 0) && (errno == EINTR));
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ }
+ RETURN ( ((ret == 0) ? true : false) );
}
%}.
^ self primitiveFailed
@@ -4686,17 +4684,17 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_ACCESS_CALLS
- printf("access on '%s' for readable\n", __stringVal(aPathName));
-# endif
- __BEGIN_INTERRUPTABLE__
- do {
- ret = access(__stringVal(aPathName), R_OK);
- } while ((ret < 0) && (errno == EINTR));
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- }
- RETURN ( ((ret == 0) ? true : false) );
+ printf("access on '%s' for readable\n", __stringVal(aPathName));
+# endif
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = access(__stringVal(aPathName), R_OK);
+ } while ((ret < 0) && (errno == EINTR));
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ }
+ RETURN ( ((ret == 0) ? true : false) );
}
%}.
^ self primitiveFailed
@@ -4741,17 +4739,17 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_ACCESS_CALLS
- printf("access on '%s' for writable\n", __stringVal(aPathName));
-# endif
- __BEGIN_INTERRUPTABLE__
- do {
- ret = access(__stringVal(aPathName), W_OK);
- } while ((ret < 0) && (errno == EINTR));
- __END_INTERRUPTABLE__
- if (ret < 0) {
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- }
- RETURN ( ((ret == 0) ? true : false) );
+ printf("access on '%s' for writable\n", __stringVal(aPathName));
+# endif
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = access(__stringVal(aPathName), W_OK);
+ } while ((ret < 0) && (errno == EINTR));
+ __END_INTERRUPTABLE__
+ if (ret < 0) {
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ }
+ RETURN ( ((ret == 0) ? true : false) );
}
%}.
^ self primitiveFailed
@@ -5021,20 +5019,20 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for id\n", __stringVal(aPathName));
-# endif
- __BEGIN_INTERRUPTABLE__
- do {
- ret = stat((char *) __stringVal(aPathName), &buf);
- } while (ret < 0 && errno == EINTR);
- __END_INTERRUPTABLE__
- if (ret >= 0) {
- ino = buf.st_ino;
- retVal = __MKUINT(ino);
- RETURN (retVal);
- }
- @global(LastErrorNumber) = __mkSmallInteger(errno);
- RETURN (nil);
+ printf("stat on '%s' for id\n", __stringVal(aPathName));
+# endif
+ __BEGIN_INTERRUPTABLE__
+ do {
+ ret = stat((char *) __stringVal(aPathName), &buf);
+ } while (ret < 0 && errno == EINTR);
+ __END_INTERRUPTABLE__
+ if (ret >= 0) {
+ ino = buf.st_ino;
+ retVal = __MKUINT(ino);
+ RETURN (retVal);
+ }
+ @global(LastErrorNumber) = __mkSmallInteger(errno);
+ RETURN (nil);
}
RETURN (nil);
%}.
@@ -5061,29 +5059,29 @@
%{ /* UNLIMITEDSTACK */
if (__isStringLike(pathName)) {
- if (strcmp(__stringVal(pathName), ".") == 0) {
- char nameBuffer[MAXPATHLEN + 1];
-
- if (@global(CurrentDirectory) == nil) {
- if (getcwd(nameBuffer, MAXPATHLEN)) {
- OBJ d;
-
- @global(CurrentDirectory) = d = __MKSTRING(nameBuffer);
- __GSTORE(d);
- }
- }
- RETURN (@global(CurrentDirectory));
- }
+ if (strcmp(__stringVal(pathName), ".") == 0) {
+ char nameBuffer[MAXPATHLEN + 1];
+
+ if (@global(CurrentDirectory) == nil) {
+ if (getcwd(nameBuffer, MAXPATHLEN)) {
+ OBJ d;
+
+ @global(CurrentDirectory) = d = __MKSTRING(nameBuffer);
+ __GSTORE(d);
+ }
+ }
+ RETURN (@global(CurrentDirectory));
+ }
#ifdef HAS_REALPATH
- {
- char nameBuffer[MAXPATHLEN + 1 + MAXPATHLEN + 1];
-
- if (realpath(__stringVal(pathName), nameBuffer)) {
- RETURN ( __MKSTRING(nameBuffer) );
- }
- RETURN ( nil );
- }
+ {
+ char nameBuffer[MAXPATHLEN + 1 + MAXPATHLEN + 1];
+
+ if (realpath(__stringVal(pathName), nameBuffer)) {
+ RETURN ( __MKSTRING(nameBuffer) );
+ }
+ RETURN ( nil );
+ }
#endif /* ! HAS_REALPATH */
}
%}.
@@ -5095,7 +5093,7 @@
For nonexistent files, nil is returned."
"could be implemented as:
- (self infoOf:aPathName) accessed
+ (self infoOf:aPathName) accessed
"
|osSeconds i|
%{
@@ -5105,18 +5103,18 @@
if (__isStringLike(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) = __mkSmallInteger(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) = __mkSmallInteger(errno);
+ RETURN (nil);
+ }
+ osSeconds = __MKUINT(buf.st_atime);
}
%}.
osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
@@ -5135,7 +5133,7 @@
For nonexistent files, nil is returned."
"could be implemented as:
- (self infoOf:aPathName) modified
+ (self infoOf:aPathName) modified
"
|osSeconds i|
@@ -5146,18 +5144,18 @@
if (__isStringLike(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) = __mkSmallInteger(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) = __mkSmallInteger(errno);
+ RETURN ( nil );
+ }
+ osSeconds = __MKUINT(buf.st_mtime);
}
%}.
osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
@@ -5180,7 +5178,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
"
@@ -5190,45 +5188,45 @@
if (__isStringLike(aPathName)) {
# ifdef TRACE_STAT_CALLS
- printf("stat on '%s' for type\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) = __mkSmallInteger(errno);
- RETURN ( nil );
- }
- switch (buf.st_mode & S_IFMT) {
- case S_IFDIR:
- RETURN ( @symbol(directory) );
- case S_IFREG:
- RETURN ( @symbol(regular) );
+ printf("stat on '%s' for type\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) = __mkSmallInteger(errno);
+ RETURN ( nil );
+ }
+ switch (buf.st_mode & S_IFMT) {
+ case S_IFDIR:
+ RETURN ( @symbol(directory) );
+ case S_IFREG:
+ RETURN ( @symbol(regular) );
# ifdef S_IFCHR
- case S_IFCHR:
- RETURN ( @symbol(characterSpecial) );
+ case S_IFCHR:
+ RETURN ( @symbol(characterSpecial) );
# endif
# ifdef S_IFBLK
- case S_IFBLK:
- RETURN ( @symbol(blockSpecial) );
+ case S_IFBLK:
+ RETURN ( @symbol(blockSpecial) );
# endif
# ifdef S_IFLNK
- case S_IFLNK:
- RETURN ( @symbol(symbolicLink) );
+ case S_IFLNK:
+ RETURN ( @symbol(symbolicLink) );
# endif
# ifdef S_IFSOCK
- case S_IFSOCK:
- RETURN ( @symbol(socket) );
+ case S_IFSOCK:
+ RETURN ( @symbol(socket) );
# endif
# ifdef S_IFIFO
- case S_IFIFO:
- RETURN ( @symbol(fifo) );
-# endif
- default:
- RETURN ( @symbol(unknown) );
- }
+ case S_IFIFO:
+ RETURN ( @symbol(fifo) );
+# endif
+ default:
+ RETURN ( @symbol(unknown) );
+ }
}
%}.
i := self infoOf:aPathName.
@@ -6350,37 +6348,37 @@
getDomainName
"return the domain this host is in.
Notice:
- not all systems support this; on some, #unknown is returned."
+ not all systems support this; on some, #unknown is returned."
|domainName idx hostName|
DomainName notNil ifTrue:[
- ^ DomainName
+ ^ DomainName
].
domainName := self primGetDomainName.
domainName isEmptyOrNil ifTrue:[
- "sometimes, we can extract the domainName from the hostName ..."
- hostName := self primGetHostName.
- hostName notNil ifTrue:[
- idx := hostName indexOf:$..
- idx ~~ 0 ifTrue:[
- domainName := hostName copyFrom:idx+1.
- ]
- ].
- domainName isNil ifTrue:[
- "/ fallBack
- domainName := self getEnvironment:'DOMAIN'.
- domainName isNil ifTrue:[
- domainName := self getCommandOutputFrom:'/bin/domainname'
- ].
- domainName isNil ifTrue:[
- 'UnixOperatingSystem [warning]: cannot find out domainname' errorPrintCR.
- domainName := #unknown.
- ].
- "cache only, if domain name fetching is expensive"
- DomainName := domainName.
- ].
+ "sometimes, we can extract the domainName from the hostName ..."
+ hostName := self primGetHostName.
+ hostName notNil ifTrue:[
+ idx := hostName indexOf:$..
+ idx ~~ 0 ifTrue:[
+ domainName := hostName copyFrom:idx+1.
+ ]
+ ].
+ domainName isNil ifTrue:[
+ "/ fallBack
+ domainName := self getEnvironment:'DOMAIN'.
+ domainName isNil ifTrue:[
+ domainName := self getCommandOutputFrom:'/bin/domainname'
+ ].
+ domainName isNil ifTrue:[
+ 'UnixOperatingSystem [warning]: cannot find out domainname' errorPrintCR.
+ domainName := #unknown.
+ ].
+ "cache only, if domain name fetching is expensive"
+ DomainName := domainName.
+ ].
].
^ domainName
@@ -6502,24 +6500,24 @@
|hostName|
HostName notNil ifTrue:[
- ^ HostName
+ ^ HostName
].
hostName := self primGetHostName.
hostName isNil ifTrue:[
- "fallBack - in non-antique systes we never come here"
- hostName := self getEnvironment:'HOST'.
- hostName isNil ifTrue:[
- hostName := self getCommandOutputFrom:'/bin/hostname'
- ].
- hostName isNil ifTrue:[
- 'UnixOperatingSystem [warning]: cannot find out hostname' errorPrintCR.
- hostName := #unknown.
- ].
- "cache, only because hostname fetching was expensive,
- otherwise we want to see a changed hostname"
- HostName := hostName.
+ "fallBack - in non-antique systes we never come here"
+ hostName := self getEnvironment:'HOST'.
+ hostName isNil ifTrue:[
+ hostName := self getCommandOutputFrom:'/bin/hostname'
+ ].
+ hostName isNil ifTrue:[
+ 'UnixOperatingSystem [warning]: cannot find out hostname' errorPrintCR.
+ hostName := #unknown.
+ ].
+ "cache, only because hostname fetching was expensive,
+ otherwise we want to see a changed hostname"
+ HostName := hostName.
].
^ hostName
@@ -6783,8 +6781,8 @@
getNetworkAddressInfo
"return a dictionary filled with
- key -> name of interface
- value -> the socket adress of the interface
+ key -> name of interface
+ value -> the socket adress of the interface
for each interface"
|returnArray addressArray nameArray noOfIf retDictionary error retIndex|
@@ -6805,8 +6803,8 @@
OBJ t;
if (getifaddrs(&ifap) < 0) {
- error = __MKSTRING("getifaddrs() failed");
- goto out;
+ error = __MKSTRING("getifaddrs() failed");
+ goto out;
}
for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) n_ifa++;
@@ -6814,49 +6812,49 @@
returnArray = __ARRAY_NEW_INT(n_ifa*5);
if (returnArray == nil) {
- /* Creating a string wouldn't work here */
- error = @symbol(allocationFailure);
- goto bad;
+ /* Creating a string wouldn't work here */
+ error = @symbol(allocationFailure);
+ goto bad;
}
for (ifaLoop = ifap; ifaLoop != 0; ifaLoop = ifaLoop->ifa_next) {
- int family, len;
-
- if (ifaLoop->ifa_addr == 0)
- continue;
- family = ifaLoop->ifa_addr->sa_family;
- switch (family) {
- case AF_INET:
- len = sizeof(struct sockaddr_in);
- break;
- case AF_INET6:
- len = sizeof(struct sockaddr_in6);
- break;
+ int family, len;
+
+ if (ifaLoop->ifa_addr == 0)
+ continue;
+ family = ifaLoop->ifa_addr->sa_family;
+ switch (family) {
+ case AF_INET:
+ len = sizeof(struct sockaddr_in);
+ break;
+ case AF_INET6:
+ len = sizeof(struct sockaddr_in6);
+ break;
#if 0
- case AF_PACKET:
- len = sizeof(sockaddr_ll);
- break;
-#endif
- default:
- /* skip */
- continue;
- };
- t = __MKSTRING(ifaLoop->ifa_name);
- __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
- t = __MKUINT(ifaLoop->ifa_flags);
- __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
- t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
- __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
- if (ifaLoop->ifa_netmask != 0) {
- t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
- __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
- }
- retI++;
- if (ifaLoop->ifa_dstaddr != 0) {
- t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
- __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
- }
- retI++;
+ case AF_PACKET:
+ len = sizeof(sockaddr_ll);
+ break;
+#endif
+ default:
+ /* skip */
+ continue;
+ };
+ t = __MKSTRING(ifaLoop->ifa_name);
+ __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+ t = __MKUINT(ifaLoop->ifa_flags);
+ __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+ t = __MKBYTEARRAY((char *)ifaLoop->ifa_addr, len);
+ __arrayVal(returnArray)[retI++] = t; __STORE(returnArray, t);
+ if (ifaLoop->ifa_netmask != 0) {
+ t = __MKBYTEARRAY((char *)ifaLoop->ifa_netmask, len);
+ __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+ }
+ retI++;
+ if (ifaLoop->ifa_dstaddr != 0) {
+ t = __MKBYTEARRAY((char *)ifaLoop->ifa_dstaddr, len);
+ __arrayVal(returnArray)[retI] = t; __STORE(returnArray, t);
+ }
+ retI++;
}
noOfIf = __mkSmallInteger(n_ifa);
@@ -6881,7 +6879,7 @@
afinet_socket = socket(AF_INET, SOCK_DGRAM, 0);
if (afinet_socket < 0) {
- goto bad;
+ goto bad;
}
/*
@@ -6892,9 +6890,9 @@
ifc.ifc_buf = (caddr_t) buf;
if (ioctl (afinet_socket, SIOCGIFCONF, (caddr_t) &ifc) < 0) {
- close(afinet_socket);
- error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
- goto bad;
+ close(afinet_socket);
+ error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+ goto bad;
}
n_ifs = ifc.ifc_len / sizeof (struct ifreq);
@@ -6903,9 +6901,9 @@
addressArray = __ARRAY_NEW_INT(n_ifs);
if (nameArray == nil || addressArray == nil) {
- /* Creating a string wouldn/t work here */
- error = @symbol(allocationFailure);
- goto bad;
+ /* Creating a string wouldn/t work here */
+ error = @symbol(allocationFailure);
+ goto bad;
}
/*
@@ -6915,27 +6913,27 @@
countOfIf = 0;
for (i=0, ifr = ifc.ifc_req; i < n_ifs; i++, ifr++) {
- /*
- ** Get address for this interface
- */
- memset (&ifreq, 0, sizeof(ifreq));
- memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
- if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
- t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
- __arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
- t = __MKSTRING(&ifreq.ifr_name);
- __arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
- countOfIf++;
- } else {
- fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
- }
- error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
+ /*
+ ** Get address for this interface
+ */
+ memset (&ifreq, 0, sizeof(ifreq));
+ memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
+ if (ioctl (afinet_socket, SIOCGIFADDR, &ifreq) >= 0) {
+ t = __MKBYTEARRAY((char *)&ifreq.ifr_addr, sizeof(ifreq.ifr_addr));
+ __arrayVal(addressArray)[countOfIf] = t; __STORE(addressArray, t);
+ t = __MKSTRING(&ifreq.ifr_name);
+ __arrayVal(nameArray)[countOfIf] = t; __STORE(nameArray, t);
+ countOfIf++;
+ } else {
+ fprintf(stderr, "SIOCGIFADDR failed: %s\n", errno);
+ }
+ error = __MKSTRING("ioctl(SIOCGIFCONF) failed");
}
noOfIf = __mkSmallInteger(countOfIf);
bad:
if (afinet_socket >= 0)
- close(afinet_socket);
+ close(afinet_socket);
#else
error = @symbol(notSupported);
#endif /* defined(SIOCGIFADDR) */
@@ -6944,35 +6942,35 @@
retDictionary := Dictionary new:noOfIf.
error notNil ifTrue:[
- self primitiveFailed:error.
- "return empty dictionary if proceeding from error"
- ^ retDictionary.
+ self primitiveFailed:error.
+ "return empty dictionary if proceeding from error"
+ ^ retDictionary.
].
retIndex := 1.
1 to:noOfIf do:[:cnt|
- |name addressBytes set dict|
-
- name := returnArray at:retIndex.
- addressBytes := returnArray at:retIndex+2.
-
- addressBytes notNil ifTrue:[
- set := retDictionary at:name ifAbsentPut:[Set new].
- dict := Dictionary new:5.
- dict at:#flags put:(returnArray at:retIndex+1).
- dict at:#address put:(SocketAddress fromBytes:addressBytes).
- addressBytes := returnArray at:retIndex+3.
- addressBytes notNil ifTrue:[
- dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
- ].
- addressBytes := returnArray at:retIndex+4.
- addressBytes notNil ifTrue:[
- dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
- ].
- set add:dict.
- ].
- retIndex := retIndex + 5.
+ |name addressBytes set dict|
+
+ name := returnArray at:retIndex.
+ addressBytes := returnArray at:retIndex+2.
+
+ addressBytes notNil ifTrue:[
+ set := retDictionary at:name ifAbsentPut:[Set new].
+ dict := Dictionary new:5.
+ dict at:#flags put:(returnArray at:retIndex+1).
+ dict at:#address put:(SocketAddress fromBytes:addressBytes).
+ addressBytes := returnArray at:retIndex+3.
+ addressBytes notNil ifTrue:[
+ dict at:#netMask put:(SocketAddress fromBytes:addressBytes).
+ ].
+ addressBytes := returnArray at:retIndex+4.
+ addressBytes notNil ifTrue:[
+ dict at:#destAddress put:(SocketAddress fromBytes:addressBytes).
+ ].
+ set add:dict.
+ ].
+ retIndex := retIndex + 5.
].
^ retDictionary
@@ -7235,20 +7233,20 @@
"if supported by the OS, return the systemID;
a unique per machine identification.
WARNING:
- not all systems support this; on some, #unknown is returned."
+ not all systems support this; on some, #unknown is returned."
%{ /* NOCONTEXT */
#if defined(HAS_SYSINFO) && defined(SI_HW_SERIAL)
{
- char buffer[128];
-
- buffer[0] = 0;
- if (sysinfo(SI_HW_SERIAL, buffer, sizeof(buffer))) {
- buffer[127] = 0;
- if (strlen(buffer) > 0) {
- RETURN(__MKSTRING(buffer));
- }
- }
+ char buffer[128];
+
+ buffer[0] = 0;
+ if (sysinfo(SI_HW_SERIAL, buffer, sizeof(buffer))) {
+ buffer[127] = 0;
+ if (strlen(buffer) > 0) {
+ RETURN(__MKSTRING(buffer));
+ }
+ }
}
#elif defined(HAS_GETHOSTID)
int runningId;
@@ -7264,9 +7262,9 @@
OBJ arr;
if ((retVal = syssgi(SGI_SYSID, idBuffer)) == 0) {
- arr = __BYTEARRAY_UNINITIALIZED_NEW_INT(MAXSYSIDSIZE);
- bcopy(idBuffer, __byteArrayVal(arr), MAXSYSIDSIZE);
- RETURN (arr);
+ arr = __BYTEARRAY_UNINITIALIZED_NEW_INT(MAXSYSIDSIZE);
+ bcopy(idBuffer, __byteArrayVal(arr), MAXSYSIDSIZE);
+ RETURN (arr);
}
#endif
%}.
@@ -7290,53 +7288,53 @@
This method is mainly provided to augment error reports with some system
information.
(in case of system/version specific OS errors, conditional workarounds and patches
- may be based upon this info).
+ may be based upon this info).
Also, applications could enable/disable buffering or otherwise reduce
their memory usage depending upon the amount of memory installed.
Your application may make use of available information for tuning,
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 ...)
- #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 ...)
+ #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
- #sharedRam -> amount of memory which is shared among processes
- (i.e. shared code)
- #bufferRam -> amount used for buffers
- #swapSize -> total size of swap space
- #freeSwap -> free amount in swapSpace
- #numberOfCPUs -> number of cpus in box
- #extendedInstructions -> extended instruction set info
+ #totalRam -> total amount of memory available
+ #sharedRam -> amount of memory which is shared among processes
+ (i.e. shared code)
+ #bufferRam -> amount used for buffers
+ #swapSize -> total size of swap space
+ #freeSwap -> free amount in swapSpace
+ #numberOfCPUs -> number of cpus in box
+ #extendedInstructions -> extended instruction set info
osf:
- #physicalRam -> total amount of physical memory
- #cpuType -> type of cpu (more detailed than machine)
- #numberOfCPUs -> number of cpus in box
+ #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)
- #freeRam -> amount of free memory
- #numberOfCPUs -> number of cpus in box (online CPUS)
- [#dCacheSize] -> bytes in data cache (only available on some solaris versions)
- [#iCacheSize] -> bytes in data cache (only available on some solaris versions)
- [#instructionSets]-> instruction sets available (only available on some solaris versions)
- [#platform] -> platform name (only available on some solaris versions)
+ #physicalRam -> total amount of physical memory
+ #availableRam -> total available amount of physical memory (i.e. unused ram)
+ #freeRam -> amount of free memory
+ #numberOfCPUs -> number of cpus in box (online CPUS)
+ [#dCacheSize] -> bytes in data cache (only available on some solaris versions)
+ [#iCacheSize] -> bytes in data cache (only available on some solaris versions)
+ [#instructionSets]-> instruction sets available (only available on some solaris versions)
+ [#platform] -> platform name (only available on some solaris versions)
hpux:
- #physicalRam -> total amount of physical memory in box
- #activeRealMemory -> ? - read pstat documentation
- #activeVirtualRam -> ? - read pstat documentation
- #freeMemory -> ? - read pstat documentation
- #realMemory -> ? (amount of memory left to user programs)
- #virtualRam -> ? - read pstat documentation
+ #physicalRam -> total amount of physical memory in box
+ #activeRealMemory -> ? - read pstat documentation
+ #activeVirtualRam -> ? - read pstat documentation
+ #freeMemory -> ? - read pstat documentation
+ #realMemory -> ? (amount of memory left to user programs)
+ #virtualRam -> ? - read pstat documentation
"
|sys node rel ver mach dom mtyp brel info arch cpuType cpuSpeed
@@ -7354,11 +7352,11 @@
struct sysinfo infoBuffer;
if (sysinfo(&infoBuffer) >= 0) {
- totalRam = __MKUINT(infoBuffer.totalram);
- sharedRam = __MKUINT(infoBuffer.sharedram);
- bufferRam = __MKUINT(infoBuffer.bufferram);
- swapSize = __MKUINT(infoBuffer.totalswap);
- freeSwap = __MKUINT(infoBuffer.freeswap);
+ totalRam = __MKUINT(infoBuffer.totalram);
+ sharedRam = __MKUINT(infoBuffer.sharedram);
+ bufferRam = __MKUINT(infoBuffer.bufferram);
+ swapSize = __MKUINT(infoBuffer.totalswap);
+ freeSwap = __MKUINT(infoBuffer.freeswap);
}
# endif
#endif /* LINUX */
@@ -7385,18 +7383,18 @@
#if defined(HAS_UNAME)
{
- struct utsname ubuff;
-
- if (uname(&ubuff) >= 0) {
- sys = __MKSTRING(ubuff.sysname);
- node = __MKSTRING(ubuff.nodename);
- rel = __MKSTRING(ubuff.release);
- ver = __MKSTRING(ubuff.version);
- mach = __MKSTRING(ubuff.machine);
+ struct utsname ubuff;
+
+ if (uname(&ubuff) >= 0) {
+ sys = __MKSTRING(ubuff.sysname);
+ node = __MKSTRING(ubuff.nodename);
+ rel = __MKSTRING(ubuff.release);
+ ver = __MKSTRING(ubuff.version);
+ mach = __MKSTRING(ubuff.machine);
# if defined(HAS_UTS_DOMAINNAME) || defined(_GNU_SOURCE)
- dom = __MKSTRING(ubuff.domainname);
+ dom = __MKSTRING(ubuff.domainname);
# endif /* no HAS_UTS_DOMAINNAME */
- }
+ }
}
#else /* no UNAME */
@@ -7409,41 +7407,41 @@
#if defined(HAS_SYSINFO)
# if defined(SI_ARCHITECTURE)
if (arch == nil) {
- char buffer[128];
-
- if (sysinfo(SI_ARCHITECTURE, buffer, sizeof(buffer))) {
- arch = __MKSTRING(buffer);
- }
+ char buffer[128];
+
+ if (sysinfo(SI_ARCHITECTURE, buffer, sizeof(buffer))) {
+ arch = __MKSTRING(buffer);
+ }
}
# endif /* SI_ARCHITECTURE */
# if defined(SI_ISALIST)
{
- char buffer[128];
-
- if (sysinfo(SI_ISALIST, buffer, sizeof(buffer))) {
- instructionSets = __MKSTRING(buffer);
- }
+ char buffer[128];
+
+ if (sysinfo(SI_ISALIST, buffer, sizeof(buffer))) {
+ instructionSets = __MKSTRING(buffer);
+ }
}
# endif /* SI_ISALIST */
# if defined(SI_PLATFORM)
{
- char buffer[128];
-
- if (sysinfo(SI_PLATFORM, buffer, sizeof(buffer))) {
- platform = __MKSTRING(buffer);
- }
+ char buffer[128];
+
+ if (sysinfo(SI_PLATFORM, buffer, sizeof(buffer))) {
+ platform = __MKSTRING(buffer);
+ }
}
# endif /* SI_PLATFORM */
# if defined(SI_RELEASE)
{
- char buffer[128];
-
- if (sysinfo(SI_RELEASE, buffer, sizeof(buffer))) {
- rel = __MKSTRING(buffer);
- }
+ char buffer[128];
+
+ if (sysinfo(SI_RELEASE, buffer, sizeof(buffer))) {
+ rel = __MKSTRING(buffer);
+ }
}
# endif /* SI_RELEASE */
#endif /* HAS_SYSINFO */
@@ -7451,426 +7449,426 @@
#if defined(HAS_SYSCONF)
# ifdef _SC_NPROCESSORS_ONLN
{
- long val;
-
- val = sysconf(_SC_NPROCESSORS_ONLN);
- if (val > 0) {
- numberOfCPUs = __MKINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_NPROCESSORS_ONLN);
+ if (val > 0) {
+ numberOfCPUs = __MKINT(val);
+ }
}
# endif
# ifdef _SC_NPROCESSORS_CONF
{
- long val;
-
- val = sysconf(_SC_NPROCESSORS_CONF);
- if (val > 0) {
- numberOfPhysicalCPUs = __MKINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_NPROCESSORS_CONF);
+ if (val > 0) {
+ numberOfPhysicalCPUs = __MKINT(val);
+ }
}
# endif
# if defined(_SC_PAGESIZE)
{
- long val;
-
- val = sysconf(_SC_PAGESIZE);
- if (val != -1) {
- pageSize = __MKUINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_PAGESIZE);
+ if (val != -1) {
+ pageSize = __MKUINT(val);
+ }
}
# endif
# if defined(_SC_PHYS_PAGES)
{
- long val;
-
- val = sysconf(_SC_PHYS_PAGES);
- if (val != -1) {
- physicalPages = __MKUINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_PHYS_PAGES);
+ if (val != -1) {
+ physicalPages = __MKUINT(val);
+ }
}
# endif
# if defined(_SC_AVPHYS_PAGES)
{
- long val;
-
- val = sysconf(_SC_AVPHYS_PAGES);
- if (val != -1) {
- availablePages = __MKUINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_AVPHYS_PAGES);
+ if (val != -1) {
+ availablePages = __MKUINT(val);
+ }
}
# endif
# if defined(_SC_ICACHE_SZ)
{
- long val;
-
- val = sysconf(_SC_ICACHE_SZ);
- if (val != -1) {
- iCacheSize = __MKUINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_ICACHE_SZ);
+ if (val != -1) {
+ iCacheSize = __MKUINT(val);
+ }
}
# endif
# if defined(_SC_DCACHE_SZ)
{
- long val;
-
- val = sysconf(_SC_DCACHE_SZ);
- if (val != -1) {
- dCacheSize = __MKUINT(val);
- }
+ long val;
+
+ val = sysconf(_SC_DCACHE_SZ);
+ if (val != -1) {
+ dCacheSize = __MKUINT(val);
+ }
}
# endif
#endif /* HAS_SYSCONF */
#if defined(HAS_GETSYSINFO)
{
- INT index;
- int retInt32 = 0;
+ INT index;
+ int retInt32 = 0;
# if defined(GSI_CPU)
- index = 0;
- if (getsysinfo(GSI_CPU, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
- switch (retInt32) {
+ index = 0;
+ if (getsysinfo(GSI_CPU, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
+ switch (retInt32) {
# ifdef VAX_780
- case VAX_780:
- cpuType = __MKSTRING("VAX_780");
- break;
+ case VAX_780:
+ cpuType = __MKSTRING("VAX_780");
+ break;
# endif
# ifdef VAX_750
- case VAX_750:
- cpuType = __MKSTRING("VAX_750");
- break;
+ case VAX_750:
+ cpuType = __MKSTRING("VAX_750");
+ break;
# endif
# ifdef VAX_730
- case VAX_730:
- cpuType = __MKSTRING("VAX_730");
- break;
+ case VAX_730:
+ cpuType = __MKSTRING("VAX_730");
+ break;
# endif
# ifdef VAX_8600
- case VAX_8600:
- cpuType = __MKSTRING("VAX_8600");
- break;
+ case VAX_8600:
+ cpuType = __MKSTRING("VAX_8600");
+ break;
# endif
# ifdef VAX_8200
- case VAX_8200:
- cpuType = __MKSTRING("VAX_8200");
- break;
+ case VAX_8200:
+ cpuType = __MKSTRING("VAX_8200");
+ break;
# endif
# ifdef VAX_8800
- case VAX_8800:
- cpuType = __MKSTRING("VAX_8800");
- break;
+ case VAX_8800:
+ cpuType = __MKSTRING("VAX_8800");
+ break;
# endif
# ifdef MVAX_I
- case MVAX_I:
- cpuType = __MKSTRING("MVAX_I");
- break;
+ case MVAX_I:
+ cpuType = __MKSTRING("MVAX_I");
+ break;
# endif
# ifdef MVAX_II
- case MVAX_II:
- cpuType = __MKSTRING("MVAX_II");
- break;
+ case MVAX_II:
+ cpuType = __MKSTRING("MVAX_II");
+ break;
# endif
# ifdef V_VAX
- case V_VAX:
- cpuType = __MKSTRING("V_VAX");
- break;
+ case V_VAX:
+ cpuType = __MKSTRING("V_VAX");
+ break;
# endif
# ifdef VAX_3600
- case VAX_3600:
- cpuType = __MKSTRING("VAX_3600");
- break;
+ case VAX_3600:
+ cpuType = __MKSTRING("VAX_3600");
+ break;
# endif
# ifdef VAX_6200
- case VAX_6200:
- cpuType = __MKSTRING("VAX_6200");
- break;
+ case VAX_6200:
+ cpuType = __MKSTRING("VAX_6200");
+ break;
# endif
# ifdef VAX_3400
- case VAX_3400:
- cpuType = __MKSTRING("VAX_3400");
- break;
+ case VAX_3400:
+ cpuType = __MKSTRING("VAX_3400");
+ break;
# endif
# ifdef C_VAXSTAR
- case C_VAXSTAR:
- cpuType = __MKSTRING("C_VAXSTAR");
- break;
+ case C_VAXSTAR:
+ cpuType = __MKSTRING("C_VAXSTAR");
+ break;
# endif
# ifdef VAX_60
- case VAX_60:
- cpuType = __MKSTRING("VAX_60");
- break;
+ case VAX_60:
+ cpuType = __MKSTRING("VAX_60");
+ break;
# endif
# ifdef VAX_3900
- case VAX_3900:
- cpuType = __MKSTRING("VAX_3900");
- break;
+ case VAX_3900:
+ cpuType = __MKSTRING("VAX_3900");
+ break;
# endif
# ifdef DS_3100
- case DS_3100:
- cpuType = __MKSTRING("DS_3100");
- break;
+ case DS_3100:
+ cpuType = __MKSTRING("DS_3100");
+ break;
# endif
# ifdef VAX_8820
- case VAX_8820:
- cpuType = __MKSTRING("VAX_8820");
- break;
+ case VAX_8820:
+ cpuType = __MKSTRING("VAX_8820");
+ break;
# endif
# ifdef DS_5400
- case DS_5400:
- cpuType = __MKSTRING("DS_5400");
- break;
+ case DS_5400:
+ cpuType = __MKSTRING("DS_5400");
+ break;
# endif
# ifdef DS_5800
- case DS_5800:
- cpuType = __MKSTRING("DS_5800");
- break;
+ case DS_5800:
+ cpuType = __MKSTRING("DS_5800");
+ break;
# endif
# ifdef DS_5000
- case DS_5000:
- cpuType = __MKSTRING("DS_5000");
- break;
+ case DS_5000:
+ cpuType = __MKSTRING("DS_5000");
+ break;
# endif
# ifdef DS_CMAX
- case DS_CMAX:
- cpuType = __MKSTRING("DS_CMAX");
- break;
+ case DS_CMAX:
+ cpuType = __MKSTRING("DS_CMAX");
+ break;
# endif
# ifdef VAX_6400
- case VAX_6400:
- cpuType = __MKSTRING("VAX_6400");
- break;
+ case VAX_6400:
+ cpuType = __MKSTRING("VAX_6400");
+ break;
# endif
# ifdef VAXSTAR
- case VAXSTAR:
- cpuType = __MKSTRING("VAXSTAR");
- break;
+ case VAXSTAR:
+ cpuType = __MKSTRING("VAXSTAR");
+ break;
# endif
# ifdef DS_5500
- case DS_5500:
- cpuType = __MKSTRING("DS_5500");
- break;
+ case DS_5500:
+ cpuType = __MKSTRING("DS_5500");
+ break;
# endif
# ifdef DS_5100
- case DS_5100:
- cpuType = __MKSTRING("DS_5100");
- break;
+ case DS_5100:
+ cpuType = __MKSTRING("DS_5100");
+ break;
# endif
# ifdef VAX_9000
- case VAX_9000:
- cpuType = __MKSTRING("VAX_9000");
- break;
+ case VAX_9000:
+ cpuType = __MKSTRING("VAX_9000");
+ break;
# endif
# ifdef DS_500_100
- case DS_500_100:
- cpuType = __MKSTRING("DS_500_100");
- break;
+ case DS_500_100:
+ cpuType = __MKSTRING("DS_500_100");
+ break;
# endif
# ifdef ALPHA_ADU
- case ALPHA_ADU:
- cpuType = __MKSTRING("ALPHA_ADU");
- break;
+ case ALPHA_ADU:
+ cpuType = __MKSTRING("ALPHA_ADU");
+ break;
# endif
# ifdef DEC_4000
- case DEC_4000:
- cpuType = __MKSTRING("DEC_4000");
- break;
+ case DEC_4000:
+ cpuType = __MKSTRING("DEC_4000");
+ break;
# endif
# ifdef DEC_3000_500
- case DEC_3000_500:
- cpuType = __MKSTRING("DEC_3000_500");
- break;
+ case DEC_3000_500:
+ cpuType = __MKSTRING("DEC_3000_500");
+ break;
# endif
# ifdef DEC_7000
- case DEC_7000:
- cpuType = __MKSTRING("DEC_7000");
- break;
+ case DEC_7000:
+ cpuType = __MKSTRING("DEC_7000");
+ break;
# endif
# ifdef DS_5000_300
- case DS_5000_300:
- cpuType = __MKSTRING("DS_5000_300");
- break;
+ case DS_5000_300:
+ cpuType = __MKSTRING("DS_5000_300");
+ break;
# endif
# ifdef DEC_3000_300
- case DEC_3000_300:
- cpuType = __MKSTRING("DEC_3000_300");
- break;
+ case DEC_3000_300:
+ cpuType = __MKSTRING("DEC_3000_300");
+ break;
# endif
# ifdef DEC_2000_300
- case DEC_2000_300:
- cpuType = __MKSTRING("DEC_2000_300");
- break;
+ case DEC_2000_300:
+ cpuType = __MKSTRING("DEC_2000_300");
+ break;
# endif
# ifdef DEC_2100_A500
- case DEC_2100_A500:
- cpuType = __MKSTRING("DEC_2100_A500");
- break;
+ case DEC_2100_A500:
+ cpuType = __MKSTRING("DEC_2100_A500");
+ break;
# endif
# ifdef DEC_2100_A50
- case DEC_2100_A50:
- cpuType = __MKSTRING("DEC_2100_A50");
- break;
+ case DEC_2100_A50:
+ cpuType = __MKSTRING("DEC_2100_A50");
+ break;
# endif
# ifdef ALPHA_KN20AA
- case ALPHA_KN20AA:
- cpuType = __MKSTRING("ALPHA_KN20AA");
- break;
+ case ALPHA_KN20AA:
+ cpuType = __MKSTRING("ALPHA_KN20AA");
+ break;
# endif
# ifdef DEC_21000
- case DEC_21000:
- cpuType = __MKSTRING("DEC_21000");
- break;
+ case DEC_21000:
+ cpuType = __MKSTRING("DEC_21000");
+ break;
# endif
# ifdef DEC_AXPVME_64
- case DEC_AXPVME_64:
- cpuType = __MKSTRING("DEC_AXPVME_64");
- break;
+ case DEC_AXPVME_64:
+ cpuType = __MKSTRING("DEC_AXPVME_64");
+ break;
# endif
# ifdef DEC_2100_C500
- case DEC_2100_C500:
- cpuType = __MKSTRING("DEC_2100_C500");
- break;
+ case DEC_2100_C500:
+ cpuType = __MKSTRING("DEC_2100_C500");
+ break;
# endif
# ifdef DEC_AXPPCI_33
- case DEC_AXPPCI_33:
- cpuType = __MKSTRING("DEC_AXPPCI_33");
- break;
+ case DEC_AXPPCI_33:
+ cpuType = __MKSTRING("DEC_AXPPCI_33");
+ break;
# endif
# ifdef DEC_1000
- case DEC_1000:
- cpuType = __MKSTRING("DEC_1000");
- break;
+ case DEC_1000:
+ cpuType = __MKSTRING("DEC_1000");
+ break;
# endif
# ifdef EB64_PLUS
- case EB64_PLUS:
- cpuType = __MKSTRING("EB64_PLUS");
- break;
+ case EB64_PLUS:
+ cpuType = __MKSTRING("EB64_PLUS");
+ break;
# endif
# ifdef LCA_EB66
- case LCA_EB66:
- cpuType = __MKSTRING("LCA_EB66");
- break;
+ case LCA_EB66:
+ cpuType = __MKSTRING("LCA_EB66");
+ break;
# endif
# ifdef ALPHA_EB164
- case ALPHA_EB164:
- cpuType = __MKSTRING("ALPHA_EB164");
- break;
+ case ALPHA_EB164:
+ cpuType = __MKSTRING("ALPHA_EB164");
+ break;
# endif
# ifdef DEC_EV45_PBP
- case DEC_EV45_PBP:
- cpuType = __MKSTRING("DEC_EV45_PBP");
- break;
+ case DEC_EV45_PBP:
+ cpuType = __MKSTRING("DEC_EV45_PBP");
+ break;
# endif
# ifdef DEC_1000A
- case DEC_1000A:
- cpuType = __MKSTRING("DEC_1000A");
- break;
+ case DEC_1000A:
+ cpuType = __MKSTRING("DEC_1000A");
+ break;
# endif
# ifdef DEC_4100
- case DEC_4100:
- cpuType = __MKSTRING("DEC_4100");
- break;
+ case DEC_4100:
+ cpuType = __MKSTRING("DEC_4100");
+ break;
# endif
# ifdef DEC_ALPHAVME_224
- case DEC_ALPHAVME_224:
- cpuType = __MKSTRING("DEC_ALPHAVME_224");
- break;
+ case DEC_ALPHAVME_224:
+ cpuType = __MKSTRING("DEC_ALPHAVME_224");
+ break;
# endif
# ifdef DEC_1000_5
- case DEC_1000_5:
- cpuType = __MKSTRING("DEC_1000_5");
- break;
+ case DEC_1000_5:
+ cpuType = __MKSTRING("DEC_1000_5");
+ break;
# endif
# ifdef DEC_1000A_5
- case DEC_1000A_5:
- cpuType = __MKSTRING("DEC_1000A_5");
- break;
+ case DEC_1000A_5:
+ cpuType = __MKSTRING("DEC_1000A_5");
+ break;
# endif
# ifdef DEC_EV56_PBP
- case DEC_EV56_PBP:
- cpuType = __MKSTRING("DEC_EV56_PBP");
- break;
+ case DEC_EV56_PBP:
+ cpuType = __MKSTRING("DEC_EV56_PBP");
+ break;
# endif
# ifdef ALPHABOOK
- case ALPHABOOK:
- cpuType = __MKSTRING("ALPHABOOK");
- break;
+ case ALPHABOOK:
+ cpuType = __MKSTRING("ALPHABOOK");
+ break;
# endif
# ifdef DEC_ALPHAVME_320
- case DEC_ALPHAVME_320:
- cpuType = __MKSTRING("DEC_ALPHAVME_320");
- break;
+ case DEC_ALPHAVME_320:
+ cpuType = __MKSTRING("DEC_ALPHAVME_320");
+ break;
# endif
# ifdef DEC_550
- case DEC_550:
- cpuType = __MKSTRING("DEC_550");
- break;
+ case DEC_550:
+ cpuType = __MKSTRING("DEC_550");
+ break;
# endif
# ifdef DEC_6600
- case DEC_6600:
- cpuType = __MKSTRING("DEC_6600");
- break;
+ case DEC_6600:
+ cpuType = __MKSTRING("DEC_6600");
+ break;
# endif
# ifdef UNKN_SYSTEM
- case UNKN_SYSTEM:
- cpuType = __MKSTRING("UNKN_SYSTEM");
- break;
-# endif
- default:
- cpuType = __MKSTRING("OTHER_DEC_SYSTEM");
- break;
- }
- }
+ case UNKN_SYSTEM:
+ cpuType = __MKSTRING("UNKN_SYSTEM");
+ break;
+# endif
+ default:
+ cpuType = __MKSTRING("OTHER_DEC_SYSTEM");
+ break;
+ }
+ }
# endif /* GSI_CPU */
# if defined(GSI_CPU_INFO)
- /*
- * stupid: OSF1 pre V4.0 has no mhz, but V4.0 has it.
- * use the GSI_PLATFORM_NAME as a hint - it is only defined in
- * V4.0 and higher ... (sigh)
- */
+ /*
+ * stupid: OSF1 pre V4.0 has no mhz, but V4.0 has it.
+ * use the GSI_PLATFORM_NAME as a hint - it is only defined in
+ * V4.0 and higher ... (sigh)
+ */
# if defined GSI_PLATFORM_NAME
- {
- struct cpu_info cpuInfo;
-
- index = 0;
- if (getsysinfo(GSI_CPU_INFO, &cpuInfo, sizeof(cpuInfo), &index, NULL) > 0) {
- cpuSpeed = __MKUINT(cpuInfo.mhz);
- }
- }
+ {
+ struct cpu_info cpuInfo;
+
+ index = 0;
+ if (getsysinfo(GSI_CPU_INFO, &cpuInfo, sizeof(cpuInfo), &index, NULL) > 0) {
+ cpuSpeed = __MKUINT(cpuInfo.mhz);
+ }
+ }
# endif
# endif /* GSI_CPU_INFO */
# if defined(GSI_CPUS_IN_BOX)
- index = 0;
- if (getsysinfo(GSI_CPUS_IN_BOX, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
- numberOfCPUs = __MKUINT(retInt32);
- }
+ index = 0;
+ if (getsysinfo(GSI_CPUS_IN_BOX, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
+ numberOfCPUs = __MKUINT(retInt32);
+ }
# endif /* GSI_CPUS_IN_BOX */
# if defined(GSI_PHYSMEM)
- index = 0;
- if (getsysinfo(GSI_PHYSMEM, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
- INT bytes = retInt32 * 1024;
-
- physicalRam = __MKUINT(bytes);
- }
+ index = 0;
+ if (getsysinfo(GSI_PHYSMEM, &retInt32, sizeof(retInt32), &index, NULL) > 0) {
+ INT bytes = retInt32 * 1024;
+
+ physicalRam = __MKUINT(bytes);
+ }
# endif /* GSI_PHYSMEM */
# if defined(GSI_PLATFORM_NAME) && (!defined(HAS_SYSINFO) || !defined(SI_PLATFORM))
{
- char buffer[128];
-
- index = 0;
- if (getsysinfo(GSI_PLATFORM_NAME, buffer, sizeof(buffer), &index, NULL) > 0) {
- platform = __MKSTRING(buffer);
- }
+ char buffer[128];
+
+ index = 0;
+ if (getsysinfo(GSI_PLATFORM_NAME, buffer, sizeof(buffer), &index, NULL) > 0) {
+ platform = __MKSTRING(buffer);
+ }
}
# endif /* GSI_PLATFORM_NAME */
@@ -7878,25 +7876,25 @@
#endif /* HAS_GETSYSINFO */
{
- extern OBJ __getInstructionSetInfo();
-
- extendedInstructions = __getInstructionSetInfo();
+ extern OBJ __getInstructionSetInfo();
+
+ extendedInstructions = __getInstructionSetInfo();
}
%}.
sys isNil ifTrue:[
- sys := self getSystemType.
+ sys := self getSystemType.
].
node isNil ifTrue:[
- node := self getHostName.
+ node := self getHostName.
].
dom isNil ifTrue:[
- dom := self getDomainName.
+ dom := self getDomainName.
].
mach isNil ifTrue:[
- mach := self getCPUType.
+ mach := self getCPUType.
].
arch isNil ifTrue:[
- arch := sys.
+ arch := sys.
].
info := IdentityDictionary new.
@@ -7908,12 +7906,12 @@
arch notNil ifTrue:[info at:#architecture put:arch].
dom notNil ifTrue:[info at:#domain put:dom].
(pageSize notNil and:[physicalPages notNil]) ifTrue:[
- physicalRam := pageSize * physicalPages. "/ done here - could be largeInt.
+ physicalRam := pageSize * physicalPages. "/ done here - could be largeInt.
].
physicalRam notNil ifTrue:[info at:#physicalRam put:physicalRam].
(pageSize notNil and:[availablePages notNil]) ifTrue:[
- availableRam := pageSize * availablePages. "/ done here - could be largeInt.
- availableRam notNil ifTrue:[info at:#availableRam put:availableRam].
+ availableRam := pageSize * availablePages. "/ done here - could be largeInt.
+ availableRam notNil ifTrue:[info at:#availableRam put:availableRam].
].
totalRam notNil ifTrue:[info at:#totalRam put:totalRam].
sharedRam notNil ifTrue:[info at:#sharedRam put:sharedRam].
@@ -7968,7 +7966,7 @@
%}.
sys isNil ifTrue:[
- ^ self getOSType
+ ^ self getOSType
].
^ sys
@@ -7998,11 +7996,11 @@
%{
if (__isSmallInteger(pid)) {
- /* in UNIX, a kill(pid, 0) is a noop used to check if a pid exists */
- if (kill(__smallIntegerVal(pid), 0) < 0 && errno != EPERM) {
- RETURN ( false );
- }
- RETURN ( true );
+ /* in UNIX, a kill(pid, 0) is a noop used to check if a pid exists */
+ if (kill(__smallIntegerVal(pid), 0) < 0 && errno != EPERM) {
+ RETURN ( false );
+ }
+ RETURN ( true );
}
%}.
@@ -8013,7 +8011,7 @@
self isProcessIdPresent:self getProcessId
self isProcessIdPresent:1
self isProcessIdPresent:4711
- "
+ "
!
isUNIXlike
@@ -8213,30 +8211,30 @@
int valueSize;
if (__isStringLike(aKeyStringOrSymbol)) {
- if (aString == nil) {
- /* env used only temporary for deregistration */
- valueSize = 0;
- env = __stringVal(aKeyStringOrSymbol);
- } else if (__isStringLike(aString)) {
- /* have to use stable memory for env */
- valueSize = __stringSize(aString);
- env = (char *)malloc(__stringSize(aKeyStringOrSymbol) + valueSize + 2);
- if (env == 0)
- goto err;
- strcpy(env, __stringVal(aKeyStringOrSymbol));
- strcat(env, "=");
- strncat(env, __stringVal(aString), valueSize);
- } else
- goto err;
-
- if (putenv(env) == 0) {
- RETURN(self);
- }
-
- if (valueSize > 0) {
- /* could not register, free */
- free(env);
- }
+ if (aString == nil) {
+ /* env used only temporary for deregistration */
+ valueSize = 0;
+ env = __stringVal(aKeyStringOrSymbol);
+ } else if (__isStringLike(aString)) {
+ /* have to use stable memory for env */
+ valueSize = __stringSize(aString);
+ env = (char *)malloc(__stringSize(aKeyStringOrSymbol) + valueSize + 2);
+ if (env == 0)
+ goto err;
+ strcpy(env, __stringVal(aKeyStringOrSymbol));
+ strcat(env, "=");
+ strncat(env, __stringVal(aString), valueSize);
+ } else
+ goto err;
+
+ if (putenv(env) == 0) {
+ RETURN(self);
+ }
+
+ if (valueSize > 0) {
+ /* could not register, free */
+ free(env);
+ }
err:;
}
%}.
@@ -8596,26 +8594,26 @@
if (__bothSmallInteger(y, m)
&& __bothSmallInteger(d, h)
&& __bothSmallInteger(min, s)) {
- tm.tm_hour = __intVal(h);
- tm.tm_min = __intVal(min);
- tm.tm_sec = __intVal(s);
-
- tm.tm_year = __intVal(y) - 1900;
- tm.tm_mon = __intVal(m) - 1;
- tm.tm_mday = __intVal(d);
- tm.tm_isdst = -1;
-
- t = mktime(&tm); /* mktime() interprets tm as localtime */
- if ((INT)t != -1) {
- if (utcBoolean == true) { /* convert to utc time */
- t = (INT)t - TIMEZONE(&tm); /* TIMZONE = seconds westward from 0 */
- }
- osSeconds = __MKINT((INT)t); /* be careful, t can be negative at the start of the epoch ! */
- }
+ tm.tm_hour = __intVal(h);
+ tm.tm_min = __intVal(min);
+ tm.tm_sec = __intVal(s);
+
+ tm.tm_year = __intVal(y) - 1900;
+ tm.tm_mon = __intVal(m) - 1;
+ tm.tm_mday = __intVal(d);
+ tm.tm_isdst = -1;
+
+ t = mktime(&tm); /* mktime() interprets tm as localtime */
+ if ((INT)t != -1) {
+ if (utcBoolean == true) { /* convert to utc time */
+ t = (INT)t - TIMEZONE(&tm); /* TIMZONE = seconds westward from 0 */
+ }
+ osSeconds = __MKINT((INT)t); /* be careful, t can be negative at the start of the epoch ! */
+ }
}
%}.
osSeconds notNil ifTrue:[
- ^ osSeconds * 1000 + millis
+ ^ osSeconds * 1000 + millis
].
^ TimeConversionError raiseRequest.
@@ -8641,17 +8639,17 @@
static int has_clock_gettime = 1;
if (has_clock_gettime) {
- if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
- _secs = ts.tv_sec;
- _micros = ts.tv_nsec / 1000;
- goto out;
- } else {
- /*
- * clock_gettime is not implemented in the kernel
- * fall through to alternative implementation
- */
- has_clock_gettime = 0;
- }
+ if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
+ _secs = ts.tv_sec;
+ _micros = ts.tv_nsec / 1000;
+ goto out;
+ } else {
+ /*
+ * clock_gettime is not implemented in the kernel
+ * fall through to alternative implementation
+ */
+ has_clock_gettime = 0;
+ }
}
#endif
@@ -8660,8 +8658,8 @@
gettimeofday(&tb, NULL /* &tzb */);
if (tb.tv_usec >= (1000000)) {
- error = @symbol(bad);
- goto err;
+ error = @symbol(bad);
+ goto err;
}
_secs = tb.tv_sec;
@@ -8682,18 +8680,18 @@
#if __POINTER_SIZE__ == 8
{
- unsigned INT rslt;
-
- rslt = (unsigned INT)_secs * 1000000 + _micros;
- RETURN (__MKUINT(rslt));
+ unsigned INT rslt;
+
+ rslt = (unsigned INT)_secs * 1000000 + _micros;
+ RETURN (__MKUINT(rslt));
}
#else
# ifdef HAS_LONGLONG
{
- unsigned long long rslt;
-
- rslt = (unsigned long long)_secs * 1000000 + _micros;
- RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
+ unsigned long long rslt;
+
+ rslt = (unsigned long long)_secs * 1000000 + _micros;
+ RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
}
# else
seconds = __MKUINT(_secs);
@@ -8704,10 +8702,10 @@
%}.
seconds notNil ifTrue:[
- ^ (seconds * 1000000) + micros
+ ^ (seconds * 1000000) + micros
].
error isNil ifTrue:[
- ^ self getMillisecondTime * 1000
+ ^ self getMillisecondTime * 1000
].
self primitiveFailed:error.
@@ -8726,8 +8724,8 @@
Use the XXXmillisecondTime:-methods to compare and add time deltas - these know about the wrap.
BAD DESIGN:
- This should be changed to return some instance of RelativeTime,
- and these computations moved there.
+ This should be changed to return some instance of RelativeTime,
+ and these computations moved there.
Don't use this method in application code since it is an internal (private)
interface. For compatibility with ST-80, use Time millisecondClockValue.
@@ -8742,16 +8740,16 @@
struct timespec ts;
if (has_clock_gettime) {
- if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
- t = ts.tv_sec*1000 + ts.tv_nsec/1000000;
- goto out;
- } else {
- /*
- * clock_gettime is not implemented in the kernel
- * fall through to alternative implementation
- */
- has_clock_gettime = 0;
- }
+ if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1) {
+ t = ts.tv_sec*1000 + ts.tv_nsec/1000000;
+ goto out;
+ } else {
+ /*
+ * clock_gettime is not implemented in the kernel
+ * fall through to alternative implementation
+ */
+ has_clock_gettime = 0;
+ }
}
#endif /* _POSIX_MONOTONIC_CLOCK */
@@ -8767,12 +8765,12 @@
struct tms tb;
if (!millisecondsPerTick) {
- int ticksPerSecond = sysconf(_SC_CLK_TCK);
- if (ticksPerSecond <= 0)
- goto err;
- if (ticksPerSecond > 1000)
- goto err;
- millisecondsPerTick = 1000 / ticksPerSecond;
+ int ticksPerSecond = sysconf(_SC_CLK_TCK);
+ if (ticksPerSecond <= 0)
+ goto err;
+ if (ticksPerSecond > 1000)
+ goto err;
+ millisecondsPerTick = 1000 / ticksPerSecond;
/*
printf("milliSecondsPerTick: %d\n", millisecondsPerTick);
*/
@@ -8780,7 +8778,7 @@
ticks = times(&tb);
if (ticks == -1)
- goto err;
+ goto err;
t = ticks * millisecondsPerTick;
@@ -8833,11 +8831,11 @@
#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 */
@@ -8850,16 +8848,16 @@
*/
{
- /*
- * bsd time
- */
- struct timeval tb;
- /* struct timezone tzb; */
-
- gettimeofday(&tb, NULL /* &tzb */);
-
- _secs = tb.tv_sec;
- _millis = tb.tv_usec / 1000;
+ /*
+ * bsd time
+ */
+ struct timeval tb;
+ /* struct timezone tzb; */
+
+ gettimeofday(&tb, NULL /* &tzb */);
+
+ _secs = tb.tv_sec;
+ _millis = tb.tv_usec / 1000;
}
#endif
@@ -8875,18 +8873,18 @@
#if __POINTER_SIZE__ == 8
{
- unsigned INT rslt;
-
- rslt = (unsigned INT)_secs * 1000 + _millis;
- RETURN (__MKUINT(rslt));
+ unsigned INT rslt;
+
+ rslt = (unsigned INT)_secs * 1000 + _millis;
+ RETURN (__MKUINT(rslt));
}
#else
# ifdef HAS_LONGLONG
{
- unsigned long long rslt;
-
- rslt = (unsigned long long)_secs * 1000 + _millis;
- RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
+ unsigned long long rslt;
+
+ rslt = (unsigned long long)_secs * 1000 + _millis;
+ RETURN (__MKLARGEINT64(1, (unsigned INT)(rslt & 0xFFFFFFFF), (unsigned INT)(rslt >> 32)));
}
# else
seconds = __MKUINT(_secs);
@@ -8896,7 +8894,7 @@
%}.
seconds notNil ifTrue:[
- ^ (seconds * 1000) + millis
+ ^ (seconds * 1000) + millis
].
self primitiveFailed.
@@ -9261,68 +9259,68 @@
struct passwd pwd;
if (__isStringLike(aNameOrID)) {
- getpwnam_r(__stringVal(aNameOrID), &pwd, buf, sizeof(buf), &result);
+ getpwnam_r(__stringVal(aNameOrID), &pwd, buf, sizeof(buf), &result);
} else if (__isSmallInteger(aNameOrID)) {
- getpwuid_r(__intVal(aNameOrID), &pwd, buf, sizeof(buf), &result);
+ getpwuid_r(__intVal(aNameOrID), &pwd, buf, sizeof(buf), &result);
}
#else
if (__isStringLike(aNameOrID)) {
- result = getpwnam(__stringVal(aNameOrID));
+ result = getpwnam(__stringVal(aNameOrID));
} else if (__isSmallInteger(aNameOrID)) {
- result = getpwuid(__intVal(aNameOrID));
+ result = getpwuid(__intVal(aNameOrID));
}
#endif /* ! _POSIX_SOURCE */
if (result) {
- returnArray = __ARRAY_NEW_INT(20);
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_name);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(name);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+ returnArray = __ARRAY_NEW_INT(20);
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_name);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(name);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
# ifndef NO_PWD_PASSWD
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_passwd);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(passwd);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_passwd);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(passwd);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
# endif
# ifdef SYSV4
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_age);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(age);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_comment);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(comment);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
-# endif
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_dir);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(dir);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_age);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(age);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_comment);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(comment);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+# endif
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_dir);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(dir);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
# ifndef NO_PWD_GECOS
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_gecos);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(gecos);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
-# endif
- __PROTECT__(returnArray);
- tmp = __MKSTRING(result->pw_shell);
- __UNPROTECT__(returnArray);
- __arrayVal(returnArray)[idx++] = @symbol(shell);
- __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
-
- __arrayVal(returnArray)[idx++] = @symbol(uid);
- __arrayVal(returnArray)[idx++] = __mkSmallInteger(result->pw_uid);
-
- __arrayVal(returnArray)[idx++] = @symbol(gid);
- __arrayVal(returnArray)[idx++] = __mkSmallInteger(result->pw_gid);
- RETURN(returnArray);
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_gecos);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(gecos);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+# endif
+ __PROTECT__(returnArray);
+ tmp = __MKSTRING(result->pw_shell);
+ __UNPROTECT__(returnArray);
+ __arrayVal(returnArray)[idx++] = @symbol(shell);
+ __arrayVal(returnArray)[idx++] = tmp; __STORE(returnArray, tmp);
+
+ __arrayVal(returnArray)[idx++] = @symbol(uid);
+ __arrayVal(returnArray)[idx++] = __mkSmallInteger(result->pw_uid);
+
+ __arrayVal(returnArray)[idx++] = @symbol(gid);
+ __arrayVal(returnArray)[idx++] = __mkSmallInteger(result->pw_gid);
+ RETURN(returnArray);
}
# endif /* ! NO_PWD */
%}.
@@ -9356,23 +9354,23 @@
infoArray := self primUserInfoOf:aNameOrID.
info := IdentityDictionary new.
- infoArray notNil ifTrue:[
- infoArray pairWiseDo:[:key :value|
- key notNil ifTrue:[
- info at:key put:value.
- key == #name ifTrue:[name := value].
- key == #dir ifTrue:[dir := value].
- ].
- ].
+ infoArray notNil ifTrue:[
+ infoArray pairWiseDo:[:key :value|
+ key notNil ifTrue:[
+ info at:key put:value.
+ key == #name ifTrue:[name := value].
+ key == #dir ifTrue:[dir := value].
+ ].
+ ].
].
name isNil ifTrue:[
- info at:#name put:#unknown
+ info at:#name put:#unknown
].
dir isNil ifTrue:[
- aNameOrID == self getUserID ifTrue:[
- info at:#dir put:self getHomeDirectory
- ]
+ aNameOrID == self getUserID ifTrue:[
+ info at:#dir put:self getHomeDirectory
+ ]
].
^ info
@@ -11376,15 +11374,15 @@
%{
if (__isSmallInteger(aNameOrNumber) || aNameOrNumber == nil) {
- RETURN(aNameOrNumber);
+ RETURN(aNameOrNumber);
}
%}.
ProtocolCache notNil ifTrue:[
- protocolCode := ProtocolCache at:(aNameOrNumber asSymbol) ifAbsent:[].
- protocolCode notNil ifTrue:[
- ^ protocolCode.
- ].
+ protocolCode := ProtocolCache at:(aNameOrNumber asSymbol) ifAbsent:[].
+ protocolCode notNil ifTrue:[
+ ^ protocolCode.
+ ].
].
%{
@@ -11392,21 +11390,21 @@
struct protoent *protoent = 0;
if (__isStringLike(aNameOrNumber)) {
- protoent = getprotobyname((char *) __stringVal(aNameOrNumber));
- if (protoent) {
- protocolCode = __mkSmallInteger(protoent->p_proto);
- protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
- }
+ protoent = getprotobyname((char *) __stringVal(aNameOrNumber));
+ if (protoent) {
+ protocolCode = __mkSmallInteger(protoent->p_proto);
+ protocolSymbol = __MKSYMBOL(protoent->p_name, 0);
+ }
}
#endif /*NO_SOCKET*/
%}.
protocolSymbol notNil ifTrue:[
- ProtocolCache isNil ifTrue:[
- ProtocolCache := IdentityDictionary new.
- ].
- "beware of polluting the protocol cache with aliases"
- ProtocolCache at:protocolSymbol put:protocolCode.
+ ProtocolCache isNil ifTrue:[
+ ProtocolCache := IdentityDictionary new.
+ ].
+ "beware of polluting the protocol cache with aliases"
+ ProtocolCache at:protocolSymbol put:protocolCode.
].
^ protocolCode
@@ -11479,7 +11477,7 @@
type := OperatingSystem socketTypeCodeOf:typeArg.
proto := self protocolCodeOf:protoArg.
serviceNameArg notNil ifTrue:[
- serviceName := serviceNameArg printString. "convert integer port numbers"
+ serviceName := serviceNameArg printString. "convert integer port numbers"
].
%{ /* STACK: 200000 */ /* Don't know whether DNS, NIS, LDAP or whatever is consulted */
@@ -11491,24 +11489,24 @@
int ret, cnt = 0;
if (hostName == nil) {
- __hostName = 0;
+ __hostName = 0;
} else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
+ __hostName = __stringVal(hostName);
} else {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (serviceName == nil) {
- __serviceName = 0;
+ __serviceName = 0;
} else if (__isStringLike(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;
}
{
@@ -11521,117 +11519,117 @@
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 {
- if (hostName == nil) {
- __hostName = 0;
- } else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
- }
- if (serviceName == nil) {
- __serviceName = 0;
- } else if (__isStringLike(serviceName)) {
- __serviceName = __stringVal(serviceName);
- }
-
- __BEGIN_INTERRUPTABLE__
- ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
- __END_INTERRUPTABLE__
+ if (hostName == nil) {
+ __hostName = 0;
+ } else if (__isStringLike(hostName)) {
+ __hostName = __stringVal(hostName);
+ }
+ if (serviceName == nil) {
+ __serviceName = 0;
+ } else if (__isStringLike(serviceName)) {
+ __serviceName = __stringVal(serviceName);
+ }
+
+ __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;
+ 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;
#ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
+ case EAI_ADDRFAMILY :
+ error = @symbol(unknownHostForProtocol);
+ break;
#endif
#ifdef EAI_NODATA
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
-#endif
- 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;
+ case EAI_NODATA:
+ error = @symbol(noAddress);
+ break;
+#endif
+ 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] = __mkSmallInteger(infop->ai_flags);
- __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
- __ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
- __ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(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);
+ 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] = __mkSmallInteger(infop->ai_flags);
+ __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
+ __ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
+ __ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(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);
- }
+ 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:
@@ -11648,136 +11646,136 @@
int i;
if (__serviceName) {
- struct servent *sp;
- char *__proto = 0;
-
- if (__isStringLike(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 (__isStringLike(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 {
- if (hostName == nil) {
- __hostName = 0;
- } else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
- }
- /* __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 {
+ if (hostName == nil) {
+ __hostName = 0;
+ } else if (__isStringLike(hostName)) {
+ __hostName = __stringVal(hostName);
+ }
+ /* __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:;
@@ -11788,57 +11786,57 @@
#endif
%}.
error notNil ifTrue:[
- |request|
- request := SocketAddressInfo new
- domain:domainArg;
- type:typeArg;
- protocol:protoArg;
- canonicalName:hostName;
- serviceName:serviceName.
- ^ (HostNameLookupError new
- parameter:error;
- messageText:' - ', (errorString ? error printString);
- request:request) raiseRequest.
+ |request|
+ request := SocketAddressInfo new
+ domain:domainArg;
+ type:typeArg;
+ protocol:protoArg;
+ canonicalName:hostName;
+ serviceName:serviceName.
+ ^ (HostNameLookupError new
+ parameter:error;
+ messageText:' - ', (errorString ? error printString);
+ request:request) raiseRequest.
].
1 to:result size do:[:i |
- |entry dom info|
-
- entry := result at:i.
-
- info := SocketAddressInfo new.
- info
- flags:(entry at:1);
- domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
- type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
- protocol:(self protocolSymbolOf:(entry at:4));
- socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
- canonicalName:(entry at:6).
-
- result at:i put:info.
+ |entry dom info|
+
+ entry := result at:i.
+
+ info := SocketAddressInfo new.
+ info
+ flags:(entry at:1);
+ domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
+ type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
+ protocol:(self protocolSymbolOf:(entry at:4));
+ socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
+ canonicalName:(entry at:6).
+
+ result at:i put:info.
].
^ result
"
self getAddressInfo:'localhost' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:nil flags:nil
+ domain:#inet type:#stream protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:#tcp flags:nil
+ domain:#inet type:#stream protocol:#tcp flags:nil
self getAddressInfo:'blurb.exept.de' serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'1.2.3.4' serviceName:'bla'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:nil serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:nil serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'www.google.de' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
self getAddressInfo:'smc1' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
"
!
@@ -11853,62 +11851,62 @@
type := OperatingSystem socketTypeCodeOf:typeArg.
proto := self protocolCodeOf:protoArg.
serviceNameArg notNil ifTrue:[
- serviceName := serviceNameArg printString. "convert integer port numbers"
+ serviceName := serviceNameArg printString. "convert integer port numbers"
].
result := self primGetAddressInfo:hostName serviceName:serviceName domainCode:domain socketTypeCode:type protocolCode:proto flags:flags.
result isArray ifFalse:[
- |request|
- request := SocketAddressInfo new
- domain:domainArg;
- type:typeArg;
- protocol:protoArg;
- canonicalName:hostName;
- serviceName:serviceName.
- ^ (HostNameLookupError new
- parameter:result;
- messageText:' - ', (result printString);
- request:request) raiseRequest.
+ |request|
+ request := SocketAddressInfo new
+ domain:domainArg;
+ type:typeArg;
+ protocol:protoArg;
+ canonicalName:hostName;
+ serviceName:serviceName.
+ ^ (HostNameLookupError new
+ parameter:result;
+ messageText:' - ', (result printString);
+ request:request) raiseRequest.
].
1 to:result size do:[:i |
- |entry dom info|
-
- entry := result at:i.
-
- info := SocketAddressInfo new.
- info
- flags:(entry at:1);
- domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
- type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
- protocol:(self protocolSymbolOf:(entry at:4));
- socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
- canonicalName:(entry at:6).
-
- result at:i put:info.
+ |entry dom info|
+
+ entry := result at:i.
+
+ info := SocketAddressInfo new.
+ info
+ flags:(entry at:1);
+ domain:(dom := OperatingSystem domainSymbolOf:(entry at:2));
+ type:(OperatingSystem socketTypeSymbolOf:(entry at:3));
+ protocol:(self protocolSymbolOf:(entry at:4));
+ socketAddress:((SocketAddress newDomain:dom) fromBytes:(entry at:5));
+ canonicalName:(entry at:6).
+
+ result at:i put:info.
].
^ result
"
self getAddressInfo:'localhost' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:nil flags:nil
+ domain:#inet type:#stream protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:nil
- domain:#inet type:#stream protocol:#tcp flags:nil
+ domain:#inet type:#stream protocol:#tcp flags:nil
self getAddressInfo:'blurb.exept.de' serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'1.2.3.4' serviceName:'bla'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'localhost' serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:nil serviceName:'echo'
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:nil serviceName:nil
- domain:#inet type:nil protocol:nil flags:nil
+ domain:#inet type:nil protocol:nil flags:nil
self getAddressInfo:'www.google.de' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
self getAddressInfo:'smc1' serviceName:nil
- domain:nil type:nil protocol:nil flags:nil
+ domain:nil type:nil protocol:nil flags:nil
"
!
@@ -11940,20 +11938,20 @@
int nInstBytes, sockAddrSize;
if (wantHostName == true) {
- hp = host;
- hsz = sizeof(host);
+ hp = host;
+ hsz = sizeof(host);
}
if (wantServiceName == true) {
- sp = service;
- ssz = sizeof(service);
+ sp = service;
+ ssz = sizeof(service);
}
if (hp == 0 && sp == 0) {
- error = @symbol(badArgument);
- goto err;
+ error = @symbol(badArgument);
+ goto err;
}
if (!__isBytes(socketAddress)) {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
nInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(__qClass(socketAddress))->c_ninstvars));
@@ -11961,187 +11959,187 @@
sockAddrSize -= nInstBytes;
if (!__isSmallInteger(flags)) {
- error = @symbol(badArgument5);
- goto err;
+ error = @symbol(badArgument5);
+ goto err;
}
__flags = __intVal(flags);
#if defined(NI_NUMERICHOST)
if (useDatagram == true) {
- __flags |= NI_DGRAM;
+ __flags |= NI_DGRAM;
}
{
- bp = (char *)(__byteArrayVal(socketAddress));
- bp += nInstBytes;
- __BEGIN_INTERRUPTABLE__
- ret = getnameinfo((struct sockaddr *)bp, sockAddrSize,
- hp, hsz, sp, ssz, __flags);
- __END_INTERRUPTABLE__
+ bp = (char *)(__byteArrayVal(socketAddress));
+ bp += nInstBytes;
+ __BEGIN_INTERRUPTABLE__
+ ret = getnameinfo((struct sockaddr *)bp, sockAddrSize,
+ hp, hsz, sp, ssz, __flags);
+ __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;
+ 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;
#ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
+ case EAI_ADDRFAMILY :
+ error = @symbol(unknownHostForProtocol);
+ break;
#endif
#ifdef EAI_NODATA
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
-#endif
- 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;
+ case EAI_NODATA:
+ error = @symbol(noAddress);
+ break;
+#endif
+ 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;
}
# else /* ! NI_NUMERICHOST */
{
- /*
- * Do it using gethostbyaddr()
- */
- struct sockaddr_in *sa;
-
- if (sockAddrSize < sizeof(*sa)) {
- error = @symbol(badArgument1);
- goto err;
- }
- bp = (char *)(__byteArrayVal(socketAddress));
- bp += nInstBytes;
- sa = (struct sockaddr_in *)bp;
-
- if (sp) {
- struct servent *servp;
- char *__proto = 0;
-
- __proto = (useDatagram == true ? "udp" : "tcp");
-
- servp = getservbyport(sa->sin_port, __proto);
- if (servp) {
- sp = servp->s_name;
- }
- }
- if (hp) {
- struct hostent *hostp;
+ /*
+ * Do it using gethostbyaddr()
+ */
+ struct sockaddr_in *sa;
+
+ if (sockAddrSize < sizeof(*sa)) {
+ error = @symbol(badArgument1);
+ goto err;
+ }
+ bp = (char *)(__byteArrayVal(socketAddress));
+ bp += nInstBytes;
+ sa = (struct sockaddr_in *)bp;
+
+ if (sp) {
+ struct servent *servp;
+ char *__proto = 0;
+
+ __proto = (useDatagram == true ? "udp" : "tcp");
+
+ servp = getservbyport(sa->sin_port, __proto);
+ if (servp) {
+ sp = servp->s_name;
+ }
+ }
+ if (hp) {
+ struct hostent *hostp;
# ifdef USE_H_ERRNO
- do {
- bp = (char *)(__byteArrayVal(socketAddress));
- bp += nInstBytes;
- sa = (struct sockaddr_in *)bp;
-
- /* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname uses a static data area
- */
- hostp = gethostbyaddr((char *)&sa->sin_addr, sockAddrSize, sa->sin_family);
- /* __END_INTERRUPTABLE__ */
- } while ((hostp == NULL)
- && ((h_errno == TRY_AGAIN)
- || errno == EINTR
+ do {
+ bp = (char *)(__byteArrayVal(socketAddress));
+ bp += nInstBytes;
+ sa = (struct sockaddr_in *)bp;
+
+ /* __BEGIN_INTERRUPTABLE__ is dangerous, because gethostbyname uses a static data area
+ */
+ hostp = gethostbyaddr((char *)&sa->sin_addr, sockAddrSize, sa->sin_family);
+ /* __END_INTERRUPTABLE__ */
+ } while ((hostp == NULL)
+ && ((h_errno == TRY_AGAIN)
+ || errno == EINTR
# ifdef IRIX5_3
- || (errno == ECONNREFUSED)
+ || (errno == ECONNREFUSED)
# endif
- )
- );
- if (hostp == 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 (hostp == 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 */
- hostp = gethostbyaddr(sa->sin_addr, sockAddrSize, sa->sin_family);
- if (hostp == 0) {
- errorString = @symbol(unknownHost);
- error = __mkSmallInteger(-1);
- goto err;
- }
+ hostp = gethostbyaddr(sa->sin_addr, sockAddrSize, sa->sin_family);
+ if (hostp == 0) {
+ errorString = @symbol(unknownHost);
+ error = __mkSmallInteger(-1);
+ goto err;
+ }
# endif /* !USE_H_ERRNO*/
- hp = hostp->h_name;
- }
+ hp = hostp->h_name;
+ }
}
# endif /* ! NI_NUMERICHOST */
if (hp)
- hostName = __MKSTRING(hp);
+ hostName = __MKSTRING(hp);
if (sp)
- serviceName = __MKSTRING(sp);
+ serviceName = __MKSTRING(sp);
err:;
#else
error = @symbol(notImplemented);
#endif
%}.
error notNil ifTrue:[
- ^ (HostAddressLookupError new
- parameter:error;
- messageText:' - ', errorString;
- request:thisContext message) raiseRequest.
+ ^ (HostAddressLookupError new
+ parameter:error;
+ messageText:' - ', errorString;
+ request:thisContext message) raiseRequest.
].
^ Array with:hostName with:serviceName
"
self getNameInfo:
- (self getAddressInfo:'localhost' serviceName:'echo'
- domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ (self getAddressInfo:'localhost' serviceName:'echo'
+ domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
+ wantHostName:true wantServiceName:true datagram:false flags:0
self getNameInfo:
- (self getAddressInfo:'exept.de' serviceName:'echo'
- domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ (self getAddressInfo:'exept.de' serviceName:'echo'
+ domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
+ wantHostName:true wantServiceName:true datagram:false flags:0
self getNameInfo:
- (self getAddressInfo:'217.172.183.25' serviceName:'22'
- domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ (self getAddressInfo:'217.172.183.25' serviceName:'22'
+ domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
+ wantHostName:true wantServiceName:true datagram:false flags:0
self getNameInfo:
- (self getAddressInfo:'1.2.3.4' serviceName:'22'
- domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
- wantHostName:true wantServiceName:true datagram:false flags:0
+ (self getAddressInfo:'1.2.3.4' serviceName:'22'
+ domain:#inet type:#stream protocol:nil flags:nil) first socketAddress
+ wantHostName:true wantServiceName:true datagram:false flags:0
"
!
@@ -12161,24 +12159,24 @@
int ret, cnt = 0;
if (hostName == nil) {
- __hostName = 0;
+ __hostName = 0;
} else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
+ __hostName = __stringVal(hostName);
} else {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (serviceName == nil) {
- __serviceName = 0;
+ __serviceName = 0;
} else if (__isStringLike(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;
}
{
@@ -12191,117 +12189,117 @@
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 {
- if (hostName == nil) {
- __hostName = 0;
- } else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
- }
- if (serviceName == nil) {
- __serviceName = 0;
- } else if (__isStringLike(serviceName)) {
- __serviceName = __stringVal(serviceName);
- }
+ if (hostName == nil) {
+ __hostName = 0;
+ } else if (__isStringLike(hostName)) {
+ __hostName = __stringVal(hostName);
+ }
+ if (serviceName == nil) {
+ __serviceName = 0;
+ } else if (__isStringLike(serviceName)) {
+ __serviceName = __stringVal(serviceName);
+ }
// __BEGIN_INTERRUPTABLE__
- ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
+ ret = getaddrinfo(__hostName, __serviceName, &hints, &info);
// __END_INTERRUPTABLE__
} while (ret == EAI_SYSTEM && errno == EINTR);
if (ret != 0) {
- switch (ret) {
- 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;
+ 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;
#ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY :
- error = @symbol(unknownHostForProtocol);
- break;
+ case EAI_ADDRFAMILY :
+ error = @symbol(unknownHostForProtocol);
+ break;
#endif
#ifdef EAI_NODATA
- case EAI_NODATA:
- error = @symbol(noAddress);
- break;
-#endif
- 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;
+ case EAI_NODATA:
+ error = @symbol(noAddress);
+ break;
+#endif
+ 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] = __mkSmallInteger(infop->ai_flags);
- __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
- __ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
- __ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(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);
+ 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] = __mkSmallInteger(infop->ai_flags);
+ __ArrayInstPtr(resp)->a_element[1] = __mkSmallInteger(infop->ai_family);
+ __ArrayInstPtr(resp)->a_element[2] = __mkSmallInteger(infop->ai_socktype);
+ __ArrayInstPtr(resp)->a_element[3] = __mkSmallInteger(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);
- }
+ 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:
@@ -12318,136 +12316,136 @@
int i;
if (__serviceName) {
- struct servent *sp;
- char *__proto = 0;
-
- if (__isStringLike(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 (__isStringLike(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 {
- if (hostName == nil) {
- __hostName = 0;
- } else if (__isStringLike(hostName)) {
- __hostName = __stringVal(hostName);
- }
- /* __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 {
+ if (hostName == nil) {
+ __hostName = 0;
+ } else if (__isStringLike(hostName)) {
+ __hostName = __stringVal(hostName);
+ }
+ /* __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:;
@@ -12458,10 +12456,10 @@
#endif
%}.
error notNil ifTrue:[
- errorString notNil ifTrue:[
- ^ errorString.
- ].
- ^ error.
+ errorString notNil ifTrue:[
+ ^ errorString.
+ ].
+ ^ error.
].
^ result.
! !
@@ -12848,64 +12846,64 @@
int offs, __startIndex, __maxBytes;
if (!__isSmallInteger(__INST(fd))) {
- error = @symbol(badFd);
- goto err;
+ error = @symbol(badFd);
+ goto err;
}
if (!__isSmallInteger(startIndex) ||
- (__startIndex = __intVal(startIndex)-1) < 0) {
- if (startIndex == nil) {
- __startIndex = 0;
- } else {
- error = @symbol(badArgument3);
- goto err;
- }
+ (__startIndex = __intVal(startIndex)-1) < 0) {
+ if (startIndex == nil) {
+ __startIndex = 0;
+ } else {
+ error = @symbol(badArgument3);
+ goto err;
+ }
}
if (__isSmallInteger(maxBytes)) {
- __maxBytes = __intVal(maxBytes);
+ __maxBytes = __intVal(maxBytes);
} else if (maxBytes == nil) {
- __maxBytes = -1;
+ __maxBytes = -1;
} else {
- error = @symbol(badArgument4);
- goto err;
+ error = @symbol(badArgument4);
+ goto err;
}
if (!__isInteger(flags)) {
- error = @symbol(badArgument5);
- goto err;
+ error = @symbol(badArgument5);
+ goto err;
}
__flags = __longIntVal(flags);
sock = __smallIntegerVal(__INST(fd));
oClass = __Class(aDataBuffer);
switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
- case BYTEARRAY:
- offs = __startIndex;
- break;
- case WORDARRAY:
- case SWORDARRAY:
- offs = __startIndex * 2;
- break;
- case LONGARRAY:
- case SLONGARRAY:
- offs = __startIndex * 4;
- break;
- case LONGLONGARRAY:
- case SLONGLONGARRAY:
- offs = __startIndex * 8;
+ case BYTEARRAY:
+ offs = __startIndex;
+ break;
+ case WORDARRAY:
+ case SWORDARRAY:
+ offs = __startIndex * 2;
+ break;
+ case LONGARRAY:
+ case SLONGARRAY:
+ offs = __startIndex * 4;
+ break;
+ case LONGLONGARRAY:
+ case SLONGLONGARRAY:
+ offs = __startIndex * 8;
# ifdef __NEED_LONGLONG_ALIGN
- offs += 4;
-# endif
- case FLOATARRAY:
- offs = __startIndex * sizeof(float);
- break;
- case DOUBLEARRAY:
- offs = __startIndex * sizeof(double);
+ offs += 4;
+# endif
+ case FLOATARRAY:
+ offs = __startIndex * sizeof(float);
+ break;
+ case DOUBLEARRAY:
+ offs = __startIndex * sizeof(double);
# ifdef __NEED_DOUBLE_ALIGN
- offs += 4;
-# endif
- break;
- default:
- error = @symbol(badArgument2);
- goto err;
+ offs += 4;
+# endif
+ break;
+ default:
+ error = @symbol(badArgument2);
+ goto err;
}
nInstVars = __smallIntegerVal(_ClassInstPtr(oClass)->c_ninstvars);
@@ -12914,35 +12912,35 @@
if (__maxBytes >= 0 && __maxBytes < objSize) {
# ifdef DGRAM_DEBUG
- printf("cut off ...\n");
-# endif
- objSize = __maxBytes;
+ printf("cut off ...\n");
+# endif
+ objSize = __maxBytes;
}
if (socketAddress == nil) {
- alen = 0;
+ alen = 0;
} else {
- if (! __isByteArrayLike(socketAddress)) {
- error = @symbol(badArgument1);
- goto err;
- }
- alen = __byteArraySize(socketAddress);
+ if (! __isByteArrayLike(socketAddress)) {
+ error = @symbol(badArgument1);
+ goto err;
+ }
+ alen = __byteArraySize(socketAddress);
}
saPtr = (struct sockaddr *)0;
again:
if (alen)
- saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
+ saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
cp = (char *)__InstPtr(aDataBuffer) + nInstBytes + offs;
n = sendto(sock, cp, objSize, __flags, saPtr, alen);
if (n < 0) {
- if (errno == EINTR) {
- __HANDLE_INTERRUPTS__;
- goto again;
- } else {
- error = __mkSmallInteger(errno);
- goto err;
- }
+ if (errno == EINTR) {
+ __HANDLE_INTERRUPTS__;
+ goto again;
+ } else {
+ error = __mkSmallInteger(errno);
+ goto err;
+ }
}
RETURN (__mkSmallInteger(n));
#endif
@@ -13137,48 +13135,48 @@
char *p;
if (!__isSmallInteger(__INST(fd))) {
- error = @symbol(badFd);
- goto err;
+ error = @symbol(badFd);
+ goto err;
}
if (__isSmallInteger(level)) {
- __level = __smallIntegerVal(level);
+ __level = __smallIntegerVal(level);
} else if (level == @symbol(SOL_SOCKET)) {
- __level = SOL_SOCKET;
+ __level = SOL_SOCKET;
} else {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (__isSmallInteger(name)) {
- __name = __smallIntegerVal(name);
+ __name = __smallIntegerVal(name);
} else if (name == @symbol(SO_REUSEADDR)) {
- __name = SO_REUSEADDR;
+ __name = SO_REUSEADDR;
} else {
- error = @symbol(badArgument2);
- goto err;
+ error = @symbol(badArgument2);
+ goto err;
}
if (__isSmallInteger(value)) {
- intval = __intVal(value);
- p = (char *) &intval;
- sz = sizeof(intval);
+ intval = __intVal(value);
+ p = (char *) &intval;
+ sz = sizeof(intval);
} else if (__isByteArrayLike(value)) {
- p = __byteArrayVal(value);
- sz = __byteArraySize(value);
+ p = __byteArrayVal(value);
+ sz = __byteArraySize(value);
} else {
- error = @symbol(badArgument3);
- goto err;
+ error = @symbol(badArgument3);
+ goto err;
}
sock = __smallIntegerVal(__INST(fd));
if (setsockopt(sock, __level, __name, p, sz) < 0) {
- error = __mkSmallInteger(errno);
+ error = __mkSmallInteger(errno);
}
err:;
#endif
%}.
error notNil ifTrue:[
- ^ self error:error
+ ^ self error:error
].
^ nil.
!
@@ -13307,11 +13305,11 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.281 2011-09-26 16:46:00 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.282 2011-10-07 13:57:55 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.281 2011-09-26 16:46:00 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.282 2011-10-07 13:57:55 cg Exp $'
! !
UnixOperatingSystem initialize!