#define _stdout 1\r
\r
// === PROTOTYPES ===\r
-EXPORT void itoa(char *buf, uint64_t num, int base, int minLength, char pad, int bSigned);\r
+EXPORT void itoa(char *buf, uint64_t num, uint base, int minLength, char pad, int bSigned);\r
struct sFILE *get_file_struct();\r
\r
// === GLOBALS ===\r
\r
// === CODE ===\r
/**\r
- * \fn FILE *freopen(FILE *fp, char *file, char *mode)\r
+ * \fn FILE *freopen(char *file, char *mode, FILE *fp)\r
*/\r
-EXPORT FILE *freopen(FILE *fp, char *file, char *mode)\r
+EXPORT FILE *freopen(const char *file, const char *mode, FILE *fp)\r
{\r
int openFlags = 0;\r
int i;\r
\r
if(fp->Flags) {\r
fflush(fp);\r
- close(fp->FD);\r
- }\r
+ } else\r
+ fp->FD = -1;\r
\r
// Get main mode\r
switch(mode[0])\r
}\r
\r
//Open File\r
- fp->FD = reopen(fp->FD, file, openFlags);\r
+ if(fp->FD != -1)\r
+ fp->FD = reopen(fp->FD, file, openFlags);\r
+ else\r
+ fp->FD = open(file, openFlags);\r
if(fp->FD == -1) {\r
fp->Flags = 0;\r
return NULL;\r
return fp;\r
}\r
/**\r
- \fn FILE *fopen(char *file, char *mode)\r
+ \fn FILE *fopen(const char *file, const char *mode)\r
\brief Opens a file and returns the pointer\r
\param file String - Filename to open\r
\param mode Mode to open in\r
*/\r
-EXPORT FILE *fopen(char *file, char *mode)\r
+EXPORT FILE *fopen(const char *file, const char *mode)\r
{\r
FILE *retFile;\r
\r
// Create Return Structure\r
retFile = get_file_struct();\r
\r
- return freopen(retFile, file, mode);\r
+ return freopen(file, mode, retFile);\r
}\r
\r
EXPORT void fclose(FILE *fp)\r
///\todo Implement\r
}\r
\r
+EXPORT long int ftell(FILE *fp)\r
+{\r
+ if(!fp || !fp->FD) return -1;\r
+ \r
+ return tell(fp->FD);\r
+}\r
+\r
+EXPORT int fseek(FILE *fp, long int amt, int whence)\r
+{\r
+ if(!fp || !fp->FD) return -1;\r
+ \r
+ return seek(fp->FD, amt, whence);\r
+}\r
+\r
+\r
/**\r
* \fn EXPORT int vfprintf(FILE *fp, const char *format, va_list args)\r
* \brief Print to a file from a variable argument list\r
*/\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 *buf;\r
- \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 = vsprintf(NULL, (char*)format, tmpList);\r
+ size = vsnprintf(sbuf, 1024, (char*)format, tmpList);\r
\r
- buf = (char*)malloc(size+1);\r
- buf[size] = '\0';\r
+ if( size >= 1024 )\r
+ {\r
+ buf = (char*)malloc(size+1);\r
+ if(!buf) {\r
+ write(_stdout, 31, "vfprintf ERROR: malloc() failed");\r
+ return 0;\r
+ }\r
+ buf[size] = '\0';\r
\r
- // Print\r
- vsprintf(buf, (char*)format, args);\r
+ // Print\r
+ vsnprintf(buf, size+1, (char*)format, args);\r
+ }\r
\r
// Write to stream\r
- write(fp->FD, size+1, buf);\r
+ write(fp->FD, size, buf);\r
\r
// Free buffer\r
free(buf);\r
}\r
\r
/**\r
+ * \fn EXPORT size_t fwrite(void *ptr, size_t size, size_t num, FILE *fp)\r
+ * \brief Write to a stream\r
*/\r
EXPORT size_t fwrite(void *ptr, size_t size, size_t num, FILE *fp)\r
{\r
return ret;\r
}\r
\r
+/**\r
+ * \fn EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)\r
+ * \brief Read from a stream\r
+ */\r
+EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)\r
+{\r
+ int ret;\r
+ if(!fp || !fp->FD) return -1;\r
+ \r
+ ret = read(fp->FD, size*num, ptr);\r
+ \r
+ return ret;\r
+}\r
+\r
/**\r
* \fn EXPORT int fputc(int c, FILE *fp)\r
* \brief Write a single character to the stream\r
return len;\r
}\r
\r
+EXPORT int vsprintf(char * __s, const char *__format, va_list __args)\r
+{\r
+ return vsnprintf(__s, 0x7FFFFFFF, __format, __args);\r
+}\r
+\r
//sprintfv\r
/**\r
- \fn EXPORT void vsprintf(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 vsprintf(char *buf, const char *format, va_list args)\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[33];\r
+ char tmp[65];\r
int c, minSize;\r
int pos = 0;\r
char *p;\r
{\r
// Non-control character\r
if (c != '%') {\r
- if(buf) buf[pos] = c;\r
+ if(buf && pos < __maxlen) buf[pos] = c;\r
pos ++;\r
continue;\r
}\r
// Control Character\r
c = *format++;\r
if(c == '%') { // Literal %\r
- if(buf) buf[pos] = '%';\r
+ if(buf && pos < __maxlen) buf[pos] = '%';\r
pos ++;\r
continue;\r
}\r
\r
// Pointer\r
case 'p':\r
- if(buf) {\r
+ if(buf && pos+2 < __maxlen) {\r
buf[pos] = '*';\r
buf[pos+1] = '0';\r
buf[pos+2] = 'x';\r
}\r
pos += 3;\r
+ arg = va_arg(args, uint32_t);\r
+ itoa(tmp, arg, 16, minSize, pad, 0);\r
+ goto sprintf_puts;\r
// Fall through to hex\r
// Unsigned Hexadecimal\r
case 'x':\r
p = (void*)(intptr_t)arg;\r
sprintf_puts:\r
if(!p) p = "(null)";\r
+ //_SysDebug("vsnprintf: p = '%s'", p);\r
if(buf) {\r
while(*p) {\r
- buf[pos++] = *p++;\r
+ if(pos < __maxlen) buf[pos] = *p;\r
+ pos ++; p ++;\r
}\r
}\r
else {\r
// Unknown, just treat it as a character\r
default:\r
arg = va_arg(args, uint32_t);\r
- if(buf) buf[pos] = arg;\r
+ if(buf && pos < __maxlen) buf[pos] = arg;\r
pos ++;\r
break;\r
}\r
}\r
- if(buf) buf[pos] = '\0';\r
+ if(buf && pos < __maxlen) buf[pos] = '\0';\r
+ \r
+ //_SysDebug("vsnprintf: buf = '%s'", buf);\r
\r
return pos;\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, int 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
{\r
- char tmpBuf[32];\r
+ char tmpBuf[64];\r
int pos=0, i;\r
\r
if(!buf) return;\r
- if(base > 16) {\r
+ if(base > 16 || base < 2) {\r
buf[0] = 0;\r
return;\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 = (long) num / base; // Shift {number} right 1 digit\r
- pos++;\r
+ tmpBuf[pos++] = cUCDIGITS[ num % base ];\r
+ num = (uint64_t) num / (uint64_t)base; // Shift {number} right 1 digit\r
}\r
\r
tmpBuf[pos++] = cUCDIGITS[ num % base ]; // Last digit of {number}\r
if(bSigned) tmpBuf[pos++] = '-'; // Append sign symbol if needed\r
+ \r
i = 0;\r
minLength -= pos;\r
while(minLength-- > 0) buf[i++] = pad;\r
{\r
#if 1\r
int size;\r
- char *buf;\r
+ char sbuf[1024];\r
+ char *buf = sbuf;\r
va_list args;\r
\r
// Get final size\r
va_start(args, format);\r
- size = vsprintf(NULL, (char*)format, args);\r
+ size = vsnprintf(sbuf, 1024, (char*)format, args);\r
va_end(args);\r
\r
- // Allocate buffer\r
- buf = (char*)malloc(size+1);\r
- buf[size] = '\0';\r
+ if( size >= 1024 ) {\r
+ // Allocate buffer\r
+ buf = (char*)malloc(size+1);\r
+ if(buf) {\r
+ write(_stdout, 29, "PRINTF ERROR: malloc() failed");\r
+ return 0;\r
+ }\r
+ buf[size] = '\0';\r
\r
- // Fill Buffer\r
- va_start(args, format);\r
- vsprintf(buf, (char*)format, args);\r
- va_end(args);\r
+ // Fill Buffer\r
+ va_start(args, format);\r
+ vsnprintf(buf, size+1, (char*)format, args);\r
+ va_end(args);\r
+ }\r
\r
// Send to stdout\r
write(_stdout, size+1, buf);\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