X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FfileIO.c;h=c0013c98a8b4b5d1c4bb84f6311b886788633a9b;hb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;hp=b8cdb116152b4a0bda1c087b9e3ff08971e4490b;hpb=eb80b37c619769496f3fca58d54c4a4b8d8fac4a;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/fileIO.c b/Usermode/Libraries/libc.so_src/fileIO.c
index b8cdb116..c0013c98 100644
--- a/Usermode/Libraries/libc.so_src/fileIO.c
+++ b/Usermode/Libraries/libc.so_src/fileIO.c
@@ -1,6 +1,7 @@
 /*
-AcessOS Basic C Library
-*/
+ * AcessOS Basic C Library
+ * stdio.c
+ */
 #include "config.h"
 #include <acess/sys.h>
 #include <stdlib.h>
@@ -9,6 +10,8 @@ AcessOS Basic C Library
 #include "lib.h"
 #include "stdio_int.h"
 
+#define WRITE_STR(_fd, _str)	write(_fd, _str, sizeof(_str))
+
 #define DEBUG_BUILD	0
 
 // === CONSTANTS ===
@@ -16,7 +19,7 @@ AcessOS Basic C Library
 #define	_stdout	1
 
 // === PROTOTYPES ===
-EXPORT void	itoa(char *buf, unsigned long num, int base, int minLength, char pad);
+EXPORT void	itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned);
 struct sFILE	*get_file_struct();
 
 // === GLOBALS ===
@@ -28,9 +31,9 @@ struct sFILE	*stderr;	// Standard Error
 
 // === CODE ===
 /**
- * \fn FILE *freopen(FILE *fp, char *file, char *mode)
+ * \fn FILE *freopen(char *file, char *mode, FILE *fp)
  */
-EXPORT FILE *freopen(FILE *fp, char *file, char *mode)
+EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)
 {
 	 int	openFlags = 0;
 	 int	i;
@@ -40,8 +43,8 @@ EXPORT FILE *freopen(FILE *fp, char *file, char *mode)
 	
 	if(fp->Flags) {
 		fflush(fp);
-		close(fp->FD);
-	}
+	} else
+		fp->FD = -1;
 	
 	// Get main mode
 	switch(mode[0])
@@ -79,9 +82,12 @@ EXPORT FILE *freopen(FILE *fp, char *file, char *mode)
 	case 'x':	openFlags = OPENFLAG_EXEC;
 		break;
 	}
-	
+
 	//Open File
-	fp->FD = reopen(fp->FD, file, openFlags);
+	if(fp->FD != -1)
+		fp->FD = reopen(fp->FD, file, openFlags);
+	else
+		fp->FD = open(file, openFlags);
 	if(fp->FD == -1) {
 		fp->Flags = 0;
 		return NULL;
@@ -94,12 +100,12 @@ EXPORT FILE *freopen(FILE *fp, char *file, char *mode)
 	return fp;
 }
 /**
- \fn FILE *fopen(char *file, char *mode)
+ \fn FILE *fopen(const char *file, const char *mode)
  \brief Opens a file and returns the pointer
  \param file	String - Filename to open
  \param mode	Mode to open in
 */
-EXPORT FILE *fopen(char *file, char *mode)
+EXPORT FILE *fopen(const char *file, const char *mode)
 {
 	FILE	*retFile;
 	
@@ -109,13 +115,15 @@ EXPORT FILE *fopen(char *file, char *mode)
 	// Create Return Structure
 	retFile = get_file_struct();
 	
-	return freopen(retFile, file, 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)
@@ -123,28 +131,59 @@ EXPORT void fflush(FILE *fp)
 	///\todo Implement
 }
 
