hg/stx-libbasic: comparison FileStream.st

equal deleted inserted replaced

-:3f2e6f5fab12
+:264cf9877dda
 "the sendfile() system call currently (2004-05-07) handles only descriptors that
 support mmap-like operations as from-fd.
 Therefore, this method is reimplemented here (from ExternalStream)"
 outStream isExternalStream ifTrue:[
-	pos := self position0Based.
+pos := self position.
-	n := self size - pos.
+n := self size - pos.
-	nWritten := OperatingSystem
+nWritten := OperatingSystem
-	    copyFromFd:(self fileDescriptor)
+copyFromFd:(self fileDescriptor)
-	    toFd:(outStream fileDescriptor)
+toFd:(outStream fileDescriptor)
-	    startIndex:pos
+startIndex:pos
-	    count:n.
+count:n.
-	nWritten = n ifTrue:[
+nWritten = n ifTrue:[
-	    ^ self
+^ self
-	].
+].
-	nWritten > 0 ifTrue:[
+nWritten > 0 ifTrue:[
-	    self position0Based:pos+nWritten.
+self position:pos+nWritten.
-	].
+].
 ].
 ^ super copyToEndInto:outStream bufferSize:bufferSize.
 "
 |in out|
 "
 ! !
 !FileStream methodsFor:'positioning'!
-position0Based
+position
 "return the read/write position in the file"
 %{
 HFILE f;
 off_t currentPosition;
 if (__INST(handle) != nil) {
-	do {
+do {
-	    f = __FILEVal(__INST(handle));
+f = __FILEVal(__INST(handle));
 #ifdef WIN32
-	    __threadErrno = 0;
+__threadErrno = 0;
-	    if (__INST(buffered) == true) {
+if (__INST(buffered) == true) {
 # if 0
-		currentPosition = STX_C_CALL1( "ftell", ftell, f);
+currentPosition = STX_C_CALL1( "ftell", ftell, f);
 # else
-		currentPosition = ftell(f);
+currentPosition = ftell(f);
 # endif
-	    } else {
+} else {
-		OBJ rA = __INST(readAhead);
+OBJ rA = __INST(readAhead);
-		off_t offs = 0;
+off_t offs = 0;
-		if (rA != nil) {
+if (rA != nil) {
-		    __INST(readAhead) = nil;
+__INST(readAhead) = nil;
-		    offs = -1;
+offs = -1;
-		}
+}
 # if 0
-		currentPosition = STX_C_CALL3( "lseek", lseek, fileno(f), offs, SEEK_CUR);
+currentPosition = STX_C_CALL3( "lseek", lseek, fileno(f), offs, SEEK_CUR);
 # else
-		currentPosition = lseek(fileno(f), offs, SEEK_CUR);
+currentPosition = lseek(fileno(f), offs, SEEK_CUR);
 # endif
-	    }
+}
 #else /* !WIN32 */
-	    if (__INST(buffered) == true) {
+if (__INST(buffered) == true) {
 #ifdef _LFS_LARGEFILE
-		currentPosition = ftello(f);
+currentPosition = ftello(f);
 #else
-		currentPosition = ftell(f);
+currentPosition = ftell(f);
 #endif /* ! _LFS_LARGEFILE */
-	    } else {
+} else {
-		currentPosition = lseek(fileno(f), (off_t)0, SEEK_CUR);
+currentPosition = lseek(fileno(f), (off_t)0, SEEK_CUR);
-	    }
+}
 #endif /* !WIN32 */
-	} while ((currentPosition < 0) && (__threadErrno == EINTR));
+} while ((currentPosition < 0) && (__threadErrno == EINTR));
-	if (currentPosition >= 0) {
+if (currentPosition >= 0) {
-	    OBJ rslt;
+OBJ rslt;
-	    if (sizeof(currentPosition) == 8) {
+if (sizeof(currentPosition) == 8) {
-		rslt = __MKINT64 (&currentPosition);
+rslt = __MKINT64 (&currentPosition);
-	    } else {
+} else {
-		rslt = __MKINT(currentPosition);
+rslt = __MKINT(currentPosition);
-	    }
+}
-	    RETURN ( rslt );
+RETURN ( rslt );
-	}
+}
-	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
 }
 %}.
 lastErrorNumber notNil ifTrue:[^ self ioError].
 handle isNil ifTrue:[^ self errorNotOpen].
 ^ self primitiveFailed
 !
