*/\r
EXPORT int vfprintf(FILE *fp, const char *format, va_list args)\r
{\r
- va_list tmpList = args;\r
+ va_list tmpList;\r
int size;\r
char sbuf[1024];\r
char *buf = sbuf;\r
- \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
\r
*/\r
EXPORT int fgetc(FILE *fp)\r
{\r
- int ret = 0;\r
+ char ret = 0;\r
if(!fp) return -1;\r
if(read(fp->FD, 1, &ret) == -1) return -1;\r
return ret;\r
\r
//sprintfv\r
/**\r
- \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)\r
- \brief Prints a formatted string to a buffer\r
- \param buf Pointer - Destination Buffer\r
- \param format String - Format String\r
- \param args VarArgs List - Arguments\r
-*/\r
+ * \fn EXPORT void vsnprintf(char *buf, const char *format, va_list args)\r
+ * \brief Prints a formatted string to a buffer\r
+ * \param buf Pointer - Destination Buffer\r
+ * \param format String - Format String\r
+ * \param args VarArgs List - Arguments\r
+ */\r
EXPORT int vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args)\r
{\r
char tmp[65];\r
- int c, minSize;\r
+ int c, minSize, precision, len;\r
int pos = 0;\r
char *p;\r
char pad;\r
uint64_t arg;\r
- int bLongLong;\r
+ int bLongLong, bPadLeft;\r
+\r
+ void _addchar(char ch)\r
+ {\r
+ if(buf && pos < __maxlen) buf[pos] = ch;\r
+ pos ++;\r
+ }\r
\r
tmp[32] = '\0';\r
\r
{\r
// Non-control character\r
if (c != '%') {\r
- if(buf && pos < __maxlen) buf[pos] = c;\r
- pos ++;\r
+ _addchar(c);\r
continue;\r
}\r
\r
// Control Character\r
c = *format++;\r
if(c == '%') { // Literal %\r
- if(buf && pos < __maxlen) buf[pos] = '%';\r
- pos ++;\r
+ _addchar('%');\r
continue;\r
}\r
\r
- // Padding\r
+ bPadLeft = 0;\r
+ bLongLong = 0;\r
+ minSize = 0;\r
+ precision = -1;\r
+ pad = ' ';\r
+ \r
+ // Padding Character\r
if(c == '0') {\r
pad = '0';\r
c = *format++;\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
{\r
- minSize *= 10;\r
- minSize += c - '0';\r
+ minSize = 0;\r
+ while('0' <= c && c <= '9')\r
+ {\r
+ minSize *= 10;\r
+ minSize += c - '0';\r
+ c = *format++;\r
+ }\r
+ }\r
+ }\r
+\r
+ // Precision\r
+ if(c == '.') {\r
+ c = *format++;\r
+ if(c == '*') {\r
+ precision = va_arg(args, size_t);\r
c = *format++;\r
}\r
+ else if('1' <= c && c <= '9')\r
+ {\r
+ precision = 0;\r
+ while('0' <= c && c <= '9')\r
+ {\r
+ precision *= 10;\r
+ precision += c - '0';\r
+ c = *format++;\r
+ }\r
+ }\r
}\r
\r
// Check for long long\r
bLongLong = 1;\r
}\r
}\r
- \r
+ \r
+ // Just help things along later\r
p = tmp;\r
\r
// Get Type\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
+ precision = -1;\r
goto sprintf_puts;\r
\r
// Unsigned Integer\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
+ precision = -1;\r
goto sprintf_puts;\r
\r
// Pointer\r
case 'p':\r
- if(buf && pos+2 < __maxlen) {\r
- buf[pos] = '*';\r
- buf[pos+1] = '0';\r
- buf[pos+2] = 'x';\r
- }\r
- pos += 3;\r
+ _addchar('*');\r
+ _addchar('0');\r
+ _addchar('x');\r
arg = va_arg(args, uint32_t);\r
itoa(tmp, arg, 16, minSize, pad, 0);\r
+ precision = -1;\r
goto sprintf_puts;\r
- // Fall through to hex\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
+ precision = -1;\r
goto sprintf_puts;\r
\r
// Unsigned Octal\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
+ precision = -1;\r
goto sprintf_puts;\r
\r
// Unsigned binary\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
+ precision = -1;\r
goto sprintf_puts;\r
\r
// String\r
sprintf_puts:\r
if(!p) p = "(null)";\r
//_SysDebug("vsnprintf: p = '%s'", p);\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
}\r
+ if(!bPadLeft) while(minSize > len++) _addchar(pad);\r
break;\r
\r
// Unknown, just treat it as a character\r
default:\r
arg = va_arg(args, uint32_t);\r
- if(buf && pos < __maxlen) buf[pos] = arg;\r
- pos ++;\r
+ _addchar(arg);\r
break;\r
}\r
- }\r
- if(buf && pos < __maxlen) buf[pos] = '\0';\r
+ }\r
+ _addchar('\0');\r
+ pos --;\r
\r
//_SysDebug("vsnprintf: buf = '%s'", buf);\r
\r
/**\r
* \fn static void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned)\r
* \brief Convert an integer into a character string\r
+ * \param buf Destination Buffer\r
+ * \param num Number to convert\r
+ * \param base Base-n number output\r
+ * \param minLength Minimum length of output\r
+ * \param pad Padding used to ensure minLength\r
+ * \param bSigned Signed number output?\r
*/\r
EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)\r
{\r
} else\r
bSigned = 0;\r
\r
+ // Encode into reversed string\r
while(num > base-1) {\r
tmpBuf[pos++] = cUCDIGITS[ num % base ];\r
num = (uint64_t) num / (uint64_t)base; // Shift {number} right 1 digit\r
va_end(args);\r
return ret;\r
}\r
+\r
+/**\r
+ * \fn EXPORT int snprintf(const char *buf, size_t maxlen, char *format, ...)\r
+ * \brief Print a formatted string to a buffer\r
+ */\r
+EXPORT int snprintf(char *buf, size_t maxlen, const char *format, ...)\r
+{\r
+ int ret;\r
+ va_list args;\r
+ va_start(args, format);\r
+ ret = vsnprintf((char*)buf, maxlen, (char*)format, args);\r
+ va_end(args);\r
+ return ret;\r
+}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au