X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstdio.c;h=e98ca42accf8e5b7e155ac55b99a145f840688ac;hb=d054bf40d18fadaf90c28c8703d332efd3a55dad;hp=d03231c38bd773504e8f9e9c2d0e9b65431f3edd;hpb=4cec3cb45e1a5343c8791fb6bdd1d2b896d3f500;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index d03231c3..e98ca42a 100644
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -18,6 +18,10 @@
 #define	_stdin	0
 #define	_stdout	1
 
+#define FD_NOTOPEN	-1
+#define FD_MEMFILE	-2
+#define FD_MEMSTREAM	-3
+
 // === PROTOTYPES ===
 struct sFILE	*get_file_struct();
 
@@ -36,13 +40,13 @@ void _stdio_init(void)
 	// Init FileIO Pointers
 	stdin = &_iob[0];
 	stdin->FD = 0;
-	stdin->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_READ|FILE_FLAG_LINEBUFFERED;
+	stdin->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_READ|FILE_FLAG_LINEBUFFERED|FILE_FLAG_OURBUFFER;
 	stdin->Buffer = malloc(STDIN_BUFSIZ);
 	stdin->BufferSpace = STDIN_BUFSIZ;
 
 	stdout = &_iob[1];
 	stdout->FD = 1;
-	stdout->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_WRITE|FILE_FLAG_LINEBUFFERED;
+	stdout->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_WRITE|FILE_FLAG_LINEBUFFERED|FILE_FLAG_OURBUFFER;
 	stdout->Buffer = malloc(STDOUT_BUFSIZ);
 	stdout->BufferSpace = STDOUT_BUFSIZ;
 	
@@ -101,7 +105,7 @@ EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)
 	// Sanity Check Arguments
 	if(!fp || !file || !mode)	return NULL;
 	
-	if(fp->FD != -1) {
+	if(fp->FD != FD_NOTOPEN) {
 		fflush(fp);
 	}
 
@@ -138,7 +142,7 @@ EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)
 	}
 
 	//Open File
-	if(fp->FD != -1)
+	if(fp->FD != FD_NOTOPEN)
 		fp->FD = _SysReopen(fp->FD, file, openFlags);
 	else
 		fp->FD = _SysOpen(file, openFlags);
@@ -147,6 +151,16 @@ EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)
 		return NULL;
 	}
 	
+	// Default to buffered
+	// - Disabled until fseek() is fixed
+	#if 0
+	fp->BufferOfs = 0;
+	fp->BufferPos = 0;
+	fp->BufferSpace = BUFSIZ;
+	fp->Buffer = malloc( fp->BufferSpace );
+	fp->Flags |= FILE_FLAG_OURBUFFER;
+	#endif
+	
 	if( (fp->Flags & FILE_FLAG_MODE_MASK) == FILE_FLAG_MODE_APPEND ) {
 		_SysSeek(fp->FD, 0, SEEK_END);	//SEEK_END
 	}
@@ -180,7 +194,7 @@ EXPORT FILE *fmemopen(void *buffer, size_t length, const char *mode)
 	
 	ret = get_file_struct();
 	
-	ret->FD = -2;
+	ret->FD = FD_MEMFILE;
 	ret->Flags = _fopen_modetoflags(mode);
 	if(ret->Flags == -1) {
 		ret->Flags = 0;
@@ -194,6 +208,21 @@ EXPORT FILE *fmemopen(void *buffer, size_t length, const char *mode)
 	return ret;
 }
 
+EXPORT FILE *open_memstream(char **bufferptr, size_t *lengthptr)
+{
+	FILE	*ret = get_file_struct();
+	ret->FD = FD_MEMSTREAM;
+	ret->Flags = FILE_FLAG_MODE_WRITE;
+	
+	ret->Buffer = NULL;
+	ret->BufferPos = 0;
+	ret->BufferSpace = 0;
+	ret->BufPtr = bufferptr;
+	ret->LenPtr = lengthptr;
+	
+	return ret;
+}
+
 EXPORT int fclose(FILE *fp)
 {
 	if( !(fp->Flags & FILE_FLAG_ALLOC) )
@@ -201,9 +230,13 @@ EXPORT int fclose(FILE *fp)
 	fflush(fp);
 	if( fp->FD >= 0 ) {
 		_SysClose(fp->FD);
+		if( fp->Buffer && (fp->Flags & FILE_FLAG_OURBUFFER) ) {
+			free(fp->Buffer);
+		}
+		fp->Buffer = NULL;
 	}
 	fp->Flags = 0;
-	fp->FD = -1;
+	fp->FD = FD_NOTOPEN;
 	return 0;
 }
 
