diff options
| author | Nathan Reiner <nathan@nathanreiner.xyz> | 2022-12-19 23:10:44 +0100 |
|---|---|---|
| committer | Nathan Reiner <nathan@nathanreiner.xyz> | 2022-12-19 23:10:44 +0100 |
| commit | 6f77c541db4f58d7a3fbc8fbd52caa4c379a884e (patch) | |
| tree | cfb1fb6d46f984d4ba3278f2be1f3fbd9aeeb23d /lib/io | |
| parent | 85139c4208063a911d9ac8c871dc1052d2712c17 (diff) | |
add aec to wstdf
Diffstat (limited to 'lib/io')
| -rw-r--r-- | lib/io/Makefile | 2 | ||||
| -rw-r--r-- | lib/io/io.c | 19 | ||||
| -rwxr-xr-x | lib/io/test | bin | 20240 -> 26504 bytes |
3 files changed, 17 insertions, 4 deletions
diff --git a/lib/io/Makefile b/lib/io/Makefile index e60a656..73aa785 100644 --- a/lib/io/Makefile +++ b/lib/io/Makefile @@ -1,3 +1,3 @@ unit_test: - gcc io.c ../cstr/cstr.c ../sys/start.S -o test -static -nostdlib -fno-stack-protector -Wno-implicit-function-declaration -g + gcc io.c ../aec/aec.c ../cstr/cstr.c ../env/env.c ../sys/start.S -o test -static -nostdlib -fno-stack-protector -Wno-implicit-function-declaration -DIO_LIB_UNIT_TEST -g ./test diff --git a/lib/io/io.c b/lib/io/io.c index 160b4cb..3b0ea96 100644 --- a/lib/io/io.c +++ b/lib/io/io.c @@ -1,6 +1,7 @@ #include "io.h" #include "../cstr/cstr.h" +#include "../aec/aec.h" void __wstdn(const char *buf, u64 n) { @@ -33,7 +34,20 @@ void wstdf__(const char *buf, const void **args) case '%': __wstdn("%", 1); break; case 's': __wstdn(((const char **)args)[0], cstr_length(((const char**)args)[0])); - ++args; break; + ++args; + break; + case 'S': + sgr(((const char **)args)[0]); + ++args; + break; + case 'F': + foreground(((const char **)args)[0]); + ++args; + break; + case 'B': + background(((const char **)args)[0]); + ++args; + break; } start = buf + 1; @@ -46,7 +60,6 @@ void wstdf__(const char *buf, const void **args) #ifdef IO_LIB_UNIT_TEST int main() { - void *args[] = { "hallo", "welt" }; - wstdf__("%s %s\n", args); + wstdf("%s %S%F%s%S\n", "hallo", SGR_UNDERLINE, COLOR_RED, "welt", SGR_RESET); } #endif diff --git a/lib/io/test b/lib/io/test Binary files differindex 560b047..b2a3047 100755 --- a/lib/io/test +++ b/lib/io/test |