diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-14 14:42:59 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-14 14:42:59 -0800 |
| commit | 168667c972a1e9ede5b64ad6cee0666e9b96d4d8 (patch) | |
| tree | d4312b237b885460537ce9dc8fe53e26564a7d48 /libc/stdio | |
| parent | 898aab282cff2a2949bc1726f8a4b81c1c30148e (diff) | |
| download | bionic-168667c972a1e9ede5b64ad6cee0666e9b96d4d8.zip bionic-168667c972a1e9ede5b64ad6cee0666e9b96d4d8.tar.gz bionic-168667c972a1e9ede5b64ad6cee0666e9b96d4d8.tar.bz2 | |
Add non-macro stdin/stdout/stderr too.
Various C and C++ standards explicitly say that stdin/stdout/stderr
should be macros, but glibc makes them global variables too. This
means it's possible to write code that uses those names as locals,
but that code (toybox being an example) won't build on bionic.
If we'd done this earlier, we could have hidden __sF for LP64, but
it's too late now.
Change-Id: I90cf8c73f52b66e1760b8fa2e135b9f9f9651230
Diffstat (limited to 'libc/stdio')
| -rw-r--r-- | libc/stdio/fileext.h | 4 | ||||
| -rw-r--r-- | libc/stdio/findfp.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libc/stdio/fileext.h b/libc/stdio/fileext.h index 7efff8f..dc89fff 100644 --- a/libc/stdio/fileext.h +++ b/libc/stdio/fileext.h @@ -43,10 +43,6 @@ struct __sfileext { pthread_mutex_t _lock; /* file lock */ }; -__LIBC_HIDDEN__ extern struct __sfileext __sFext[3]; - -#define _FILEEXT_INITIALIZER {{NULL,0},{0},PTHREAD_RECURSIVE_MUTEX_INITIALIZER} - #define _EXT(fp) ((struct __sfileext *)((fp)->_ext._base)) #define _UB(fp) _EXT(fp)->_ub #define _FLOCK(fp) _EXT(fp)->_lock diff --git a/libc/stdio/findfp.c b/libc/stdio/findfp.c index ef8e9e6..5e51198 100644 --- a/libc/stdio/findfp.c +++ b/libc/stdio/findfp.c @@ -59,12 +59,15 @@ static struct glue uglue = { 0, FOPEN_MAX - 3, usual }; static struct glue *lastglue = &uglue; _THREAD_PRIVATE_MUTEX(__sfp_mutex); -struct __sfileext __sFext[3]; +static struct __sfileext __sFext[3]; FILE __sF[3] = { std(__SRD, STDIN_FILENO), /* stdin */ std(__SWR, STDOUT_FILENO), /* stdout */ std(__SWR|__SNBF, STDERR_FILENO) /* stderr */ }; +FILE* stdin = &__sF[0]; +FILE* stdout = &__sF[1]; +FILE* stderr = &__sF[2]; struct glue __sglue = { &uglue, 3, __sF }; static struct glue * |