diff options
author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
---|---|---|
committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
commit | 09e967c2d732783b2579e4e120cd9b608404cb00 (patch) | |
tree | 8d2783a6a7e33608c6012efd6a88b8f5694df81d /mdk-stage1/dietlibc/libstdio/stdin.c | |
parent | 18fcff49d3c836697d3b75a3d01d31c700e69974 (diff) | |
download | drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.gz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.bz2 drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.xz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.zip |
Merge from R9_0-AMD64, most notably:
- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes
Diffstat (limited to 'mdk-stage1/dietlibc/libstdio/stdin.c')
-rw-r--r-- | mdk-stage1/dietlibc/libstdio/stdin.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/mdk-stage1/dietlibc/libstdio/stdin.c b/mdk-stage1/dietlibc/libstdio/stdin.c index 2db82f9ab..217f3f609 100644 --- a/mdk-stage1/dietlibc/libstdio/stdin.c +++ b/mdk-stage1/dietlibc/libstdio/stdin.c @@ -1,13 +1,23 @@ #include <dietstdio.h> -#ifdef WANT_BUFFERED_STDIO -static FILE __stdin = { 0, BUFINPUT, 0, 0 }; - -int __fflush_stdin() { - return fflush(stdin); -} -#else -static FILE __stdin = { 0, 0 }; +static char __stdin_buf[BUFSIZE]; +static FILE __stdin = { + .fd=0, + .flags=BUFINPUT|STATICBUF, + .bs=0, .bm=0, + .buflen=BUFSIZE, + .buf=__stdin_buf, + .next=0, + .popen_kludge=0, + .ungetbuf=0, + .ungotten=0 +#ifdef WANT_THREAD_SAFE + , .m=PTHREAD_MUTEX_INITIALIZER #endif +}; FILE *stdin=&__stdin; + +int __fflush_stdin(void) { + return fflush(stdin); +} |