@@ -215,7 +248,7 @@ EXPORT int setvbuf(FILE *fp, char *buffer, int mode, size_t size)
 	}
 
 	// Check for memory files
-	if( fp->FD == -2 ) {
+	if( fp->FD == FD_MEMFILE || fp->FD == FD_MEMSTREAM ) {
 		errno = EINVAL;
 		return 2;
 	}	
@@ -243,9 +276,13 @@ EXPORT int setvbuf(FILE *fp, char *buffer, int mode, size_t size)
 		}
 		// Allocate a buffer if one was not provided
 		if( !buffer ) {
+			fp->Flags |= FILE_FLAG_OURBUFFER;
 			buffer = malloc(size);
 			assert(buffer);
 		}
+		else {
+			fp->Flags &= ~FILE_FLAG_OURBUFFER;
+		}
 		
 		// Set buffer pointer and size
 		fp->Buffer = buffer;
@@ -281,9 +318,12 @@ int _fflush_int(FILE *fp)
 	case FILE_FLAG_MODE_APPEND:
 		_SysSeek(fp->FD, fp->BufferOfs, SEEK_SET);
 		len = _SysWrite(fp->FD, fp->Buffer, fp->BufferPos);
-		if( len < fp->BufferPos )
+		if( len != fp->BufferPos )
 			ret = 1;
-		fp->BufferPos -= len;
+		if( len <= fp->BufferPos )
+		{
+			fp->BufferPos -= len;
+		}
 		fp->BufferOfs = _SysTell(fp->FD);
 		break;
 		
@@ -293,7 +333,13 @@ int _fflush_int(FILE *fp)
 		len = _SysWrite(fp->FD, fp->Buffer, fp->BufferPos);
 		if( len != fp->BufferPos )
 			ret = 1;
-		fp->BufferPos -= len;
+		if( len <= fp->BufferPos )
+		{
+			fp->BufferPos -= len;
+		}
+		//else {
+		//	_SysDebug("Flush of %i failed, %s", fp->FD, strerror(errno));
+		//}
 		break;
 	default:
 		break;
