#include "lib.h"\r
#include "stdio_int.h"\r
\r
+#define WRITE_STR(_fd, _str) write(_fd, _str, sizeof(_str))\r
+\r
#define DEBUG_BUILD 0\r
\r
// === CONSTANTS ===\r
#define _stdout 1\r
\r
// === PROTOTYPES ===\r
-EXPORT void itoa(char *buf, uint64_t num, uint base, int minLength, char pad, int bSigned);\r
+EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned);\r
struct sFILE *get_file_struct();\r
\r
// === GLOBALS ===\r
case 'x': openFlags = OPENFLAG_EXEC;\r
break;\r
}\r
- \r
+\r
//Open File\r
if(fp->FD != -1)\r
fp->FD = reopen(fp->FD, file, openFlags);\r
return freopen(file, mode, retFile);\r
}\r
\r
-EXPORT void fclose(FILE *fp)\r
+EXPORT int fclose(FILE *fp)\r
{\r
close(fp->FD);\r
- free(fp);\r
+ fp->Flags = 0;\r
+ fp->FD = -1;\r
+ return 0;\r
}\r
\r
EXPORT void fflush(FILE *fp)\r
///\todo Implement\r
}\r
\r
-EXPORT long int ftell(FILE *fp)\r
+EXPORT off_t ftell(FILE *fp)\r
{\r
if(!fp || !fp->FD) return -1;\r
\r
int size;\r
char sbuf[1024];\r
char *buf = sbuf;\r
- \r
-\r
\r
if(!fp || !format) return -1;\r
\r
va_copy(tmpList, args);\r
\r
- size = vsnprintf(sbuf, 1024, (char*)format, tmpList);\r
+ size = vsnprintf(sbuf, sizeof(sbuf), (char*)format, tmpList);\r
\r
- if( size >= 1024 )\r
+ if( size >= sizeof(sbuf) )\r
{\r
buf = (char*)malloc(size+1);\r
if(!buf) {\r
- write(_stdout, 31, "vfprintf ERROR: malloc() failed");\r
+ WRITE_STR(_stdout, "vfprintf ERROR: malloc() failed");\r
return 0;\r
}\r
buf[size] = '\0';\r
}\r
\r
// Write to stream\r
- write(fp->FD, size, buf);\r
+ write(fp->FD, buf, size);\r
\r
// Free buffer\r
free(buf);\r
int ret;\r
if(!fp || !fp->FD) return -1;\r
\r
- ret = write(fp->FD, size*num, ptr);\r
+ ret = write(fp->FD, ptr, size*num);\r
\r
return ret;\r
}\r
{\r
int ret;\r
if(!fp || !fp->FD) return -1;\r
- \r
- ret = read(fp->FD, size*num, ptr);\r
+\r
+ // TODO: Fit the spec better with the return value \r
+ ret = read(fp->FD, ptr, size*num);\r
\r
return ret;\r
}\r
EXPORT int fputc(int c, FILE *fp)\r
{\r
if(!fp || !fp->FD) return -1;\r
- return write(fp->FD, 1, &c);\r
+ return write(fp->FD, &c, 1);\r
+}\r
+\r
+EXPORT int putchar(int c)\r
+{\r
+ c &= 0xFF;\r
+ return write(_stdout, &c, 1);\r
}\r
\r
/**\r
{\r
char ret = 0;\r
if(!fp) return -1;\r
- if(read(fp->FD, 1, &ret) == -1) return -1;\r
+ if(read(fp->FD, &ret, 1) == -1) return -1;\r
+ return ret;\r
+}\r
+\r
+EXPORT int getchar(void)\r
+{\r
+ char ret = 0;\r
+ if(read(_stdin, &ret, 1) != 1) return -1;\r
return ret;\r
}\r
\r
return NULL;\r
}\r
\r
-EXPORT int putchar(int ch)\r
-{\r
- return write(_stdout, 1, (char*)&ch);\r
-}\r
-\r
-EXPORT int puts(const char *str)\r
+EXPORT int puts(const char *str)\r
{\r
int len;\r
\r
if(!str) return 0;\r
len = strlen(str);\r
\r
- len = write(_stdout, len, (char*)str);\r
- write(_stdout, 1, "\n");\r
+ len = write(_stdout, str, len);\r
+ write(_stdout, "\n", 1);\r
return len;\r
}\r
\r
_addchar('*');\r
_addchar('0');\r
_addchar('x');\r
- arg = va_arg(args, uint32_t);\r
+ arg = va_arg(args, intptr_t);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
precision = -1;\r
goto sprintf_puts;\r
\r
// String\r
case 's':\r
- arg = va_arg(args, uint32_t);\r
- p = (void*)(intptr_t)arg;\r
+ p = va_arg(args, char*);\r
sprintf_puts:\r
if(!p) p = "(null)";\r
//_SysDebug("vsnprintf: p = '%s'", p);\r
// Allocate buffer\r
buf = (char*)malloc(size+1);\r
if(buf) {\r
- write(_stdout, 29, "PRINTF ERROR: malloc() failed");\r
+ WRITE_STR(_stdout, "PRINTF ERROR: malloc() failed\n");\r
return 0;\r
}\r
buf[size] = '\0';\r
}\r
\r
// Send to stdout\r
- write(_stdout, size+1, buf);\r
+ write(_stdout, buf, size+1);\r
\r
// Free buffer\r
free(buf);\r