mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
37ba7d6663
2002-08-02 Ulrich Drepper <drepper@redhat.com> * configure.in (HAVE_BROKEN_ALIAS_ATTRIBUTE): Add check for broken alias attribute handling. * config.h.in (HAVE_BROKEN_ALIAS_ATTRIBUTE): Add. * assert/assert.c (__assert_fail): Fix typo in comment. * include/rpc/rpc.h: Declare __libc_tsd_RPC_VARS if USE_TLS && HAVE___THREAD. * sunrpc/rpc_thread.c: Don't define __libc_tsd_RPC_VARS as static if USE_TLS && HAVE___THREAD. * sunrpc/Versions [libc] (GLIBC_PRIVATE): Export __libc_tsd_RPC_VARS. 2002-08-02 Jakub Jelinek <jakub@redhat.com> * assert/assert.c (__assert_fail): Remove undef. Replace INTDEF with libc_hidden_def. * assert/__assert.c (__assert): Remove INTUSE. * elf/dl-minimal.c (__assert_fail): Replace INTDEF with libc_hidden_weak. * include/libc-symbols.h (hidden_proto, hidden_def, hidden_weak, hidden_ver, libc_hidden_proto, libc_hidden_def, libc_hidden_weak, libc_hidden_ver, rtld_hidden_proto, rtld_hidden_def, rtld_hidden_weak, rltd_hidden_ver, libm_hidden_proto, libm_hidden_def, libm_hidden_weak, libm_hiden_ver): Define. * include/assert.h (__assert_fail_internal): Remove. (__assert_fail): Add prototype. Add hidden_proto. * include/libc-internal.h (__libc_freeres, __profile_frequency): Add libc_hidden_proto. * include/wchar.h (__mbrtowc_internal, __mbrlen_internal): Remove. (__mbrtowc, __mbrlen): Use libc_hidden_proto. Remove macros. * include/string.h (__mempcpy, __stpncpy, __rawmemchr, __strcasecmp): Add libc_hidden_proto. * include/fcntl.h (__open64, __libc_open, __libc_fcntl, __open, __fcntl): Add libc_hidden_proto. Remove macros. (__open_internal, __fcntl_internal): Remove. * libio/iofdopen.c (_IO_fcntl): Remove INTUSE from __fcntl. * malloc/set-freeres.c (__libc_freeres): Add libc_hidden_def. * nss/nsswitch.h (__nss_database_lookup, __nss_next): Add libc_hiden_proto. * nss/nsswitch.c (__nss_database_lookup, __nss_next): Add libc_hidden_def. * sysdeps/generic/mempcpy.c (__mempcpy): Remove undef. Add libc_hidden_def. * sysdeps/generic/open64.c (__open64): Add libc_hidden_def. * sysdeps/generic/open.c (__open): Remove undef. Add libc_hidden_def. Remove INTDEF. * sysdeps/generic/fcntl.c (__fcntl): Remove undef. Add libc_hidden_def. * sysdeps/mach/hurd/fcntl.c (__fcntl): Likewise. * sysdeps/i386/i586/mempcpy.S (__mempcpy): Add libc_hidden_def. * sysdeps/i386/i686/mempcpy.S (__mempcpy): Likewise. * sysdeps/mach/hurd/fcntl.c (__libc_fcntl, __fcntl): Remove undef. (__fcntl): Remove INTDEF2. Add libc_hidden_weak. (__libc_fcntl): Add libc_hidden_def. * sysdeps/mach/hurd/open.c (__libc_open, __open): Remove undef. (__open): Remove INTDEF2. Add libc_hidden_weak. (__libc_open): Add libc_hidden_def. * sysdeps/posix/open64.c (__open64): Add libc_hidden_weak. * sysdeps/standalone/open.c (__open): Add libc_hidden_def. * sysdeps/unix/sysv/aix/fcntl.c (__libc_fcntl, __fcntl): Remove undef. Add libc_hidden_def. * sysdeps/unix/sysv/aix/open.c (__libc_open, __open): Remove undef. Add libc_hidden_def. * sysdeps/unix/sysv/linux/i386/fcntl.c (__libc_fcntl, __fcntl): Remove undef. (__fcntl): Remove INTDEF2. Add libc_hidden_weak. (__libc_fcntl): Add libc_hidden_def. * sysdeps/unix/sysv/linux/syscalls.list (__fcntl_internal, __getpgid_internal, __chown_internal): Remove. (__GI___fcntl, __GI___libc_fcntl, __GI___getpgid, __GI___pipe, __GI___sched_setscheduler, __GI___select, __GI___setpgid, __GI___chown): Add. * sysdeps/unix/syscalls.list (__close_internal, __dup2_internal, __getpid_internal, __open_internal, __write_internal): Remove. (__GI___fcntl, __GI___libc_fcntl, __GI___open, __GI___libc_open, __GI___chown, __GI___close, __GI___dup2, __GI___getpid, __GI___libc_open, __GI___open, __GI___read, __GI___libc_read, __GI___select, __GI___statfs, __GI___write, __GI___libc_write): Add. * wcsmbs/mbrlen.c (__mbrlen): Remove undef. Replace INTDEF with libc_hidden_def. * wcsmbs/mbrtowc.c (__mbrtowc): Likewise. * catgets/catgetsinfo.h (__open_catalog): Add libc_hidden_proto. * catgets/open_catalog.c (__open_catalog): Add libc_hidden_def. * elf/dl-profile.c (__profile_frequency): Add libc_hidden_proto. * include/rpc/rpc.h (__rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_proto. * include/sys/poll.h (__poll): Add libc_hidden_proto. * include/sys/select.h (__select): Likewise. * include/sys/socket.h (__send): Likewise. * include/sys/statfs.h (__statfs): Likewise. * include/unistd.h (__pwrite64, __libc_read, __pipe, __chown, __dup2, __getpid, __getpgid, __setpgid, __close, __read, __write, __getpagesize, __sbrk): Likewise. (__chown_internal, __dup2_internal, __getpid_internal, __getpgid_internal, __close_internal, __write_internal, __getpagesize_internal): Remove. (__close, __dup2, __getpagesize, __getpgid, __getpid, __libc_write): Remove macros. * include/printf.h (__printf_fp): Add libc_hidden_proto. * include/sched.h (__sched_setscheduler): Likewise. * include/resolv.h (__res_ninit, __res_randomid): Likewise. * include/stdlib.h (__secure_getenv): Likewise. * include/signal.h (__sigaction, __sigsuspend): Likewise. * inet/getaliasent_r.c (NSS_attribute_hidden): Remove. * inet/getaliasname_r.c (NSS_attribute_hidden): Remove. * inet/getnetbyad_r.c (NSS_attribute_hidden): Remove. * inet/getnetbynm_r.c (NSS_attribute_hidden): Remove. * inet/getnetent_r.c (NSS_attribute_hidden): Remove. * inet/getproto_r.c (NSS_attribute_hidden): Remove. * inet/getprtent_r.c (NSS_attribute_hidden): Remove. * inet/getprtname_r.c (NSS_attribute_hidden): Remove. * inet/getrpcbyname_r.c (NSS_attribute_hidden): Remove. * inet/getrpcbynumber_r.c (NSS_attribute_hidden): Remove. * inet/getrpcent_r.c (NSS_attribute_hidden): Remove. * inet/getservent_r.c (NSS_attribute_hidden): Remove. * inet/getsrvbynm_r.c (NSS_attribute_hidden): Remove. * inet/getsrvbypt_r.c (NSS_attribute_hidden): Remove. * inet/gethstbyad_r.c (DB_LOOKUP_FCT): Remove INTUSE. * inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise. * libio/genops.c (__overflow): Add libc_hidden_def. * libio/iovdprintf.c: Remove libio.h include. * libio/libioP.h (libc_hidden_proto, libc_hidden_def, libc_hidden_weak): Define to nothing if not defined. (__overflow, __woverflow): Add libc_hidden_proto. * libio/wgenops.c (__woverflow): Add libc_hidden_def. * nss/getXXent_r.c (NSS_attribute_hidden): Remove. (DB_LOOKUP_FCT): Add libc_hidden_proto. * nss/getXXbyYY_r.c (NSS_attribute_hidden): Remove. (DB_LOOKUP_FCT): Add libc_hidden_proto. * nss/XXX-lookup.c (DB_LOOKUP_FCT): Add libc_hidden_proto and libc_hidden_def. * nss/hosts-lookup.c (__nss_hosts_lookup): Remove INTDEF. * posix/bsd-getpgrp.c (__getpgid_internal): Remove. (__getpgid): Add libc_hidden_proto. (__bsd_getpgrp): Remove INTUSE. * resolv/res_init.c (__res_ninit, __res_randomid): Add libc_hidden_def. * shadow/getspent_r.c (NSS_attribute_hidden): Remove. * shadow/getspnam_r.c (NSS_attribute_hidden): Remove. * stdio-common/printf_fp.c (__printf_fp): Add libc_hidden_def. * stdlib/strfmon.c (__printf_fp): Add libc_hidden_proto. * stdlib/secure-getenv.c (__secure_getenv): Add libc_hidden_def. * sunrpc/rpc_thread.c (__rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_def. * sysdeps/alpha/alphaev67/rawmemchr.S (__rawmemchr): Add libc_hidden_def. * sysdeps/alpha/alphaev67/stpncpy.S (__stpncpy): Likewise. * sysdeps/alpha/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/alpha/stpncpy.S (__stpncpy): Likewise. * sysdeps/generic/chown.c (__chown): Likewise. * sysdeps/generic/close.c (__close): Likewise. * sysdeps/generic/dup2.c (__dup2): Likewise. * sysdeps/generic/pipe.c (__pipe): Likewise. * sysdeps/generic/prof-freq.c (__profile_frequency): Likewise. * sysdeps/generic/pwrite64.c (__pwrite64): Likewise. * sysdeps/generic/rawmemchr.c (__rawmemchr): Likewise. * sysdeps/generic/read.c (__libc_read): Likewise. (__read): Add libc_hidden_weak. * sysdeps/generic/sbrk.c (__sbrk): Add libc_hidden_def. * sysdeps/generic/sched_sets.c (__sched_setscheduler): Likewise. * sysdeps/generic/select.c (__select): Likewise. * sysdeps/generic/send.c (__send): Likewise. * sysdeps/generic/setpgid.c (__setpgid): Likewise. * sysdeps/generic/sigaction.c (__sigaction): Likewise. * sysdeps/generic/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/generic/statfs.c (__statfs): Likewise. * sysdeps/generic/stpncpy.c (__stpncpy): Likewise. * sysdeps/generic/strcasecmp.c (__strcasecmp): Likewise. * sysdeps/generic/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/generic/getpgid.c (__getpgid): Likewise. * sysdeps/generic/getpid.c (__getpid): Likewise. * sysdeps/generic/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. Remove undef and INTDEF. * sysdeps/i386/rawmemchr.S (__rawmemchr): Add libc_hidden_def. * sysdeps/i386/stpncpy.S (__stpncpy): Likewise. * sysdeps/m68k/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/mach/hurd/chown.c (__chown): Likewise. Remove INTDEF. * sysdeps/mach/hurd/close.c (__close): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/mach/hurd/dup2.c (__dup2): Likewise. * sysdeps/mach/hurd/getpgid.c (__getpgid): Likewise. * sysdeps/mach/hurd/getpid.c (__getpid): Likewise. * sysdeps/mach/getpagesize.c (__getpagesize): Likewise. * sysdeps/mach/hurd/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. Remove undef and INTDEF. * sysdeps/mach/hurd/pipe.c: Include unistd.h. (__pipe): Add libc_hidden_def. * sysdeps/mach/hurd/dl-sysdep.c (__libc_read, __libc_write): Add libc_hidden_weak. * sysdeps/mach/hurd/poll.c (__poll): Add libc_hidden_def. * sysdeps/mach/hurd/profil.c (__profile_frequency): Likewise. * sysdeps/mach/hurd/read.c (__libc_read): Likewise. (__read): Add libc_hidden_weak. * sysdeps/mach/hurd/pwrite64.c (__pwrite64): Likewise. (__libc_pwrite64): Add libc_hidden_def. * sysdeps/mach/hurd/sbrk.c (__sbrk): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/mach/hurd/send.c (__send): Likewise. * sysdeps/mach/hurd/setpgid.c (__setpgid): Likewise. * sysdeps/mach/hurd/sigaction.c (__sigaction): Likewise. * sysdeps/mach/hurd/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/mach/hurd/statfs.c (__statfs): Likewise. * sysdeps/posix/dup2.c: Likewise. Remove undef and INTDEF. * sysdeps/posix/getpagesize.c (__getpagesize): Likewise. * sysdeps/posix/pwrite64.c (__libc_pwrite64): Add libc_hidden_def. (__pwrite64): Add libc_hidden_weak. * sysdeps/posix/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/sparc/sparc64/rawmemchr.S (__rawmemchr): Likewise. * sysdeps/sparc/sparc64/stpncpy.S (__stpncpy): Likewise. * sysdeps/standalone/close.c (__close): Likewise. * sysdeps/standalone/write.c (__libc_write): Likewise. (__write): Add libc_hidden_weak. * sysdeps/standalone/read.c (__read): Likewise. (__libc_read): Add libc_hidden_def. * sysdeps/unix/grantpt.c (grantpt): Remove INTUSE. * sysdeps/unix/bsd/m68k/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/bsd/osf/alpha/pipe.S (__pipe): Likewise. * sysdeps/unix/bsd/vax/pipe.S (__pipe): Likewise. * sysdeps/unix/bsd/syscalls.list (__GI___getpagesize): Likewise. * sysdeps/unix/bsd/poll.c (__poll): Likewise. * sysdeps/unix/bsd/sigaction.c (__sigaction): Likewise. * sysdeps/unix/bsd/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/common/syscalls.list (__GI___getpgid, __GI___setpgid, __GI___sigaction): Add. * sysdeps/unix/i386/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/inet/syscalls.list (__GI___send): Add. * sysdeps/unix/mips/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sparc/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/irix4/syscalls.list (__GI___getpgid, __GI___setpgid): Add. * sysdeps/unix/sysv/aix/chown.c (__chown): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/aix/getpgid.c (__getpgid): Likewise. * sysdeps/unix/sysv/aix/write.c (__write, __libc_write): Likewise. * sysdeps/unix/sysv/aix/close.c (__close): Add libc_hidden_def. * sysdeps/unix/sysv/aix/getpid.c (__getpid): Likewise. * sysdeps/unix/sysv/aix/pipe.c (__pipe): Likewise. * sysdeps/unix/sysv/aix/read.c (__read, __libc_read): Likewise. * sysdeps/unix/sysv/aix/poll.c (__poll): Likewise. * sysdeps/unix/sysv/aix/sbrk.c (__sbrk): Likewise. * sysdeps/unix/sysv/aix/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/aix/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/sysv/aix/statfs.c (__statfs): Likewise. * sysdeps/unix/sysv/aix/select.c (__select): Likewise. * sysdeps/unix/sysv/aix/setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/linux/alpha/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/linux/alpha/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___send): Add. * sysdeps/unix/sysv/linux/alpha/select.S (__select): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/ia64/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___send): Add. * sysdeps/unix/sysv/linux/ia64/sigaction.c (__sigaction): Add libc_hidden_def. * sysdeps/unix/sysv/linux/ia64/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/sysv/linux/sh/pipe.S (__pipe): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/chown.c (__chown): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__GI___pwrite64, __GI___send): Add. * sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/hppa/syscalls.list (__GI___send): Add. * sysdeps/unix/sysv/linux/arm/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/i386/chown.c (__chown): Add libc_hidden_ver resp. libc_hidden_def. * sysdeps/unix/sysv/linux/i386/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/m68k/chown.c (__chown): Likewise. Remove INTDEF. * sysdeps/unix/sysv/linux/m68k/getpagesize.c (__getpagesize): Likewise. Remove undef. * sysdeps/unix/sysv/linux/mips/pwrite64.c (__pwrite64): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/mips/syscalls.list (__GI___send): Add. * sysdeps/unix/sysv/linux/mips/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/powerpc/chown.c (__chown): Add libc_hidden_def. * sysdeps/unix/sysv/linux/powerpc/pwrite64.c (__pwrite64): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c (__getpagesize): Likewise. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S (__pipe): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (__GI___pwrite64, __GI___statfs, __GI___select, __GI___send): Add. * sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sparc/sparc64/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (__GI___pwrite64, __GI___statfs): Add. * sysdeps/unix/sysv/linux/x86_64/send.c (__send): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/x86_64/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/linux/poll.c (__poll): Add libc_hidden_def. * sysdeps/unix/sysv/linux/pwrite64.c (__pwrite64): Add libc_hidden_def. * sysdeps/unix/sysv/linux/send.S (__send): Likewise. * sysdeps/unix/sysv/linux/sigaction.c (__sigaction): Add libc_hidden_weak. * sysdeps/unix/sysv/linux/sigsuspend.c (__sigsuspend): Add libc_hidden_def. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/sco3.2.4/sigaction.S (__sigaction): Likewise. * sysdeps/unix/sysv/sysv4/solaris2/syscalls.list (__GI___sigaction): Add. * sysdeps/unix/sysv/sysv4/__getpgid.c (__getpgid): Add libc_hidden_def. Remove undef and INTDEF. * sysdeps/unix/sysv/sysv4/getpgid.c (__getpgid): Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c (__setpgid): Add libc_hidden_def. * sysdeps/unix/sysv/sysv4/setpgid.c (__setpgid): Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c (__sigaction): Likewise. * sysdeps/unix/sysv/sigaction.c (__sigaction): Likewise. * sysdeps/unix/getpagesize.c (__getpagesize): Add libc_hidden_def. Remove undef and INTDEF. * configure.in (HAVE_BROKEN_VISIBILITY_ATTRIBUTE): Add check for broken visibility attribute handling. * config.h.in (HAVE_BROKEN_VISIBILITY_ATTRIBUTE): Add. 2002-08-02 Ulrich Drepper <drepper@redhat.com>
746 lines
19 KiB
C
746 lines
19 KiB
C
/* Copyright (C) 1993,1995,1997-2001,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@cygnus.com>.
|
|
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
/* Generic or default I/O operations. */
|
|
|
|
#include "libioP.h"
|
|
#ifdef __STDC__
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
|
|
|
|
#ifndef _LIBC
|
|
# define __wmemcpy(dst, src, n) wmemcpy (dst, src, n)
|
|
#endif
|
|
|
|
|
|
static int save_for_wbackup __P ((_IO_FILE *fp, wchar_t *end_p))
|
|
#ifdef _LIBC
|
|
internal_function
|
|
#endif
|
|
;
|
|
|
|
/* Return minimum _pos markers
|
|
Assumes the current get area is the main get area. */
|
|
_IO_ssize_t _IO_least_wmarker __P ((_IO_FILE *fp, wchar_t *end_p));
|
|
|
|
_IO_ssize_t
|
|
_IO_least_wmarker (fp, end_p)
|
|
_IO_FILE *fp;
|
|
wchar_t *end_p;
|
|
{
|
|
_IO_ssize_t least_so_far = end_p - fp->_wide_data->_IO_read_base;
|
|
struct _IO_marker *mark;
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
if (mark->_pos < least_so_far)
|
|
least_so_far = mark->_pos;
|
|
return least_so_far;
|
|
}
|
|
INTDEF(_IO_least_wmarker)
|
|
|
|
/* Switch current get area from backup buffer to (start of) main get area. */
|
|
void
|
|
_IO_switch_to_main_wget_area (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
wchar_t *tmp;
|
|
fp->_flags &= ~_IO_IN_BACKUP;
|
|
/* Swap _IO_read_end and _IO_save_end. */
|
|
tmp = fp->_wide_data->_IO_read_end;
|
|
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_save_end;
|
|
fp->_wide_data->_IO_save_end= tmp;
|
|
/* Swap _IO_read_base and _IO_save_base. */
|
|
tmp = fp->_wide_data->_IO_read_base;
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_save_base;
|
|
fp->_wide_data->_IO_save_base = tmp;
|
|
/* Set _IO_read_ptr. */
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
|
|
}
|
|
INTDEF(_IO_switch_to_main_wget_area)
|
|
|
|
|
|
/* Switch current get area from main get area to (end of) backup area. */
|
|
void
|
|
_IO_switch_to_wbackup_area (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
wchar_t *tmp;
|
|
fp->_flags |= _IO_IN_BACKUP;
|
|
/* Swap _IO_read_end and _IO_save_end. */
|
|
tmp = fp->_wide_data->_IO_read_end;
|
|
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_save_end;
|
|
fp->_wide_data->_IO_save_end = tmp;
|
|
/* Swap _IO_read_base and _IO_save_base. */
|
|
tmp = fp->_wide_data->_IO_read_base;
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_save_base;
|
|
fp->_wide_data->_IO_save_base = tmp;
|
|
/* Set _IO_read_ptr. */
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
|
|
}
|
|
INTDEF(_IO_switch_to_wbackup_area)
|
|
|
|
|
|
void
|
|
_IO_wsetb (f, b, eb, a)
|
|
_IO_FILE *f;
|
|
wchar_t *b;
|
|
wchar_t *eb;
|
|
int a;
|
|
{
|
|
if (f->_wide_data->_IO_buf_base && !(f->_flags & _IO_USER_BUF))
|
|
FREE_BUF (f->_wide_data->_IO_buf_base, _IO_wblen (f));
|
|
f->_wide_data->_IO_buf_base = b;
|
|
f->_wide_data->_IO_buf_end = eb;
|
|
if (a)
|
|
f->_flags &= ~_IO_USER_BUF;
|
|
else
|
|
f->_flags |= _IO_USER_BUF;
|
|
}
|
|
INTDEF(_IO_wsetb)
|
|
|
|
|
|
wint_t
|
|
_IO_wdefault_pbackfail (fp, c)
|
|
_IO_FILE *fp;
|
|
wint_t c;
|
|
{
|
|
if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base
|
|
&& !_IO_in_backup (fp)
|
|
&& (wint_t) fp->_IO_read_ptr[-1] == c)
|
|
--fp->_IO_read_ptr;
|
|
else
|
|
{
|
|
/* Need to handle a filebuf in write mode (switch to read mode). FIXME!*/
|
|
if (!_IO_in_backup (fp))
|
|
{
|
|
/* We need to keep the invariant that the main get area
|
|
logically follows the backup area. */
|
|
if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base
|
|
&& _IO_have_wbackup (fp))
|
|
{
|
|
if (save_for_wbackup (fp, fp->_wide_data->_IO_read_ptr))
|
|
return WEOF;
|
|
}
|
|
else if (!_IO_have_wbackup (fp))
|
|
{
|
|
/* No backup buffer: allocate one. */
|
|
/* Use nshort buffer, if unused? (probably not) FIXME */
|
|
int backup_size = 128;
|
|
wchar_t *bbuf = (wchar_t *) malloc (backup_size
|
|
* sizeof (wchar_t));
|
|
if (bbuf == NULL)
|
|
return WEOF;
|
|
fp->_wide_data->_IO_save_base = bbuf;
|
|
fp->_wide_data->_IO_save_end = (fp->_wide_data->_IO_save_base
|
|
+ backup_size);
|
|
fp->_wide_data->_IO_backup_base = fp->_wide_data->_IO_save_end;
|
|
}
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr;
|
|
INTUSE(_IO_switch_to_wbackup_area) (fp);
|
|
}
|
|
else if (fp->_wide_data->_IO_read_ptr <= fp->_wide_data->_IO_read_base)
|
|
{
|
|
/* Increase size of existing backup buffer. */
|
|
_IO_size_t new_size;
|
|
_IO_size_t old_size = (fp->_wide_data->_IO_read_end
|
|
- fp->_wide_data->_IO_read_base);
|
|
wchar_t *new_buf;
|
|
new_size = 2 * old_size;
|
|
new_buf = (wchar_t *) malloc (new_size * sizeof (wchar_t));
|
|
if (new_buf == NULL)
|
|
return WEOF;
|
|
__wmemcpy (new_buf + (new_size - old_size),
|
|
fp->_wide_data->_IO_read_base, old_size);
|
|
free (fp->_wide_data->_IO_read_base);
|
|
_IO_wsetg (fp, new_buf, new_buf + (new_size - old_size),
|
|
new_buf + new_size);
|
|
fp->_wide_data->_IO_backup_base = fp->_wide_data->_IO_read_ptr;
|
|
}
|
|
|
|
*--fp->_wide_data->_IO_read_ptr = c;
|
|
}
|
|
return c;
|
|
}
|
|
INTDEF(_IO_wdefault_pbackfail)
|
|
|
|
|
|
void
|
|
_IO_wdefault_finish (fp, dummy)
|
|
_IO_FILE *fp;
|
|
int dummy;
|
|
{
|
|
struct _IO_marker *mark;
|
|
if (fp->_wide_data->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
|
|
{
|
|
FREE_BUF (fp->_wide_data->_IO_buf_base,
|
|
_IO_wblen (fp) * sizeof (wchar_t));
|
|
fp->_wide_data->_IO_buf_base = fp->_wide_data->_IO_buf_end = NULL;
|
|
}
|
|
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
mark->_sbuf = NULL;
|
|
|
|
if (fp->_IO_save_base)
|
|
{
|
|
free (fp->_wide_data->_IO_save_base);
|
|
fp->_IO_save_base = NULL;
|
|
}
|
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
if (fp->_lock != NULL)
|
|
_IO_lock_fini (*fp->_lock);
|
|
#endif
|
|
|
|
INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
|
|
}
|
|
INTDEF(_IO_wdefault_finish)
|
|
|
|
|
|
wint_t
|
|
_IO_wdefault_uflow (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
wint_t wch;
|
|
wch = _IO_UNDERFLOW (fp);
|
|
if (wch == WEOF)
|
|
return WEOF;
|
|
return *fp->_wide_data->_IO_read_ptr++;
|
|
}
|
|
INTDEF(_IO_wdefault_uflow)
|
|
|
|
|
|
wint_t
|
|
__woverflow (f, wch)
|
|
_IO_FILE *f;
|
|
wint_t wch;
|
|
{
|
|
if (f->_mode == 0)
|
|
_IO_fwide (f, 1);
|
|
return _IO_OVERFLOW (f, wch);
|
|
}
|
|
libc_hidden_def (__woverflow)
|
|
|
|
|
|
wint_t
|
|
__wuflow (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1))
|
|
return WEOF;
|
|
|
|
if (fp->_mode == 0)
|
|
_IO_fwide (fp, 1);
|
|
if (_IO_in_put_mode (fp))
|
|
if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF)
|
|
return WEOF;
|
|
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
|
|
return *fp->_wide_data->_IO_read_ptr++;
|
|
if (_IO_in_backup (fp))
|
|
{
|
|
INTUSE(_IO_switch_to_main_wget_area) (fp);
|
|
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
|
|
return *fp->_wide_data->_IO_read_ptr++;
|
|
}
|
|
if (_IO_have_markers (fp))
|
|
{
|
|
if (save_for_wbackup (fp, fp->_wide_data->_IO_read_end))
|
|
return WEOF;
|
|
}
|
|
else if (_IO_have_wbackup (fp))
|
|
INTUSE(_IO_free_wbackup_area) (fp);
|
|
return _IO_UFLOW (fp);
|
|
}
|
|
|
|
|
|
wint_t
|
|
__wunderflow (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1))
|
|
return WEOF;
|
|
|
|
if (fp->_mode == 0)
|
|
_IO_fwide (fp, 1);
|
|
if (_IO_in_put_mode (fp))
|
|
if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF)
|
|
return WEOF;
|
|
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
|
|
return *fp->_wide_data->_IO_read_ptr;
|
|
if (_IO_in_backup (fp))
|
|
{
|
|
INTUSE(_IO_switch_to_main_wget_area) (fp);
|
|
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
|
|
return *fp->_wide_data->_IO_read_ptr;
|
|
}
|
|
if (_IO_have_markers (fp))
|
|
{
|
|
if (save_for_wbackup (fp, fp->_wide_data->_IO_read_end))
|
|
return WEOF;
|
|
}
|
|
else if (_IO_have_backup (fp))
|
|
INTUSE(_IO_free_wbackup_area) (fp);
|
|
return _IO_UNDERFLOW (fp);
|
|
}
|
|
|
|
|
|
_IO_size_t
|
|
_IO_wdefault_xsputn (f, data, n)
|
|
_IO_FILE *f;
|
|
const void *data;
|
|
_IO_size_t n;
|
|
{
|
|
const wchar_t *s = (const wchar_t *) data;
|
|
_IO_size_t more = n;
|
|
if (more <= 0)
|
|
return 0;
|
|
for (;;)
|
|
{
|
|
/* Space available. */
|
|
_IO_ssize_t count = (f->_wide_data->_IO_write_end
|
|
- f->_wide_data->_IO_write_ptr);
|
|
if (count > 0)
|
|
{
|
|
if ((_IO_size_t) count > more)
|
|
count = more;
|
|
if (count > 20)
|
|
{
|
|
#ifdef _LIBC
|
|
f->_wide_data->_IO_write_ptr =
|
|
__wmempcpy (f->_wide_data->_IO_write_ptr, s, count);
|
|
#else
|
|
memcpy (f->_wide_data->_IO_write_ptr, s, count);
|
|
f->_wide_data->_IO_write_ptr += count;
|
|
#endif
|
|
s += count;
|
|
}
|
|
else if (count <= 0)
|
|
count = 0;
|
|
else
|
|
{
|
|
wchar_t *p = f->_wide_data->_IO_write_ptr;
|
|
_IO_ssize_t i;
|
|
for (i = count; --i >= 0; )
|
|
*p++ = *s++;
|
|
f->_wide_data->_IO_write_ptr = p;
|
|
}
|
|
more -= count;
|
|
}
|
|
if (more == 0 || __woverflow (f, *s++) == WEOF)
|
|
break;
|
|
more--;
|
|
}
|
|
return n - more;
|
|
}
|
|
INTDEF(_IO_wdefault_xsputn)
|
|
|
|
|
|
_IO_size_t
|
|
_IO_wdefault_xsgetn (fp, data, n)
|
|
_IO_FILE *fp;
|
|
void *data;
|
|
_IO_size_t n;
|
|
{
|
|
_IO_size_t more = n;
|
|
wchar_t *s = (wchar_t*) data;
|
|
for (;;)
|
|
{
|
|
/* Data available. */
|
|
_IO_ssize_t count = (fp->_wide_data->_IO_read_end
|
|
- fp->_wide_data->_IO_read_ptr);
|
|
if (count > 0)
|
|
{
|
|
if ((_IO_size_t) count > more)
|
|
count = more;
|
|
if (count > 20)
|
|
{
|
|
#ifdef _LIBC
|
|
s = __wmempcpy (s, fp->_wide_data->_IO_read_ptr, count);
|
|
#else
|
|
memcpy (s, fp->_wide_data->_IO_read_ptr, count);
|
|
s += count;
|
|
#endif
|
|
fp->_wide_data->_IO_read_ptr += count;
|
|
}
|
|
else if (count <= 0)
|
|
count = 0;
|
|
else
|
|
{
|
|
wchar_t *p = fp->_wide_data->_IO_read_ptr;
|
|
int i = (int) count;
|
|
while (--i >= 0)
|
|
*s++ = *p++;
|
|
fp->_wide_data->_IO_read_ptr = p;
|
|
}
|
|
more -= count;
|
|
}
|
|
if (more == 0 || __wunderflow (fp) == WEOF)
|
|
break;
|
|
}
|
|
return n - more;
|
|
}
|
|
INTDEF(_IO_wdefault_xsgetn)
|
|
|
|
|
|
void
|
|
_IO_wdoallocbuf (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_wide_data->_IO_buf_base)
|
|
return;
|
|
if (!(fp->_flags & _IO_UNBUFFERED))
|
|
if ((wint_t)_IO_WDOALLOCATE (fp) != WEOF)
|
|
return;
|
|
INTUSE(_IO_wsetb) (fp, fp->_wide_data->_shortbuf,
|
|
fp->_wide_data->_shortbuf + 1, 0);
|
|
}
|
|
INTDEF(_IO_wdoallocbuf)
|
|
|
|
|
|
int
|
|
_IO_wdefault_doallocate (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
wchar_t *buf;
|
|
|
|
ALLOC_WBUF (buf, _IO_BUFSIZ, EOF);
|
|
INTUSE(_IO_wsetb) (fp, buf, buf + _IO_BUFSIZ, 1);
|
|
return 1;
|
|
}
|
|
INTDEF(_IO_wdefault_doallocate)
|
|
|
|
|
|
int
|
|
_IO_switch_to_wget_mode (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base)
|
|
if ((wint_t)_IO_WOVERFLOW (fp, WEOF) == WEOF)
|
|
return EOF;
|
|
if (_IO_in_backup (fp))
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_backup_base;
|
|
else
|
|
{
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_buf_base;
|
|
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)
|
|
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;
|
|
}
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_write_ptr;
|
|
|
|
fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_write_ptr
|
|
= fp->_wide_data->_IO_write_end = fp->_wide_data->_IO_read_ptr;
|
|
|
|
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
|
|
return 0;
|
|
}
|
|
INTDEF(_IO_switch_to_wget_mode)
|
|
|
|
void
|
|
_IO_free_wbackup_area (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (_IO_in_backup (fp))
|
|
INTUSE(_IO_switch_to_main_wget_area) (fp); /* Just in case. */
|
|
free (fp->_wide_data->_IO_save_base);
|
|
fp->_wide_data->_IO_save_base = NULL;
|
|
fp->_wide_data->_IO_save_end = NULL;
|
|
fp->_wide_data->_IO_backup_base = NULL;
|
|
}
|
|
INTDEF(_IO_free_wbackup_area)
|
|
|
|
#if 0
|
|
int
|
|
_IO_switch_to_wput_mode (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_read_ptr;
|
|
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_read_ptr;
|
|
/* Following is wrong if line- or un-buffered? */
|
|
fp->_wide_data->_IO_write_end = (fp->_flags & _IO_IN_BACKUP
|
|
? fp->_wide_data->_IO_read_end
|
|
: fp->_wide_data->_IO_buf_end);
|
|
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
|
|
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_end;
|
|
|
|
fp->_flags |= _IO_CURRENTLY_PUTTING;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
|
|
static int
|
|
#ifdef _LIBC
|
|
internal_function
|
|
#endif
|
|
save_for_wbackup (fp, end_p)
|
|
_IO_FILE *fp;
|
|
wchar_t *end_p;
|
|
{
|
|
/* Append [_IO_read_base..end_p] to backup area. */
|
|
_IO_ssize_t least_mark = INTUSE(_IO_least_wmarker) (fp, end_p);
|
|
/* needed_size is how much space we need in the backup area. */
|
|
_IO_size_t needed_size = ((end_p - fp->_wide_data->_IO_read_base)
|
|
- least_mark);
|
|
/* FIXME: Dubious arithmetic if pointers are NULL */
|
|
_IO_size_t current_Bsize = (fp->_wide_data->_IO_save_end
|
|
- fp->_wide_data->_IO_save_base);
|
|
_IO_size_t avail; /* Extra space available for future expansion. */
|
|
_IO_ssize_t delta;
|
|
struct _IO_marker *mark;
|
|
if (needed_size > current_Bsize)
|
|
{
|
|
wchar_t *new_buffer;
|
|
avail = 100;
|
|
new_buffer = (wchar_t *) malloc ((avail + needed_size)
|
|
* sizeof (wchar_t));
|
|
if (new_buffer == NULL)
|
|
return EOF; /* FIXME */
|
|
if (least_mark < 0)
|
|
{
|
|
#ifdef _LIBC
|
|
__wmempcpy (__wmempcpy (new_buffer + avail,
|
|
fp->_wide_data->_IO_save_end + least_mark,
|
|
-least_mark),
|
|
fp->_wide_data->_IO_read_base,
|
|
end_p - fp->_wide_data->_IO_read_base);
|
|
#else
|
|
memcpy (new_buffer + avail,
|
|
fp->_wide_data->_IO_save_end + least_mark,
|
|
-least_mark * sizeof (wchar_t));
|
|
memcpy (new_buffer + avail - least_mark,
|
|
fp->_wide_data->_IO_read_base,
|
|
(end_p - fp->_wide_data->_IO_read_base) * sizeof (wchar_t));
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
#ifdef _LIBC
|
|
__wmemcpy (new_buffer + avail,
|
|
fp->_wide_data->_IO_read_base + least_mark,
|
|
needed_size);
|
|
#else
|
|
memcpy (new_buffer + avail,
|
|
fp->_wide_data->_IO_read_base + least_mark,
|
|
needed_size * sizeof (wchar_t));
|
|
#endif
|
|
}
|
|
if (fp->_wide_data->_IO_save_base)
|
|
free (fp->_wide_data->_IO_save_base);
|
|
fp->_wide_data->_IO_save_base = new_buffer;
|
|
fp->_wide_data->_IO_save_end = new_buffer + avail + needed_size;
|
|
}
|
|
else
|
|
{
|
|
avail = current_Bsize - needed_size;
|
|
if (least_mark < 0)
|
|
{
|
|
#ifdef _LIBC
|
|
__wmemmove (fp->_wide_data->_IO_save_base + avail,
|
|
fp->_wide_data->_IO_save_end + least_mark,
|
|
-least_mark);
|
|
__wmemcpy (fp->_wide_data->_IO_save_base + avail - least_mark,
|
|
fp->_wide_data->_IO_read_base,
|
|
end_p - fp->_wide_data->_IO_read_base);
|
|
#else
|
|
memmove (fp->_wide_data->_IO_save_base + avail,
|
|
fp->_wide_data->_IO_save_end + least_mark,
|
|
-least_mark * sizeof (wchar_t));
|
|
memcpy (fp->_wide_data->_IO_save_base + avail - least_mark,
|
|
fp->_wide_data->_IO_read_base,
|
|
(end_p - fp->_wide_data->_IO_read_base) * sizeof (wchar_t));
|
|
#endif
|
|
}
|
|
else if (needed_size > 0)
|
|
#ifdef _LIBC
|
|
__wmemcpy (fp->_wide_data->_IO_save_base + avail,
|
|
fp->_wide_data->_IO_read_base + least_mark,
|
|
needed_size);
|
|
#else
|
|
memcpy (fp->_wide_data->_IO_save_base + avail,
|
|
fp->_wide_data->_IO_read_base + least_mark,
|
|
needed_size * sizeof (wchar_t));
|
|
#endif
|
|
}
|
|
fp->_wide_data->_IO_backup_base = fp->_wide_data->_IO_save_base + avail;
|
|
/* Adjust all the streammarkers. */
|
|
delta = end_p - fp->_wide_data->_IO_read_base;
|
|
for (mark = fp->_markers; mark != NULL; mark = mark->_next)
|
|
mark->_pos -= delta;
|
|
return 0;
|
|
}
|
|
|
|
wint_t
|
|
_IO_sputbackwc (fp, c)
|
|
_IO_FILE *fp;
|
|
wint_t c;
|
|
{
|
|
wint_t result;
|
|
|
|
if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base
|
|
&& (wchar_t)fp->_wide_data->_IO_read_ptr[-1] == (wchar_t) c)
|
|
{
|
|
fp->_wide_data->_IO_read_ptr--;
|
|
result = c;
|
|
}
|
|
else
|
|
result = _IO_PBACKFAIL (fp, c);
|
|
|
|
if (result != WEOF)
|
|
fp->_flags &= ~_IO_EOF_SEEN;
|
|
|
|
return result;
|
|
}
|
|
INTDEF(_IO_sputbackwc)
|
|
|
|
wint_t
|
|
_IO_sungetwc (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
wint_t result;
|
|
|
|
if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base)
|
|
{
|
|
fp->_wide_data->_IO_read_ptr--;
|
|
result = *fp->_wide_data->_IO_read_ptr;
|
|
}
|
|
else
|
|
result = _IO_PBACKFAIL (fp, EOF);
|
|
|
|
if (result != WEOF)
|
|
fp->_flags &= ~_IO_EOF_SEEN;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
unsigned
|
|
_IO_adjust_wcolumn (start, line, count)
|
|
unsigned start;
|
|
const wchar_t *line;
|
|
int count;
|
|
{
|
|
const wchar_t *ptr = line + count;
|
|
while (ptr > line)
|
|
if (*--ptr == L'\n')
|
|
return line + count - ptr - 1;
|
|
return start + count;
|
|
}
|
|
|
|
void
|
|
_IO_init_wmarker (marker, fp)
|
|
struct _IO_marker *marker;
|
|
_IO_FILE *fp;
|
|
{
|
|
marker->_sbuf = fp;
|
|
if (_IO_in_put_mode (fp))
|
|
INTUSE(_IO_switch_to_wget_mode) (fp);
|
|
if (_IO_in_backup (fp))
|
|
marker->_pos = fp->_wide_data->_IO_read_ptr - fp->_wide_data->_IO_read_end;
|
|
else
|
|
marker->_pos = (fp->_wide_data->_IO_read_ptr
|
|
- fp->_wide_data->_IO_read_base);
|
|
|
|
/* Should perhaps sort the chain? */
|
|
marker->_next = fp->_markers;
|
|
fp->_markers = marker;
|
|
}
|
|
|
|
#define BAD_DELTA EOF
|
|
|
|
/* Return difference between MARK and current position of MARK's stream. */
|
|
int
|
|
_IO_wmarker_delta (mark)
|
|
struct _IO_marker *mark;
|
|
{
|
|
int cur_pos;
|
|
if (mark->_sbuf == NULL)
|
|
return BAD_DELTA;
|
|
if (_IO_in_backup (mark->_sbuf))
|
|
cur_pos = (mark->_sbuf->_wide_data->_IO_read_ptr
|
|
- mark->_sbuf->_wide_data->_IO_read_end);
|
|
else
|
|
cur_pos = (mark->_sbuf->_wide_data->_IO_read_ptr
|
|
- mark->_sbuf->_wide_data->_IO_read_base);
|
|
return mark->_pos - cur_pos;
|
|
}
|
|
|
|
int
|
|
_IO_seekwmark (fp, mark, delta)
|
|
_IO_FILE *fp;
|
|
struct _IO_marker *mark;
|
|
int delta;
|
|
{
|
|
if (mark->_sbuf != fp)
|
|
return EOF;
|
|
if (mark->_pos >= 0)
|
|
{
|
|
if (_IO_in_backup (fp))
|
|
INTUSE(_IO_switch_to_main_wget_area) (fp);
|
|
fp->_wide_data->_IO_read_ptr = (fp->_wide_data->_IO_read_base
|
|
+ mark->_pos);
|
|
}
|
|
else
|
|
{
|
|
if (!_IO_in_backup (fp))
|
|
INTUSE(_IO_switch_to_wbackup_area) (fp);
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end + mark->_pos;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
_IO_unsave_wmarkers (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
struct _IO_marker *mark = fp->_markers;
|
|
if (mark)
|
|
{
|
|
#ifdef TODO
|
|
streampos offset = seekoff (0, ios::cur, ios::in);
|
|
if (offset != EOF)
|
|
{
|
|
offset += eGptr () - Gbase ();
|
|
for ( ; mark != NULL; mark = mark->_next)
|
|
mark->set_streampos (mark->_pos + offset);
|
|
}
|
|
else
|
|
{
|
|
for ( ; mark != NULL; mark = mark->_next)
|
|
mark->set_streampos (EOF);
|
|
}
|
|
#endif
|
|
fp->_markers = 0;
|
|
}
|
|
|
|
if (_IO_have_backup (fp))
|
|
INTUSE(_IO_free_wbackup_area) (fp);
|
|
}
|