apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libc: make fprintf actually write to the chosen file

Browse Source 
Also, printf now is kind of an alias for fprintf(stdout,...), as it should be.
This commit is contained in:
apio 2022-10-11 21:10:19 +02:00
parent 2f46e46aa4
commit 0f47f59364
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/libc/src/printf.cpp
View File

@ -306,8 +306,7 @@ extern "C"
{ {
int vprintf(const char* format, va_list ap) int vprintf(const char* format, va_list ap)
{ {
return internal_printf( return vfprintf(stdout, format, ap);
format, [](const char* s) { syscall(SYS_write, s, strlen(s)); }, -1, ap);
} }
int vsprintf(char* str, const char* format, va_list ap) int vsprintf(char* str, const char* format, va_list ap)
@ -352,23 +351,23 @@ extern "C"
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
int written = vprintf(format, ap); int written = vfprintf(stdout, format, ap);
va_end(ap); va_end(ap);
return written; return written;
} }
int fprintf(FILE*, const char* format, ...) // FIXME: Make fprintf print to the selected file instead of stdout. int fprintf(FILE* stream, const char* format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
int written = vprintf(format, ap); int written = vfprintf(stream, format, ap);
va_end(ap); va_end(ap);
return written; return written;
} }
int vfprintf(FILE*, const char* format, int vfprintf(FILE* stream, const char* format, va_list ap)
va_list ap) // FIXME: Make vfprintf print to the selected file instead of stdout.
{ {
return vprintf(format, ap); return internal_printf(
format, [&](const char* s) { fwrite(s, strlen(s), 1, stream); }, -1, ap);
} }
} }