hg/stx-libbasic: comparison FileStream.st

equal deleted inserted replaced

-:5844a3bcdd52
+:7ef3221b036d
 byte boundaries if the file is a variable-record-RMS file.
 (stupid enough, this is the default for textfiles as created by some tools ...)
 Therefore, the instance variable canPosition is set according to
 this and an error is raised, if a position: is attemted.
 I know, this is ugly, but what else could we do ?
 Late note: who cares for VMS these days?
-(and how much useless effort has been put in the past,
+	       (and how much useless effort has been put in the past,
-to support lousy operating systems?)
+		to support lousy operating systems?)
 [instance variables:]
-pathName        <String>        the files path (if known)
+	pathName        <String>        the files path (if known)
-canPosition     <Boolean>       positionable - read above comment
+	canPosition     <Boolean>       positionable - read above comment
 [author:]
-Claus Gittinger
+	Claus Gittinger
 [see also:]
-Filename DirectoryStream PipeStream Socket
+	Filename DirectoryStream PipeStream Socket
 "
 !
 examples
 "
 newTemporary
 "create atomically a new file and return the file stream - use this for temporary files.
 The created file has the name '/tmp/stxtmp_xx_nn' where xx is our
 unix process id, and nn is a unique number, incremented with every call to this method.
 If any of the environment variables ST_TMPDIR or TMPDIR is set,
 its value defines the temp directory."
 ^ self newTemporaryIn:Filename tempDirectory
 "
 FileStream newTemporary
 FileStream newTemporary
 "
 !
 newTemporaryIn:aDirectoryOrNil
 "create atomically a new file and return the file stream - use this for temporary files.
 The created file is in aDirectoryPrefix and named 'stxtmp_xx_nn',
 where xx is our unix process id, and nn is a unique number, incremented
 with every call to this method."
 ^ self newTemporaryIn:aDirectoryOrNil nameTemplate:Filename tempFileNameTemplate
 "temp files in '/tmp':
 FileStream newTemporary
 "
 "temp files somewhere
 (not recommended - use above since it can be controlled via shell variables):
 FileStream newTemporaryIn:'/tmp'
 FileStream newTemporaryIn:'/tmp'
 FileStream newTemporaryIn:'/usr/tmp'
 FileStream newTemporaryIn:'/'
 "
 "a local temp file:
 FileStream newTemporaryIn:''
 FileStream newTemporaryIn:nil
 FileStream newTemporaryIn:'.'
 FileStream newTemporaryIn:('source' asFilename)
 "
 !
 newTemporaryIn:aDirectoryOrNil nameTemplate:template
 "create atomically a new file and return the file stream - use this for temporary files.
 See also: #newTemporary which looks for a good temp directory."
 |nameString random prevRandom prevNameString newTempFilename stream|
 [
-prevRandom := random.
+	prevRandom := random.
-prevNameString := nameString.
+	prevNameString := nameString.
-"Use random numbers in order to improve the security
+	"Use random numbers in order to improve the security
-by making the generated names less predictable"
+	 by making the generated names less predictable"
-[
+	[
-random := RandomGenerator new nextInteger.
+	    random := RandomGenerator new nextInteger.
-] doWhile:[random = prevRandom].
+	] doWhile:[random = prevRandom].
-nameString := template bindWith:(OperatingSystem getProcessId) with:random.
+	nameString := template bindWith:(OperatingSystem getProcessId) with:random.
-aDirectoryOrNil isNil ifTrue:[
+	aDirectoryOrNil isNil ifTrue:[
-newTempFilename := nameString.
+	    newTempFilename := nameString.
-] ifFalse:[
+	] ifFalse:[
-newTempFilename := aDirectoryOrNil asFilename constructString:nameString.
+	    newTempFilename := aDirectoryOrNil asFilename constructString:nameString.
-].
+	].
-[
+	[
-stream := self open:newTempFilename withMode:#(CREATE_NEW GENERIC_READ_WRITE).
+	    stream := self open:newTempFilename withMode:#(CREATE_NEW GENERIC_READ_WRITE).
-] on:OpenError do:[:ex|
+	] on:OpenError do:[:ex|
-(OperatingSystem errorHolderForNumber:ex errorCode) errorCategory ~~ #existingReferentSignal ifFalse:[
+	    (OperatingSystem errorHolderForNumber:ex errorCode) errorCategory ~~ #existingReferentSignal ifFalse:[
-"some fundamental error, raise exception"
+		"some fundamental error, raise exception"
-ex reject.
+		ex reject.
-].
+	    ].
-prevNameString = nameString ifTrue:[
+	    prevNameString = nameString ifTrue:[
-"no more names - probably a bad template"
+		"no more names - probably a bad template"
-ex reject.
+		ex reject.
-].
+	    ].
-"file exists, retry another one"
+	    "file exists, retry another one"
-].
+	].
 ] doWhile:[
-stream isNil and:[prevNameString ~= nameString]   "/ if namestring didn't change, the template is bad
+	stream isNil and:[prevNameString ~= nameString]   "/ if namestring didn't change, the template is bad
 ].
 ^ stream
 "temp files in '/tmp':
