X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstdio.c;h=cf2e733671e626bb684558758f318e39554d0adf;hb=d7f2b37cad318f38d83d2249b8ff97f13ce973d8;hp=7082f2354991af7e64c0727ff20dd0ca99a6c557;hpb=ab04abef852c7f3c999092a5f25865fbd5981c20;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index 7082f235..cf2e7336 100644
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -14,6 +14,9 @@
 
 #define DEBUG_BUILD	0
 
+#define LOG_WARN(f,...)	_SysDebug("WARN: %s: "f, __func__ ,## __VA_ARGS__)
+#define LOG_NOTICE(f,...)	_SysDebug("NOTE: %s: "f, __func__ ,## __VA_ARGS__)
+
 // === CONSTANTS ===
 #define	_stdin	0
 #define	_stdout	1
@@ -27,9 +30,9 @@ struct sFILE	*get_file_struct();
 
 // === GLOBALS ===
 struct sFILE	_iob[STDIO_MAX_STREAMS];	// IO Buffer
-struct sFILE	*stdin;	// Standard Input
-struct sFILE	*stdout;	// Standard Output
-struct sFILE	*stderr;	// Standard Error
+struct sFILE	*stdin = &_iob[0];	// Standard Input
+struct sFILE	*stdout = &_iob[1];	// Standard Output
+struct sFILE	*stderr = &_iob[2];	// Standard Error
 ///\note Initialised in SoMain
 static const int STDIN_BUFSIZ = 512;
 static const int STDOUT_BUFSIZ = 512;
@@ -38,19 +41,16 @@ static const int STDOUT_BUFSIZ = 512;
 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;
 	
-	stderr = &_iob[2];
 	stderr->FD = 2;
 	stderr->Flags = FILE_FLAG_ALLOC|FILE_FLAG_MODE_WRITE;
 }
@@ -151,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
 	}
@@ -213,6 +223,33 @@ EXPORT FILE *open_memstream(char **bufferptr, size_t *lengthptr)
 	return ret;
 }
 
+EXPORT FILE *fdopen(int fd, const char *mode)
+{
+	FILE	*ret;
+	
+	if( fd < 0 || !mode )	return NULL;
+	
+	ret = get_file_struct();
+	
+	ret->FD = fd;
+	ret->Flags = _fopen_modetoflags(mode);
+	if(ret->Flags == -1) {
+		ret->Flags = 0;
+		return NULL;
+	}
+	
+	ret->Buffer = NULL;
+	ret->BufferPos = 0;
+	ret->BufferSpace = 0;
+	
+	return ret;
+}
+
+EXPORT FILE *tmpfile(void)
+{
+	return NULL;
+}
+
 EXPORT int fclose(FILE *fp)
 {
 	if( !(fp->Flags & FILE_FLAG_ALLOC) )
@@ -220,6 +257,10 @@ 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 = FD_NOTOPEN;
@@ -262,9 +303,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;
@@ -300,9 +345,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;
 		
@@ -312,7 +360,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;
@@ -320,22 +374,23 @@ int _fflush_int(FILE *fp)
 	return ret;
 }
 
-EXPORT void fflush(FILE *fp)
+EXPORT int fflush(FILE *fp)
 {
 	if( !fp || fp->FD == FD_NOTOPEN )
-		return ;
+		return EBADF;
 	
 	// Nothing to do for memory files
 	if( fp->FD == FD_MEMFILE )
-		return ;
+		return 0;
 	// Memory streams, update pointers
 	if( fp->FD == FD_MEMSTREAM ) {
 		*fp->BufPtr = fp->Buffer;
 		*fp->LenPtr = fp->BufferPos;
-		return ;
+		return 0;
 	}
 	
 	_fflush_int(fp);
+	return 0;
 }
 
 EXPORT void clearerr(FILE *fp)
@@ -425,7 +480,7 @@ int _fseek_memstream(FILE *fp, long int amt, int whence)
 	return 0;
 }
 
-EXPORT int fseek(FILE *fp, long int amt, int whence)
+EXPORT int fseeko(FILE *fp, off_t amt, int whence)
 {
 	if(!fp || fp->FD == FD_NOTOPEN) {
 		errno = EBADF;
@@ -446,6 +501,11 @@ EXPORT int fseek(FILE *fp, long int amt, int whence)
 	}
 }
 
+EXPORT int fseek(FILE *fp, long int amt, int whence)
+{
+	return fseeko(fp, amt, whence);
+}
+
 size_t _fwrite_unbuffered(FILE *fp, size_t size, size_t num, const void *data)
 {
 	size_t	ret = 0, bytes;
@@ -583,6 +643,37 @@ size_t _fread_memstream(void *ptr, size_t size, size_t num, FILE *fp)
 }
 #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
@@ -591,36 +682,84 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 {
 	size_t	ret;
 	
-	if(!fp || fp->FD == -1)
+	if(!fp || fp->FD == -1) {
+		LOG_WARN("bad fp %p", fp);
 		return -1;
+	}
 	if( size == 0 || num == 0 )
 		return 0;
 	
 	if( _GetFileMode(fp) != FILE_FLAG_MODE_READ ) {
 		errno = 0;
+		LOG_WARN("not open for read");
+		if( fp == stdin ) {
+			LOG_WARN("BUGCHECK FAIL: stdin was not open for read");
+			exit(129);
+		}
 		return -1;
 	}
 
+	// Don't read if EOF is set
+	if( fp->Flags & FILE_FLAG_EOF ) {
+		LOG_NOTICE("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);
+		LOG_WARN("Reading from a mem stream");
 		errno = EBADF;
 		return 0;
 	}
-	
+
 	// Standard file
-	ret = _SysRead(fp->FD, ptr, size*num);
-	if( ret == (size_t)-1)
-		return -1;
-	if( ret == 0 && size*num > 0 ) {
-		fp->Flags |= FILE_FLAG_EOF;
-		return 0;
+	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
+				);
+		}
+		LOG_NOTICE("Incomplete read %i/%i bytes (object size %i)",
+			ret, bytes, size);
 	}
-	ret /= size;
 	
-	return ret;
+	return ret / size;
 }
 
 /**
@@ -629,7 +768,7 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 EXPORT int fputs(const char *s, FILE *fp)
 {
 	int len = strlen(s);
-	return fwrite(s, 1, len, fp);
+	return fwrite(s, len, 1, fp);
 }
 
 /**
@@ -656,13 +795,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);
 }
 
 /**
@@ -679,20 +819,18 @@ 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)
 {
-	 int	len;
 	
 	if(!str)	return 0;
-	len = strlen(str);
+	 int	len = strlen(str);
 	
-	len = _SysWrite(_stdout, str, len);
-	_SysWrite(_stdout, "\n", 1);
+	fwrite(str, 1, len, stdout);
+	fwrite("\n", 1, 1, stdout);
 	return len;
 }
 
@@ -703,8 +841,7 @@ EXPORT int puts(const char *str)
  */
 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 ;