mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
c40298232a
Mon Sep 23 15:31:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make variable `top_srcdir' in libc; use $(..) instead. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special definition. It was a *Mistake*. (With a capital M.) * sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from __get_nproc. (__get_nprocs_conf): Renamed from __get_nproc_conf. Fri Sep 27 03:49:56 1996 Ulrich Drepper <drepper@cygnus.com> Add support for cancelable system calls. * csu/initfini.c: Make in crti.o reference to symbol __libc_force_cancel_wrapper when compiling reentrant version. * misc/Makefile (routines): Add force-wrapper. * misc/force-wrapper.c: New file. * posix/system.c: Rename function to __libc_system and make system a weak alias. * sysdeps/stub/system.c: Likewise. * posix/wait.c: Rename function to __libc_wait and make __wait a weak alias. De-ANSI-fy. * sysdeps/standalone/read.c: Rename function to __libc_read and make __read a weak alias. * sysdeps/stub/read.c: Likewise. * sysdeps/standalone/write.c: Rename function to __libc_write and make __write a weak alias. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/tcdrain.c: Rename function to __libc_tcdrain and make tcdrain a weak alias. * sysdeps/unix/bsd/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Likewise. * sysdeps/unix/sysv/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait.c: Rename function to __libc_wait and make __wait a weak alias. * sysdeps/stub/waitpid.c: Rename function to __libc_waitpid and make __waitpid a weak alias. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/common/pause.c: Rename function to __libc_pause and make pause a weak alias. De-ANSI-fy. * sysdeps/unix/syscalls.list: Change name for close, fcntl, fsync, lseek, open, read, and write to have __libc_ prefix and make old names a weak alias. * sysdeps/unix/mman/syscalls.list: Likewise for msync. * sysdeps/unix/sysv/linux/syscalls.list: Likewise for nanosleep. * io/creat.c: De-ANSI-fy. * sysdeps/unix/sysv/linux/syscalls.list: Add pause. Thu Sep 26 19:15:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.h: Add MNTTYPE_* and MNTOPT_* macros. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. Thu Sep 26 14:40:10 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/pathconf.c: Pass descriptor for just opened file to fpathconf. Reported by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>. Thu Sep 26 04:02:43 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locfile.c (write_locale_data): Allocate room even for file name for LC_MESSAGES locale. (locafile_read): `tok_era' must be handled as a string list. * locale/programs/ld-time.c: Finish correction of handling `era'. * locale/C-time.c (_nl_C_LC_TIME): Add initializer for new fields. * locale/categories.def: Add postload function for LC_TIME. * locale/setlocale.c: Make lock global and rename to __libc_setlocale_lock. * locale/localeinfo.h (struct era_entry): New type. Used in strftime. Add prototypes for _nl_get_era_entry and _nl_get_alt_digit. * locale/lc-time.c (_nl_postload_time): New function. Initialize lazy intialization. (_nl_get_era_entry): New function. Return era entry which corresponds to given year. (_nl_get_alt_digit): New function. Return string with alternate digit representation for given number. * time/strftime.c (strftime): Use _nl_get_alt_digit to get string representing alternate digit notation. Wed Sep 25 17:31:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (union wait): Add w_status field. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. * elf/rtld.c (dl_main): Process LD_PRELOAD before loading ld.so.preload. Suggested by David Engel <david@elo.ods.com>. Wed Sep 25 13:10:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Change --version again because RMS wants the package name in parentheses. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. Tue Sep 24 01:28:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(objpfx)sysd-dirs): Depend on Subdirs files, command rewritten. ($(objpfx)version-info.h): Depend on Banner files, command rewritten. Wed Sep 25 02:44:41 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sleep.c: New file. Based on nanosleep. Tue Sep 24 21:46:02 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/lckpwdf.c (PWD_LOCKFILE): Change to /etc/lock.pwd to be on the same device as the password file. * shadow/shadow.h (struct spwd): Change type of numeric fields to `long int' since there value are days, not seconds. * shadow/putspent.c: Change casts from time_t to `long int'. * shadow/sgetspent_r.c (LINE_READER): Likewise. Mon Sep 23 23:05:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Define __set_errno to make sure the thread specific variable is set as well as the global variable. * sysdeps/mach/hurd/errnos.awk: Define macro for source code compatibility. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * shadow/putspent.c: Don't include <errno.h>. * dirent/scandir.c (scandir): Use __set_errno to set errno variable. * elf/dl-load.c (open_path): Likewise. * inet/rcmd.c (rcmd): Likewise. (rresvport): Likewise. * intl/dcgettext.c [!__set_errno]: Define __set_errno. (DCGETTEXT): Use __set_errno to set errno variable. * io/fts.c (fts_open): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. * io/ftw.c (ftw_dir): Likewise. (ftw): Likewise. * io/getwd.c (getwd): Likewise. * io/lockf.c (lockf): Likewise. * libio/libioP.h [EINVAL]: Use __set_errno to define MAYBE_SET_EINVAL. * libio/iofdopen.c (_IO_fdopen): Use MAYBE_SET_EINVAL to errno. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/fileops.c (_IO_file_open): Use __set_errno to set errno variable. * libio/iofgetpos.c (_IO_fgetpos): Likewise. * libio/iofsetpos.c (_IO_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/setlocale.c (ERROR_RETURN): Likewise. * login/getutid_r (__getutid_r): Likewise. * login/getutline_r (__getutline_r): Likewise. * login/login.c (tty_name): Likewise. * login/oututline_r.c (__pututline_r): Likewise. * malloc/malloc.c (morecore): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * misc/hsearch_r.c (hcreate_r): Likewise. (hdestroy_r): Likewise. (hsearch_r): Likewise. * nss/nsswitch.c (__nss_configure_lookup): Likewise. * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Likewise. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_files/files-XXX.c (internal_getent): Likewise. * nss/nss_files/files-parse.c (parse_list): Likewise. * posix/confstr.c (confstr): Likewise. De-ANSI-fy. * posix/execvp.c (execvp): Likewise. * posix/glob.c: Define __set_errno. (glob): Use __set_errno to set errno variable. (glob_in_dir): Likewise. * pwd/getpw.c: Likewise. De-ANSI-fy. * pwd/putpwent.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/inet_pton.c: Likewise. * resolv/res_query.c (res_search): Likewise. * resolv/res_send.c (Aerror): Likewise. (Perror): Likewise. (res_send): Likewise. * signal/sigaddset.c: Likewise. De-ANSI-fy. * signal/sigdelset.c: Likewise. * signal/sigempty.c: Likewise. * signal/sigfillset.c: Likewise. * signal/sigismem.c: Likewise. * stdio/fclose.c: Likewise. * stdio/feof.c: Likewise. * stdio/ferror.c: Likewise. * stdio/fflush.c: Likewise. * stdio/fgetc.c: Likewise. * stdio/fgetpos.c: Likewise. * stdio/fgets.c: Likewise. * stdio/fileno.c: Likewise. * stdio/fmemopen.c: Likewise. * stdio/fopen.c: Likewise. * stdio/fputc.c: Likewise. * stdio/fread.c: Likewise. * stdio/freopen.c: Likewise. * stdio/fseek.c: Likewise. * stdio/fsetpos.c: Likewise. * stdio/ftell.c: Likewise. * stdio/fwrite.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/gets.c: Likewise. * stdio/glue.c: Likewise. * stdio/internals.c: Likewise. * stdio/memstream.c: Likewise. * stdio/setvbuf.c: Likewise. * stdio/ungetc.c: Likewise. * stdio/vsscanf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * stdlib/random_r.c: Likewise. * stdlib/strfmon.c: Likewise. * stdlib/strtod.c: Likewise. * stdlib/strtol.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * time/asctime.c: Likewise. * time/localtime.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/ftime.c: Likewise. * sysdeps/generic/pty.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/generic/speed.c: Likewise. * sysdeps/generic/sysd-stdio.c: Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/libm-ieee754/k_standard.c: Likewise. * sysdeps/libm-ieee754/s_ldexp.c: Likewise. * sysdeps/libm-ieee754/s_ldexpf.c: Likewise. * sysdeps/libm-ieee754/s_ldexpl.c: Likewise. * sysdeps/libm-ieee754/w_scalb.c: Likewise. * sysdeps/libm-ieee754/w_scalbf.c: Likewise. * sysdeps/libm-ieee754/w_scalbl.c: Likewise. * sysdeps/posix/dup2.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/fdopen.c: Likewise. * sysdeps/posix/flock.c: Likewise. * sysdeps/posix/fpathconf.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/gettimeofday.c: Likewise. * sysdeps/posix/isatty.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/killpg.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pathconf.c: Likewise. * sysdeps/posix/pipestream.c: Likewise. * sysdeps/posix/remove.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/posix/sigintr.c: Likewise. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigsuspend.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sleep.c: Likewise. * sysdeps/posix/sysconf.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/posix/truncate.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/wait3.c: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/standalone/read.c: Likewise. * sysdeps/standalone/write.c: Likewise. * sysdeps/stub/__longjmp.c: Likewise. * sysdeps/stub/accept.c: Likewise. * sysdeps/stub/access.c: Likewise. * sysdeps/stub/acct.c: Likewise. * sysdeps/stub/adjtime.c: Likewise. * sysdeps/stub/alarm.c: Likewise. * sysdeps/stub/bind.c: Likewise. * sysdeps/stub/brk.c: Likewise. * sysdeps/stub/chdir.c: Likewise. * sysdeps/stub/chflags.c: Likewise. * sysdeps/stub/chmod.c: Likewise. * sysdeps/stub/chown.c: Likewise. * sysdeps/stub/chroot.c: Likewise. * sysdeps/stub/clock.c: Likewise. * sysdeps/stub/close.c: Likewise. * sysdeps/stub/closedir.c: Likewise. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/ctermid.c: Likewise. * sysdeps/stub/cuserid.c: Likewise. * sysdeps/stub/dirfd.c: Likewise. * sysdeps/stub/dup.c: Likewise. * sysdeps/stub/dup2.c: Likewise. * sysdeps/stub/euidaccess.c: Likewise. * sysdeps/stub/execve.c: Likewise. * sysdeps/stub/fchdir.c: Likewise. * sysdeps/stub/fchflags.c: Likewise. * sysdeps/stub/fchmod.c: Likewise. * sysdeps/stub/fchown.c: Likewise. * sysdeps/stub/fcntl.c: Likewise. * sysdeps/stub/fdopen.c: Likewise. * sysdeps/stub/fexecve.c: Likewise. * sysdeps/stub/flock.c: Likewise. * sysdeps/stub/fork.c: Likewise. * sysdeps/stub/fpathconf.c: Likewise. * sysdeps/stub/fstatfs.c: Likewise. * sysdeps/stub/fsync.c: Likewise. * sysdeps/stub/ftruncate.c: Likewise. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/getdomain.c: Likewise. * sysdeps/stub/getdtsz.c: Likewise. * sysdeps/stub/getegid.c: Likewise. * sysdeps/stub/getenv.c: Likewise. * sysdeps/stub/geteuid.c: Likewise. * sysdeps/stub/getgid.c: Likewise. * sysdeps/stub/getgroups.c: Likewise. * sysdeps/stub/gethostid.c: Likewise. * sysdeps/stub/gethostname.c: Likewise. * sysdeps/stub/getitimer.c: Likewise. * sysdeps/stub/getlogin.c: Likewise. * sysdeps/stub/getlogin_r.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/stub/getpeername.c: Likewise. * sysdeps/stub/getpid.c: Likewise. * sysdeps/stub/getppid.c: Likewise. * sysdeps/stub/getpriority.c: Likewise. * sysdeps/stub/getrlimit.c: Likewise. * sysdeps/stub/getrusage.c: Likewise. * sysdeps/stub/getsid.c: Likewise. * sysdeps/stub/getsockname.c: Likewise. * sysdeps/stub/getsockopt.c: Likewise. * sysdeps/stub/getsysstats.c: Likewise. * sysdeps/stub/gettimeofday.c: Likewise. * sysdeps/stub/getuid.c: Likewise. * sysdeps/stub/gtty.c: Likewise. * sysdeps/stub/ioctl.c: Likewise. * sysdeps/stub/isatty.c: Likewise. * sysdeps/stub/isfdtype.c: Likewise. * sysdeps/stub/kill.c: Likewise. * sysdeps/stub/killpg.c: Likewise. * sysdeps/stub/link.c: Likewise. * sysdeps/stub/listen.c: Likewise. * sysdeps/stub/lseek.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/madvice.c: Likewise. * sysdeps/stub/mkdir.c: Likewise. * sysdeps/stub/mkfifo.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysdeps/stub/mmap.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/mprotect.c: Likewise. * sysdeps/stub/msgctl.c: Likewise. * sysdeps/stub/msgget.c: Likewise. * sysdeps/stub/msgrcv.c: Likewise. * sysdeps/stub/msgsnd.c: Likewise. * sysdeps/stub/msync.c: Likewise. * sysdeps/stub/munmap.c: Likewise. * sysdeps/stub/nanosleep.c: Likewise. * sysdeps/stub/nice.c: Likewise. * sysdeps/stub/nlist.c: Likewise. * sysdeps/stub/open.c: Likewise. * sysdeps/stub/opendir.c: Likewise. * sysdeps/stub/pathconf.c: Likewise. * sysdeps/stub/pause.c: Likewise. * sysdeps/stub/pipe.c: Likewise. * sysdeps/stub/pipestream.c: Likewise. * sysdeps/stub/poll.c: Likewise. * sysdeps/stub/profil.c: Likewise. * sysdeps/stub/ptrace.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/raise.c: Likewise. * sysdeps/stub/read.c: Likewise. * sysdeps/stub/readdir.c: Likewise. * sysdeps/stub/readlink.c: Likewise. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/recv.c: Likewise. * sysdeps/stub/recvfrom.c: Likewise. * sysdeps/stub/recvmsg.c: Likewise. * sysdeps/stub/remove.c: Likewise. * sysdeps/stub/rename.c: Likewise. * sysdeps/stub/revoke.c: Likewise. * sysdeps/stub/rewinddir.c: Likewise. * sysdeps/stub/rmdir.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/sched_getp.c: Likewise. * sysdeps/stub/sched_gets.c: Likewise. * sysdeps/stub/sched_primax.c: Likewise. * sysdeps/stub/sched_primin.c: Likewise. * sysdeps/stub/sched_rr_gi.c: Likewise. * sysdeps/stub/sched_setp.c: Likewise. * sysdeps/stub/sched_sets.c: Likewise. * sysdeps/stub/sched_yield.c: Likewise. * sysdeps/stub/seekdir.c: Likewise. * sysdeps/stub/select.c: Likewise. * sysdeps/stub/semctl.c: Likewise. * sysdeps/stub/semget.c: Likewise. * sysdeps/stub/semop.c: Likewise. * sysdeps/stub/send.c: Likewise. * sysdeps/stub/sendmsg.c: Likewise. * sysdeps/stub/sendto.c: Likewise. * sysdeps/stub/setdomain.c: Likewise. * sysdeps/stub/setegid.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/seteuid.c: Likewise. * sysdeps/stub/setgid.c: Likewise. * sysdeps/stub/setgroups.c: Likewise. * sysdeps/stub/sethostid.c: Likewise. * sysdeps/stub/sethostname.c: Likewise. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/stub/setjmp.c: Likewise. * sysdeps/stub/setlogin.c: Likewise. * sysdeps/stub/setpgid.c: Likewise. * sysdeps/stub/setpriority.c: Likewise. * sysdeps/stub/setregid.c: Likewise. * sysdeps/stub/setreuid.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * sysdeps/stub/setsid.c: Likewise. * sysdeps/stub/setsockopt.c: Likewise. * sysdeps/stub/settimeofday.c: Likewise. * sysdeps/stub/setuid.c: Likewise. * sysdeps/stub/shmat.c: Likewise. * sysdeps/stub/shmctl.c: Likewise. * sysdeps/stub/shmdt.c: Likewise. * sysdeps/stub/shmget.c: Likewise. * sysdeps/stub/shutdown.c: Likewise. * sysdeps/stub/sigaction.c: Likewise. * sysdeps/stub/sigaltstack.c: Likewise. * sysdeps/stub/sigblock.c: Likewise. * sysdeps/stub/sigintr.c: Likewise. * sysdeps/stub/signal.c: Likewise. * sysdeps/stub/sigpause.c: Likewise. * sysdeps/stub/sigpending.c: Likewise. * sysdeps/stub/sigprocmask.c: Likewise. * sysdeps/stub/sigreturn.c: Likewise. * sysdeps/stub/sigsetmask.c: Likewise. * sysdeps/stub/sigstack.c: Likewise. * sysdeps/stub/sigsuspend.c: Likewise. * sysdeps/stub/sigvec.c: Likewise. * sysdeps/stub/sleep.c: Likewise. * sysdeps/stub/socket.c: Likewise. * sysdeps/stub/socketpair.c: Likewise. * sysdeps/stub/sstk.c: Likewise. * sysdeps/stub/statfs.c: Likewise. * sysdeps/stub/stime.c: Likewise. * sysdeps/stub/stty.c: Likewise. * sysdeps/stub/swapoff.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/symlink.c: Likewise. * sysdeps/stub/sync.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/system.c: Likewise. * sysdeps/stub/tcdrain.c: Likewise. * sysdeps/stub/tcflow.c: Likewise. * sysdeps/stub/tcflush.c: Likewise. * sysdeps/stub/tcgetattr.c: Likewise. * sysdeps/stub/tcgetpgrp.c: Likewise. * sysdeps/stub/tcsendbrk.c: Likewise. * sysdeps/stub/tcsetattr.c: Likewise. * sysdeps/stub/tcsetpgrp.c: Likewise. * sysdeps/stub/telldir.c: Likewise. * sysdeps/stub/tempname.c: Likewise. * sysdeps/stub/time.c: Likewise. * sysdeps/stub/times.c: Likewise. * sysdeps/stub/truncate.c: Likewise. * sysdeps/stub/ttyname.c: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/ulimit.c: Likewise. * sysdeps/stub/umask.c: Likewise. * sysdeps/stub/unlink.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/stub/ustat.c: Likewise. * sysdeps/stub/utime.c: Likewise. * sysdeps/stub/utimes.c: Likewise. * sysdeps/stub/vhangup.c: Likewise. * sysdeps/stub/wait.c: Likewise. * sysdeps/stub/wait3.c: Likewise. * sysdeps/stub/wait4.c: Likewise. * sysdeps/stub/waitpid.c: Likewise. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/stub/xmknod.c: Likewise. * sysdeps/stub/xstat.c: Likewise. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/getlogin.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/mkdir.c: Likewise. * sysdeps/unix/nice.c: Likewise. * sysdeps/unix/nlist.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/readdir.c: Likewise. * sysdeps/unix/rmdir.c: Likewise. * sysdeps/unix/stime.c: Likewise. * sysdeps/unix/xmknod.c: Likewise. * sysdeps/unix/xstat.c: Likewise. * sysdeps/unix/bsd/isatty.c: Likewise. * sysdeps/unix/bsd/setegid.c: Likewise. * sysdeps/unix/bsd/seteuid.c: Likewise. * sysdeps/unix/bsd/setsid.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sigprocmask.c: Likewise. * sysdeps/unix/bsd/sigsuspend.c: Likewise. * sysdeps/unix/bsd/tcflow.c: Likewise. * sysdeps/unix/bsd/tcflush.c: Likewise. * sysdeps/unix/bsd/tcgetattr.c: Likewise. * sysdeps/unix/bsd/tcsetattr.c: Likewise. * sysdeps/unix/bsd/times.c: Likewise. * sysdeps/unix/bsd/ulimit.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/common/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/setrlimit.c: Likewise. * sysdeps/unix/sysv/settimeofday.c: Likewise. * sysdeps/unix/sysv/sigaction.c: Likewise. * sysdeps/unix/sysv/tcflow.c: Likewise. * sysdeps/unix/sysv/tcflush.c: Likewise. * sysdeps/unix/sysv/tcgetattr.c: Likewise. * sysdeps/unix/sysv/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/tcsetattr.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/speed.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Likewise. * sysdeps/unix/sysv/linux/i386/brk.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/m68k/brk.c: Likewise. * sunrpc/clnt_tcp.c: Protect declaration of errno by #ifndef. * sunrpc/clnt_udp.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sysdeps/generic/strtok.c: Don't check argument, just crash. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/stub/start.c: Make __errno a strong alias of errno. * sysdeps/unix/start.c: Likewise. De-ANSI-fy. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/standalone/m68k/m68020/start.S: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. Mon Sep 23 17:54:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Put package name in --version message in parantheses. Reported by Jim Meyering. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * sysdeps/i386/fpu/__math.h (tan): Make sure gcc knows we use two registers. Patch by John Bowman. Sat Sep 21 15:08:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/mach/libc-lock.h: Fix comment. * sysdeps/stubs/libc-lock.h: Likewise. Sat Sep 21 13:50:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/genops.c (_IO_init) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_init macro. (_IO_default_finish) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_fini macro. Sat Sep 21 14:35:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER) [_LIBC_REENTRANT]: Add missing semicolon. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Move inclusion of sysdep.h to the top outside of #ifndef PIC. Don't include errnos.h. Use the ENTRY macro. Sat Sep 21 14:33:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile: Make `all' the default target. * po/Makefile: Likewise. Mon Sep 23 15:49:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/test-canon.c: Correct patch from Thu Sep 12 23:01:16 1996. I applied it incorrectly. * sysdeps/m68k/fpu/s_scalbn.c: Likewise. * sysdeps/m68k/fpu/s_scalbnf.c: Likewise. * sysdeps/m68k/fpu/s_scalbnl.c: Likewise. Mon Sep 23 03:00:10 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/sgetspent_r.c (LINE_PARSER): Accept empty 9th field. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * shadow/sgetspent_r.c (LINE_PARSER): Don't accept any chars after 9th field. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Add sys/debugreg.h, sys/kd.h, sys/soundcard.h, and sys/vt.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: New file. * sysdeps/unix/sysv/linux/sys/kd.h: New file. * sysdeps/unix/sysv/linux/sys/soundcard.h: New file. * sysdeps/unix/sysv/linux/sys/vt.h: New file. Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
695 lines
19 KiB
C
695 lines
19 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
|
|
/* Make sure that FP has its functions set. */
|
|
void
|
|
__stdio_check_funcs (fp)
|
|
register FILE *fp;
|
|
{
|
|
if (!fp->__seen)
|
|
{
|
|
/* Initialize the stream's info, including buffering info.
|
|
This may give a buffer, change I/O functions, etc.
|
|
If no buffer is set (and the stream is not made explicitly
|
|
unbuffered), we allocate a buffer below, using the bufsize
|
|
set by this function. */
|
|
extern void __stdio_init_stream __P ((FILE *));
|
|
fp->__room_funcs = __default_room_functions;
|
|
fp->__io_funcs = __default_io_functions;
|
|
__stdio_init_stream (fp);
|
|
fp->__seen = 1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Minimum size of a buffer we will allocate by default.
|
|
If this much memory is not available,
|
|
the stream in question will be made unbuffered instead. */
|
|
#define MIN_BUFSIZE 128
|
|
|
|
/* Figure out what kind of buffering (none, line, or full)
|
|
and what buffer size to give FP. */
|
|
static void
|
|
init_stream (fp)
|
|
register FILE *fp;
|
|
{
|
|
__stdio_check_funcs (fp);
|
|
|
|
if (fp->__buffer == NULL && !fp->__userbuf)
|
|
{
|
|
int save;
|
|
|
|
if (fp->__bufsize == 0)
|
|
fp->__bufsize = BUFSIZ;
|
|
|
|
/* Try to get however many bytes of buffering __stdio_pickbuf
|
|
specified, but if that much memory isn't available,
|
|
try half as much each time until it succeeds or the buffer
|
|
size becomes too small to be useful. */
|
|
save = errno;
|
|
while (fp->__bufsize >= MIN_BUFSIZE)
|
|
{
|
|
fp->__buffer = (char *) malloc (fp->__bufsize);
|
|
if (fp->__buffer == NULL)
|
|
fp->__bufsize /= 2;
|
|
else
|
|
break;
|
|
}
|
|
__set_errno (save);
|
|
|
|
if (fp->__buffer == NULL)
|
|
{
|
|
/* We can't get space for the buffer, so make it unbuffered. */
|
|
fp->__userbuf = 1;
|
|
fp->__bufsize = 0;
|
|
}
|
|
}
|
|
|
|
if (fp->__bufp == NULL)
|
|
{
|
|
/* Set the buffer pointer to the beginning of the buffer. */
|
|
fp->__bufp = fp->__buffer;
|
|
fp->__put_limit = fp->__get_limit = fp->__buffer;
|
|
}
|
|
}
|
|
|
|
|
|
/* Determine the current file position of STREAM if it is unknown. */
|
|
int
|
|
__stdio_check_offset (stream)
|
|
FILE *stream;
|
|
{
|
|
init_stream (stream);
|
|
|
|
if (stream->__offset == (fpos_t) -1)
|
|
{
|
|
/* This stream's offset is unknown or unknowable. */
|
|
if (stream->__io_funcs.__seek == NULL)
|
|
{
|
|
/* Unknowable. */
|
|
__set_errno (ESPIPE);
|
|
return EOF;
|
|
}
|
|
else
|
|
{
|
|
/* Unknown. Find it out. */
|
|
fpos_t pos = (fpos_t) 0;
|
|
if ((*stream->__io_funcs.__seek) (stream->__cookie,
|
|
&pos, SEEK_CUR) < 0)
|
|
{
|
|
if (errno == ESPIPE)
|
|
/* Object is incapable of seeking. */
|
|
stream->__io_funcs.__seek = NULL;
|
|
return EOF;
|
|
}
|
|
stream->__offset = pos;
|
|
}
|
|
}
|
|
|
|
if (stream->__target == (fpos_t) -1)
|
|
/* This stream was opened on an existing object with
|
|
an unknown file position. The position is now known.
|
|
Make this the target position. */
|
|
stream->__target = stream->__offset;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Move FP's file position to its target file position,
|
|
seeking as necessary and updating its `offset' field.
|
|
Sets ferror(FP) (and possibly errno) for errors. */
|
|
static void
|
|
seek_to_target (fp)
|
|
FILE *fp;
|
|
{
|
|
int save = errno;
|
|
if (__stdio_check_offset (fp) == EOF)
|
|
{
|
|
if (errno == ESPIPE)
|
|
__set_errno (save);
|
|
else
|
|
fp->__error = 1;
|
|
}
|
|
else if (fp->__target != fp->__offset)
|
|
{
|
|
/* We are not at the target file position.
|
|
Seek to that position. */
|
|
if (fp->__io_funcs.__seek == NULL)
|
|
{
|
|
/* We can't seek! */
|
|
__set_errno (ESPIPE);
|
|
fp->__error = 1;
|
|
}
|
|
else
|
|
{
|
|
fpos_t pos = fp->__target;
|
|
if ((*fp->__io_funcs.__seek) (fp->__cookie, &pos, SEEK_SET) < 0)
|
|
/* Seek failed! */
|
|
fp->__error = 1;
|
|
else
|
|
{
|
|
fp->__offset = pos;
|
|
if (pos != fp->__target)
|
|
{
|
|
/* Seek didn't go to the right place!
|
|
This should never happen. */
|
|
#ifdef EGRATUITOUS
|
|
/* It happens in the Hurd when the io server doesn't
|
|
obey the protocol for io_seek. */
|
|
__set_errno (EGRATUITOUS);
|
|
#else
|
|
/* I don't think this can happen in Unix. */
|
|
__set_errno (ESPIPE); /* ??? */
|
|
#endif
|
|
fp->__error = 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Flush the buffer for FP.
|
|
If C is not EOF, it is also to be written.
|
|
If the stream is line buffered and C is a newline, it is written
|
|
to the output, otherwise it is put in the buffer after it has been
|
|
flushed to avoid a system call for a single character.
|
|
This is the default `output room' function. */
|
|
static void
|
|
flushbuf (fp, c)
|
|
register FILE *fp;
|
|
int c;
|
|
{
|
|
int flush_only = c == EOF;
|
|
size_t buffer_written;
|
|
size_t to_write;
|
|
|
|
/* Set if target and get_limit have already been twiddled appropriately. */
|
|
int twiddled = 0;
|
|
|
|
if (fp->__put_limit == fp->__buffer)
|
|
{
|
|
/* The stream needs to be primed for writing. */
|
|
|
|
size_t buffer_offset = 0;
|
|
|
|
if (fp->__target == -1)
|
|
/* For an unseekable object, data recently read bears no relation
|
|
to data we will write later. Discard the buffer. */
|
|
fp->__get_limit = fp->__buffer;
|
|
else
|
|
/* If the user has read some of the buffer, the target position
|
|
is incremented for each character he has read. */
|
|
fp->__target += fp->__bufp - fp->__buffer;
|
|
|
|
if (fp->__mode.__read && fp->__room_funcs.__input != NULL &&
|
|
!fp->__mode.__append)
|
|
{
|
|
int save = errno;
|
|
const int aligned = (fp->__buffer == NULL ||
|
|
__stdio_check_offset (fp) == EOF ||
|
|
fp->__target % fp->__bufsize == 0);
|
|
__set_errno (save);
|
|
|
|
if (!aligned)
|
|
{
|
|
/* Move to a block (buffer size) boundary and read in a block.
|
|
Then the output will be written as a whole block, too. */
|
|
const size_t o = fp->__target % fp->__bufsize;
|
|
fp->__target -= o;
|
|
if ((*fp->__room_funcs.__input) (fp) == EOF && ferror (fp))
|
|
return;
|
|
else
|
|
__clearerr (fp);
|
|
|
|
if (fp->__get_limit - fp->__buffer < o)
|
|
/* Oops. We didn't read enough (probably because we got EOF).
|
|
Forget we even mentioned it. */
|
|
fp->__target += o;
|
|
else
|
|
/* Start bufp as far into the buffer as we were into
|
|
this block before we read it. */
|
|
buffer_offset = o;
|
|
|
|
/* The target position is now set to where the beginning of the
|
|
buffer maps to; and the get_limit was set by the input-room
|
|
function. */
|
|
twiddled = 1;
|
|
}
|
|
}
|
|
|
|
if (fp->__buffer != NULL)
|
|
{
|
|
/* Set up to write output into the buffer. */
|
|
fp->__put_limit = fp->__buffer + fp->__bufsize;
|
|
fp->__bufp = fp->__buffer + buffer_offset;
|
|
|
|
if (!flush_only)
|
|
{
|
|
/* Put C in the buffer to be written out.
|
|
We only need to actually write it out now if
|
|
it is a newline on a line-buffered stream. */
|
|
*fp->__bufp++ = (unsigned char) c;
|
|
if (!fp->__linebuf || (unsigned char) c != '\n')
|
|
{
|
|
/* There is no need to flush C from the buffer right now.
|
|
Record that nothing was written from the buffer,
|
|
and go do clean-up at end. */
|
|
buffer_written = 0;
|
|
goto end;
|
|
}
|
|
else
|
|
/* We put C in the buffer, so don't write it again later. */
|
|
flush_only = 1;
|
|
}
|
|
}
|
|
|
|
if (fp->__bufp - fp->__buffer <= buffer_offset && flush_only)
|
|
{
|
|
/* There is nothing new in the buffer, only data that
|
|
was read back aligned from the file. */
|
|
buffer_written = 0;
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
/* If there is read data in the buffer past what was written,
|
|
write all of that as well. Otherwise, just write what has been
|
|
written into the buffer. */
|
|
buffer_written = fp->__bufp - fp->__buffer;
|
|
to_write = (buffer_written == 0 ? 0 :
|
|
fp->__get_limit > fp->__bufp ?
|
|
fp->__get_limit - fp->__buffer :
|
|
buffer_written);
|
|
|
|
if (fp->__io_funcs.__write == NULL || (to_write == 0 && flush_only))
|
|
{
|
|
/* There is no writing function or we're coming from an fflush
|
|
call with nothing in the buffer, so just say the buffer's
|
|
been flushed, increment the file offset, and return. */
|
|
fp->__bufp = fp->__buffer;
|
|
if (fp->__offset != -1)
|
|
fp->__offset += to_write;
|
|
goto end;
|
|
}
|
|
|
|
if (to_write > 0)
|
|
{
|
|
int wrote;
|
|
|
|
/* Go to the target file position. Don't bother if appending;
|
|
the write will just ignore the file position anyway. */
|
|
if (!fp->__mode.__append)
|
|
seek_to_target (fp);
|
|
|
|
if (!ferror(fp))
|
|
{
|
|
/* Write out the buffered data. */
|
|
wrote = (*fp->__io_funcs.__write) (fp->__cookie, fp->__buffer,
|
|
to_write);
|
|
if (wrote > 0)
|
|
{
|
|
if (fp->__mode.__append)
|
|
/* The write has written the data to the end of the file
|
|
and updated the file position to after the data. Don't
|
|
bother to find the current position; we can get it
|
|
later if we need it. */
|
|
fp->__offset = fp->__target = -1;
|
|
else if (fp->__offset != -1)
|
|
/* Record that we've moved forward in the file. */
|
|
fp->__offset += wrote;
|
|
}
|
|
if (wrote < (int) to_write)
|
|
/* The writing function should always write
|
|
the whole buffer unless there is an error. */
|
|
fp->__error = 1;
|
|
}
|
|
}
|
|
|
|
/* Reset the buffer pointer to the beginning of the buffer. */
|
|
fp->__bufp = fp->__buffer;
|
|
|
|
/* If we're not just flushing, write the last character, C. */
|
|
if (!flush_only && !ferror (fp))
|
|
{
|
|
if (fp->__buffer == NULL || (fp->__linebuf && (unsigned char) c == '\n'))
|
|
{
|
|
/* Either we're unbuffered, or we're line-buffered and
|
|
C is a newline, so really write it out immediately. */
|
|
char cc = (unsigned char) c;
|
|
if ((*fp->__io_funcs.__write)(fp->__cookie, &cc, 1) < 1)
|
|
fp->__error = 1;
|
|
else if (fp->__offset != -1)
|
|
{
|
|
/* Record that we've moved forward in the file. */
|
|
++fp->__offset;
|
|
++fp->__target;
|
|
}
|
|
}
|
|
else
|
|
/* Just put C in the buffer. */
|
|
*fp->__bufp++ = (unsigned char) c;
|
|
}
|
|
|
|
end:
|
|
|
|
if (!twiddled)
|
|
{
|
|
if (fp->__target != -1)
|
|
/* The new target position moves up as
|
|
much as the user wrote into the buffer. */
|
|
fp->__target += buffer_written;
|
|
|
|
/* Set the reading limit to the beginning of the buffer,
|
|
so the next `getc' will call __fillbf. */
|
|
fp->__get_limit = fp->__buffer;
|
|
}
|
|
|
|
if (feof (fp) || ferror (fp))
|
|
fp->__bufp = fp->__put_limit;
|
|
}
|
|
|
|
|
|
/* Fill the buffer for FP and return the first character read (or EOF).
|
|
This is the default `input_room' function. */
|
|
static int
|
|
fillbuf (fp)
|
|
register FILE *fp;
|
|
{
|
|
/* How far into the buffer we read we want to start bufp. */
|
|
size_t buffer_offset = 0;
|
|
register char *buffer;
|
|
register size_t to_read, nread = 0;
|
|
/* This must be unsigned to avoid sign extension in return. */
|
|
unsigned char c;
|
|
|
|
if (fp->__io_funcs.__read == NULL)
|
|
{
|
|
/* There is no read function, so always return EOF. */
|
|
fp->__eof = 1;
|
|
goto end;
|
|
}
|
|
|
|
if (fp->__buffer == NULL)
|
|
{
|
|
/* We're unbuffered, so we want to read only one character. */
|
|
buffer = (char *) &c;
|
|
to_read = 1;
|
|
}
|
|
else
|
|
{
|
|
/* We're buffered, so try to fill the buffer. */
|
|
buffer = fp->__buffer;
|
|
to_read = fp->__bufsize;
|
|
}
|
|
|
|
/* We're reading, so we're not at the end-of-file. */
|
|
fp->__eof = 0;
|
|
|
|
/* Go to the target file position. */
|
|
{
|
|
int save = errno;
|
|
if (__stdio_check_offset (fp) == 0 && fp->__target != fp->__offset)
|
|
{
|
|
/* Move to a block (buffer size) boundary. */
|
|
if (fp->__bufsize != 0)
|
|
{
|
|
buffer_offset = fp->__target % fp->__bufsize;
|
|
fp->__target -= buffer_offset;
|
|
}
|
|
seek_to_target (fp);
|
|
}
|
|
__set_errno (save);
|
|
}
|
|
|
|
while (!ferror (fp) && !feof (fp) && nread <= buffer_offset)
|
|
{
|
|
/* Try to fill the buffer. */
|
|
int count = (*fp->__io_funcs.__read) (fp->__cookie, buffer, to_read);
|
|
if (count == 0)
|
|
fp->__eof = 1;
|
|
else if (count < 0)
|
|
fp->__error = 1;
|
|
else
|
|
{
|
|
buffer += count;
|
|
nread += count;
|
|
to_read -= count;
|
|
if (fp->__offset != -1)
|
|
/* Record that we've moved forward in the file. */
|
|
fp->__offset += count;
|
|
}
|
|
}
|
|
|
|
if (fp->__buffer == NULL)
|
|
/* There is no buffer, so return the character we read
|
|
without all the buffer pointer diddling. */
|
|
return (feof (fp) || ferror (fp)) ? EOF : c;
|
|
|
|
/* Reset the buffer pointer to the beginning of the buffer
|
|
(plus whatever offset we may have set above). */
|
|
fp->__bufp = fp->__buffer + buffer_offset;
|
|
|
|
end:;
|
|
|
|
if (feof (fp) || ferror (fp))
|
|
{
|
|
/* Set both end pointers to the beginning of the buffer so
|
|
the next i/o call will force a call to __fillbf/__flshfp. */
|
|
fp->__put_limit = fp->__get_limit = fp->__buffer;
|
|
return EOF;
|
|
}
|
|
|
|
/* Set the end pointer to one past the last character we read. */
|
|
fp->__get_limit = fp->__buffer + nread;
|
|
|
|
/* Make it so the next `putc' will call __flshfp. */
|
|
fp->__put_limit = fp->__buffer;
|
|
|
|
/* Return the first character in the buffer. */
|
|
return *((unsigned char *) (fp->__bufp++));
|
|
}
|
|
|
|
|
|
/* Default I/O and room functions. */
|
|
|
|
extern __io_read_fn __stdio_read;
|
|
extern __io_write_fn __stdio_write;
|
|
extern __io_seek_fn __stdio_seek;
|
|
extern __io_close_fn __stdio_close;
|
|
extern __io_fileno_fn __stdio_fileno;
|
|
const __io_functions __default_io_functions =
|
|
{
|
|
__stdio_read, __stdio_write, __stdio_seek, __stdio_close, __stdio_fileno
|
|
};
|
|
|
|
const __room_functions __default_room_functions =
|
|
{
|
|
fillbuf, flushbuf
|
|
};
|
|
|
|
|
|
/* Flush the buffer for FP and also write C if FLUSH_ONLY is nonzero.
|
|
This is the function used by putc and fflush. */
|
|
int
|
|
__flshfp (fp, c)
|
|
register FILE *fp;
|
|
int c;
|
|
{
|
|
int flush_only = c == EOF;
|
|
|
|
if (!__validfp (fp) || !fp->__mode.__write)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return EOF;
|
|
}
|
|
|
|
if (ferror (fp))
|
|
return EOF;
|
|
|
|
if (fp->__pushed_back)
|
|
{
|
|
/* Discard the char pushed back by ungetc. */
|
|
fp->__bufp = fp->__pushback_bufp;
|
|
fp->__pushed_back = 0;
|
|
}
|
|
|
|
/* Make sure the stream is initialized (has functions and buffering). */
|
|
init_stream (fp);
|
|
|
|
/* Do this early, so a `putc' on such a stream will never return success. */
|
|
if (fp->__room_funcs.__output == NULL)
|
|
{
|
|
/* A NULL `output room' function means
|
|
to always return an output error. */
|
|
fp->__error = 1;
|
|
return EOF;
|
|
}
|
|
|
|
if (!flush_only &&
|
|
/* Will C fit into the buffer?
|
|
See below about linebuf_active. */
|
|
fp->__bufp < (fp->__linebuf_active ? fp->__buffer + fp->__bufsize :
|
|
fp->__put_limit))
|
|
{
|
|
/* The character will fit in the buffer, so put it there. */
|
|
*fp->__bufp++ = (unsigned char) c;
|
|
if (fp->__linebuf && (unsigned char) c == '\n')
|
|
flush_only = 1;
|
|
else
|
|
return (unsigned char) c;
|
|
}
|
|
|
|
if (fp->__linebuf_active)
|
|
/* This is an active line-buffered stream, so its put-limit is set
|
|
to the beginning of the buffer in order to force a __flshfp call
|
|
on each putc (see below). We undo this hack here (by setting
|
|
the limit to the end of the buffer) to simplify the interface
|
|
with the output-room function. */
|
|
fp->__put_limit = fp->__buffer + fp->__bufsize;
|
|
|
|
/* Make room in the buffer. */
|
|
(*fp->__room_funcs.__output) (fp, flush_only ? EOF : (unsigned char) c);
|
|
|
|
if (fp->__linebuf)
|
|
{
|
|
/* This is a line-buffered stream, and it is now ready to do
|
|
some output. We call this an "active line-buffered stream".
|
|
We set the put_limit to the beginning of the buffer,
|
|
so the next `putc' call will force a call to this function.
|
|
Setting the linebuf_active flag tells the code above
|
|
(on the next call) to undo this hackery. */
|
|
fp->__put_limit = fp->__buffer;
|
|
fp->__linebuf_active = 1;
|
|
}
|
|
|
|
if (ferror (fp))
|
|
return EOF;
|
|
if (flush_only)
|
|
return 0;
|
|
return (unsigned char) c;
|
|
}
|
|
|
|
|
|
/* Fill the buffer for FP and return the first character read.
|
|
This is the function used by getc. */
|
|
int
|
|
__fillbf (fp)
|
|
register FILE *fp;
|
|
{
|
|
register int c;
|
|
fpos_t new_target;
|
|
|
|
if (!__validfp (fp) || !fp->__mode.__read)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return EOF;
|
|
}
|
|
|
|
if (fp->__pushed_back)
|
|
{
|
|
/* Return the char pushed back by ungetc. */
|
|
fp->__bufp = fp->__pushback_bufp;
|
|
fp->__pushed_back = 0;
|
|
return fp->__pushback;
|
|
}
|
|
|
|
/* Make sure the stream is initialized (has functions and buffering). */
|
|
init_stream (fp);
|
|
|
|
/* If we're trying to read the first character of a new
|
|
line of input from an unbuffered or line buffered stream,
|
|
we must flush all line-buffered output streams. */
|
|
if (fp->__buffer == NULL || fp->__linebuf)
|
|
{
|
|
register FILE *f;
|
|
for (f = __stdio_head; f != NULL; f = f->__next)
|
|
if (__validfp (f) && f->__linebuf && f->__mode.__write)
|
|
(void) __flshfp (f, EOF);
|
|
}
|
|
|
|
/* Note we must do this after flushing all line-buffered
|
|
streams, or else __flshfp would undo it! */
|
|
if (fp->__linebuf_active)
|
|
{
|
|
/* This is an active line-buffered stream, meaning it is in the midst
|
|
of writing, but has a bogus put_limit. Restore it to normality. */
|
|
fp->__put_limit = fp->__buffer + fp->__bufsize;
|
|
fp->__linebuf_active = 0;
|
|
}
|
|
|
|
/* We want the beginning of the buffer to now
|
|
map to just past the last data we read. */
|
|
new_target = fp->__target + (fp->__get_limit - fp->__buffer);
|
|
|
|
if (fp->__put_limit > fp->__buffer)
|
|
{
|
|
/* There is written data in the buffer.
|
|
Flush it out. */
|
|
if (fp->__room_funcs.__output == NULL)
|
|
fp->__error = 1;
|
|
else
|
|
(*fp->__room_funcs.__output) (fp, EOF);
|
|
}
|
|
|
|
fp->__target = new_target;
|
|
|
|
if (ferror (fp))
|
|
c = EOF;
|
|
else if (fp->__room_funcs.__input != NULL)
|
|
{
|
|
c = (*fp->__room_funcs.__input) (fp);
|
|
if (fp->__buffer == NULL)
|
|
/* This is an unbuffered stream, so the target sync above
|
|
won't do anything the next time around. Instead, note that
|
|
we have read one character. The (nonexistent) buffer now
|
|
maps to the position just past that character. */
|
|
++fp->__target;
|
|
}
|
|
else
|
|
{
|
|
/* A NULL `input_room' function means always return EOF. */
|
|
fp->__eof = 1;
|
|
c = EOF;
|
|
}
|
|
|
|
return c;
|
|
}
|
|
|
|
|
|
/* Nuke a stream, but don't kill its link in the chain. */
|
|
void
|
|
__invalidate (stream)
|
|
register FILE *stream;
|
|
{
|
|
/* Save its link. */
|
|
register FILE *next = stream->__next;
|
|
|
|
/* Pulverize the fucker. */
|
|
memset((void *) stream, 0, sizeof(FILE));
|
|
|
|
/* Restore the deceased's link. */
|
|
stream->__next = next;
|
|
}
|