-position0Based:newPos
+position:newPos
 "set the read/write position in the file"
 |rslt|
 %{
 HFILE f;
 long ret;
 OBJ fp;
 if ((__INST(canPosition) != false) || (newPos == __mkSmallInteger(0))) {
-	if ((fp = __INST(handle)) != nil) {
+if ((fp = __INST(handle)) != nil) {
 #if defined(_LFS_LARGE_FILE) && !defined(WIN32)
 # define FSEEK fseeko
-	    off_t nP;
+off_t nP;
 #else
 #define FSEEK fseek
-	    long nP;
+long nP;
 #endif
-	    if (__isSmallInteger(newPos)) {
+if (__isSmallInteger(newPos)) {
-		nP = __intVal(newPos);
+nP = __intVal(newPos);
-		if (nP < 0) {
+if (nP < 0) {
-		    __INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
+__INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
-		    goto getOutOfHere;
+goto getOutOfHere;
-		}
+}
-	    } else {
+} else {
-		nP = __signedLongIntVal(newPos);
+nP = __signedLongIntVal(newPos);
-		if (nP < 0) {
+if (nP < 0) {
-		    __INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
+__INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
-		    goto getOutOfHere;
+goto getOutOfHere;
-		}
+}
-		if (nP == 0) {
+if (nP == 0) {
-		    if (sizeof(nP) == 8) {
+if (sizeof(nP) == 8) {
-			if (__signedLong64IntVal(newPos, &nP) == 0 || nP < 0) {
+if (__signedLong64IntVal(newPos, &nP) == 0 || nP < 0) {
-			    __INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
+__INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
-			    goto getOutOfHere;
+goto getOutOfHere;
-			}
+}
-		    } else {
+} else {
-			__INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
+__INST(lastErrorNumber) = __mkSmallInteger(EINVAL);
-			goto getOutOfHere;
+goto getOutOfHere;
-		    }
+}
-		}
+}
-	    }
+}
-	    f = __FILEVal(fp);
+f = __FILEVal(fp);
-	    do {
+do {
 #if defined(DO_WRAP_CALL_FSEEK)
-		__threadErrno = 0;
+__threadErrno = 0;
-		if (__INST(buffered) == true) {
+if (__INST(buffered) == true) {
-		    ret = STX_C_CALL3( "fseek", fseek, f, nP, SEEK_SET);
+ret = STX_C_CALL3( "fseek", fseek, f, nP, SEEK_SET);
-		} else {
+} else {
-		    __INST(readAhead) = nil;
+__INST(readAhead) = nil;
-		    ret = STX_C_CALL3( "lseek", lseek, fileno(f), nP, SEEK_SET);
+ret = STX_C_CALL3( "lseek", lseek, fileno(f), nP, SEEK_SET);
-		}
+}
 #else
-		if (__INST(buffered) == true) {
+if (__INST(buffered) == true) {
-		    ret = FSEEK(f, nP, SEEK_SET);
+ret = FSEEK(f, nP, SEEK_SET);
-		} else {
+} else {
-		    ret = lseek(fileno(f), nP, SEEK_SET);
+ret = lseek(fileno(f), nP, SEEK_SET);
-		}
+}
-		__threadErrno = errno;
+__threadErrno = errno;
 #endif
-	    } while ((ret < 0) && (__threadErrno == EINTR));
+} while ((ret < 0) && (__threadErrno == EINTR));
-	    if (ret >= 0) {
+if (ret >= 0) {
-		__INST(position) = newPos; __STORE(self, newPos);
+__INST(position) = newPos; __STORE(self, newPos);
-		/*
+/*
-		 * just to make certain ...
+* just to make certain ...
-		 */
+*/
-		__INST(hitEOF) = false;
+__INST(hitEOF) = false;
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
-	}
+}
 }
 getOutOfHere: ;
 #undef FSEEK
 %}.
 canPosition == false ifTrue:[
-	"/ position by rewinding & re-reading everything up-to
+"/ position by rewinding & re-reading everything up-to
-	"/ that point.
+"/ that point.
-	^ self slowPosition0Based:newPos
+^ self slowPosition:newPos
 ].
 lastErrorNumber notNil ifTrue:[
-	(OperatingSystem errorSymbolForNumber:lastErrorNumber) == #EINVAL ifTrue:[
+(OperatingSystem errorSymbolForNumber:lastErrorNumber) == #EINVAL ifTrue:[
-	    "/ invalid position
+"/ invalid position
-	    ^ self positionError
+^ self positionError
-	].
+].
-	"/ assume I/O error
+"/ assume I/O error
-	^ self ioError
+^ self ioError
 ].
 handle isNil ifTrue:[^ self errorNotOpen].
 rslt := self positionFile:handle position:newPos.
 rslt >= 0 ifTrue:[
-	position := newPos.
+position := newPos.
 ] ifFalse:[
-	hitEOF := true.
+hitEOF := true.
 ]
 !
 reset
 "additionaly to setting the position to the beginning of the file,
 lastErrorNumber notNil ifTrue:[^ self ioError].
 handle isNil ifTrue:[^ self errorNotOpen].
 ^ self primitiveFailed
 !
