X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstdio.c;h=55fd52134750e57d62f5aeaa04d273a03f8fa54d;hb=230612b2efeeb769f1d96193ec01b10bd36d9873;hp=5b814447da46ce6f8dd1f4f968276360d3b18a94;hpb=3c87ce36d0614cd447954ba77482ff29d5c2e0b5;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index 5b814447..55fd5213 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|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|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;
 }
@@ -223,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) )
@@ -347,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)
@@ -452,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;
@@ -473,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;
@@ -612,8 +645,8 @@ 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 <= (int)fp->BufferPos );
 	}
@@ -649,19 +682,28 @@ 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 )
+	if( fp->Flags & FILE_FLAG_EOF ) {
+		LOG_NOTICE("EOF");
 		return 0;
+	}
 
 	
 	if( fp->FD == FD_MEMFILE ) {
@@ -669,6 +711,7 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *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;
 	}
@@ -712,6 +755,8 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 				extra, size, num
 				);
 		}
+		LOG_NOTICE("Incomplete read %i/%i bytes (object size %i)",
+			ret, bytes, size);
 	}
 	
 	return ret / size;
@@ -723,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);
 }
 
 /**
@@ -750,13 +795,12 @@ EXPORT char *fgets(char *s, int size, FILE *fp)
  */
 EXPORT int fputc(int c, FILE *fp)
 {
-	char	ch = c;
+	unsigned char	ch = c;
 	return fwrite(&ch, 1, 1, fp);
 }
 
 EXPORT int putchar(int c)
 {
-	c &= 0xFF;
 	return fputc(c, stdout);
 }
 
@@ -766,7 +810,7 @@ EXPORT int putchar(int c)
  */
 EXPORT int fgetc(FILE *fp)
 {
-	char	ret = 0;
+	unsigned char	ret = 0;
 	if( fread(&ret, 1, 1, fp) != 1 )
 		return -1;
 	return ret;
@@ -774,12 +818,12 @@ EXPORT int fgetc(FILE *fp)
 
 EXPORT int getchar(void)
 {
+	fflush(stdout);
 	return fgetc(stdin);
 }
 
 EXPORT int puts(const char *str)
 {
-	
 	if(!str)	return 0;
 	 int	len = strlen(str);