hg/stx-libbasic: comparison FileStream.st

equal deleted inserted replaced

-:3103440ffcc7
+:13143fbcbdf8
 !FileStream primitiveDefinitions!
 %{
 #include <stdio.h>
 #define _STDIO_H_INCLUDED_
 #include <errno.h>
 #define _ERRNO_H_INCLUDED_
 #ifdef transputer
 # undef Point
 # undef Rectangle
 # undef Block
 # undef Time
 # undef Date
+# undef Set
+# undef Delay
+# undef Signal
 # define NOATOM
 # define NOGDICAPMASKS
 # define NOMETAFILE
 # define NOMINMAX
 #  define Time __DEF_Time
 # endif
 # ifdef __DEF_Date
 #  define Date __DEF_Date
 # endif
+# ifdef __DEF_Set
+#  define Set __DEF_Set
+# endif
+# ifdef __DEF_Signal
+#  define Signal __DEF_Signal
+# endif
+# ifdef __DEF_Delay
+#  define Delay __DEF_Delay
+# endif
 # define INT int
 # ifdef NO_STDIO
 		currentPosition = ftell(f);
 	    } else {
 		currentPosition = lseek(fileno(f), 0L, SEEK_CUR);
 	    }
 #endif
-	} while ((currentPosition < 0) && (errno == EINTR));
+	} while ((currentPosition < 0) && (__threadErrno == EINTR));
 	if (currentPosition >= 0) {
 	    /*
 	     * notice: Smalltalk index starts at 1
 	     */
 	    RETURN ( __MKSMALLINT(currentPosition + 1) );
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
 }
 %}.
 lastErrorNumber notNil ifTrue:[^ self ioError].
 filePointer isNil ifTrue:[^ self errorNotOpen].
 ^ self primitiveFailed
 			ret = fseek(f, nP, SEEK_SET);
 		    } else {
 			ret = lseek(fileno(f), nP, SEEK_SET);
 		    }
 #endif
-		} while ((ret < 0) && (errno == EINTR));
+		} while ((ret < 0) && (__threadErrno == EINTR));
 		if (ret >= 0) {
 		    __INST(position) = newPos;
 		    /*
 		     * just to make certain ...
 		     */
 		    __INST(hitEOF) = false;
 		    RETURN ( self );
 		}
-		__INST(lastErrorNumber) = __MKSMALLINT(errno);
+		__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
 	    }
 	}
 }
 %}.
 canPosition == false ifTrue:[
 		ret = fseek(f, 0L, SEEK_END);
 	    } else {
 		ret = lseek(fileno(f), 0L, SEEK_END);
 	    }
 #endif
-	} while ((ret < 0) && (errno == EINTR));
+	} while ((ret < 0) && (__threadErrno == EINTR));
 	if (ret >= 0) {
 	    RETURN ( self );
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
 }
 %}.
 lastErrorNumber notNil ifTrue:[^ self ioError].
 filePointer isNil ifTrue:[^ self errorNotOpen].
 ^ self primitiveFailed
 	do {
 	    /*
 	     * allow passing additional RMS arguments.
 	     * stupid: DEC does not seem to offer an interface for passing a char **.
 	     */
-	    errno = 0;
+	    __threadErrno = 0;
 	    {
 		if (__isArray(attributeSpec)) {
 		    OBJ *ap = __ArrayInstPtr(attributeSpec)->a_element;
 		    int numAttrib = 0;
 		    numAttrib = __arraySize(attributeSpec);
 		    for (i=0; i<numAttrib;i++) {
 			if (! __isString(ap[i])) {
 			    f = NULL;
-			    errno = EINVAL; /* invalid argument */
+			    __threadErrno = EINVAL; /* invalid argument */
 			    goto getOutOfHere;
 			}
 		    }
 		    switch (numAttrib) {
 			case 0:
 				      __stringVal(ap[9]));
 			    __END_INTERRUPTABLE__
 			    break;
 			default:
 			    f = NULL;
-			    errno = E2BIG; /* too many args */
+			    __threadErrno = E2BIG; /* too many args */
 			    goto getOutOfHere;
 		    }
 		} else if (attributeSpec != nil) {
 		    f = NULL;
-		    errno = EINVAL; /* invalid argument */
+		    __threadErrno = EINVAL; /* invalid argument */
 		    goto getOutOfHere;
 		} else {
 		    /*
 		     * create file as sequential streamLF by default.
 		     */
 		    __END_INTERRUPTABLE__
 		}
 	    }
 	    /* must refetch - could be GC'd */
 	    path = __INST(pathName);