+EXPORT void clearerr(FILE *stream)
+{
+	/// \todo Impliment
+}
+
+EXPORT int feof(FILE *stream)
+{
+	return 0;	//stream->;	// ?
+}
+
+EXPORT int ferror(FILE *stream)
+{
+	return 0;
+}
+EXPORT int fileno(FILE *stream)
+{
+	return stream->FD;
+}
+
+EXPORT off_t ftell(FILE *fp)
+{
+	if(!fp || !fp->FD)	return -1;
+	
+	return tell(fp->FD);
+}
+
+EXPORT int fseek(FILE *fp, long int amt, int whence)
+{
+	if(!fp || !fp->FD)	return -1;
+	
+	return seek(fp->FD, amt, whence);
+}
+
+
 /**
- * \fn int fprintfv(FILE *fp, const char *format, va_list args)
+ * \fn EXPORT int vfprintf(FILE *fp, const char *format, va_list args)
  * \brief Print to a file from a variable argument list
  */
-EXPORT int fprintfv(FILE *fp, const char *format, va_list args)
+EXPORT int vfprintf(FILE *fp, const char *format, va_list args)
 {
-	va_list	tmpList = args;
+	va_list	tmpList;
 	 int	size;
-	char	*buf;
-	 
+
 	if(!fp || !format)	return -1;
+
+	va_copy(tmpList, args);
 	
-	size = ssprintfv((char*)format, tmpList);
-	
-	buf = (char*)malloc(size+1);
-	buf[size] = '\0';
-	
-	// Print
-	sprintfv(buf, (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+1, buf);
+	write(fp->FD, buf, size);
 	
 	// Free buffer
 	free(buf);
@@ -164,20 +203,37 @@ EXPORT int fprintf(FILE *fp, const char *format, ...)
 	
 	// Get Size
 	va_start(args, format);
-	ret = fprintfv(fp, (char*)format, args);
+	ret = vfprintf(fp, (char*)format, args);
 	va_end(args);
 	
 	return ret;
 }
 
 /**
+ * \fn EXPORT size_t fwrite(void *ptr, size_t size, size_t num, FILE *fp)
+ * \brief Write to a stream
  */
 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;
+}
+
+/**
+ * \fn EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
+ * \brief Read from a stream
+ */
+EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
+{
+	 int	ret;
+	if(!fp || !fp->FD)	return -1;
+
+	// TODO: Fit the spec better with the return value	
+	ret = read(fp->FD, ptr, size*num);
 	
 	return ret;
 }
@@ -189,7 +245,13 @@ EXPORT size_t fwrite(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);
 }
 
 /**
@@ -198,9 +260,16 @@ EXPORT int fputc(int c, FILE *fp)
  */
 EXPORT int fgetc(FILE *fp)
 {
-	 int	ret = 0;
+	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;
 }
 
@@ -219,243 +288,256 @@ 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;
 }
 
