hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:a68adb223592
+:62450598d208
 INT fd;
 INT cnt, offs;
 int nInstBytes, objSize;
 if (! __isSmallInteger(__INST(fd))) {
-	error = @symbol(errorNotOpen);
+error = @symbol(errorNotOpen);
-	goto bad;
+goto bad;
 }
 if (! __bothSmallInteger(count, firstIndex)) {
-	error = @symbol(badArgument);
+error = @symbol(badArgument);
-	goto bad;
+goto bad;
 }
 fd = __smallIntegerVal(__INST(fd));
 cnt = __smallIntegerVal(count);
 offs = __smallIntegerVal(firstIndex) - 1;
 if (fd < 0) {
-	error = @symbol(internalError);
+error = @symbol(internalError);
-	goto bad;
+goto bad;
 }
-if (__isExternalBytes(aByteBuffer)) {
+if (__isExternalBytesLike(aByteBuffer)) {
-	OBJ sz;
+OBJ sz;
-	nInstBytes = 0;
+nInstBytes = 0;
-	extPtr = (char *)(__externalBytesAddress(aByteBuffer));
+extPtr = (char *)(__externalBytesAddress(aByteBuffer));
-	sz = __externalBytesSize(aByteBuffer);
+sz = __externalBytesSize(aByteBuffer);
-	if (__isSmallInteger(sz)) {
+if (__isSmallInteger(sz)) {
-	    objSize = __smallIntegerVal(sz);
+objSize = __smallIntegerVal(sz);
-	} else {
+} else {
-	    objSize = -1; /* unknown */
+objSize = -1; /* unknown */
-	}
+}
 } else {
-	OBJ oClass;
+OBJ oClass;
-	int nInstVars;
+int nInstVars;
-	oClass = __Class(aByteBuffer);
+oClass = __Class(aByteBuffer);
-	switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-	    case BYTEARRAY:
+case BYTEARRAY:
-	    case WORDARRAY:
+case WORDARRAY:
-	    case LONGARRAY:
+case LONGARRAY:
-	    case SWORDARRAY:
+case SWORDARRAY:
-	    case SLONGARRAY:
+case SLONGARRAY:
-	    case FLOATARRAY:
+case FLOATARRAY:
-	    case DOUBLEARRAY:
+case DOUBLEARRAY:
-		break;
+break;
-	    default:
+default:
-		error = @symbol(badArgument1);
+error = @symbol(badArgument1);
-		goto bad;
+goto bad;
-	}
+}
-	extPtr = (char *)0;
+extPtr = (char *)0;
-	nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
+nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
-	nInstBytes = __OBJS2BYTES__(nInstVars);
+nInstBytes = __OBJS2BYTES__(nInstVars);
-	objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
+objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
 }
 if ((offs >= 0)
-	&& (cnt >= 0)
+&& (cnt >= 0)
-	&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
+&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
-	nRead = 0;
+nRead = 0;
-	do {
+do {
-	    int n;
+int n;
-	    if (extPtr) {
+if (extPtr) {
-		n = read(fd, extPtr+offs, cnt);
+n = read(fd, extPtr+offs, cnt);
-	    } else {
+} else {
-		char *bp;
+char *bp;
-		/*
+/*
-		 * on interrupt, anObject may be moved to another location.
+* on interrupt, anObject may be moved to another location.
-		 * So we recompute the byte-address here.
+* So we recompute the byte-address here.
-		 */
+*/
-		bp = __byteArrayVal(aByteBuffer) + nInstBytes;
+bp = __byteArrayVal(aByteBuffer) + nInstBytes;
-		n = read(fd, bp + offs, cnt);
+n = read(fd, bp + offs, cnt);
-	    }
+}
-	    if (n > 0) {
+if (n > 0) {
-		cnt -= n;
+cnt -= n;
-		offs += n;
+offs += n;
-		nRead += n;
+nRead += n;
-	    } else if (n == 0) {
+} else if (n == 0) {
-		break;
+break;
-	    } else if (n < 0) {
+} else if (n < 0) {
-		if (0
+if (0
 #ifdef EWOULDBLOCK
-		    || errno == EWOULDBLOCK
+|| errno == EWOULDBLOCK
 #endif
 #ifdef EAGAIN
-		    || errno == EAGAIN
+|| errno == EAGAIN
 #endif
-		) {
+) {
-		     RETURN(nil);
+RETURN(nil);
-		}
+}
-		if (errno != EINTR) {
+if (errno != EINTR) {
-		     error = __mkSmallInteger(errno);
+error = __mkSmallInteger(errno);
-		     goto bad;
+goto bad;
-		}
+}
-		__HANDLE_INTERRUPTS__;
+__HANDLE_INTERRUPTS__;
-	    }
+}
-	} while (cnt > 0);
+} while (cnt > 0);
-	RETURN (__mkSmallInteger(nRead));
+RETURN (__mkSmallInteger(nRead));
 }
 bad: ;
 %}.
 ^ self error:error.
 INT fd;
 INT cnt, offs;
 int nInstBytes, objSize;
 if (! __isSmallInteger(__INST(fd))) {
-	error = @symbol(errorNotOpen);
+error = @symbol(errorNotOpen);
-	goto bad;
+goto bad;
 }
 if (! __bothSmallInteger(count, firstIndex)) {
-	error = @symbol(badArgument);
+error = @symbol(badArgument);
-	goto bad;
+goto bad;
 }
 fd = __smallIntegerVal(__INST(fd));
 cnt = __smallIntegerVal(count);
 offs = __smallIntegerVal(firstIndex) - 1;
 if (fd < 0) {
-	error = @symbol(internalError);
+error = @symbol(internalError);
-	goto bad;
+goto bad;
 }
