hg/stx-libbasic: comparison ExternalStream.st

equal deleted inserted replaced

-:7bf49766c324
+:ff526d39bb07
 !
 reset
 "set the read position to the beginning of the collection"
-self position:ZeroPosition
+self position:0
 !
 setToEnd
 "redefined since it must be implemented differently"
 FILE *fdopen();
 int fd = -2;
 if (__isStringLike(openmode)) {
 #ifdef WIN32
-	__stxWrapApiEnterCritical();
+__stxWrapApiEnterCritical();
 #endif
-	if (__isSmallInteger(aFileDescriptor)) {
+if (__isSmallInteger(aFileDescriptor)) {
-	    fd = __intVal(aFileDescriptor);
+fd = __intVal(aFileDescriptor);
-	}
+}
 #ifdef WIN32
-	else if (__isExternalAddressLike(aFileDescriptor)) {
+else if (__isExternalAddressLike(aFileDescriptor)) {
-	    fd = _open_osfhandle((long)__externalAddressVal(aFileDescriptor), O_BINARY);
+fd = _open_osfhandle((long)__externalAddressVal(aFileDescriptor), O_BINARY);
-	    if (fd < 0) {
+if (fd < 0) {
-		if (__threadErrno == 0) {
+if (__threadErrno == 0) {
-		    // no more file descriptors
+// no more file descriptors
-		    __threadErrno = EMFILE;
+__threadErrno = EMFILE;
-		}
+}
-		error = __mkSmallInteger(__threadErrno);
+error = __mkSmallInteger(__threadErrno);
-		__stxWrapApiLeaveCritical();
+__stxWrapApiLeaveCritical();
-		goto out;
+goto out;
-	    }
+}
-	}
+}
 #endif
-	f = (FILEPOINTER) fdopen(fd, (char *)__stringVal(openmode));
+f = (FILEPOINTER) fdopen(fd, (char *)__stringVal(openmode));
 #ifdef WIN32
-	__stxWrapApiLeaveCritical();
+__stxWrapApiLeaveCritical();
 #endif
-	if (f == NULL) {
+if (f == NULL) {
-	    error =__mkSmallInteger(__threadErrno);
+error =__mkSmallInteger(__threadErrno);
-	} else {
+} else {
-	    if (@global(FileOpenTrace) == true) {
+if (@global(FileOpenTrace) == true) {
-		fprintf(stderr, "fdopen [ExternalStream] %d (%x) -> %x\n", fd, fd, f);
+fprintf(stderr, "fdopen [ExternalStream] %d (%x) -> %x\n", fd, fd, f);
-	    }
+}
-	    fp = __MKFILEPOINTER(f); __INST(handle) = fp; __STORE(self, fp);
+fp = __MKFILEPOINTER(f); __INST(handle) = fp; __STORE(self, fp);
-	    retVal = self;
+retVal = self;
-	}
+}
 }
 out:;
 %}.
 retVal notNil ifTrue:[
-	position := ZeroPosition.
+position := 0.
-	buffered isNil ifTrue:[
+buffered isNil ifTrue:[
-	    buffered := true.       "default is buffered"
+buffered := true.       "default is buffered"
-	].
+].
-	handleType := handleTypeSymbol.
+handleType := handleTypeSymbol.
-	Lobby register:self.
+Lobby register:self.
-	^ retVal
+^ retVal
 ].
 error notNil ifTrue:[
-	OperatingSystem closeFd:aFileDescriptor.
+OperatingSystem closeFd:aFileDescriptor.
-	lastErrorNumber := error.
+lastErrorNumber := error.
-	position := nil.
+position := nil.
-	"
+"
-	 the open failed for some reason ...
+the open failed for some reason ...
-	"
+"
-	^ self openError:error
+^ self openError:error
 ].
 !
 dupFd
 "duplicate my file descriptor"
 if (__isStringLike(aPath) && __isStringLike(openModeString)) {
 #ifdef WIN32
 # if 1
 f = fopen((char *) __stringVal(aPath), (char *) __stringVal(openModeString));
 # else
-	__BEGIN_INTERRUPTABLE__
+__BEGIN_INTERRUPTABLE__
-	do {
+do {
-	    f = fopen((char *) __stringVal(aPath), (char *) __stringVal(openModeString));
+f = fopen((char *) __stringVal(aPath), (char *) __stringVal(openModeString));
-	} while ((f == NULL) && (__threadErrno == EINTR));
+} while ((f == NULL) && (__threadErrno == EINTR));
-	__END_INTERRUPTABLE__
+__END_INTERRUPTABLE__
 # endif
 #else /* UNIX */
-	__BEGIN_INTERRUPTABLE__
+__BEGIN_INTERRUPTABLE__
-	do {
+do {
-	    f = fopen((char *) __stringVal(aPath), (char *) __stringVal(openModeString));
+f = fopen((char *) __stringVal(aPath), (char *) __stringVal(openModeString));
-	} while ((f == NULL) && (__threadErrno == EINTR));
+} while ((f == NULL) && (__threadErrno == EINTR));
-	__END_INTERRUPTABLE__
+__END_INTERRUPTABLE__
 #endif /* UNIX */
-	if (f == NULL) {
+if (f == NULL) {
-	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
-	} else {
+} else {
-	    if (@global(FileOpenTrace) == true) {
+if (@global(FileOpenTrace) == true) {
-		fprintf(stderr, "fopen %s [ExternalStream] -> %x\n", __stringVal(aPath), f);
+fprintf(stderr, "fopen %s [ExternalStream] -> %x\n", __stringVal(aPath), f);
-	    }
+}
-	    fp = __MKFILEPOINTER(f); __INST(handle) = fp; __STORE(self, fp);
+fp = __MKFILEPOINTER(f); __INST(handle) = fp; __STORE(self, fp);
-	    __INST(handleType) = @symbol(filePointer);
+__INST(handleType) = @symbol(filePointer);
-	    ok = true;
+ok = true;
-	}
+}
 }
 %}.
 ok ifFalse:[
-	"
+"
-	 the open failed for some reason ...
+the open failed for some reason ...
-	"
+"
-	^ self openError:lastErrorNumber.
+^ self openError:lastErrorNumber.
 ].
-position := ZeroPosition.
+position := 0.
 Lobby register:self.
 !
 reOpen
 "USERS WILL NEVER INVOKE THIS METHOD
 ! !
 !ExternalStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.363 2013-05-31 12:50:39 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.364 2013-06-03 18:41:42 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.363 2013-05-31 12:50:39 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.364 2013-06-03 18:41:42 cg Exp $'
 ! !
 ExternalStream initialize!

changeset 15361	ff526d39bb07
parent 15342	d89884677c76
child 15435	fc902ce16af0
child 18066	89d51443ba6f