--- a/FileStream.st Thu Jun 02 13:20:08 1994 +0200
+++ b/FileStream.st Thu Jun 02 13:21:56 1994 +0200
@@ -24,7 +24,7 @@
This class provides access to the operating systems underlying file
system (i.e. its an interface to the stdio library).
-$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.11 1994-05-17 10:07:32 claus Exp $
+$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.12 1994-06-02 11:20:21 claus Exp $
'!
%{
@@ -293,7 +293,7 @@
%{
FILE *f;
OBJ path;
- extern OBJ ErrorNumber, Filename;
+ extern OBJ Filename;
extern errno;
if (_INST(filePointer) == nil) {
@@ -313,7 +313,7 @@
#endif
} while ((f == NULL) && (errno == EINTR));
if (f == NULL) {
- ErrorNumber = _MKSMALLINT(errno);
+ ExternalStream_LastErrorNumber = _MKSMALLINT(errno);
_INST(position) = nil;
} else {
_INST(filePointer) = MKOBJ((int)f);
@@ -424,7 +424,6 @@
struct stat buf;
int ret;
extern errno;
- extern OBJ ErrorNumber;
int fd;
if (_INST(filePointer) != nil) {
@@ -436,7 +435,7 @@
if (ret >= 0) {
RETURN ( _MKSMALLINT(buf.st_size) );
}
- ErrorNumber = _MKSMALLINT(errno);
+ ExternalStream_LastErrorNumber = _MKSMALLINT(errno);
}
#endif
%}
@@ -462,7 +461,6 @@
FILE *f;
long currentPosition;
extern errno;
- extern OBJ ErrorNumber;
if (_INST(filePointer) != nil) {
f = (FILE *)MKFD(_INST(filePointer));
@@ -479,7 +477,7 @@
*/
RETURN ( _MKSMALLINT(currentPosition + 1) );
}
- ErrorNumber = _MKSMALLINT(errno);
+ ExternalStream_LastErrorNumber = _MKSMALLINT(errno);
}
%}
.
@@ -494,7 +492,6 @@
FILE *f;
int ret;
- extern OBJ ErrorNumber;
extern errno;
if (_INST(filePointer) != nil) {
@@ -518,7 +515,7 @@
_INST(hitEOF) = false;
RETURN ( self );
}
- ErrorNumber = _MKSMALLINT(errno);
+ ExternalStream_LastErrorNumber = _MKSMALLINT(errno);
}
}
%}
@@ -533,7 +530,6 @@
%{
FILE *f;
int ret;
- extern OBJ ErrorNumber;
extern errno;
if (_INST(filePointer) != nil) {
@@ -549,7 +545,7 @@
if (ret >= 0) {
RETURN ( self );
}
- ErrorNumber = _MKSMALLINT(errno);
+ ExternalStream_LastErrorNumber = _MKSMALLINT(errno);
}
%}
.