diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-02-01 22:05:36 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-02-01 22:05:36 +0000 |
commit | 88815225fdabe7fa862f1c07abfcc971fdf5b04e (patch) | |
tree | 7aaae7c04fcf06aea85505fc028f476a131b9c50 /libgcompat/stdio.c | |
parent | c545f7393f0a10c182c2c085a36d7099b9c07a7f (diff) | |
parent | 78722ef403ffadcb78917e93e1859d43b9bf9df5 (diff) | |
download | gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.gz gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.bz2 gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.xz gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.zip |
Merge branch 'patch-1' into 'master'
Clean up everything and add lots of new functions
I hope everything here is okay. I fixed some bugs in existing functions (mostly wrong prototypes or off-by-one errors) and formatted everything to a consistent style. If you'd like me to adjust the style, that's no problem. It wasn't very consistent to start with (within the code, and compared to the documentation).
*I added specific notes you may want to comment on to some of the commit messages.*
Major features:
* Pass correct `argv[0]` in loader
* Intercept `readlink("/proc/self/exe")` to allow re-exec
* Add almost all reasonable-to-implement functions in LSB 5.0.0 core generic libc. Remaining functions are:
- Impossible-to-implement: sigreturn
- Not useful: reentrant random (`*rand48_r`, etc.), argz, envz, pmap, rpc (clnt_*, svc*, xdr*), bindresvport
- Got tired of it: checked wchar
* Add additional functions used by android and its NDK tools (clang, cmake, lldb, ninja, etc.).
At this point, I am able to run Android Studio with the bundled prebuilt JDK, and compile, install, and run an android application (including one with native libraries) on a real device, with only a few minor issues:
* must export `LD_LIBRARY_PATH=/opt/android-studio/jre/jre/lib/amd64/server` because musl and glibc interpret the variable differently with regards to `dlopen`. This is something that has to be patched in musl builds of openjdk, so it's not a gcompat issue.
* ld.bfd fails to parse the argument `--sysroot=/path`, but can parse `--sysroot /path`. So there's some difference with `getopt_long_only` (or getopt in general). May be a bug, may be just an API difference. May be it can be patched up.
* LLDB fails to connect to the android phone for native debugging -- I haven't tried it on glibc yet, so it may not be a gcompat issue at all (may be a phone or the app issue).
I'd be happy to send some documentation later.
See merge request !1
Diffstat (limited to 'libgcompat/stdio.c')
-rw-r--r-- | libgcompat/stdio.c | 280 |
1 files changed, 193 insertions, 87 deletions
diff --git a/libgcompat/stdio.c b/libgcompat/stdio.c index 89bd677..0ff5feb 100644 --- a/libgcompat/stdio.c +++ b/libgcompat/stdio.c @@ -1,130 +1,236 @@ -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <wchar.h> - -size_t __fread_chk(void *ptr, size_t size, size_t nmemb, FILE *stream) +#define _GNU_SOURCE /* fgets_unlocked */ +#include <assert.h> /* assert */ +#include <stdarg.h> /* va_list, va_start, va_end */ +#include <stddef.h> /* NULL, size_t */ +#include <stdio.h> /* feof, fgets, fread, puts, v*printf */ + +int __vasprintf_chk(char **strp, int flag, const char *format, va_list ap); +int __vfprintf_chk(FILE *stream, int flag, const char *format, va_list ap); +int __vsnprintf_chk(char *s, size_t n, int flag, size_t slen, + const char *format, va_list ap); +int __vsprintf_chk(char *s, int flag, size_t slen, const char *format, + va_list ap); + +/** + * Test end-of-file indicator on a stream. + * + * LSB 5.0: LSB-Core-generic/baselib--io-feof-3.html + */ +int _IO_feof(FILE *stream) { - assert(ptr != NULL); - assert(stream != NULL); - return fread(ptr, size, nmemb, stream); + return feof(stream); } -int __printf_chk(int flag, const char *format, ...) +/** + * Put a string on standard output. + * + * LSB 5.0: LSB-Core-generic/baselib--io-puts-3.html + */ +int _IO_puts(const char *c) { - va_list argp; - int result; + return puts(c); +} - if(flag > 0) - { - assert(format != NULL); - } +/** + * Print to allocated string, with stack checking. + */ +int __asprintf_chk(char **strp, int flag, const char *format, ...) +{ + int ret; + va_list ap; - va_start(argp, format); - result = vprintf(format, argp); - va_end(argp); + va_start(ap, format); + ret = __vasprintf_chk(strp, flag, format, ap); + va_end(ap); - return result; + return ret; } -int __fprintf_chk(FILE *stream, int flag, const char *format, ...) +/** + * String input, with buffer overflow checking. + * + * LSB 5.0: LSB-Core-generic/baselib---fgets-chk-1.html + */ +char *__fgets_chk(char *s, size_t slen, int n, FILE *stream) { - va_list argp; - int result; + assert(s != NULL); + assert(slen >= (size_t) n); + assert(n > 0); + assert(stream != NULL); - if(flag > 0) - { - assert(stream != NULL); - assert(format != NULL); - } + return fgets(s, n, stream); +} - va_start(argp, format); - result = vfprintf(stream, format, argp); - va_end(argp); +/** + * Non-locking string input, with buffer overflow checking. + * + * LSB 5.0: LSB-Core-generic/baselib---fgets-unlocked-chk-1.html + */ +char *__fgets_unlocked_chk(char *s, size_t slen, int n, FILE *stream) +{ + assert(s != NULL); + assert(slen >= (size_t) n); + assert(n > 0); + assert(stream != NULL); - return result; + return fgets_unlocked(s, n, stream); } -int __sprintf_chk(char *str, int flag, size_t strlen, const char *format, ...) +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---fprintf-chk-1.html + */ +int __fprintf_chk(FILE *stream, int flag, const char *format, ...) { - va_list argp; - int result; - - assert(strlen > 0); + int ret; + va_list ap; - va_start(argp, format); - result = vsnprintf(str, strlen, format, argp); - va_end(argp); + va_start(ap, format); + ret = __vfprintf_chk(stream, flag, format, ap); + va_end(ap); - return result; + return ret; } -int __snprintf_chk(char *str, size_t size, int flag, size_t strlen, const char *format, ...) +/** + * Binary input, with stack checking. + */ +size_t __fread_chk(void *buf, size_t buflen, size_t size, size_t nitems, + FILE *stream) { - va_list argp; - int result; + assert(buf != NULL); + assert(size > 0); + assert(buflen / size >= nitems); + assert(stream != NULL); - if(flag > 0) - { - assert(format != NULL); - } - // must always be done per LFS - assert(size <= strlen); + return fread(buf, size, nitems, stream); +} - va_start(argp, format); - result = vsnprintf(str, size, format, argp); - va_end(argp); +/** + * Format and print data, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---printf-chk-1.html + */ +int __printf_chk(int flag, const char *format, ...) +{ + int ret; + va_list ap; + + va_start(ap, format); + ret = __vfprintf_chk(stdout, flag, format, ap); + va_end(ap); - return result; + return ret; } -int __swprintf_chk(wchar_t *wcs, size_t maxlen, int flag, size_t wcslen, const wchar_t *format, ...) +/** + * Convert formatted output, with buffer overflow checking. + * + * LSB 5.0: LSB-Core-generic/baselib---snprintf-chk-1.html + */ +int __snprintf_chk(char *s, size_t n, int flag, size_t slen, const char *format, + ...) { - va_list argp; - int result; + int ret; + va_list ap; - if(flag > 0) - { - assert(format != NULL); - } - // must always be done per LFS - assert(maxlen <= wcslen); + va_start(ap, format); + ret = __vsnprintf_chk(s, n, flag, slen, format, ap); + va_end(ap); - va_start(argp, format); - result = vswprintf(wcs, maxlen, format, argp); - va_end(argp); + return ret; +} - return result; +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---sprintf-chk-1.html + */ +int __sprintf_chk(char *s, int flag, size_t slen, const char *format, ...) +{ + int ret; + va_list ap; + + va_start(ap, format); + ret = __vsprintf_chk(s, flag, slen, format, ap); + va_end(ap); + + return ret; } -int __vasprintf_chk(char **strp, int flag, const char *fmt, va_list ap) +/** + * Print to allocated string, with stack checking. + */ +int __vasprintf_chk(char **strp, int flag, const char *format, va_list ap) { - if(flag > 0) - { - assert(strp != NULL); - assert(fmt != NULL); - } - return vasprintf(strp, fmt, ap); + assert(strp != NULL); + assert(format != NULL); + + return vasprintf(strp, format, ap); } +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---vfprintf-chk-1.html + */ int __vfprintf_chk(FILE *stream, int flag, const char *format, va_list ap) { - if(flag > 0) - { - assert(stream != NULL); - assert(format != NULL); - } + assert(stream != NULL); + assert(format != NULL); + return vfprintf(stream, format, ap); } -int __vsnprintf_chk(char *str, size_t size, int flag, size_t strlen, const char *format, va_list ap) +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---vprintf-chk-1.html + */ +int __vprintf_chk(int flag, const char *format, va_list ap) { - if(flag > 0) - { - assert(format != NULL); - } - // must always be done per LFS - assert(size <= strlen); - return vsnprintf(str, size, format, ap); + return __vfprintf_chk(stdout, flag, format, ap); } +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---vsnprintf-chk-1.html + */ +int __vsnprintf_chk(char *s, size_t n, int flag, size_t slen, + const char *format, va_list ap) +{ + assert(s != NULL || n == 0); + assert(slen >= n); + assert(format != NULL); + + return vsnprintf(s, n, format, ap); +} + +/** + * Convert formatted output, with stack checking. + * + * LSB 5.0: LSB-Core-generic/baselib---vsprintf-chk-1.html + */ +int __vsprintf_chk(char *s, int flag, size_t slen, const char *format, + va_list ap) +{ + assert(s != NULL); + assert(slen > 0); + assert(format != NULL); + + return vsprintf(s, format, ap); +} + +/** + * Create a name for a temporary file. + */ +char *tmpnam_r(char *s) +{ + if (s == NULL) { + return NULL; + } + + return tmpnam(s); +} |