nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Libmaxsi now offers printf to user-space programs.

This commit is contained in:
Jonas 'Sortie' Termansen 2011-08-23 01:32:49 +02:00
parent 9db2c88aca
commit ea396ddd69
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmaxsi/hsrc/io.h
View File

@ -44,10 +44,14 @@ namespace Maxsi
size_t WriteAt(int FileDesc, const void* Buffer, size_t BufferSize, intmax_t Position);
}
// TODO: This namespace is hereby deprecated as it was stupid. Delete it soon.
namespace StdOut
{
size_t Print(const char* Message);
}
size_t Print(const char* msg);
size_t PrintF(const char* format, ...);
}
#endif

41
libmaxsi/io.cpp
View File

@ -25,24 +25,49 @@
#include "platform.h"
#include "syscall.h"
#include "io.h"
#include "format.h"
namespace Maxsi
{
DEFN_SYSCALL1(size_t, SysPrint, 4, const char*);
size_t Print(const char* Message)
{
return SysPrint(Message);
}
// TODO: This namespace is hereby deprecated as it was stupid. Delete it soon.
namespace StdOut
{
DEFN_SYSCALL1(size_t, SysPrint, 4, const char*);
size_t Print(const char* Message)
{
return SysPrint(Message);
}
}
size_t PrintCallback(void* user, const char* string, size_t stringlen)
{
return SysPrint(string);
}
size_t PrintF(const char* format, ...)
{
va_list list;
va_start(list, format);
size_t result = Maxsi::Format::Virtual(PrintCallback, NULL, format, list);
va_end(list);
return result;
}
#ifdef LIBMAXSI_LIBC
extern "C" int printf(const char* /*restrict*/ format, ...)
{
// TODO: The format string is currently being ignored!
return Print(format);
}
#endif
extern "C" int printf(const char* /*restrict*/ format, ...)
{
va_list list;
va_start(list, format);
size_t result = Maxsi::Format::Virtual(PrintCallback, NULL, format, list);
va_end(list);
return (int) result;
}
#endif
}