X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2Flibc.so_src%2Fstdio.c;h=e98ca42accf8e5b7e155ac55b99a145f840688ac;hb=384befc18f81f42d2dd6e324a35904ad037b3af7;hp=372c48996e3d6f86f95b15d359b6df43babb71b9;hpb=eb763749fc81090d46ec805d01a08c3ae37b8a61;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index 372c4899..e98ca42a 100644
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -612,12 +612,12 @@ size_t _fread_memstream(void *ptr, size_t size, size_t num, FILE *fp)
 
 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);
+	//_SysDebug("%p: %i-%i <= %i", fp,
+	//	(int)fp->Pos, (int)fp->BufferOfs, (int)fp->BufferPos);
 	if( fp->BufferPos > 0 ) {
-		assert( fp->Pos - fp->BufferOfs <= fp->BufferPos );
+		assert( fp->Pos - fp->BufferOfs <= (int)fp->BufferPos );
 	}
-	if( fp->BufferPos == 0 || fp->Pos - fp->BufferOfs == 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 ) {
@@ -627,15 +627,15 @@ size_t _fread_buffered(void *ptr, size_t size, FILE *fp)
 		
 		fp->BufferPos = rv;
 		fp->BufferOfs = fp->Pos;
-		_SysDebug("%p: Buffered %i at %i", fp, rv, 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);
+	//_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;
@@ -774,6 +774,7 @@ EXPORT int fgetc(FILE *fp)
 
 EXPORT int getchar(void)
 {
+	fflush(stdout);
 	return fgetc(stdin);
 }