75214cfe0
Dan Fandrich
2011-06-30
Subject
Use the _unlocked stdio macros only when they're all available
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+20 -16
| @@ -161,23 +161,27 @@ int sysinfo(struct sysinfo* info); | |
| /* Busybox does not use threads, we can speed up stdio. */ | |
| - | #undef getc |
| - | #define getc(stream) getc_unlocked(stream) |
| - | #undef getchar |
| - | #define getchar() getchar_unlocked() |
| - | #undef putc |
| - | #define putc(c, stream) putc_unlocked(c, stream) |
| - | #undef putchar |
| - | #define putchar(c) putchar_unlocked(c) |
| - | #undef fgetc |
| - | #define fgetc(stream) getc_unlocked(stream) |
| - | #undef fputc |
| - | #define fputc(c, stream) putc_unlocked(c, stream) |
| + | #ifdef HAVE_UNLOCKED_STDIO |
| + | # undef getc |
| + | # define getc(stream) getc_unlocked(stream) |
| + | # undef getchar |
| + | # define getchar() getchar_unlocked() |
| + | # undef putc |
| + | # define putc(c, stream) putc_unlocked(c, stream) |
| + | # undef putchar |
| + | # define putchar(c) putchar_unlocked(c) |
| + | # undef fgetc |
| + | # define fgetc(stream) getc_unlocked(stream) |
| + | # undef fputc |
| + | # define fputc(c, stream) putc_unlocked(c, stream) |
| + | #endif |
| /* Above functions are required by POSIX.1-2008, below ones are extensions */ | |
| - | #undef fgets |
| - | #define fgets(s, n, stream) fgets_unlocked(s, n, stream) |
| - | #undef fputs |
| - | #define fputs(s, stream) fputs_unlocked(s, stream) |
| + | #ifdef HAVE_UNLOCKED_LINE_OPS |
| + | # undef fgets |
| + | # define fgets(s, n, stream) fgets_unlocked(s, n, stream) |
| + | # undef fputs |
| + | # define fputs(s, stream) fputs_unlocked(s, stream) |
| + | #endif |
| /* Make all declarations hidden (-fvisibility flag only affects definitions) */ | |
include/platform.h+5 -5
| @@ -350,16 +350,14 @@ typedef unsigned smalluint; | |
| #define HAVE_STRSIGNAL 1 | |
| #define HAVE_STRVERSCMP 1 | |
| #define HAVE_VASPRINTF 1 | |
| + | #define HAVE_UNLOCKED_STDIO 1 |
| + | #define HAVE_UNLOCKED_LINE_OPS 1 |
| #define HAVE_GETLINE 1 | |
| #define HAVE_XTABS 1 | |
| #define HAVE_MNTENT_H 1 | |
| #define HAVE_NET_ETHERNET_H 1 | |
| #define HAVE_SYS_STATFS_H 1 | |
| - | #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 1) |
| - | # undef HAVE_NET_ETHERNET_H |
| - | #endif |
| - | |
| #if defined(__UCLIBC_MAJOR__) | |
| # if __UCLIBC_MAJOR__ == 0 \ | |
| && ( __UCLIBC_MINOR__ < 9 \ | |
| @@ -369,7 +367,6 @@ typedef unsigned smalluint; | |
| # endif | |
| #endif | |
| - | |
| #if defined(__dietlibc__) | |
| # undef HAVE_STRCHRNUL | |
| #endif | |
| @@ -387,6 +384,8 @@ typedef unsigned smalluint; | |
| # undef HAVE_STRSIGNAL | |
| # undef HAVE_STRVERSCMP | |
| # undef HAVE_VASPRINTF | |
| + | # undef HAVE_UNLOCKED_STDIO |
| + | # undef HAVE_UNLOCKED_LINE_OPS |
| # undef HAVE_NET_ETHERNET_H | |
| #endif | |
| @@ -424,6 +423,7 @@ typedef unsigned smalluint; | |
| # undef HAVE_STPCPY | |
| # undef HAVE_STRCHRNUL | |
| # undef HAVE_STRVERSCMP | |
| + | # undef HAVE_UNLOCKED_LINE_OPS |
| # undef HAVE_NET_ETHERNET_H | |
| #endif | |