mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
Sat Sep 7 05:15:45 1996 Ulrich Drepper <drepper@cygnus.com> * libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO. * libio/iofopen: Likewise. * libio/iofopncook.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vdprintf.c: Likewise. * libio/vsnprintf.c: Likewise. Sat Sep 7 03:55:47 1996 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (soversions.mk): Also use shlib-versions files in add-on directories. * config.make.in (config-defines): Remove. Not used anymore. (defines): New variable. Initiliazed by @DEFINES@. * configure.in: Add AC_SUBST(DEFINES). * libio/Makefile (routines): When compiling reentrant libc add clearerr_u, feof_u, ferror_u, fputc_u, getc_u, getchar_u, iofflush_u, putc_u, putchar_u, ioflockfile. (CPPFLAGS): Add -D_IO_MTSAFE_IO for reentrant libc. * sysdeps/stub/libc-lock.h: Add stubs for __libc_cleanup_region_start and __libc_cleanup_region_end. * sysdeps/unix/i386/sysdep.S [_LIBC_REENTRANT]: Set errno using __errno_location function. * sysdeps/unix/sysv/linux/i386/sysdep.S [_LIBC_REENTRANT]: Set errno using __errno_location function. (__errno_location): New function. * sysdeps/unix/sysv/linux/i386/sysdep.h [PIC]: Add second syscall_error handler for reentrant libc. * sysdeps/unix/opendir.c: Remove unneeded `;'. * libio.h [_IO_MTSAFE_IO]: Include <pthread.h>. [!_IO_MTSAFE_IO]: Define _IO_flockfile and _IO_funlockfile as empty macros. * libioP.h: Include <libc-lock.h>. * libio/stdio.h: Add prototypes for *_locked and *_unlocked functions. * libio/clearerr.c: Use _IO_ protected versions of flockfile and funlockfile to be namespace clean. * libio/genops.c: Use __libc_lock_* macros for handling lock. * libio/iofdopen: Add initialization of _lock in _IO_FILE. * libio/iofopen: Likewise. * libio/iofopncook.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vdprintf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/fgetc.c: Use __libc_cleanup_region_* macros instead of flockfile etc. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * libio/clearerr_u.c: Correct alias name. * libio/ferror_u.c: Likewise. * libio/fileno.c: Likewise. * libio/fputc_u.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/feof_u.c: Undefine macro with name of function before definition of function itself. * libio/ioflockfile.c: New file. Implementation of flockfile and funlockfile. * libio/putchar_u.c: Fix typo. Use stdout instead of fp. * malloc/malloc.h: Don't include <libc-lock.h> and don't declare _malloc_loc. * malloc/free.c: Include <libc-lock.h>. * malloc/realloc.c: Likewise. * malloc/malloc-find.c: Likewise. * malloc/malloc-size.c: Likewise. * malloc/malloc-walk.c: Likewise. * malloc/memalign.c: Likewise. * malloc/malloc.c: Likewise. * sysdeps/i386/dl-machine.h: Correct clearing of _dl_starting_up. Fri Sep 6 19:38:49 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/libc-lock.h: Define __libc_lock_critical_start and __libc_lock_critical_end as empty macros. * malloc/malloc.h: Don't include <libc-lock.h> and don't declare __libc_malloc_lock. * malloc/free.c: Include <libc-lock.h>. * malloc/malloc-find.c: Likewise. * malloc/malloc-size.c: Likewise. * malloc/malloc-walk.c: Likewise. * malloc/malloc.c: Likewise. * malloc/memalign.c: Likewise. * malloc/realloc.c: Likewise. * Makefile: Undo change from Mon Sep 2 22:15:14 1996. No more extra_solibs pass. * Rules: Likewise. * extra-lib.mk: Likewise. * manual/Makefile: Likewise. * db/Makefile (makedb): Choose dependecies based on build-shared. Patch by Andres Schwab. * sysdeps/posix/sysconf.c: Don't use PTHREAD_DESTRUCTOR_ITERATIONS but _POSIX_THREAD_DESTRUCTOR_ITERATIONS. * sysdeps/unix/sysv/linux/errnos.h: New file. * sysdeps/unix/sysv/linux/schedbits.h: New file. * sysdeps/unix/sysv/linux/waitflags.h: New file. * sysdeps/unix/sysv/linux/gnu/types.h: Add definition of `key_t'. Fri Sep 6 08:26:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * rpm/template: Fix typo in %build section. Fri Sep 6 03:31:07 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Don't define errno macro when building libc without thread support. * resolv/netdb.h: Likewise for h_errno macro. Thu Sep 5 23:01:48 1996 Ulrich Drepper <drepper@cygnus.com> * libc-symbols.h: Add new macro weak_const_function. It's like weak_function, but the function is additionally marked as const. * features.h: Only include <sys/cdefs.h> if !__ASSEMBLER__. Thu Sep 5 22:55:49 1996 Richard Henderson <rth@tamu.edu> * inet/herrno.c (__h_errno_location): New function. (h_errno): Make strong_alias __h_errno so that we can access the variable even if `h_errno' is a macro. * resolv/netdb.h: Define macro h_errno to access thread specific version of h_errno variable. Declare alias __h_errno for h_errno. * resolv/res_query (h_errno): Remove definition. * sysdeps/unix/sysv/linux/errnos.h [!__ASSEMBLER__ && __USE_REENTRANT]: Add macro `errno' to get thread specific variable. * sysdeps/unix/alpha/sysdep.S [_LIBC_REENTRANT]: Set errno using __errno_location function. (__errno_location): New function. Thu Sep 5 21:08:44 1996 Ulrich Drepper <drepper@cygnus.com> * posix/gnu/types.h: Remove definition of key_t. * sysdeps/generic/gnu/types.h: Move it to here. * sysdeps/unix/sysv/linux/gnu/types.h: Add Linux specific definition of key_t. * sysdeps/unix/sysv/linux/waitflags.h: New file. Linux specific definitions. * sysdeps/unix/sysv/linux/schedbits.h: New file. Include clone prototypes and associated flags. Thu Sep 5 08:58:47 1996 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/elf/start.S: Make _start global again. hertz. here. Wed Sep 4 16:16:13 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/hurd/send.c (__send): De-ANSI-fy. * sysdeps/mach/hurd/sendto.c (sendto): Likewise.
293 lines
8.4 KiB
C++
293 lines
8.4 KiB
C++
/*
|
|
Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation
|
|
|
|
This file is part of the GNU IO Library. This library is free
|
|
software; you can redistribute it and/or modify it under the
|
|
terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
This 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this library; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
As a special exception, if you link this library with files
|
|
compiled with a GNU compiler to produce an executable, this does not cause
|
|
the resulting executable to be covered by the GNU General Public License.
|
|
This exception does not however invalidate any other reasons why
|
|
the executable file might be covered by the GNU General Public License. */
|
|
|
|
/* This is part of the iostream library. Written by Per Bothner. */
|
|
|
|
#ifndef _IO_STDIO_H
|
|
#define _IO_STDIO_H
|
|
|
|
#include <_G_config.h>
|
|
#define _IO_pos_t _G_fpos_t /* obsolete */
|
|
#define _IO_fpos_t _G_fpos_t
|
|
#define _IO_size_t _G_size_t
|
|
#define _IO_ssize_t _G_ssize_t
|
|
#define _IO_off_t _G_off_t
|
|
#define _IO_pid_t _G_pid_t
|
|
#define _IO_uid_t _G_uid_t
|
|
#define _IO_HAVE_SYS_WAIT _G_HAVE_SYS_WAIT
|
|
#define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
|
|
#define _IO_BUFSIZ _G_BUFSIZ
|
|
#define _IO_va_list _G_va_list
|
|
|
|
#ifdef _G_NEED_STDARG_H
|
|
/* This define avoids name pollution if we're using GNU stdarg.h */
|
|
#define __need___va_list
|
|
#include <stdarg.h>
|
|
#ifdef __GNUC_VA_LIST
|
|
#undef _IO_va_list
|
|
#define _IO_va_list __gnuc_va_list
|
|
#endif /* __GNUC_VA_LIST */
|
|
#endif
|
|
|
|
#ifndef __P
|
|
#ifdef __STDC__
|
|
#define __P(protos) protos
|
|
#else
|
|
#define __P(protos) ()
|
|
#endif
|
|
#endif /*!__P*/
|
|
|
|
/* For backward compatibility */
|
|
#ifndef _PARAMS
|
|
#define _PARAMS(protos) __P(protos)
|
|
#endif /*!_PARAMS*/
|
|
|
|
#ifndef __STDC__
|
|
#define const
|
|
#endif
|
|
#define _IO_UNIFIED_JUMPTABLES 1
|
|
|
|
#if 0
|
|
#ifdef _IO_NEED_STDARG_H
|
|
#include <stdarg.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef EOF
|
|
#define EOF (-1)
|
|
#endif
|
|
#ifndef NULL
|
|
#if !defined(__cplusplus) || defined(__GNUC__)
|
|
#define NULL ((void*)0)
|
|
#else
|
|
#define NULL (0)
|
|
#endif
|
|
#endif
|
|
|
|
#define _IOS_INPUT 1
|
|
#define _IOS_OUTPUT 2
|
|
#define _IOS_ATEND 4
|
|
#define _IOS_APPEND 8
|
|
#define _IOS_TRUNC 16
|
|
#define _IOS_NOCREATE 32
|
|
#define _IOS_NOREPLACE 64
|
|
#define _IOS_BIN 128
|
|
|
|
/* Magic numbers and bits for the _flags field.
|
|
The magic numbers use the high-order bits of _flags;
|
|
the remaining bits are abailable for variable flags.
|
|
Note: The magic numbers must all be negative if stdio
|
|
emulation is desired. */
|
|
|
|
#define _IO_MAGIC 0xFBAD0000 /* Magic number */
|
|
#define _OLD_STDIO_MAGIC 0xFABC0000 /* Emulate old stdio. */
|
|
#define _IO_MAGIC_MASK 0xFFFF0000
|
|
#define _IO_USER_BUF 1 /* User owns buffer; don't delete it on close. */
|
|
#define _IO_UNBUFFERED 2
|
|
#define _IO_NO_READS 4 /* Reading not allowed */
|
|
#define _IO_NO_WRITES 8 /* Writing not allowd */
|
|
#define _IO_EOF_SEEN 0x10
|
|
#define _IO_ERR_SEEN 0x20
|
|
#define _IO_DELETE_DONT_CLOSE 0x40 /* Don't call close(_fileno) on cleanup. */
|
|
#define _IO_LINKED 0x80 /* Set if linked (using _chain) to streambuf::_list_all.*/
|
|
#define _IO_IN_BACKUP 0x100
|
|
#define _IO_LINE_BUF 0x200
|
|
#define _IO_TIED_PUT_GET 0x400 /* Set if put and get pointer logicly tied. */
|
|
#define _IO_CURRENTLY_PUTTING 0x800
|
|
#define _IO_IS_APPENDING 0x1000
|
|
#define _IO_IS_FILEBUF 0x2000
|
|
|
|
/* These are "formatting flags" matching the iostream fmtflags enum values. */
|
|
#define _IO_SKIPWS 01
|
|
#define _IO_LEFT 02
|
|
#define _IO_RIGHT 04
|
|
#define _IO_INTERNAL 010
|
|
#define _IO_DEC 020
|
|
#define _IO_OCT 040
|
|
#define _IO_HEX 0100
|
|
#define _IO_SHOWBASE 0200
|
|
#define _IO_SHOWPOINT 0400
|
|
#define _IO_UPPERCASE 01000
|
|
#define _IO_SHOWPOS 02000
|
|
#define _IO_SCIENTIFIC 04000
|
|
#define _IO_FIXED 010000
|
|
#define _IO_UNITBUF 020000
|
|
#define _IO_STDIO 040000
|
|
#define _IO_DONT_CLOSE 0100000
|
|
|
|
|
|
struct _IO_jump_t; struct _IO_FILE;
|
|
|
|
/* Define the user-visible type, with user-friendly member names. */
|
|
typedef struct
|
|
{
|
|
_IO_ssize_t (*read) __P ((struct _IO_FILE *, void *, _IO_ssize_t));
|
|
_IO_ssize_t (*write) __P ((struct _IO_FILE *, const void *, _IO_ssize_t));
|
|
_IO_fpos_t (*seek) __P ((struct _IO_FILE *, _IO_off_t, int));
|
|
int (*close) __P ((struct _IO_FILE *));
|
|
} _IO_cookie_io_functions_t;
|
|
|
|
/* Handle lock. */
|
|
#ifdef _IO_MTSAFE_IO
|
|
#include <pthread.h>
|
|
typedef pthread_mutex_t _IO_lock_t;
|
|
#else
|
|
typedef void _IO_lock_t;
|
|
#endif
|
|
|
|
|
|
/* A streammarker remembers a position in a buffer. */
|
|
|
|
struct _IO_marker {
|
|
struct _IO_marker *_next;
|
|
struct _IO_FILE *_sbuf;
|
|
/* If _pos >= 0
|
|
it points to _buf->Gbase()+_pos. FIXME comment */
|
|
/* if _pos < 0, it points to _buf->eBptr()+_pos. FIXME comment */
|
|
int _pos;
|
|
#if 0
|
|
void set_streampos(streampos sp) { _spos = sp; }
|
|
void set_offset(int offset) { _pos = offset; _spos = (streampos)(-2); }
|
|
public:
|
|
streammarker(streambuf *sb);
|
|
~streammarker();
|
|
int saving() { return _spos == -2; }
|
|
int delta(streammarker&);
|
|
int delta();
|
|
#endif
|
|
};
|
|
|
|
struct _IO_FILE {
|
|
int _flags; /* High-order word is _IO_MAGIC; rest is flags. */
|
|
#define _IO_file_flags _flags
|
|
|
|
/* The following pointers correspond to the C++ streambuf protocol. */
|
|
char* _IO_read_ptr; /* Current read pointer */
|
|
char* _IO_read_end; /* End of get area. */
|
|
char* _IO_read_base; /* Start of putback+get area. */
|
|
char* _IO_write_base; /* Start of put area. */
|
|
char* _IO_write_ptr; /* Current put pointer. */
|
|
char* _IO_write_end; /* End of put area. */
|
|
char* _IO_buf_base; /* Start of reserve area. */
|
|
char* _IO_buf_end; /* End of reserve area. */
|
|
/* The following fields are used to support backing up and undo. */
|
|
char *_IO_save_base; /* Pointer to start of non-current get area. */
|
|
char *_IO_backup_base; /* Pointer to first valid character of backup area */
|
|
char *_IO_save_end; /* Pointer to end of non-current get area. */
|
|
|
|
struct _IO_marker *_markers;
|
|
|
|
struct _IO_FILE *_chain;
|
|
|
|
#if !_IO_UNIFIED_JUMPTABLES
|
|
struct _IO_jump_t *_jumps; /* Jump table */
|
|
#endif
|
|
|
|
int _fileno;
|
|
int _blksize;
|
|
_IO_off_t _offset;
|
|
|
|
#define __HAVE_COLUMN /* temporary */
|
|
/* 1+column number of pbase(); 0 is unknown. */
|
|
unsigned short _cur_column;
|
|
char _unused;
|
|
char _shortbuf[1];
|
|
|
|
/* char* _save_gptr; char* _save_egptr; */
|
|
|
|
_IO_lock_t *_lock;
|
|
};
|
|
|
|
#ifndef __cplusplus
|
|
typedef struct _IO_FILE _IO_FILE;
|
|
#endif
|
|
|
|
struct _IO_FILE_plus;
|
|
extern struct _IO_FILE_plus _IO_stdin_, _IO_stdout_, _IO_stderr_;
|
|
#define _IO_stdin ((_IO_FILE*)(&_IO_stdin_))
|
|
#define _IO_stdout ((_IO_FILE*)(&_IO_stdout_))
|
|
#define _IO_stderr ((_IO_FILE*)(&_IO_stderr_))
|
|
|
|
|
|
/* Special file type for fopencookie function. */
|
|
struct _IO_cookie_file {
|
|
struct _IO_FILE file;
|
|
const void *vtable;
|
|
void *cookie;
|
|
_IO_cookie_io_functions_t io_functions;
|
|
};
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern int __underflow __P((_IO_FILE*));
|
|
extern int __uflow __P((_IO_FILE*));
|
|
extern int __overflow __P((_IO_FILE*, int));
|
|
|
|
#define _IO_getc_unlocked(_fp) \
|
|
((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end ? __uflow(_fp) \
|
|
: *(unsigned char*)(_fp)->_IO_read_ptr++)
|
|
#define _IO_peekc_unlocked(_fp) \
|
|
((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end \
|
|
&& __underflow(_fp) == EOF ? EOF \
|
|
: *(unsigned char*)(_fp)->_IO_read_ptr)
|
|
|
|
#define _IO_putc_unlocked(_ch, _fp) \
|
|
(((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end) \
|
|
? __overflow(_fp, (unsigned char)(_ch)) \
|
|
: (unsigned char)(*(_fp)->_IO_write_ptr++ = (_ch)))
|
|
|
|
#define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0)
|
|
#define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0)
|
|
|
|
/* This one is for Emacs. */
|
|
#define _IO_PENDING_OUTPUT_COUNT(_fp) \
|
|
((_fp)->_IO_write_ptr - (_fp)->_IO_write_base)
|
|
|
|
extern int _IO_getc_locked __P ((_IO_FILE *));
|
|
extern int _IO_putc_locked __P ((int, _IO_FILE *));
|
|
|
|
extern void _IO_flockfile __P ((_IO_FILE *));
|
|
extern void _IO_funlockfile __P ((_IO_FILE *));
|
|
|
|
#ifndef _IO_MTSAFE_IO
|
|
# define _IO_flockfile(FILE) /**/
|
|
# define _IO_funlockfile(FILE) /**/
|
|
#endif /* !_IO_MTSAFE_IO */
|
|
|
|
|
|
extern int _IO_vfscanf __P((_IO_FILE*, const char*, _IO_va_list, int*));
|
|
extern int _IO_vfprintf __P((_IO_FILE*, const char*, _IO_va_list));
|
|
extern _IO_ssize_t _IO_padn __P((_IO_FILE *, int, _IO_ssize_t));
|
|
extern _IO_size_t _IO_sgetn __P((_IO_FILE *, void*, _IO_size_t));
|
|
|
|
extern void _IO_free_backup_area __P((_IO_FILE*));
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _IO_STDIO_H */
|