artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mescc: Tinycc support: snprintf.

Browse source 
* mlibc/include/stdarg.h (vsprintf): Declare.
* mlibc/libc-gcc.c (vsprintf): New function.
  (sprintf): Use it.
* mlibc/libc-mes+tcc.c (snprintf): Implement.
* mlibc/libc-mes.c (vsprintf): New function
  (sprintf): Use it.
This commit is contained in:
Jan Nieuwenhuizen 2017-08-12 17:38:44 +02:00
parent 3392f7241a
commit 70e3e83581
4 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mlibc/include/stdarg.h
View file

@ -43,6 +43,7 @@ typedef int va_list;
#define va_copy(dest, src) dest = src #define va_copy(dest, src) dest = src
int vprintf (char const* format, va_list ap); int vprintf (char const* format, va_list ap);
int vsprintf (char *str, char const *format, va_list ap);
int vsnprintf (char *str, size_t size, char const *format, va_list ap); int vsnprintf (char *str, size_t size, char const *format, va_list ap);
#endif // ! (__GNUC__ && POSIX) #endif // ! (__GNUC__ && POSIX)

17
mlibc/libc-gcc.c
View file

@ -389,10 +389,8 @@ printf (char const* format, ...)
} }
int int
sprintf (char *str, char const* format, ...) vsprintf (char *str, char const* format, va_list ap)
{ {
va_list ap;
va_start (ap, format);
char const *p = format; char const *p = format;
while (*p) while (*p)
if (*p != '%') if (*p != '%')
@ -411,8 +409,19 @@ sprintf (char *str, char const* format, ...)
} }
p++; p++;
} }
*str = 0;
return strlen (str);
}
int
sprintf (char *str, char const* format, ...)
{
va_list ap;
va_start (ap, format);
int r = vsprintf (str, format, ap);
va_end (ap); va_end (ap);
return 0; return r;
} }
#endif #endif

29
mlibc/libc-mes+tcc.c
View file

@ -248,8 +248,11 @@ sigemptyset (sigset_t *set)
int int
snprintf(char *str, size_t size, char const *format, ...) snprintf(char *str, size_t size, char const *format, ...)
{ {
eputs ("snprintf stub\n"); va_list ap;
return 0; va_start (ap, format);
int r = vsprintf (str, format, ap);
va_end (ap);
return r;
} }
int int
@ -337,27 +340,7 @@ time_t time (time_t *tloc)
int int
vsnprintf (char *str, size_t size, char const *format, va_list ap) vsnprintf (char *str, size_t size, char const *format, va_list ap)
{ {
char const *p = format; return vsprintf (str, format, ap);
while (*p)
if (*p != '%')
*str++ = *p++;
else
{
p++;
char c = *p;
switch (c)
{
case '%': {*str++ = *p; break;}
case 'c': {char c; c = va_arg (ap, char); *str++=c; break;}
case 'd': {int d; d = va_arg (ap, int); strcpy (str, itoa (d)); break;}
case 's': {char *s; s = va_arg (ap, char *); strcpy (str, s); break;}
default: {*str++ = *p; break;}
}
p++;
}
va_end (ap);
*str = 0;
return strlen (str);
} }
void * void *

17
mlibc/libc-mes.c
View file

@ -416,10 +416,8 @@ printf (char const* format, ...)
} }
int int
sprintf (char *str, char const* format, ...) vsprintf (char *str, char const* format, va_list ap)
{ {
va_list ap;
va_start (ap, format);
char const *p = format; char const *p = format;
while (*p) while (*p)
if (*p != '%') if (*p != '%')
@ -439,5 +437,16 @@ sprintf (char *str, char const* format, ...)
p++; p++;
} }
va_end (ap); va_end (ap);
return 0; *str = 0;
return strlen (str);
}
int
sprintf (char *str, char const* format, ...)
{
va_list ap;
va_start (ap, format);
int r = vsprintf (str, format, ap);
va_end (ap);
return r;
} }