-	} while ((f == NULL) && (errno == EINTR));
+	} while ((f == NULL) && (__threadErrno == EINTR));
 #else /* not VMS */
 # ifdef WIN32
 	    f = fopen((char *) __stringVal(path), (char *) __stringVal(openmode));
 	    __END_INTERRUPTABLE__
 #  endif /* use_STDIO */
 	    /* must refetch - could be GC'd */
 	    path = __INST(pathName);
-	} while ((f == NULL) && (errno == EINTR));
+	} while ((f == NULL) && (__threadErrno == EINTR));
 # else /* not WIN32 */
 	do {
 	    __BEGIN_INTERRUPTABLE__
 #  ifdef LINUX
 	    /*
 	     * LINUX may ret a non-NULL f even when interrupted.
 	     * Therefore, check errno and fake a null-ret.
 	     */
-	    errno = 0;
+	    __threadErrno = 0;
 	    f = fopen((char *) __stringVal(path), (char *) __stringVal(openmode));
-	    if (errno == EINTR)
+	    if (__threadErrno == EINTR)
 		f = NULL;
 #  else /* not LINUX */
 	    f = fopen((char *) __stringVal(path), (char *) __stringVal(openmode));
 #  endif /* not LINUX */
 	    __END_INTERRUPTABLE__
 	    /* must refetch - could be GC'd */
 	    path = __INST(pathName);
-	} while ((f == NULL) && (errno == EINTR));
+	} while ((f == NULL) && (__threadErrno == EINTR));
 # endif /* not WIN32 */
 #endif /* not VMS */
 	if (f == NULL) {
 	    /*
 	     * If no filedescriptors available, try to finalize
 	     * possibly collected fd's and try again.
 	     */
-	    if (pass == 0 && (errno == ENFILE || errno == EMFILE)) {
+	    if (pass == 0 && (__threadErrno == ENFILE || __threadErrno == EMFILE)) {
 		pass = 1;
 		__SSEND0(@global(ObjectMemory), @symbol(scavenge), 0);
 		__SSEND0(@global(ObjectMemory), @symbol(finalize), 0);
 		goto retry;
 	    }
 	getOutOfHere: ;
-	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
+	    __INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
 	    __INST(position) = nil;
 	} else {
 #ifdef __VMS__
 	    /*
 	     * check to see if this is positionable ...
 if (__INST(filePointer) != nil) {
 	f = __FILEVal(__INST(filePointer));
 	fd = fileno(f);
 	do {
 	    ret = fstat(fd, &buf);
-	} while ((ret < 0) && (errno == EINTR));
+	} while ((ret < 0) && (__threadErrno == EINTR));
 	if (ret >= 0) {
 	    RETURN ( __MKSMALLINT(buf.st_size) );
 	}
-	__INST(lastErrorNumber) = __MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(__threadErrno);
 }
 #endif
 %}.
 "could add a fall-back here:
 ! !
 !FileStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.68 1999-10-14 23:51:01 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.69 1999-12-17 11:35:52 cg Exp $'
 ! !
 FileStream initialize!

changeset 5120	13143fbcbdf8
parent 4910	33b0edbb1920
child 5186	ed0c5597034f