@@ -303,19 +349,25 @@ int _fflush_int(FILE *fp)
 
 EXPORT void fflush(FILE *fp)
 {
-	if( !fp || fp->FD == -1 )
+	if( !fp || fp->FD == FD_NOTOPEN )
 		return ;
 	
 	// Nothing to do for memory files
-	if( fp->FD == -2 )
+	if( fp->FD == FD_MEMFILE )
+		return ;
+	// Memory streams, update pointers
+	if( fp->FD == FD_MEMSTREAM ) {
+		*fp->BufPtr = fp->Buffer;
+		*fp->LenPtr = fp->BufferPos;
 		return ;
+	}
 	
 	_fflush_int(fp);
 }
 
 EXPORT void clearerr(FILE *fp)
 {
-	if( !fp || fp->FD == -1 )
+	if( !fp || fp->FD == FD_NOTOPEN )
 		return ;
 	
 	// TODO: Impliment clearerr()
@@ -323,14 +375,14 @@ EXPORT void clearerr(FILE *fp)
 
 EXPORT int feof(FILE *fp)
 {
-	if( !fp || fp->FD == -1 )
+	if( !fp || fp->FD == FD_NOTOPEN )
 		return 0;
 	return !!(fp->Flags & FILE_FLAG_EOF);
 }
 
 EXPORT int ferror(FILE *fp)
 {
-	if( !fp || fp->FD == -1 )
+	if( !fp || fp->FD == FD_NOTOPEN )
 		return 0;
 	return 0;
 }
@@ -341,39 +393,77 @@ EXPORT int fileno(FILE *stream)
 
 EXPORT off_t ftell(FILE *fp)
 {
-	if(!fp || fp->FD == -1)	return -1;
+	if(!fp || fp->FD == FD_NOTOPEN) {
+		errno = EBADF;
+		return -1;
+	}
 
-	if( fp->FD == -2 )
+	if( fp->FD == FD_MEMFILE || fp->FD == FD_MEMSTREAM )
 		return fp->Pos;	
 	else
 		return _SysTell(fp->FD);
 }
 
+int _fseek_memfile(FILE *fp, long int amt, int whence)
+{
+	switch(whence)
+	{
+	case SEEK_CUR:
+		fp->Pos += amt;
+		break;
+	case SEEK_SET:
+		fp->Pos = amt;
+		break;
+	case SEEK_END:
+		if( fp->BufferSpace < (size_t)amt )
+			fp->Pos = 0;
+		else
+			fp->Pos = fp->BufferSpace - amt;
+		break;
+	}
+	if(fp->Pos > (off_t)fp->BufferSpace) {
+		fp->Pos = fp->BufferSpace;
+		fp->Flags |= FILE_FLAG_EOF;
+	}
+	return 0;
+}
+
+int _fseek_memstream(FILE *fp, long int amt, int whence)
+{
+	switch(whence)
+	{
+	case SEEK_CUR:
+		fp->Pos += amt;
+		break;
+	case SEEK_SET:
+		fp->Pos = amt;
+		break;
+	case SEEK_END:
+		if( fp->BufferSpace < (size_t)amt )
+			fp->Pos = 0;
+		else
+			fp->Pos = fp->BufferSpace - amt;
+		break;
+	}
+	if(fp->Pos > (off_t)fp->BufferSpace) {
+		fp->Pos = fp->BufferSpace;
+		fp->Flags |= FILE_FLAG_EOF;
+	}
+	return 0;
+}
+
 EXPORT int fseek(FILE *fp, long int amt, int whence)
 {
-	if(!fp || fp->FD == -1)	return -1;
+	if(!fp || fp->FD == FD_NOTOPEN) {
+		errno = EBADF;
+		return -1;
+	}
 
-	if( fp->FD == -2 ) {
-		switch(whence)
-		{
-		case SEEK_CUR:
-			fp->Pos += amt;
-			break;
-		case SEEK_SET:
-			fp->Pos = amt;
-			break;
-		case SEEK_END:
-			if( fp->BufferSpace < (size_t)amt )
-				fp->Pos = 0;
-			else
-				fp->Pos = fp->BufferSpace - amt;
-			break;
-		}
-		if(fp->Pos > (off_t)fp->BufferSpace) {
-			fp->Pos = fp->BufferSpace;
-			fp->Flags |= FILE_FLAG_EOF;
-		}
-		return 0;
+	if( fp->FD == FD_MEMFILE ) {
+		return _fseek_memfile(fp, amt, whence);
+	}
+	else if( fp->FD == FD_MEMSTREAM ) {
+		return _fseek_memstream(fp, amt, whence);
 	}
 	else {
 		fflush(fp);
@@ -405,6 +495,37 @@ size_t _fwrite_unbuffered(FILE *fp, size_t size, size_t num, const void *data)
 	return ret;
 }
 
+size_t _fwrite_memfile(const void *ptr, size_t size, size_t num, FILE *fp)
+{
+	size_t	avail = (fp->BufferSpace - fp->Pos) / size;
+	if( avail == 0 )
+		fp->Flags |= FILE_FLAG_EOF;
+	if( num > avail )
+		num = avail;
+	size_t	bytes = num * size;
+	memcpy(fp->Buffer + fp->Pos, ptr, bytes);
+	fp->Pos += bytes;
+	return num;
+}
+
+size_t _fwrite_memstream(const void *ptr, size_t size, size_t num, FILE *fp)
+{
+	size_t	bytes = size*num;
+	// #1. Check if we need to expand
+	if( fp->Pos + bytes > fp->BufferSpace )
+	{
+		void *newbuf = realloc(fp->Buffer, fp->BufferSpace + bytes);
+		if( !newbuf ) {
+			errno = ENOMEM;
+			return -1;
+		}
+		fp->Buffer = newbuf;
+		fp->BufferSpace = fp->Pos + bytes;
+	}
+	// #2. Write (use the memfile code for that)
+	return _fwrite_memfile(ptr, size, num, fp);
+}
+
 /**
  * \fn EXPORT size_t fwrite(void *ptr, size_t size, size_t num, FILE *fp)
  * \brief Write to a stream
@@ -418,28 +539,23 @@ EXPORT size_t fwrite(const void *ptr, size_t size, size_t num, FILE *fp)
 	if( size == 0 || num == 0 )
 		return 0;
 
-	// Handle memory files first
-	if( fp->FD == -2 ) {
-		size_t	avail = (fp->BufferSpace - fp->Pos) / size;
-		if( avail == 0 )
-			fp->Flags |= FILE_FLAG_EOF;
-		if( num > avail )
-			num = avail;
-		size_t	bytes = num * size;
-		memcpy(fp->Buffer + fp->Pos, ptr, bytes);
-		fp->Pos += bytes;
-		return num;
-	}
-
 	switch( _GetFileMode(fp) )
 	{
 	case FILE_FLAG_MODE_READ:
 	case FILE_FLAG_MODE_EXEC:
+		errno = EBADF;
 		return 0;
 	case FILE_FLAG_MODE_APPEND:
 		fseek(fp, 0, SEEK_END);
 	case FILE_FLAG_MODE_WRITE:
-		if( fp->BufferSpace )
+		// Handle memory files first
+		if( fp->FD == FD_MEMFILE ) {
+			return _fwrite_memfile(ptr, size, num, fp);
+		}
+		else if( fp->FD == FD_MEMSTREAM ) {
+			return _fwrite_memstream(ptr, size, num, fp);
+		}
+		else if( fp->BufferSpace )
 		{
 			// Buffering enabled
 			if( fp->BufferSpace - fp->BufferPos < size*num )
@@ -474,6 +590,57 @@ EXPORT size_t fwrite(const void *ptr, size_t size, size_t num, FILE *fp)
 	return ret;
 }
 
+size_t _fread_memfile(void *ptr, size_t size, size_t num, FILE *fp)
+{
+	size_t	avail = (fp->BufferSpace - fp->Pos) / size;
+	if( avail == 0 )
+		fp->Flags |= FILE_FLAG_EOF;
+	if( num > avail )	num = avail;
+	size_t	bytes = num * size;
+	memcpy(ptr, fp->Buffer + fp->Pos, bytes);
+	fp->Pos += bytes;
+	return num;
+}
+
+#if 0
+size_t _fread_memstream(void *ptr, size_t size, size_t num, FILE *fp)
+{
+	errno = ENOTIMPL;
+	return -1;
+}
+#endif
+
+size_t _fread_buffered(void *ptr, size_t size, FILE *fp)
+{
+	//_SysDebug("%p: %i-%i <= %i", fp,
+	//	(int)fp->Pos, (int)fp->BufferOfs, (int)fp->BufferPos);
+	if( fp->BufferPos > 0 ) {
+		assert( fp->Pos - fp->BufferOfs <= (int)fp->BufferPos );
+	}
+	if( fp->BufferPos == 0 || fp->Pos - fp->BufferOfs == (int)fp->BufferPos )
+	{
+		int rv = _SysRead(fp->FD, fp->Buffer, fp->BufferSpace);
+		if( rv <= 0 ) {
+			fp->Flags |= FILE_FLAG_EOF;
+			return 0;
+		}
+		
+		fp->BufferPos = rv;
+		fp->BufferOfs = fp->Pos;
+		//_SysDebug("%p: Buffered %i at %i", fp, rv, fp->Pos);
+	}
+	
+	size_t	inner_ofs = fp->Pos - fp->BufferOfs;
+	if(size > fp->BufferPos - inner_ofs)
+		size = fp->BufferPos - inner_ofs;
+	
+	//_SysDebug("%p: Read %i from %i+%i", fp, size,
+	//	(int)fp->BufferOfs, inner_ofs);
+	memcpy(ptr, fp->Buffer + inner_ofs, size);
+	fp->Pos += size;
+	return size;
+}
+
 /**
  * \fn EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
  * \brief Read from a stream
@@ -486,29 +653,68 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 		return -1;
 	if( size == 0 || num == 0 )
 		return 0;
-
-	if( fp->FD == -2 ) {
-		size_t	avail = (fp->BufferSpace - fp->Pos) / size;
-		if( avail == 0 )
-			fp->Flags |= FILE_FLAG_EOF;
-		if( num > avail )	num = avail;
-		size_t	bytes = num * size;
-		memcpy(ptr, fp->Buffer + fp->Pos, bytes);
-		fp->Pos += bytes;
-		return num;
-	}
 	
-	// Standard file
-	ret = _SysRead(fp->FD, ptr, size*num);
-	if( ret == (size_t)-1)
+	if( _GetFileMode(fp) != FILE_FLAG_MODE_READ ) {
+		errno = 0;
 		return -1;
-	if( ret == 0 && size*num > 0 ) {
-		fp->Flags |= FILE_FLAG_EOF;
+	}
+
+	// Don't read if EOF is set
+	if( fp->Flags & FILE_FLAG_EOF )
 		return 0;
+
+	
+	if( fp->FD == FD_MEMFILE ) {
+		return _fread_memfile(ptr, size, num, fp);
+	}
+	else if( fp->FD == FD_MEMSTREAM ) {
+		//return _fread_memstream(ptr, size, num, fp);
+		errno = EBADF;
+		return 0;
+	}
+
+	// Standard file
+	const size_t	bytes = size*num;
+
+	// TODO: Buffered reads
+	if( fp->BufferSpace )
+	{
+		size_t	ofs = 0;
+		size_t	rv;
+		// While not done, and buffered read succeeds
+		while( ofs < bytes && (rv = _fread_buffered((char*)ptr + ofs, bytes - ofs, fp)) != 0 )
+		{
+			ofs += rv;
+		}
+		
+		ret = ofs;
+	}
+	else
+	{
+		ret = _SysRead(fp->FD, ptr, bytes);
+		if( ret == (size_t)-1)
+			return -1;
+		if( ret == 0 && bytes > 0 ) {
+			fp->Flags |= FILE_FLAG_EOF;
+			return 0;
+		}
+	}
+
+	// if read was cut short	
+	if( ret != bytes )
+	{
+		size_t	extra = ret - (ret / size) * size;
+		// And it didn't fall short on a member boundary
+		if( extra )
+		{
+			// Need to roll back the file pointer to the end of the last member
+			_SysDebug("fread: TODO Roll back %zi bytes due to incomplete object (sz=%zi,n=%zi)",
+				extra, size, num
+				);
+		}
 	}
-	ret /= size;
 	
-	return ret;
+	return ret / size;
 }
 
 /**
@@ -544,13 +750,14 @@ EXPORT char *fgets(char *s, int size, FILE *fp)
  */
 EXPORT int fputc(int c, FILE *fp)
 {
-	return fwrite(&c, 1, 1, fp);
+	char	ch = c;
+	return fwrite(&ch, 1, 1, fp);
 }
 
 EXPORT int putchar(int c)
 {
 	c &= 0xFF;
-	return _SysWrite(_stdout, &c, 1);
+	return fputc(c, stdout);
 }
 
 /**
@@ -567,9 +774,19 @@ EXPORT int fgetc(FILE *fp)
 
 EXPORT int getchar(void)
 {
-	char	ret = 0;
-	if(_SysRead(_stdin, &ret, 1) != 1)	return -1;
-	return ret;
+	fflush(stdout);
+	return fgetc(stdin);
+}
+
+EXPORT int puts(const char *str)
+{
+	
+	if(!str)	return 0;
+	 int	len = strlen(str);
+	
+	fwrite(str, 1, len, stdout);
+	fwrite("\n", 1, 1, stdout);
+	return len;
 }
 
 // --- INTERNAL ---
@@ -579,8 +796,7 @@ EXPORT int getchar(void)
  */
 FILE *get_file_struct()
 {
-	 int	i;
-	for(i=0;i<STDIO_MAX_STREAMS;i++)
+	for(int i=0;i<STDIO_MAX_STREAMS;i++)
 	{
 		if(_iob[i].Flags & FILE_FLAG_ALLOC)
 			continue ;
@@ -592,15 +808,3 @@ FILE *get_file_struct()
 	return NULL;
 }
 
-EXPORT int puts(const char *str)
-{
-	 int	len;
-	
-	if(!str)	return 0;
-	len = strlen(str);
-	
-	len = _SysWrite(_stdout, str, len);
-	_SysWrite(_stdout, "\n", 1);
-	return len;
-}
-