hg/stx-libbasic: comparison FileStream.st

equal deleted inserted replaced

-:8e03bd717355
+:62303f84ff5f
 All Rights Reserved
 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.5 1993-11-08 02:30:24 claus Exp $
+$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.6 1993-12-11 00:48:19 claus Exp $
 '!
 %{
 #include <stdio.h>
 #include <errno.h>
 # include <sys/types.h>
 # include <sys/stat.h>
 #endif
 #ifndef SEEK_SET
-# define SEEK_SET	0
+# define SEEK_SET       0
 #endif
 #ifndef SEEK_CUR
-# define SEEK_CUR	1
+# define SEEK_CUR       1
 #endif
 #ifndef SEEK_END
-# define SEEK_END	2
+# define SEEK_END       2
 #endif
 %}
 !FileStream class methodsFor:'instance creation'!
 extern errno;
 if (_INST(filePointer) == nil) {
 path = _INST(pathName);
 if (path != nil
-	 && ((_qClass(path)==String) || (_qClass(path) == Filename))) {
+&& ((_qClass(path)==String) || (_qClass(path) == Filename))) {
-	    do {
+do {
+#ifdef LINUX
+/* LINUX returns a non-NULL f even when interrupted */
+errno = 0;
 f = (FILE *)fopen((char *) _stringVal(path), (char *) _stringVal(openmode));
-	    } while ((f == NULL) && (errno == EINTR));
+if (errno == EINTR)
+f = NULL;
+#else
+f = (FILE *)fopen((char *) _stringVal(path), (char *) _stringVal(openmode));
+#endif
+} while ((f == NULL) && (errno == EINTR));
 if (f == NULL) {
 ErrorNumber = _MKSMALLINT(errno);
 _INST(position) = nil;
 } else {
 _INST(filePointer) = _MKSMALLINT((int)f);
 }
 }
 %}
 .
 retVal notNil ifTrue:[
-	buffered := true.	"default is buffered"
+buffered := true.       "default is buffered"
 lobby register:self
 ].
 ^ retVal
 !
 "sent after snapin to reopen streams"
 filePointer notNil ifTrue:[
 "it was open, when snapped-out"
 filePointer := nil.
+lobby unregister:self.
 self open.
 filePointer isNil ifTrue:[
+"this happens, if after a restart, the file is no longer accessable ..."
 ('could not reopen file: ', pathName) printNewline.
-	    lobby unregister:self
 ] ifFalse:[
 self position:position.
-	    lobby changed:self
 ]
 ]
 !
 size
 extern errno;
 extern OBJ ErrorNumber;
 if (_INST(filePointer) != nil) {
 f = (FILE *)_intVal(_INST(filePointer));
-	do {
+do {
 ret = fstat(fileno(f), &buf);
-	} while ((ret < 0) && (errno == EINTR));
+} while ((ret < 0) && (errno == EINTR));
 if (ret >= 0) {
 RETURN ( _MKSMALLINT(buf.st_size) );
 }
-	ErrorNumber = _MKSMALLINT(errno);
+ErrorNumber = _MKSMALLINT(errno);
 }
 #endif
 %}
 .
 "could add a fall-back here:
 extern errno;
 extern OBJ ErrorNumber;
 if (_INST(filePointer) != nil) {
 f = (FILE *)_intVal(_INST(filePointer));
-	do {
+do {
-	    if (_INST(buffered) == true) {
+if (_INST(buffered) == true) {
 currentPosition = ftell(f);
-	    } else {
+} else {
-	        currentPosition = (long)lseek(fileno(f), SEEK_CUR, 0);
+currentPosition = (long)lseek(fileno(f), SEEK_CUR, 0);
-	    }
+}
-	} while ((currentPosition < 0) && (errno == EINTR));
+} while ((currentPosition < 0) && (errno == EINTR));
 if (currentPosition >= 0) {
 /*
 * notice: Smalltalk index starts at 1
 */
 RETURN ( _MKSMALLINT(currentPosition + 1) );
 }
-	ErrorNumber = _MKSMALLINT(errno);
+ErrorNumber = _MKSMALLINT(errno);
 }
 %}
 .
 filePointer isNil ifTrue:[^ self errorNotOpen].
 ^ self primitiveFailed
 if (_isSmallInteger(newPos)) {
 f = (FILE *)_intVal(_INST(filePointer));
 /*
 * notice: Smalltalk index starts at 1
 */
-	    do {
+do {
-	        if (_INST(buffered) == true) {
+if (_INST(buffered) == true) {
 ret = fseek(f, _intVal(newPos) - 1, 0);
 } else {
 ret = lseek(fileno(f), (long)_intVal(newPos) - 1, SEEK_SET);
-		}
+}
-	    } while ((ret < 0) && (errno == EINTR));
+} while ((ret < 0) && (errno == EINTR));
 if (ret >= 0) {
 _INST(position) = newPos;
 RETURN ( self );
 }
 ErrorNumber = _MKSMALLINT(errno);

changeset 13	62303f84ff5f
parent 10	4f1f9a91e406
child 31	75f2b9f78be2