X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FfileIO.c;h=776a2def924e3bd6b900796c9c284000ac4693cd;hb=7378996995784940b371210bf7167628551a3486;hp=b588f2461e760c11cce74a2c511025e000690ad2;hpb=cd0a4d84497fe89a8680ac0b881007ab6e97f44d;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/fileIO.c b/Usermode/Libraries/libc.so_src/fileIO.c
index b588f246..776a2def 100644
--- a/Usermode/Libraries/libc.so_src/fileIO.c
+++ b/Usermode/Libraries/libc.so_src/fileIO.c
@@ -10,6 +10,8 @@
 #include "lib.h"
 #include "stdio_int.h"
 
+#define WRITE_STR(_fd, _str)	write(_fd, _str, sizeof(_str))
+
 #define DEBUG_BUILD	0
 
 // === CONSTANTS ===
@@ -17,7 +19,7 @@
 #define	_stdout	1
 
 // === PROTOTYPES ===
-EXPORT void	itoa(char *buf, uint64_t num, uint base, int minLength, char pad, int bSigned);
+EXPORT void	itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned);
 struct sFILE	*get_file_struct();
 
 // === GLOBALS ===
@@ -80,7 +82,7 @@ EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)
 	case 'x':	openFlags = OPENFLAG_EXEC;
 		break;
 	}
-	
+
 	//Open File
 	if(fp->FD != -1)
 		fp->FD = reopen(fp->FD, file, openFlags);
@@ -116,10 +118,12 @@ EXPORT FILE *fopen(const char *file, const char *mode)
 	return freopen(file, mode, retFile);
 }
 
-EXPORT void fclose(FILE *fp)
+EXPORT int fclose(FILE *fp)
 {
 	close(fp->FD);
-	free(fp);
+	fp->Flags = 0;
+	fp->FD = -1;
+	return 0;
 }
 
 EXPORT void fflush(FILE *fp)
@@ -127,7 +131,7 @@ EXPORT void fflush(FILE *fp)
 	///\todo Implement
 }
 
-EXPORT long int ftell(FILE *fp)
+EXPORT off_t ftell(FILE *fp)
 {
 	if(!fp || !fp->FD)	return -1;
 	
@@ -150,32 +154,17 @@ EXPORT int vfprintf(FILE *fp, const char *format, va_list args)
 {
 	va_list	tmpList;
 	 int	size;
-	char	sbuf[1024];
-	char	*buf = sbuf;
- 
-
 
 	if(!fp || !format)	return -1;
 
 	va_copy(tmpList, args);
 	
-	size = vsnprintf(sbuf, 1024, (char*)format, tmpList);
-	
-	if( size >= 1024 )
-	{
-		buf = (char*)malloc(size+1);
-		if(!buf) {
-			write(_stdout, 31, "vfprintf ERROR: malloc() failed");
-			return 0;
-		}
-		buf[size] = '\0';
-	
-		// Print
-		vsnprintf(buf, size+1, (char*)format, args);
-	}
+	size = vsnprintf(NULL, 0, (char*)format, tmpList);
+	char	buf[size+1];
+	vsnprintf(buf, size+1, (char*)format, args);
 	
 	// Write to stream
-	write(fp->FD, size, buf);
+	write(fp->FD, buf, size);
 	
 	// Free buffer
 	free(buf);
@@ -210,7 +199,7 @@ EXPORT size_t fwrite(void *ptr, size_t size, size_t num, FILE *fp)
 	 int	ret;
 	if(!fp || !fp->FD)	return -1;
 	
-	ret = write(fp->FD, size*num, ptr);
+	ret = write(fp->FD, ptr, size*num);
 	
 	return ret;
 }
@@ -223,8 +212,9 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 {
 	 int	ret;
 	if(!fp || !fp->FD)	return -1;
-	
-	ret = read(fp->FD, size*num, ptr);
+
+	// TODO: Fit the spec better with the return value	
+	ret = read(fp->FD, ptr, size*num);
 	
 	return ret;
 }
@@ -236,7 +226,13 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 EXPORT int fputc(int c, FILE *fp)
 {
 	if(!fp || !fp->FD)	return -1;
-	return write(fp->FD, 1, &c);
+	return write(fp->FD, &c, 1);
+}
+
+EXPORT int putchar(int c)
+{
+	c &= 0xFF;
+	return write(_stdout, &c, 1);
 }
 
 /**
@@ -247,7 +243,14 @@ EXPORT int fgetc(FILE *fp)
 {
 	char	ret = 0;
 	if(!fp)	return -1;
-	if(read(fp->FD, 1, &ret) == -1)	return -1;
+	if(read(fp->FD, &ret, 1) == -1)	return -1;
+	return ret;
+}
+
+EXPORT int getchar(void)
+{
+	char	ret = 0;
+	if(read(_stdin, &ret, 1) != 1)	return -1;
 	return ret;
 }
 
@@ -266,20 +269,15 @@ FILE *get_file_struct()
 	return NULL;
 }
 
-EXPORT int putchar(int ch)
-{
-	return write(_stdout, 1, (char*)&ch);
-}
-
-EXPORT int	puts(const char *str)
+EXPORT int puts(const char *str)
 {
 	 int	len;
 	
 	if(!str)	return 0;
 	len = strlen(str);
 	
-	len = write(_stdout, len, (char*)str);
-	write(_stdout, 1, "\n");
+	len = write(_stdout, str, len);
+	write(_stdout, "\n", 1);
 	return len;
 }
 
@@ -417,7 +415,7 @@ EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list arg
 			_addchar('*');
 			_addchar('0');
 			_addchar('x');
-			arg = va_arg(args, uint32_t);
+			arg = va_arg(args, intptr_t);
 			itoa(tmp, arg, 16, minSize, pad, 0);
 			precision = -1;
 			goto sprintf_puts;
@@ -447,8 +445,7 @@ EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list arg
 
 		// String
 		case 's':
-			arg = va_arg(args, uint32_t);
-			p = (void*)(intptr_t)arg;
+			p = va_arg(args, char*);
 		sprintf_puts:
 			if(!p)	p = "(null)";
 			//_SysDebug("vsnprintf: p = '%s'", p);
@@ -533,32 +530,20 @@ EXPORT int printf(const char *format, ...)
 {
 	#if 1
 	 int	size;
-	char	sbuf[1024];
-	char	*buf = sbuf;
 	va_list	args;
 	
 	// Get final size
 	va_start(args, format);
-	size = vsnprintf(sbuf, 1024, (char*)format, args);
+	size = vsnprintf(NULL, 0, (char*)format, args);
+	va_end(args);
+	char buf[size+1];
+	// Fill Buffer
+	va_start(args, format);
+	vsnprintf(buf, size+1, (char*)format, args);
 	va_end(args);
-	
-	if( size >= 1024 ) {
-		// Allocate buffer
-		buf = (char*)malloc(size+1);
-		if(buf) {
-			write(_stdout, 29, "PRINTF ERROR: malloc() failed");
-			return 0;
-		}
-		buf[size] = '\0';
-	
-		// Fill Buffer
-		va_start(args, format);
-		vsnprintf(buf, size+1, (char*)format, args);
-		va_end(args);
-	}
 	
 	// Send to stdout
-	write(_stdout, size+1, buf);
+	write(_stdout, buf, size+1);
 	
 	// Free buffer
 	free(buf);