-slowPosition0Based:newPos
-"position the file by re-reading everything up-to newPos.
-The effect is the same as that of #position:, but its much slower.
-This is required to reposition nonPositionable streams, such
-as tape-streams or variable-record-RMS files under VMS.
-Caveat:
-	 This should really be done transparently by the stdio library."
-|buffer amount pos0Based|
-self isReadable ifFalse:[
-	"/ sorry
-	^ self positionError
-].
-buffer := ByteArray new:8*1024.
-(position isNil "/ i.e. unknown
-or:[newPos < (pos0Based := self position0Based)]) ifTrue:[
-	self reset.
-	pos0Based := self position0Based.
-].
-[pos0Based < newPos] whileTrue:[
-	amount := (buffer size) min:(newPos-pos0Based).
-	(self nextBytes:amount into:buffer startingAt:1) ~~ amount ifTrue:[
-	    ^ self positionError
-	].
-	pos0Based := self position0Based.
-].
-"/ ('FileStream [info]: slow position - please convert ''' , pathName printString , ''' to streamLF format') infoPrintCR.
-!
 slowPosition:newPos
 "position the file by re-reading everything up-to newPos.
 The effect is the same as that of #position:, but its much slower.
 This is required to reposition nonPositionable streams, such
 as tape-streams or variable-record-RMS files under VMS.
 Caveat:
-	 This should really be done transparently by the stdio library."
+This should really be done transparently by the stdio library."
-^ self slowPosition0Based:newPos
+|buffer amount pos0Based|
+self isReadable ifFalse:[
+"/ sorry
+^ self positionError
+].
+buffer := ByteArray new:8*1024.
+(position isNil "/ i.e. unknown
+or:[newPos < (pos0Based := self position)]) ifTrue:[
+self reset.
+pos0Based := self position.
+].
+[pos0Based < newPos] whileTrue:[
+amount := (buffer size) min:(newPos-pos0Based).
+(self nextBytes:amount into:buffer startingAt:1) ~~ amount ifTrue:[
+^ self positionError
+].
+pos0Based := self position.
+].
+"/ ('FileStream [info]: slow position - please convert ''' , pathName printString , ''' to streamLF format') infoPrintCR.
 ! !
 !FileStream methodsFor:'printing & storing'!
 printOn:aStream
 ! !
 !FileStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.168 2013-07-29 08:11:37 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.169 2013-08-10 11:32:53 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.168 2013-07-29 08:11:37 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.169 2013-08-10 11:32:53 stefan Exp $'
 ! !
 FileStream initialize!

changeset 15620	264cf9877dda
parent 15573	36facee1072e
child 16109	0e7d694bfc7a
child 18084	ab5b38bd8f81