+EXPORT int vsprintf(char * __s, const char *__format, va_list __args)
+{
+	return vsnprintf(__s, 0x7FFFFFFF, __format, __args);
+}
+
 //sprintfv
 /**
- \fn EXPORT void sprintfv(char *buf, const char *format, va_list args)
- \brief Prints a formatted string to a buffer
- \param buf	Pointer - Destination Buffer
- \param format	String - Format String
- \param args	VarArgs List - Arguments
-*/
-EXPORT void sprintfv(char *buf, const char *format, va_list args)
+ * \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)
+ * \brief Prints a formatted string to a buffer
+ * \param buf	Pointer - Destination Buffer
+ * \param format	String - Format String
+ * \param args	VarArgs List - Arguments
+ */
+EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)
 {
-	char	tmp[33];
-	 int	c, arg, minSize;
+	char	tmp[65];
+	 int	c, minSize, precision, len;
 	 int	pos = 0;
 	char	*p;
 	char	pad;
+	uint64_t	arg;
+	 int	bLongLong, bPadLeft;
+
+	void _addchar(char ch)
+	{
+		if(buf && pos < __maxlen)	buf[pos] = ch;
+		pos ++;
+	}
 
 	tmp[32] = '\0';
 	
 	while((c = *format++) != 0)
 	{
-		//SysDebug("c = '%c'\n", c);
+		// Non-control character
 		if (c != '%') {
-			buf[pos++] = c;
+			_addchar(c);
 			continue;
 		}
 		
+		// Control Character
 		c = *format++;
-		if(c == '%') {
-			buf[pos++] = '%';
+		if(c == '%') {	// Literal %
+			_addchar('%');
 			continue;
 		}
 		
-		// Padding
+		bPadLeft = 0;
+		bLongLong = 0;
+		minSize = 0;
+		precision = -1;
+		pad = ' ';
+		
+		// Padding Character
 		if(c == '0') {
 			pad = '0';
 			c = *format++;
-		} else
-			pad = ' ';
-		minSize = 0;
-		if('1' <= c && c <= '9')
-		{
-			while('0' <= c && c <= '9')
+		}
+		// Padding length
+		if( c == '*' ) {
+			// Variable length
+			minSize = va_arg(args, size_t);
+			c = *format++;
+		}
+		else {
+			if('1' <= c && c <= '9')
 			{
-				minSize *= 10;
-				minSize += c - '0';
-				c = *format++;
+				minSize = 0;
+				while('0' <= c && c <= '9')
+				{
+					minSize *= 10;
+					minSize += c - '0';
+					c = *format++;
+				}
 			}
 		}
-	
-		p = tmp;
-	
-		// Get Argument
-		arg = va_arg(args, int);
-		// Get Type
-		switch (c) {
-		case 'd':
-		case 'i':
-			if(arg < 0) {
-				buf[pos++] = '-';
-				arg = -arg;
-			}
-			itoa(tmp, arg, 10, minSize, pad);
-			goto sprintf_puts;
-		//	break;
-		case 'u':
-			itoa(tmp, arg, 10, minSize, pad);
-			goto sprintf_puts;
-		//	break;
-		case 'p':	// Pointer
-			buf[pos++] = '*';
-			buf[pos++] = '0';
-			buf[pos++] = 'x';
-		case 'x':
-			itoa(tmp, arg, 16, minSize, pad);
-			goto sprintf_puts;
-		//	break;
-		case 'o':
-			itoa(tmp, arg, 8, minSize, pad);
-			goto sprintf_puts;
-		//	break;
-		case 'b':
-			itoa(tmp, arg, 2, minSize, pad);
-			goto sprintf_puts;
-		//	break;
-
-		case 's':
-			p = (void*)arg;
-		sprintf_puts:
-			if(!p)	p = "(null)";
-			while(*p)	buf[pos++] = *p++;
-			break;
 
-		default:
-			buf[pos++] = arg;
-			break;
+		// Precision
+		if(c == '.') {
+			c = *format++;
+			if(c == '*') {
+				precision = va_arg(args, size_t);
+				c = *format++;
+			}
+			else if('1' <= c && c <= '9')
+			{
+				precision = 0;
+				while('0' <= c && c <= '9')
+				{
+					precision *= 10;
+					precision += c - '0';
+					c = *format++;
+				}
+			}
 		}
-    }
-	buf[pos++] = '\0';
-}
-/*
-ssprintfv
-- Size, Stream, Print Formated, Variable Argument List
-*/
-/**
- \fn EXPORT int ssprintfv(char *format, va_list args)
- \brief Gets the total character count from a formatted string
- \param format	String - Format String
- \param args	VarArgs - Argument List
-*/
-EXPORT int ssprintfv(char *format, va_list args)
-{
-	char	tmp[33];
-	 int	c, arg, minSize;
-	 int	len = 0;
-	char	*p;
-	char	pad;
-
-	tmp[32] = '\0';
 	
-	while((c = *format++) != 0)
-	{
-		if (c != '%') {
-			len++;
-			continue;
-		}
-		
-		c = *format++;
-		
-		// Literal '%'
-		if(c == '%') {
-			len++;
-			continue;
-		}
-		
-		// Padding
-		if(c == '0') {
-			pad = '0';
-			c = *format++;
-		} else
-			pad = ' ';
-		minSize = 0;
-		if('1' <= c && c <= '9')
+		// Check for long long
+		bLongLong = 0;
+		if(c == 'l')
 		{
-			while('0' <= c && c <= '9')
-			{
-				minSize *= 10;
-				minSize += c - '0';
-				c = *format++;
+			c = *format++;
+			if(c == 'l') {
+				bLongLong = 1;
 			}
 		}
 		
+		// Just help things along later
 		p = tmp;
-		arg = va_arg(args, int);
-		switch (c) {			
-		case 'd':
-		case 'i':
-			if(arg < 0) {
-				len ++;
-				arg = -arg;
-			}
-			itoa(tmp, arg, 10, minSize, pad);
+		
+		// Get Type
+		switch( c )
+		{
+		// Signed Integer
+		case 'd':	case 'i':
+			// Get Argument
+			if(bLongLong)	arg = va_arg(args, int64_t);
+			else			arg = va_arg(args, int32_t);
+			itoa(tmp, arg, 10, minSize, pad, 1);
+			precision = -1;
 			goto sprintf_puts;
+		
+		// Unsigned Integer
 		case 'u':
-			itoa(tmp, arg, 10, minSize, pad);
+			// Get Argument
+			if(bLongLong)	arg = va_arg(args, uint64_t);
+			else			arg = va_arg(args, uint32_t);
+			itoa(tmp, arg, 10, minSize, pad, 0);
+			precision = -1;
 			goto sprintf_puts;
-		case 'p':	// Pointer
-			len += 3;
+		
+		// Pointer
+		case 'p':
+			_addchar('*');
+			_addchar('0');
+			_addchar('x');
+			arg = va_arg(args, intptr_t);
+			itoa(tmp, arg, 16, minSize, pad, 0);
+			precision = -1;
+			goto sprintf_puts;
+		// Unsigned Hexadecimal
 		case 'x':
-			itoa(tmp, arg, 16, minSize, pad);
+			if(bLongLong)	arg = va_arg(args, uint64_t);
+			else			arg = va_arg(args, uint32_t);
+			itoa(tmp, arg, 16, minSize, pad, 0);
+			precision = -1;
 			goto sprintf_puts;
+		
+		// Unsigned Octal
 		case 'o':
-			itoa(tmp, arg, 8, minSize, pad);
-			p = tmp;
+			if(bLongLong)	arg = va_arg(args, uint64_t);
+			else			arg = va_arg(args, uint32_t);
+			itoa(tmp, arg, 8, minSize, pad, 0);
+			precision = -1;
 			goto sprintf_puts;
+		
+		// Unsigned binary
 		case 'b':
-			itoa(tmp, arg, 2, minSize, pad);
+			if(bLongLong)	arg = va_arg(args, uint64_t);
+			else			arg = va_arg(args, uint32_t);
+			itoa(tmp, arg, 2, minSize, pad, 0);
+			precision = -1;
 			goto sprintf_puts;
 
+		// String
 		case 's':
-			p = (char*)arg;
+			p = va_arg(args, char*);
 		sprintf_puts:
 			if(!p)	p = "(null)";
-			while(*p)	len++, p++;
+			//_SysDebug("vsnprintf: p = '%s'", p);
+			if(precision >= 0)
+				len = strnlen(p, precision);
+			else
+				len = strlen(p);
+			if(bPadLeft)	while(minSize > len++)	_addchar(pad);
+			while( *p ) {
+				if(precision >= 0 && precision -- == 0)
+					break;
+				_addchar(*p++);
+			}
+			if(!bPadLeft)	while(minSize > len++)	_addchar(pad);
 			break;
 
+		// Unknown, just treat it as a character
 		default:
-			len ++;
+			arg = va_arg(args, uint32_t);
+			_addchar(arg);
 			break;
 		}
-    }
-	return len;
+	}
+	_addchar('\0');
+	pos --;
+	
+	//_SysDebug("vsnprintf: buf = '%s'", buf);
+	
+	return pos;
 }
 
 const char cUCDIGITS[] = "0123456789ABCDEF";
 /**
- * \fn static void itoa(char *buf, unsigned long num, int base, int minLength, char pad)
+ * \fn static void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)
  * \brief Convert an integer into a character string
+ * \param buf	Destination Buffer
+ * \param num	Number to convert
+ * \param base	Base-n number output
+ * \param minLength	Minimum length of output
+ * \param pad	Padding used to ensure minLength
+ * \param bSigned	Signed number output?
  */
-EXPORT void itoa(char *buf, unsigned long num, int base, int minLength, char pad)
+EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)
 {
-	char	tmpBuf[32];
+	char	tmpBuf[64];
 	 int	pos=0, i;
 
 	if(!buf)	return;
-	if(base > 16) {
+	if(base > 16 || base < 2) {
 		buf[0] = 0;
 		return;
 	}
 	
+	if(bSigned && (int64_t)num < 0)
+	{
+		num = -num;
+		bSigned = 1;
+	} else
+		bSigned = 0;
+	
+	// Encode into reversed string
 	while(num > base-1) {
-		tmpBuf[pos] = cUCDIGITS[ num % base ];
-		num = (long) num / base;		//Shift {number} right 1 digit
-		pos++;
+		tmpBuf[pos++] = cUCDIGITS[ num % base ];
+		num = (uint64_t) num / (uint64_t)base;		// Shift {number} right 1 digit
 	}
 
-	tmpBuf[pos++] = cUCDIGITS[ num % base ];		//Last digit of {number}
+	tmpBuf[pos++] = cUCDIGITS[ num % base ];		// Last digit of {number}
+	if(bSigned)	tmpBuf[pos++] = '-';	// Append sign symbol if needed
+	
 	i = 0;
 	minLength -= pos;
 	while(minLength-- > 0)	buf[i++] = pad;
-	while(pos-- > 0)		buf[i++] = tmpBuf[pos];	//Reverse the order of characters
+	while(pos-- > 0)		buf[i++] = tmpBuf[pos];	// Reverse the order of characters
 	buf[i] = 0;
 }
 
@@ -467,24 +549,24 @@ EXPORT int printf(const char *format, ...)
 {
 	#if 1
 	 int	size;
-	char	*buf;
 	va_list	args;
 	
+	// Get final size
 	va_start(args, format);
-	size = ssprintfv((char*)format, args);
+	size = vsnprintf(NULL, 0, (char*)format, args);
 	va_end(args);
-	
-	buf = (char*)malloc(size+1);
-	buf[size] = '\0';
-	
+	char buf[size+1];
+	// Fill Buffer
 	va_start(args, format);
-	sprintfv(buf, (char*)format, args);
+	vsnprintf(buf, size+1, (char*)format, args);
 	va_end(args);
 	
+	// Send to stdout
+	write(_stdout, buf, size+1);
 	
-	write(_stdout, size+1, buf);
-	
+	// Free buffer
 	free(buf);
+	// Return
 	return size;
 	
 	#else
@@ -504,9 +586,24 @@ EXPORT int printf(const char *format, ...)
  */
 EXPORT int sprintf(char *buf, const char *format, ...)
 {
+	 int	ret;
 	va_list	args;
 	va_start(args, format);
-	sprintfv((char*)buf, (char*)format, args);
+	ret = vsprintf((char*)buf, (char*)format, args);
 	va_end(args);
-	return 1;
+	return ret;
+}
+
+/**
+ * \fn EXPORT int snprintf(const char *buf, size_t maxlen, char *format, ...)
+ * \brief Print a formatted string to a buffer
+ */
+EXPORT int snprintf(char *buf, size_t maxlen, const char *format, ...)
+{
+	 int	ret;
+	va_list	args;
+	va_start(args, format);
+	ret = vsnprintf((char*)buf, maxlen, (char*)format, args);
+	va_end(args);
+	return ret;
 }