-FileStream newTemporaryIn:'/tmp' asFilename nameTemplate:'foo%1_%2'
+	FileStream newTemporaryIn:'/tmp' asFilename nameTemplate:'foo%1_%2'
 This must fail on the second try:
-FileStream newTemporaryIn:'/tmp' asFilename nameTemplate:'foo'
+	FileStream newTemporaryIn:'/tmp' asFilename nameTemplate:'foo'
-FileStream newTemporaryIn:'c:\temp' asFilename nameTemplate:'foo'
+	FileStream newTemporaryIn:'c:\temp' asFilename nameTemplate:'foo'
 "
 "temp files somewhere
 (not recommended - use above since it can be controlled via shell variables):
 FileStream newTemporaryIn:'.'            nameTemplate:'foo%1_%2'
 FileStream newTemporaryIn:('source' asFilename) nameTemplate:'foo%1_%2'
 "
 !
 newTemporaryIn:aDirectoryOrNil withSuffix:aSuffixString
 "create atomically a new file and return the file stream - use this for temporary files.
 The created file is in aDirectoryPrefix and named 'stxtmp_xx_nn',
 where xx is our unix process id, and nn is a unique number, incremented
 with every call to this method."
 ^ self
-newTemporaryIn:aDirectoryOrNil
+	newTemporaryIn:aDirectoryOrNil
-nameTemplate:(Filename tempFileNameTemplate asFilename
+	nameTemplate:(Filename tempFileNameTemplate asFilename
-withSuffix:aSuffixString) asString
+					withSuffix:aSuffixString) asString
 "
 FileStream newTemporaryWithSuffix:'txt'
 FileStream newTemporaryIn:'/tmp' withSuffix:'txt'
 "
 The file is opened for read/write access."
 |stream|
 stream := self new pathName:aFilenameString.
 stream