-if (__isExternalBytes(aByteBuffer)) {
+if (__isExternalBytesLike(aByteBuffer)) {
-	OBJ sz;
+OBJ sz;
-	nInstBytes = 0;
+nInstBytes = 0;
-	extPtr = (char *)(__externalBytesAddress(aByteBuffer));
+extPtr = (char *)(__externalBytesAddress(aByteBuffer));
-	sz = __externalBytesSize(aByteBuffer);
+sz = __externalBytesSize(aByteBuffer);
-	if (__isSmallInteger(sz)) {
+if (__isSmallInteger(sz)) {
-	    objSize = __smallIntegerVal(sz);
+objSize = __smallIntegerVal(sz);
-	} else {
+} else {
-	    objSize = -1; /* unknown */
+objSize = -1; /* unknown */
-	}
+}
 } else {
-	OBJ oClass;
+OBJ oClass;
-	int nInstVars;
+int nInstVars;
-	oClass = __Class(aByteBuffer);
+oClass = __Class(aByteBuffer);
-	switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+switch (__smallIntegerVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-	    case BYTEARRAY:
+case BYTEARRAY:
-	    case WORDARRAY:
+case WORDARRAY:
-	    case LONGARRAY:
+case LONGARRAY:
-	    case SWORDARRAY:
+case SWORDARRAY:
-	    case SLONGARRAY:
+case SLONGARRAY:
-	    case FLOATARRAY:
+case FLOATARRAY:
-	    case DOUBLEARRAY:
+case DOUBLEARRAY:
-		break;
+break;
-	    default:
+default:
-		error = @symbol(badArgument1);
+error = @symbol(badArgument1);
-		goto bad;
+goto bad;
-	}
+}
-	extPtr = (char *)0;
+extPtr = (char *)0;
-	nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
+nInstVars = __smallIntegerVal(__ClassInstPtr(oClass)->c_ninstvars);
-	nInstBytes = __OBJS2BYTES__(nInstVars);
+nInstBytes = __OBJS2BYTES__(nInstVars);
-	objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
+objSize = __Size(aByteBuffer) - OHDR_SIZE - nInstBytes;
 }
 if ((offs >= 0)
-	&& (cnt >= 0)
+&& (cnt >= 0)
-	&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
+&& ((objSize == -1) || (objSize >= (cnt + offs)))) {
-	nWritten = 0;
+nWritten = 0;
-	do {
+do {
-	    int n;
+int n;
-	    if (extPtr) {
+if (extPtr) {
-		n = write(fd, extPtr+offs, cnt);
+n = write(fd, extPtr+offs, cnt);
-	    } else {
+} else {
-		char *bp;
+char *bp;
-		/*
+/*
-		 * on interrupt, anObject may be moved to another location.
+* on interrupt, anObject may be moved to another location.
-		 * So we recompute the byte-address here.
+* So we recompute the byte-address here.
-		 */
+*/
-		bp = __byteArrayVal(aByteBuffer) + nInstBytes;
+bp = __byteArrayVal(aByteBuffer) + nInstBytes;
-		n = write(fd, bp + offs, cnt);
+n = write(fd, bp + offs, cnt);
-	    }
+}
-	    if (n > 0) {
+if (n > 0) {
-		cnt -= n;
+cnt -= n;
-		offs += n;
+offs += n;
-		nWritten += n;
+nWritten += n;
-	    } else if (n == 0) {
+} else if (n == 0) {
-		break;
+break;
-	    } else if (n < 0) {
+} else if (n < 0) {
-		if (0
+if (0
 #ifdef EWOULDBLOCK
-		    || errno == EWOULDBLOCK
+|| errno == EWOULDBLOCK
 #endif
 #ifdef EAGAIN
-		    || errno == EAGAIN
+|| errno == EAGAIN
 #endif
-		) {
+) {
-		     RETURN(nil);
+RETURN(nil);
-		}
+}
-		if (errno != EINTR) {
+if (errno != EINTR) {
-		     error = __mkSmallInteger(errno);
+error = __mkSmallInteger(errno);
-		     goto bad;
+goto bad;
-		}
+}
-		__HANDLE_INTERRUPTS__;
+__HANDLE_INTERRUPTS__;
-	    }
+}
-	} while (cnt > 0);
+} while (cnt > 0);
-	RETURN (__mkSmallInteger(nWritten));
+RETURN (__mkSmallInteger(nWritten));
 }
 bad: ;
 %}.
 ^ self error:error
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.156 2003-04-10 11:03:26 penk Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.157 2003-04-10 23:37:49 cg Exp $'
 ! !
 UnixOperatingSystem initialize!
 UnixOperatingSystem::FileDescriptorHandle initialize!

changeset 7198	62450598d208
parent 7185	0a3ba41f0d31
child 7203	60fa52f0c2a8