diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libio/Versions | 2 | ||||
| -rw-r--r-- | libio/iofopncook.c | 77 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 4 | ||||
| -rw-r--r-- | linuxthreads/manager.c | 1 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 |
6 files changed, 96 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 1b518e45fa..3d6fb4f13f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ +2000-05-20 2000 H.J. Lu <hjl@gnu.org> + + * resolv/res_libc.c (_res): Initialize _sock to -1. + +2000-05-18 Jakub Jelinek <jakub@redhat.com> + + * libio/iofopncook.c (_IO_fopencookie): Renamed from fopencookie. + (fopencookie@@GLIBC_2.2): New. + (_IO_old_cookie_seek, _IO_old_fopencookie, _IO_old_cookie_jumps): New. + (fopencookie@GLIBC_2.0): New. + * libio/Versions: Add fopencookie to GLIBC_2.2. + 2000-05-18 Andreas Jaeger <aj@suse.de> + * sunrpc/rpc_main.c (parseargs): Don't accept -M and -N. + Closes PR libc/1731. + * manual/arith.texi (Parsing of Integers): Fix typo. Closes PR libc/1744, reported by blp@gnu.org. diff --git a/libio/Versions b/libio/Versions index c7a5f668a1..654ca29a89 100644 --- a/libio/Versions +++ b/libio/Versions @@ -107,7 +107,7 @@ libc { # f* fgetpos; fgetpos64; fgetwc; fgetwc_unlocked; fgetws; fgetws_unlocked; fputwc; fputwc_unlocked; fputws; fputws_unlocked; fsetpos; fsetpos64; - fwide; fwprintf; fwscanf; + fwide; fwprintf; fwscanf; fopencookie; # g* getwc; getwc_unlocked; getwchar; getwchar_unlocked; diff --git a/libio/iofopncook.c b/libio/iofopncook.c index 59034c7db4..852a483a49 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -26,7 +26,7 @@ #include <libioP.h> #include <stdio.h> #include <stdlib.h> - +#include <shlib-compat.h> /* Prototyped for local functions. */ static _IO_ssize_t _IO_cookie_read (register _IO_FILE* fp, void* buf, @@ -35,7 +35,8 @@ static _IO_ssize_t _IO_cookie_write (register _IO_FILE* fp, const void* buf, _IO_ssize_t size); static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir); static int _IO_cookie_close (_IO_FILE* fp); - +_IO_FILE * _IO_fopencookie (void *cookie, const char *mode, + _IO_cookie_io_functions_t io_functions); static _IO_ssize_t _IO_cookie_read (fp, buf, size) @@ -140,7 +141,7 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, _IO_FILE * -fopencookie (cookie, mode, io_functions) +_IO_fopencookie (cookie, mode, io_functions) void *cookie; const char *mode; _IO_cookie_io_functions_t io_functions; @@ -182,3 +183,73 @@ fopencookie (cookie, mode, io_functions) return &new_f->cfile.__file; } + +versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2); + +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) + +static _IO_off64_t _IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, + int dir); +_IO_FILE * _IO_old_fopencookie (void *cookie, const char *mode, + _IO_cookie_io_functions_t io_functions); + +static _IO_off64_t +_IO_old_cookie_seek (fp, offset, dir) + _IO_FILE *fp; + _IO_off64_t offset; + int dir; +{ + struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; + int (*seek) (_IO_FILE *, _IO_off_t, int); + int ret; + + seek = (int (*)(_IO_FILE *, _IO_off_t, int)) cfile->__io_functions.seek; + if (seek == NULL) + return _IO_pos_BAD; + + ret = seek (cfile->__cookie, offset, dir); + + return (ret == -1) ? _IO_pos_BAD : ret; +} + +static struct _IO_jump_t _IO_old_cookie_jumps = { + JUMP_INIT_DUMMY, + JUMP_INIT(finish, _IO_file_finish), + JUMP_INIT(overflow, _IO_file_overflow), + JUMP_INIT(underflow, _IO_file_underflow), + JUMP_INIT(uflow, _IO_default_uflow), + JUMP_INIT(pbackfail, _IO_default_pbackfail), + JUMP_INIT(xsputn, _IO_file_xsputn), + JUMP_INIT(xsgetn, _IO_default_xsgetn), + JUMP_INIT(seekoff, _IO_file_seekoff), + JUMP_INIT(seekpos, _IO_default_seekpos), + JUMP_INIT(setbuf, _IO_file_setbuf), + JUMP_INIT(sync, _IO_file_sync), + JUMP_INIT(doallocate, _IO_file_doallocate), + JUMP_INIT(read, _IO_cookie_read), + JUMP_INIT(write, _IO_cookie_write), + JUMP_INIT(seek, _IO_old_cookie_seek), + JUMP_INIT(close, _IO_cookie_close), + JUMP_INIT(stat, _IO_default_stat), + JUMP_INIT(showmanyc, _IO_default_showmanyc), + JUMP_INIT(imbue, _IO_default_imbue), +}; + +_IO_FILE * +_IO_old_fopencookie (cookie, mode, io_functions) + void *cookie; + const char *mode; + _IO_cookie_io_functions_t io_functions; +{ + _IO_FILE *ret; + + ret = _IO_fopencookie (cookie, mode, io_functions); + if (ret != NULL) + _IO_JUMPS (ret) = &_IO_old_cookie_jumps; + + return ret; +} + +compat_symbol (libc, _IO_old_fopencookie, fopencookie, GLIBC_2_0); + +#endif diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index f9fca506f1..d20d68a8e0 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2000-05-21 Jakub Jelinek <jakub@redhat.com> + + * manager.c (pthread_handle_create): Initialize p_res._sock to -1. + 2000-05-13 Jakub Jelinek <jakub@redhat.com> * internals.h (__RES_PTHREAD_INTERNAL): Define. diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c index 2d3e227f23..2cc652df97 100644 --- a/linuxthreads/manager.c +++ b/linuxthreads/manager.c @@ -395,6 +395,7 @@ static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr, new_thread->p_canceltype = PTHREAD_CANCEL_DEFERRED; new_thread->p_errnop = &new_thread->p_errno; new_thread->p_h_errnop = &new_thread->p_h_errno; + new_thread->p_res._sock = -1; new_thread->p_resp = &new_thread->p_res; new_thread->p_guardaddr = guardaddr; new_thread->p_guardsize = guardsize; diff --git a/resolv/res_libc.c b/resolv/res_libc.c index b83c27aaae..fc5cc691ba 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -89,7 +89,7 @@ res_init(void) { #undef _res -struct __res_state _res; +struct __res_state _res = { _sock : -1 }; struct __res_state * |