-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
- size = vsnprintf(sbuf, 1024, (char*)format, tmpList);\r
+ size = vsnprintf(sbuf, sizeof(sbuf), (char*)format, tmpList);\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
EXPORT int fputc(int c, FILE *fp)\r
{\r
if(!fp || !fp->FD) return -1;\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
- 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
-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
- len = write(_stdout, len, (char*)str);\r
- write(_stdout, 1, "\n");\r
+ len = write(_stdout, str, len);\r
+ write(_stdout, "\n", 1);\r
EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)\r
{\r
char tmp[65];\r
EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)\r
{\r
char tmp[65];\r
- } else\r
- pad = ' ';\r
- minSize = 0;\r
- if('1' <= c && c <= '9')\r
- {\r
- while('0' <= c && c <= '9')\r
+ }\r
+ // Padding length\r
+ if( c == '*' ) {\r
+ // Variable length\r
+ minSize = va_arg(args, size_t);\r
+ c = *format++;\r
+ }\r
+ else {\r
+ if('1' <= c && c <= '9')\r
if(bLongLong) arg = va_arg(args, int64_t);\r
else arg = va_arg(args, int32_t);\r
itoa(tmp, arg, 10, minSize, pad, 1);\r
if(bLongLong) arg = va_arg(args, int64_t);\r
else arg = va_arg(args, int32_t);\r
itoa(tmp, arg, 10, minSize, pad, 1);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 10, minSize, pad, 0);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 10, minSize, pad, 0);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
// Unsigned Hexadecimal\r
case 'x':\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
// Unsigned Hexadecimal\r
case 'x':\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 8, minSize, pad, 0);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 8, minSize, pad, 0);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 2, minSize, pad, 0);\r
if(bLongLong) arg = va_arg(args, uint64_t);\r
else arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 2, minSize, pad, 0);\r
- if(buf) {\r
- while(*p) {\r
- if(pos < __maxlen) buf[pos] = *p;\r
- pos ++; p ++;\r
- }\r
- }\r
- else {\r
- while(*p) {\r
- pos++; p++;\r
- }\r
+ if(precision >= 0)\r
+ len = strnlen(p, precision);\r
+ else\r
+ len = strlen(p);\r
+ if(bPadLeft) while(minSize > len++) _addchar(pad);\r
+ while( *p ) {\r
+ if(precision >= 0 && precision -- == 0)\r
+ break;\r
+ _addchar(*p++);\r
break;\r
\r
// Unknown, just treat it as a character\r
default:\r
arg = va_arg(args, uint32_t);\r
break;\r
\r
// Unknown, just treat it as a character\r
default:\r
arg = va_arg(args, uint32_t);\r