-readwrite;        "/ assume read/write mode, but this depends on the args
+	readwrite;        "/ assume read/write mode, but this depends on the args
-openWithMode:anArrayOrString attributes:nil.
+	openWithMode:anArrayOrString attributes:nil.
 ^ stream
 !
 readonlyFileNamed:filename
 ^ OperatingSystem accessModeOfFd:self fileDescriptor.
 "
 'Make.proto' asFilename readingFileDo:[:s|
-s accessRights
+	  s accessRights
 ]
 "
 !
 accessRights:opaqueData
 "set the access rights of the file to opaqueData,
 which is normally retrieved by Filename>>#accessRights
 or FileStreamm>>#accessRights."
 (OperatingSystem changeAccessModeOfFd:self fileDescriptor to:opaqueData) ifFalse:[
-^ self fileName accessDeniedError:self
+	^ self fileName accessDeniedError:self
 ].
 "
 'Make.proto' asFilename readingFileDo:[:s|
-s accessRights:s accessRights
+	  s accessRights:s accessRights
 ]
 "
 "
 '/' asFilename readingFileDo:[:s|
-s accessRights:s accessRights
+	  s accessRights:s accessRights
 ]
 "
 ! !
 !FileStream methodsFor:'accessing'!
 executor
 |executor|
 executor := super executor.
 removeOnClose == true ifTrue:[
-executor setPathName:pathName removeOnClose:true.
+	executor setPathName:pathName removeOnClose:true.
 ].
 ^ executor
 ! !
 !FileStream methodsFor:'misc functions'!
 "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
 ! !
 !FileStream methodsFor:'printing & storing'!
 from which a copy can be reconstructed later."
 aStream nextPutAll:'(FileStream oldFileNamed:'.
 aStream nextPutAll:pathName storeString.
 (self position ~~ 0) ifTrue:[
-aStream nextPutAll:'; position:'.
+	aStream nextPutAll:'; position:'.
-self position storeOn:aStream
+	self position storeOn:aStream
 ].
 aStream nextPut:$)
 "Modified: 30.7.1997 / 16:43:50 / cg"
 ! !
 %{
 HFILE f = NULL;
 int pass = 0;
 if (!__isNonNilObject(encodedPathName)
-|| !(__isStringLike(openmode) || __isArrayLike(openmode)))
+	|| !(__isStringLike(openmode) || __isArrayLike(openmode)))
-goto badArgument;
+	    goto badArgument;
 retry:
 #ifdef __VMS__
 if (__isStringLike(encodedPathName)) {
-do {
+	do {
-/*
+	    /*
-* allow passing additional RMS arguments.
+	     * allow passing additional RMS arguments.
-* stupid: DEC does not seem to offer an interface for passing a char **.
+	     * stupid: DEC does not seem to offer an interface for passing a char **.
-*/
+	     */
-__threadErrno = 0;
+	    __threadErrno = 0;
-{
+	    {
-if (__isArray(attributeSpec)) {
+		if (__isArray(attributeSpec)) {
-OBJ *ap = __ArrayInstPtr(attributeSpec)->a_element;
+		    OBJ *ap = __ArrayInstPtr(attributeSpec)->a_element;
-int numAttrib = 0;
+		    int numAttrib = 0;
-int i;
+		    int i;
-numAttrib = __arraySize(attributeSpec);
+		    numAttrib = __arraySize(attributeSpec);
-for (i=0; i<numAttrib;i++) {
+		    for (i=0; i<numAttrib;i++) {
-if (! __isStringLike(ap[i])) {
+			if (! __isStringLike(ap[i])) {
-__threadErrno = EINVAL; /* invalid argument */
+			    __threadErrno = EINVAL; /* invalid argument */
-goto getOutOfHere;
+			    goto getOutOfHere;
-}
+			}
-}
+		    }
-switch (numAttrib) {
+		    switch (numAttrib) {
-case 0:
+			case 0:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode));
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 1:
+			case 1:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]));
+				      __stringVal(ap[0]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 2:
+			case 2:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]));
+				      __stringVal(ap[0]), __stringVal(ap[1]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 3:
+			case 3:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]));
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 4:
+			case 4:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]));
+				      __stringVal(ap[3]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 5:
+			case 5:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]));
+				      __stringVal(ap[3]), __stringVal(ap[4]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 6:
+			case 6:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]));
+				      __stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 7:
+			case 7:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
+				      __stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
-__stringVal(ap[6]));
+				      __stringVal(ap[6]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 8:
+			case 8:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
+				      __stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
-__stringVal(ap[6]), __stringVal(ap[7]));
+				      __stringVal(ap[6]), __stringVal(ap[7]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 9:
+			case 9:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
+				      __stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
-__stringVal(ap[6]), __stringVal(ap[7]), __stringVal(ap[8]));
+				      __stringVal(ap[6]), __stringVal(ap[7]), __stringVal(ap[8]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-case 10:
+			case 10:
-__BEGIN_INTERRUPTABLE__
+			    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
+			    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode),
-__stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
+				      __stringVal(ap[0]), __stringVal(ap[1]), __stringVal(ap[2]),
-__stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
+				      __stringVal(ap[3]), __stringVal(ap[4]), __stringVal(ap[5]),
-__stringVal(ap[6]), __stringVal(ap[7]), __stringVal(ap[8]),
+				      __stringVal(ap[6]), __stringVal(ap[7]), __stringVal(ap[8]),
-__stringVal(ap[9]));
+				      __stringVal(ap[9]));
-__END_INTERRUPTABLE__
+			    __END_INTERRUPTABLE__
-break;
+			    break;
-default:
+			default:
-__threadErrno = E2BIG; /* too many args */
+			    __threadErrno = E2BIG; /* too many args */
-goto getOutOfHere;
+			    goto getOutOfHere;
-}
+		    }
-} else if (attributeSpec != nil) {
+		} else if (attributeSpec != nil) {
-__threadErrno = EINVAL; /* invalid argument */
+		    __threadErrno = EINVAL; /* invalid argument */
-goto getOutOfHere;
+		    goto getOutOfHere;
-} else {
+		} else {
-/*
+		    /*
-* create file as sequential streamLF by default.
+		     * create file as sequential streamLF by default.
-*/
+		     */
-__BEGIN_INTERRUPTABLE__
+		    __BEGIN_INTERRUPTABLE__
-f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode), "rfm=stmlf");
+		    f = fopen((char *)__stringVal(pathName), (char *)__stringVal(openmode), "rfm=stmlf");
-__END_INTERRUPTABLE__
+		    __END_INTERRUPTABLE__
-}
+		}
-}
+	    }
-} while ((f == NULL) && (__threadErrno == EINTR));
+	} while ((f == NULL) && (__threadErrno == EINTR));
 }
 #else /* not VMS */
 # ifdef WIN32
 {
-DWORD share = 0, access = 0, create = 0, attr = 0;
+	  DWORD share = 0, access = 0, create = 0, attr = 0;
-char * __openmode;
+	  char * __openmode;
-HANDLE handle;
+	  HANDLE handle;
-SECURITY_ATTRIBUTES sa;
+	  SECURITY_ATTRIBUTES sa;
-if (__isStringLike(openmode)) {
+	  if (__isStringLike(openmode)) {
-share = FILE_SHARE_READ|FILE_SHARE_WRITE;
+	      share = FILE_SHARE_READ|FILE_SHARE_WRITE;
-__openmode = __stringVal(openmode);
+	      __openmode = __stringVal(openmode);
-if (strcmp(__openmode, "rb") == 0) {
+	      if (strcmp(__openmode, "rb") == 0) {
-access = GENERIC_READ;
+		  access = GENERIC_READ;
-create = OPEN_EXISTING;
+		  create = OPEN_EXISTING;
-} else if (strcmp(__openmode, "rb+") == 0) {
+	      } else if (strcmp(__openmode, "rb+") == 0) {
-access = GENERIC_READ | GENERIC_WRITE;
+		  access = GENERIC_READ | GENERIC_WRITE;
-create = OPEN_EXISTING;
+		  create = OPEN_EXISTING;
-} else if (strcmp(__openmode, "wb") == 0) {
+	      } else if (strcmp(__openmode, "wb") == 0) {
-access = GENERIC_WRITE;
+		  access = GENERIC_WRITE;
-create = CREATE_ALWAYS;
+		  create = CREATE_ALWAYS;
-} else if (strcmp(__openmode, "wb+") == 0) {
+	      } else if (strcmp(__openmode, "wb+") == 0) {
-access = GENERIC_READ | GENERIC_WRITE;
+		  access = GENERIC_READ | GENERIC_WRITE;
-create = CREATE_ALWAYS;
+		  create = CREATE_ALWAYS;
-} else if (strcmp(__openmode, "ab") == 0) {
+	      } else if (strcmp(__openmode, "ab") == 0) {
-access = FILE_APPEND_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA|
+		  access = FILE_APPEND_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA|
-STANDARD_RIGHTS_WRITE|SYNCHRONIZE;
+				STANDARD_RIGHTS_WRITE|SYNCHRONIZE;
-create = OPEN_ALWAYS;
+		  create = OPEN_ALWAYS;
-} else if (strcmp(__openmode, "ab+") == 0) {
+	      } else if (strcmp(__openmode, "ab+") == 0) {
-access = GENERIC_READ |FILE_APPEND_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA|
+		  access = GENERIC_READ |FILE_APPEND_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA|
-STANDARD_RIGHTS_WRITE|SYNCHRONIZE;
+				STANDARD_RIGHTS_WRITE|SYNCHRONIZE;
-create = OPEN_ALWAYS;
+		  create = OPEN_ALWAYS;
-} else {
+	      } else {
-console_fprintf(stderr, "Win32OS [warning]: unsupported open mode\n");
+		  console_fprintf(stderr, "Win32OS [warning]: unsupported open mode\n");
-}
+	      }
-} else if (__isArrayLike(openmode)) {
+	  } else if (__isArrayLike(openmode)) {
-OBJ *ap = __arrayVal(openmode);
+	      OBJ *ap = __arrayVal(openmode);
-int numAttrib = __arraySize(openmode);
+	      int numAttrib = __arraySize(openmode);
-int i;
+	      int i;
-__openmode = "rb+";
+	      __openmode = "rb+";
-for (i=0; i<numAttrib; i++) {
+	      for (i=0; i<numAttrib; i++) {
-OBJ attrSym = ap[i];
+		  OBJ attrSym = ap[i];
-if (attrSym == @symbol(FILE_SHARE_READ)) {
+		  if (attrSym == @symbol(FILE_SHARE_READ)) {
-share |= FILE_SHARE_READ;
+		      share |= FILE_SHARE_READ;
-} else if (attrSym == @symbol(FILE_SHARE_WRITE)) {
+		  } else if (attrSym == @symbol(FILE_SHARE_WRITE)) {
-share |= FILE_SHARE_WRITE;
+		      share |= FILE_SHARE_WRITE;
-} else if (attrSym == @symbol(GENERIC_READ)) {
+		  } else if (attrSym == @symbol(GENERIC_READ)) {
-access |= GENERIC_READ;
+		      access |= GENERIC_READ;
-} else if (attrSym == @symbol(GENERIC_WRITE)) {
+		  } else if (attrSym == @symbol(GENERIC_WRITE)) {
-access |= GENERIC_WRITE;
+		      access |= GENERIC_WRITE;
-} else if (attrSym == @symbol(GENERIC_READ_WRITE)) {
+		  } else if (attrSym == @symbol(GENERIC_READ_WRITE)) {
-access |= GENERIC_READ|GENERIC_WRITE;
+		      access |= GENERIC_READ|GENERIC_WRITE;
-} else if (attrSym == @symbol(CREATE_NEW)) {
+		  } else if (attrSym == @symbol(CREATE_NEW)) {
-create |= CREATE_NEW;
+		      create |= CREATE_NEW;
-} else if (attrSym == @symbol(CREATE_ALWAYS)) {
+		  } else if (attrSym == @symbol(CREATE_ALWAYS)) {
-create |= CREATE_ALWAYS;
+		      create |= CREATE_ALWAYS;
-} else if (attrSym == @symbol(OPEN_EXISTING)) {
+		  } else if (attrSym == @symbol(OPEN_EXISTING)) {
-create |= OPEN_EXISTING;
+		      create |= OPEN_EXISTING;
-} else if (attrSym == @symbol(OPEN_ALWAYS)) {
+		  } else if (attrSym == @symbol(OPEN_ALWAYS)) {
-create |= OPEN_ALWAYS;
+		      create |= OPEN_ALWAYS;
-} else if (attrSym == @symbol(TRUNCATE_EXISTING)) {
+		  } else if (attrSym == @symbol(TRUNCATE_EXISTING)) {
-create |= TRUNCATE_EXISTING;
+		      create |= TRUNCATE_EXISTING;
-} else if (attrSym == @symbol(FILE_ATTRIBUTE_HIDDEN)) {
+		  } else if (attrSym == @symbol(FILE_ATTRIBUTE_HIDDEN)) {
-attr |= FILE_ATTRIBUTE_HIDDEN;
+		      attr |= FILE_ATTRIBUTE_HIDDEN;
-} else if (attrSym == @symbol(FILE_ATTRIBUTE_READONLY)) {
+		  } else if (attrSym == @symbol(FILE_ATTRIBUTE_READONLY)) {
-attr |= FILE_ATTRIBUTE_READONLY;
+		      attr |= FILE_ATTRIBUTE_READONLY;
-} else if (attrSym == @symbol(FILE_FLAG_WRITE_THROUGH)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_WRITE_THROUGH)) {
-attr |= FILE_FLAG_WRITE_THROUGH;
+		      attr |= FILE_FLAG_WRITE_THROUGH;
-} else if (attrSym == @symbol(FILE_FLAG_SEQUENTIAL_SCAN)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_SEQUENTIAL_SCAN)) {
-attr |= FILE_FLAG_SEQUENTIAL_SCAN;
+		      attr |= FILE_FLAG_SEQUENTIAL_SCAN;
-} else if (attrSym == @symbol(FILE_FLAG_DELETE_ON_CLOSE)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_DELETE_ON_CLOSE)) {
-attr |= FILE_FLAG_DELETE_ON_CLOSE;
+		      attr |= FILE_FLAG_DELETE_ON_CLOSE;
-} else if (!__isSymbol(attrSym) && __isStringLike(attrSym)) {
+		  } else if (!__isSymbol(attrSym) && __isStringLike(attrSym)) {
-__openmode = __stringVal(attrSym);
+		      __openmode = __stringVal(attrSym);
-} else {
+		  } else {
-console_fprintf(stderr, "Win32OS [warning]: unsupported open mode\n");
+		      console_fprintf(stderr, "Win32OS [warning]: unsupported open mode\n");
-}
+		  }
-}
+	      }
-}
+	  }
-if (create == 0) {
+	  if (create == 0) {
 //              argumentError = @symbol(missingCreateMode);
-goto badArgument;
+	      goto badArgument;
-}
+	  }
-if (attr == 0) {
+	  if (attr == 0) {
-attr = FILE_ATTRIBUTE_NORMAL;
+	      attr = FILE_ATTRIBUTE_NORMAL;
-}
+	  }
-/*
+	  /*
-* create security attributes - make handle inheritable by subprocesses
+	   * create security attributes - make handle inheritable by subprocesses
-*/
+	   */
-memset(&sa, 0, sizeof (sa));
+	  memset(&sa, 0, sizeof (sa));
-sa.nLength = sizeof( sa );
+	  sa.nLength = sizeof( sa );
-sa.bInheritHandle = TRUE;
+	  // sa.bInheritHandle = TRUE;
+	  sa.bInheritHandle = FALSE;
-if (__isStringLike(pathName)) {
-char _aPathName[MAXPATHLEN];
+	  if (__isStringLike(pathName)) {
+		char _aPathName[MAXPATHLEN];
-strncpy(_aPathName, __stringVal(pathName), MAXPATHLEN-1); _aPathName[MAXPATHLEN-1] = '\0';
-do {
+		strncpy(_aPathName, __stringVal(pathName), MAXPATHLEN-1); _aPathName[MAXPATHLEN-1] = '\0';
-__threadErrno = 0;
+		do {
-handle = STX_API_NOINT_CALL7( "CreateFileA", CreateFileA, _aPathName, access, share, &sa, create, attr, 0 /* hTempl */);
+		    __threadErrno = 0;
-if (__threadErrno == EINTR) {
+		    handle = STX_API_NOINT_CALL7( "CreateFileA", CreateFileA, _aPathName, access, share, &sa, create, attr, 0 /* hTempl */);
-handle = INVALID_HANDLE_VALUE;
+		    if (__threadErrno == EINTR) {
-}
+			handle = INVALID_HANDLE_VALUE;
-} while ((handle == INVALID_HANDLE_VALUE) && (__threadErrno == EINTR));
+		    }
-} else if (__isUnicode16String(pathName)) {
+		} while ((handle == INVALID_HANDLE_VALUE) && (__threadErrno == EINTR));
-wchar_t _aPathName[MAXPATHLEN+1];
+	  } else if (__isUnicode16String(pathName)) {
-int i, l;
+		wchar_t _aPathName[MAXPATHLEN+1];
+		int i, l;
-l = __unicode16StringSize(pathName);
-if (l > MAXPATHLEN) l = MAXPATHLEN;
+		l = __unicode16StringSize(pathName);
-for (i=0; i<l; i++) {
+		if (l > MAXPATHLEN) l = MAXPATHLEN;
-_aPathName[i] = __unicode16StringVal(pathName)[i];
+		for (i=0; i<l; i++) {
-}
+		    _aPathName[i] = __unicode16StringVal(pathName)[i];
-_aPathName[i] = 0;
+		}
+		_aPathName[i] = 0;
-do {
-__threadErrno = 0;
+		do {
-handle = STX_API_NOINT_CALL7( "CreateFileW", CreateFileW, _aPathName, access, share, &sa, create, attr, 0 /* hTempl */);
+		    __threadErrno = 0;
-if (__threadErrno == EINTR) {
+		    handle = STX_API_NOINT_CALL7( "CreateFileW", CreateFileW, _aPathName, access, share, &sa, create, attr, 0 /* hTempl */);
-handle = INVALID_HANDLE_VALUE;
+		    if (__threadErrno == EINTR) {
-}
+			handle = INVALID_HANDLE_VALUE;
-} while ((handle == INVALID_HANDLE_VALUE) && (__threadErrno == EINTR));
+		    }
-}
+		} while ((handle == INVALID_HANDLE_VALUE) && (__threadErrno == EINTR));
-if (handle != INVALID_HANDLE_VALUE) {
+	  }
-int fd;
+	  if (handle != INVALID_HANDLE_VALUE) {
-extern void __stxWrapApiEnterCritical(), __stxWrapApiLeaveCritical();
+	      int fd;
+	      extern void __stxWrapApiEnterCritical(), __stxWrapApiLeaveCritical();
-__stxWrapApiEnterCritical();
-fd = _open_osfhandle((long)handle, O_BINARY);
+	      __stxWrapApiEnterCritical();
-if (fd < 0) {
+	      fd = _open_osfhandle((long)handle, O_BINARY);
-if (__threadErrno == 0) {
+	      if (fd < 0) {
-// no more file descriptors
+		  if (__threadErrno == 0) {
-__threadErrno = EMFILE;
+		      // no more file descriptors
-}
+		      __threadErrno = EMFILE;
-CloseHandle(handle);
+		  }
-} else {
+		  CloseHandle(handle);
-f = fdopen(fd, __openmode);
+	      } else {
-}
+		  f = fdopen(fd, __openmode);
-__stxWrapApiLeaveCritical();
+	      }
-}  else {
+	      __stxWrapApiLeaveCritical();
-__threadErrno = __WIN32_ERR(GetLastError());
+	  }  else {
-}
+	    __threadErrno = __WIN32_ERR(GetLastError());
+	  }
 }
 # else /* not WIN32 */
 if (__isStringLike(encodedPathName)) {
-int accessMode = 0666;        // default access mode of fopen(), relies on umask()
+	  int accessMode = 0666;        // default access mode of fopen(), relies on umask()
-int flags = 0;
+	  int flags = 0;
-int fd;
+	  int fd;
-char * __openmode;
+	  char * __openmode;
-if (__isStringLike(openmode)) {
+	  if (__isStringLike(openmode)) {
-__openmode = __stringVal(openmode);
+	      __openmode = __stringVal(openmode);
-if (strcmp(__openmode, "r") == 0) {
+	      if (strcmp(__openmode, "r") == 0) {
-flags = O_RDONLY;
+		  flags = O_RDONLY;
-} else if (strcmp(__openmode, "r+") == 0) {
+	      } else if (strcmp(__openmode, "r+") == 0) {
-flags = O_RDWR;
+		  flags = O_RDWR;
-} else if (strcmp(__openmode, "w") == 0) {
+	      } else if (strcmp(__openmode, "w") == 0) {
-flags = O_WRONLY | O_CREAT | O_TRUNC;
+		  flags = O_WRONLY | O_CREAT | O_TRUNC;
-} else if (strcmp(__openmode, "w+") == 0) {
+	      } else if (strcmp(__openmode, "w+") == 0) {
-flags = O_RDWR | O_CREAT | O_TRUNC;
+		  flags = O_RDWR | O_CREAT | O_TRUNC;
-} else if (strcmp(__openmode, "a") == 0) {
+	      } else if (strcmp(__openmode, "a") == 0) {
-flags = O_WRONLY | O_CREAT | O_APPEND;
+		  flags = O_WRONLY | O_CREAT | O_APPEND;
-} else if (strcmp(__openmode, "a+") == 0) {
+	      } else if (strcmp(__openmode, "a+") == 0) {
-flags = O_RDWR | O_CREAT| O_APPEND;
+		  flags = O_RDWR | O_CREAT| O_APPEND;
-} else {
+	      } else {
-console_fprintf(stderr, "UNIXOS [warning]: unsupported open mode\n");
+		  console_fprintf(stderr, "UNIXOS [warning]: unsupported open mode\n");
-}
+	      }
-} else if (__isArrayLike(openmode)) {
+	  } else if (__isArrayLike(openmode)) {
-OBJ *ap = __arrayVal(openmode);
+	      OBJ *ap = __arrayVal(openmode);
-int numAttrib = __arraySize(openmode);
+	      int numAttrib = __arraySize(openmode);
-int i;
+	      int i;
-__openmode = "r+";
+	      __openmode = "r+";
-for (i=0; i<numAttrib; i++) {
+	      for (i=0; i<numAttrib; i++) {
-OBJ attrSym = ap[i];
+		  OBJ attrSym = ap[i];
-if (attrSym == @symbol(FILE_SHARE_READ)) {
+		  if (attrSym == @symbol(FILE_SHARE_READ)) {
-// ignore
+		      // ignore
-} else if (attrSym == @symbol(FILE_SHARE_WRITE)) {
+		  } else if (attrSym == @symbol(FILE_SHARE_WRITE)) {
-// ignore
+		     // ignore
-} else if (attrSym == @symbol(GENERIC_READ)) {
+		  } else if (attrSym == @symbol(GENERIC_READ)) {
-flags |= O_RDONLY;
+		      flags |= O_RDONLY;
-} else if (attrSym == @symbol(GENERIC_WRITE)) {
+		  } else if (attrSym == @symbol(GENERIC_WRITE)) {
-flags |= O_WRONLY;
+		      flags |= O_WRONLY;
-} else if (attrSym == @symbol(GENERIC_READ_WRITE)) {
+		  } else if (attrSym == @symbol(GENERIC_READ_WRITE)) {
-flags |= O_RDWR;
+		      flags |= O_RDWR;
-} else if (attrSym == @symbol(CREATE_NEW)) {
+		  } else if (attrSym == @symbol(CREATE_NEW)) {
-flags |= O_CREAT|O_EXCL;
+		      flags |= O_CREAT|O_EXCL;
-accessMode = 0600;     // simulate mkstemp()
+		      accessMode = 0600;     // simulate mkstemp()
-} else if (attrSym == @symbol(CREATE_ALWAYS)) {
+		  } else if (attrSym == @symbol(CREATE_ALWAYS)) {
-flags |= O_CREAT|O_TRUNC;
+		      flags |= O_CREAT|O_TRUNC;
-} else if (attrSym == @symbol(OPEN_EXISTING)) {
+		  } else if (attrSym == @symbol(OPEN_EXISTING)) {
-// nothing to be set
+		      // nothing to be set
-} else if (attrSym == @symbol(OPEN_ALWAYS)) {
+		  } else if (attrSym == @symbol(OPEN_ALWAYS)) {
-flags |= O_CREAT;
+		      flags |= O_CREAT;
-} else if (attrSym == @symbol(TRUNCATE_EXISTING)) {
+		  } else if (attrSym == @symbol(TRUNCATE_EXISTING)) {
-flags |= O_TRUNC;
+		      flags |= O_TRUNC;
-} else if (attrSym == @symbol(FILE_ATTRIBUTE_HIDDEN)) {
+		  } else if (attrSym == @symbol(FILE_ATTRIBUTE_HIDDEN)) {
-// ignore
+		      // ignore
-} else if (attrSym == @symbol(FILE_ATTRIBUTE_READONLY)) {
+		  } else if (attrSym == @symbol(FILE_ATTRIBUTE_READONLY)) {
-accessMode &= 0444;
+		      accessMode &= 0444;
-} else if (attrSym == @symbol(FILE_FLAG_WRITE_THROUGH)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_WRITE_THROUGH)) {
 #ifdef O_DIRECT
-flags |= O_DIRECT;
+		      flags |= O_DIRECT;
 #endif
-} else if (attrSym == @symbol(FILE_FLAG_SEQUENTIAL_SCAN)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_SEQUENTIAL_SCAN)) {
-// ignore
+		      // ignore
-} else if (attrSym == @symbol(FILE_FLAG_DELETE_ON_CLOSE)) {
+		  } else if (attrSym == @symbol(FILE_FLAG_DELETE_ON_CLOSE)) {
-// ignore;
+		      // ignore;
-} else if (!__isSymbol(attrSym) && __isStringLike(attrSym)) {
+		  } else if (!__isSymbol(attrSym) && __isStringLike(attrSym)) {
-__openmode = __stringVal(attrSym);
+		      __openmode = __stringVal(attrSym);
-} else {
+		  } else {
-console_fprintf(stderr, "UNIXOS [warning]: unsupported open mode\n");
+		      console_fprintf(stderr, "UNIXOS [warning]: unsupported open mode\n");
-}
+		  }
-}
+	      }
-}
+	  }
-do {
+	  do {
-__BEGIN_INTERRUPTABLE__
+	      __BEGIN_INTERRUPTABLE__
-fd = open((char *) __stringVal(encodedPathName), flags, accessMode);
+	      fd = open((char *) __stringVal(encodedPathName), flags, accessMode);
-__END_INTERRUPTABLE__
+	      __END_INTERRUPTABLE__
-} while ((fd < 0) && (__threadErrno == EINTR));
+	  } while ((fd < 0) && (__threadErrno == EINTR));
-if (fd >= 0) {
+	  if (fd >= 0) {
-__threadErrno = 0;
+	      __threadErrno = 0;
-f = fdopen(fd, __openmode);
+	      f = fdopen(fd, __openmode);
-if (f == NULL) {
+	      if (f == NULL) {
-close(fd);            // fdopen failed, close before retry.
+		  close(fd);            // fdopen failed, close before retry.
-}
+	      }
-}
+	  }
 }
 # endif /* not WIN32 */
 #endif /* not VMS */
 if (f == NULL) {
-/*
+	/*
-* If no filedescriptors available, try to finalize
+	 * If no filedescriptors available, try to finalize
-* possibly collected fd's and try again.
+	 * possibly collected fd's and try again.
-*/
+	 */
-if (pass == 0 && (__threadErrno == ENFILE || __threadErrno == EMFILE)) {
+	if (pass == 0 && (__threadErrno == ENFILE || __threadErrno == EMFILE)) {
-pass = 1;
+	    pass = 1;
-__SSEND0(@global(ObjectMemory), @symbol(scavenge), 0);
+	    __SSEND0(@global(ObjectMemory), @symbol(scavenge), 0);
-__SSEND0(@global(ObjectMemory), @symbol(finalize), 0);
+	    __SSEND0(@global(ObjectMemory), @symbol(finalize), 0);
-goto retry;
+	    goto retry;
-}
+	}
 badArgument:
 getOutOfHere:
-__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+	__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
-__INST(position) = nil;
+	__INST(position) = nil;
 } else {
 #ifdef __VMS__
-/*
+	/*
-* check to see if this is positionable ...
+	 * check to see if this is positionable ...
-*/
+	 */
-__INST(canPosition) = false;
+	__INST(canPosition) = false;
 # ifndef _POSIX_C_SOURCE
-{
+	{
-struct stat statBuffer;
+	    struct stat statBuffer;
-if (fstat(fileno(f), &statBuffer) >= 0) {
+	    if (fstat(fileno(f), &statBuffer) >= 0) {
-switch (statBuffer.st_fab_rfm) {
+		switch (statBuffer.st_fab_rfm) {
-case FAB$C_UDF: /* undefined (also stream binary)   */
+		    case FAB$C_UDF: /* undefined (also stream binary)   */
-case FAB$C_VAR: /* variable length records          */
+		    case FAB$C_VAR: /* variable length records          */
-case FAB$C_VFC: /* variable fixed control           */
+		    case FAB$C_VFC: /* variable fixed control           */
-case FAB$C_STM: /* RMS-11 stream (valid only for sequen) */
+		    case FAB$C_STM: /* RMS-11 stream (valid only for sequen) */
-default:
+		    default:
-__INST(canPosition) = false;
+			__INST(canPosition) = false;
-break;
+			break;
-case FAB$C_FIX: /* fixed length records             */
+		    case FAB$C_FIX: /* fixed length records             */
-case FAB$C_STMLF: /* LF stream (valid only for sequential) */
+		    case FAB$C_STMLF: /* LF stream (valid only for sequential) */
-case FAB$C_STMCR: /* CR stream (valid only for sequential) */
+		    case FAB$C_STMCR: /* CR stream (valid only for sequential) */
-__INST(canPosition) = true;
+			__INST(canPosition) = true;
-break;
+			break;
-}
+		}
-}
+	    }
-}
+	}
 # endif
 #else /* not VMS */
-__INST(canPosition) = true;
+	__INST(canPosition) = true;
 #endif /* not VMS */
-if (@global(FileOpenTrace) == true) {
+	if (@global(FileOpenTrace) == true) {
-console_fprintf(stderr, "fopen %s [FileStream] -> %x\n", __stringVal(pathName), f);
+	    console_fprintf(stderr, "fopen %s [FileStream] -> %x\n", __stringVal(pathName), f);
-}
+	}
-if (f != NULL) {
+	if (f != NULL) {
-OBJ fp;
+	    OBJ fp;
-wasBlocked = __BLOCKINTERRUPTS();
+	    wasBlocked = __BLOCKINTERRUPTS();
 #if 0
-// The original code was:
+	    // The original code was:
-__INST(handle) = fp = __MKEXTERNALADDRESS(f); __STORE(self, fp);
+	    __INST(handle) = fp = __MKEXTERNALADDRESS(f); __STORE(self, fp);
-// but for that, gcc generates wrong code, which loads self (volatile) into
+	    // but for that, gcc generates wrong code, which loads self (volatile) into
-// a register (bp), then calls __MKEXTERNALADDRESS, then stores indirect bp.
+	    // a register (bp), then calls __MKEXTERNALADDRESS, then stores indirect bp.
-// That is wrong if a scavenge occurs in __MKEXTERNALADDRESS, as bp is now still pointing to the old
+	    // That is wrong if a scavenge occurs in __MKEXTERNALADDRESS, as bp is now still pointing to the old
-// object.
+	    // object.
 #else
-fp = __MKEXTERNALADDRESS(f);
+	    fp = __MKEXTERNALADDRESS(f);
-__INST(handle) = fp;
+	    __INST(handle) = fp;
-__STORE(self, fp);
+	    __STORE(self, fp);
 #endif
-}
+	}
 }
 %}.
 handle notNil ifTrue:[
-position := 0.
+	position := 0.
-handleType := #filePointer.
+	handleType := #filePointer.
-Lobby register:self.
+	Lobby register:self.
-wasBlocked == false ifTrue:[OperatingSystem unblockInterrupts].
+	wasBlocked == false ifTrue:[OperatingSystem unblockInterrupts].
 ].
 ^ handle
 !
 openForAppending
 handle notNil ifTrue:[^ self errorAlreadyOpen].
 handle := self openFile:pathName withMode:openmode attributes:attributeSpec.
 handle isNil ifTrue:[
-"
+	"
-the open failed for some reason ...
+	 the open failed for some reason ...
-"
+	"
-^ self openError:lastErrorNumber.
+	^ self openError:lastErrorNumber.
 ].
 position := 0.
 buffered isNil ifTrue:[
-buffered := true.       "default is buffered"
+	buffered := true.       "default is buffered"
 ].
 !
 pathName:filename
 "set the pathname"
 ! !
 !FileStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.166 2013-07-08 19:22:38 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.167 2013-07-24 19:56:49 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.166 2013-07-08 19:22:38 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.167 2013-07-24 19:56:49 cg Exp $'
 ! !
 FileStream initialize!

branch	jv
changeset 18078	7ef3221b036d
parent 18071	009cf668b0ed
parent 15542	3a22ba499a82
child 18079	7b5afc0ad3d5