diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:44:17 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 17:03:24 -0800 |
| commit | 0e36f078d4a9666303340506638726d316096e07 (patch) | |
| tree | 173987ffb4995f03b518825885531fc1e6b2e9d0 /system | |
| parent | cd1edebb5034ea52396a5b68304e84ae80878740 (diff) | |
add fputwc, which enables wprintf1.8.9
Diffstat (limited to 'system')
| -rw-r--r-- | system/lib/libc/musl/readme.txt | 3 | ||||
| -rw-r--r-- | system/lib/libc/musl/src/internal/stdio_impl.h | 6 | ||||
| -rw-r--r-- | system/lib/libc/musl/src/stdio/fputwc.c | 39 |
3 files changed, 48 insertions, 0 deletions
diff --git a/system/lib/libc/musl/readme.txt b/system/lib/libc/musl/readme.txt index 9ca04036..5e6f8389 100644 --- a/system/lib/libc/musl/readme.txt +++ b/system/lib/libc/musl/readme.txt @@ -7,3 +7,6 @@ Differences from upstream musl include: ino_t, dev_t, blkcnt_t, fsblkcnt_t, fsfilcnt_t, rlim_t. * We don't define _POSIX_SHARED_MEMORY_OBJECTS. * We flag __assert_fail as _Noreturn. +* Disable FLOCK, FUNLOCK and FFINALLOCK +* Simplify fputwc to not rely on musl stream internals + diff --git a/system/lib/libc/musl/src/internal/stdio_impl.h b/system/lib/libc/musl/src/internal/stdio_impl.h index 2083b2fe..6bcd44dc 100644 --- a/system/lib/libc/musl/src/internal/stdio_impl.h +++ b/system/lib/libc/musl/src/internal/stdio_impl.h @@ -7,9 +7,15 @@ #define UNGET 8 +#if 1 // XXX EMSCRIPTEN +#define FFINALLOCK(f) 0 +#define FLOCK(f) 0 +#define FUNLOCK(f) 0 +#else #define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0) #define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0) #define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else +#endif #define F_PERM 1 #define F_NORD 4 diff --git a/system/lib/libc/musl/src/stdio/fputwc.c b/system/lib/libc/musl/src/stdio/fputwc.c new file mode 100644 index 00000000..11db2804 --- /dev/null +++ b/system/lib/libc/musl/src/stdio/fputwc.c @@ -0,0 +1,39 @@ +#include "stdio_impl.h" +#include <wchar.h> +#include <limits.h> +#include <ctype.h> + +wint_t __fputwc_unlocked(wchar_t c, FILE *f) +{ + char mbc[MB_LEN_MAX]; + int l; + + f->mode |= f->mode+1; + + if (isascii(c)) { +#if 0 // XXX EMSCRIPTEN + c = putc_unlocked(c, f); + } else if (f->wpos + MB_LEN_MAX < f->wend) { + l = wctomb((void *)f->wpos, c); + if (l < 0) c = WEOF; + else f->wpos += l; +#else + c = fputc(c, f); +#endif + } else { + l = wctomb(mbc, c); + if (l < 0 || __fwritex((void *)mbc, l, f) < l) c = WEOF; + } + return c; +} + +wint_t fputwc(wchar_t c, FILE *f) +{ + FLOCK(f); + c = __fputwc_unlocked(c, f); + FUNLOCK(f); + return c; +} + +weak_alias(__fputwc_unlocked, fputwc_unlocked); +weak_alias(__fputwc_unlocked, putwc_unlocked); |