diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-23 03:15:42 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-23 03:15:42 +0000 |
commit | fa0bc87c32d02cd81ec4d0ae00e0d943c683e6e1 (patch) | |
tree | 197250e2e9e1f2c900d3bf042dbf14898dc0fb73 /libio | |
parent | Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> (diff) | |
download | glibc-fa0bc87c32d02cd81ec4d0ae00e0d943c683e6e1.tar.gz glibc-fa0bc87c32d02cd81ec4d0ae00e0d943c683e6e1.tar.bz2 glibc-fa0bc87c32d02cd81ec4d0ae00e0d943c683e6e1.zip |
Wed May 22 22:10:01 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/canonicalize.c: New file.
* stdlib/stdlib.h: Declare canonicalize_file_name, realpath.
* stdlib/Makefile (routines): Add canonicalize.
* posix/unistd.h: Declare __canonicalize_directory_name_internal.
Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com>
* db/recno/rec_seq.c: Prevent `sccsid' definition by using the
same #if condition as in the other db files.
* intl/Makefile: Add -Wno-unused CFLAGS for compilation of
bindtextdom.c, finddomain.c, and localealias.c.
* intl/dcgettext.c: Don't define prototype for getcwd() when
compiling in glibc.
* libio/cleanup.c: Add prototype for _IO_register_cleanup.
* libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't
define _POSIX_SOURCE unconditionally.
* libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if
compiling in glibc.
* libio/fileops.c (_IO_file_close_it): Don't sync file, call
flush instead. This relaxes the rules from POSIX.1 about
changing the active handle a bit.
* libio/iofopncook.c (struct _IO_cookie_file): Move definition
into <libio.h>.
Add prototypes for local functions to prevent warnings.
* libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and
_IO_DUP2 to contain complete parameter list.
* libio/libio.h: Add definition of struct _IO_cookie_file.
* libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf,
and _IO_vsnprintf.
* libio/memstream.c: Include <stdio.h>.
* libio/stdio.h: Add prototypes for fopencookie,
__stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf.
* libio/strops.c: Avoid useless expression in `for' initializer.
* locale/findlocale.c: Add some casts to prevent warnings.
* locale/programs/locfile.c (write_locale_data): Don't use
double `/' in locale binary file.
* posix/unistd.h: Remove prototype for `reboot'.
Update from bind-4.9.4-T1A.
* resolv/Makefile (routines): Add inet_ntop and inet_pton.
* resolv/arpa/nameser.h: Add definition of IN6ADDRSZ.
* resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c,
resolv/res_debug.c, resolv/res_init.c
* resolv/inet_ntop.c, resolv/inet_pton.c: New files.
* resolv/resolv.h: Add RES_USE_INET6 flag.
(__dn_isvalid): Renamed to __res_dnok.
Add prototypes for __res_ownok and __res_mailok.
* stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c.
* stdio-common/getline.c, stdio-common/vfscanf.c,
sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore.
* sysdeps/unix/sysv/linux/Makefile [$subdir == misc]
(sysdep_routines): Add s_reboot.
(install-others): Add $(includedir)/sys/syscall.h.
New rule for $(includedir)/sys/syscall.h to produce from
<asm/unistd.h>.
* sysdeps/unix/sysv/linux/reboot.c: New file. Make single
argument function call 3 argument system call.
* sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific
definition for reboot function.
* sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete
comment.
* sysdeps/unix/sysv/linux/syscalls.list: Rename function for
reboot syscall to __syscall_reboot.
* wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by
__USE_GNU, not USE_GNU.
Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com>
* locale/programs/charset.c, locale/programs/ld-collate.c:
Add casts to prevent warnings on 64-bit machines.
* locale/programs/ld-monetary.c: Don't do unnecessary tests for
int_frac_digits and frac_digits which only produce warnings.
Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com>
* inet/arpa/inet.h: Backup return type of inet_addr to u_long.
* resolv/inet_addr.c: Likewise.
* resolv/Makefile (distribute): Add res_hconf.h
(routines): Add res_hconf.
* resolv/gethnamaddr.c: Add support for /etc/host.conf.
* resolv/res_init.c: Initialize /etc/host.conf reader.
* resolv/res_hconf.c, resolv/res_hconf.h: New files.
Implementation of reading /etc/host.conf.
Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (%.out rules): Prepend $($*-ENV) to the command.
* sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak
alias for __curbrk.
Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu>
* hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK.
* hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK.
Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/mach/hurd/getcwd.c
(_hurd_canonicalize_directory_name_internal): New function, broken out
of __getcwd.
(__getcwd): Use it.
(__canonicalize_directory_name_internal): New function using it.
* sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New
function, broken out of __getcwd.
(__getcwd): Use it.
Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu>
* string/argz-create.c (__argz_create): Correctly calculate length.
* string/argz-extract.c (__argz_extract): Add terminating 0 entry.
* hurd/hurdstartup.c (_hurd_startup): ... and don't so here.
[HAVE_VMSDIR_H]: Include "vmsdir.h".
(glob) [VMS]: Don't grok ~.
Diffstat (limited to 'libio')
-rw-r--r-- | libio/cleanup.c | 3 | ||||
-rw-r--r-- | libio/filedoalloc.c | 7 | ||||
-rw-r--r-- | libio/fileops.c | 10 | ||||
-rw-r--r-- | libio/iofopncook.c | 16 | ||||
-rw-r--r-- | libio/iopopen.c | 13 | ||||
-rw-r--r-- | libio/libio.h | 10 | ||||
-rw-r--r-- | libio/libioP.h | 7 | ||||
-rw-r--r-- | libio/memstream.c | 3 | ||||
-rw-r--r-- | libio/stdio.h | 8 | ||||
-rw-r--r-- | libio/strops.c | 2 |
10 files changed, 62 insertions, 17 deletions
diff --git a/libio/cleanup.c b/libio/cleanup.c index a0c5052d39..1f316ebb33 100644 --- a/libio/cleanup.c +++ b/libio/cleanup.c @@ -4,6 +4,9 @@ typedef void (*voidfunc) __P((void)); +/* Prototype. */ +static void DEFUN_VOID (_IO_register_cleanup); + static void DEFUN_VOID(_IO_register_cleanup) { diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index 0ebb75d9c5..f71656478c 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -41,13 +41,18 @@ the executable file might be covered by the GNU General Public License. */ /* Modified for GNU iostream by Per Bothner 1991, 1992. */ -#define _POSIX_SOURCE +#ifndef _POSIX_SOURCE +# define _POSIX_SOURCE +#endif #include "libioP.h" #include <sys/types.h> #include <sys/stat.h> #ifdef __STDC__ #include <stdlib.h> #endif +#ifdef _LIBC +# include <unistd.h> +#endif /* * Allocate a file buffer, or switch to unbuffered I/O. diff --git a/libio/fileops.c b/libio/fileops.c index 89381ec699..828f99db96 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -24,7 +24,9 @@ the executable file might be covered by the GNU General Public License. */ /* written by Per Bothner (bothner@cygnus.com) */ -#define _POSIX_SOURCE +#ifndef _POSIX_SOURCE +# define _POSIX_SOURCE +#endif #include "libioP.h" #include <fcntl.h> #include <sys/types.h> @@ -102,11 +104,11 @@ int DEFUN(_IO_file_close_it, (fp), register _IO_FILE* fp) { - int sync_status, close_status; + int write_status, close_status; if (!_IO_file_is_open(fp)) return EOF; - sync_status = _IO_file_sync (fp); + write_status = _IO_do_flush (fp); _IO_unsave_markers(fp); @@ -122,7 +124,7 @@ DEFUN(_IO_file_close_it, (fp), fp->_fileno = EOF; fp->_offset = _IO_pos_BAD; - return close_status ? close_status : sync_status; + return close_status ? close_status : write_status; } void diff --git a/libio/iofopncook.c b/libio/iofopncook.c index 0b57ecd344..989f6d6fe7 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -23,14 +23,18 @@ This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #include <libioP.h> +#include <stdio.h> #include <stdlib.h> -struct _IO_cookie_file { - struct _IO_FILE file; - const void *vtable; - void *cookie; - _IO_cookie_io_functions_t io_functions; -}; + +/* Prototyped for local functions. */ +static _IO_ssize_t _IO_cookie_read __P ((register _IO_FILE* fp, void* buf, + _IO_ssize_t size)); +static _IO_ssize_t _IO_cookie_write __P ((register _IO_FILE* fp, + const void* buf, _IO_ssize_t size)); +static _IO_fpos_t _IO_cookie_seek __P ((_IO_FILE *fp, _IO_off_t offset, + int dir)); +static int _IO_cookie_close __P ((_IO_FILE* fp)); static _IO_ssize_t diff --git a/libio/iopopen.c b/libio/iopopen.c index 349a4cc8d6..b9ee737502 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -24,7 +24,9 @@ the executable file might be covered by the GNU General Public License. */ /* written by Per Bothner (bothner@cygnus.com) */ -#define _POSIX_SOURCE +#ifndef _POSIX_SOURCE +# define _POSIX_SOURCE +#endif #include "libioP.h" #if _IO_HAVE_SYS_WAIT #include <signal.h> @@ -32,24 +34,27 @@ the executable file might be covered by the GNU General Public License. */ #ifdef __STDC__ #include <stdlib.h> #endif +#ifdef _LIBC +# include <unistd.h> +#endif #include <sys/types.h> #include <sys/wait.h> #ifndef _IO_fork #define _IO_fork vfork /* defined in libiberty, if needed */ -_IO_pid_t _IO_fork(); +extern _IO_pid_t _IO_fork __P ((void)); #endif #endif /* _IO_HAVE_SYS_WAIT */ #ifndef _IO_pipe #define _IO_pipe pipe -extern int _IO_pipe(); +extern int _IO_pipe __P ((int des[2])); #endif #ifndef _IO_dup2 #define _IO_dup2 dup2 -extern int _IO_dup2(); +extern int _IO_dup2 __P ((int fd, int fd2)); #endif #ifndef _IO_waitpid diff --git a/libio/libio.h b/libio/libio.h index fce8a77bf7..b498f125eb 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -228,6 +228,16 @@ extern struct _IO_FILE_plus _IO_stdin_, _IO_stdout_, _IO_stderr_; #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 diff --git a/libio/libioP.h b/libio/libioP.h index a955151ade..173e75b86f 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -266,6 +266,13 @@ extern void _IO_str_init_static __P((_IO_FILE *, char*, int, char*)); extern void _IO_str_init_readonly __P((_IO_FILE *, const char*, int)); extern _IO_ssize_t _IO_str_count __P ((_IO_FILE*)); +extern int _IO_vasprintf __P ((char **result_ptr, __const char *format, + _IO_va_list args)); +extern int _IO_vdprintf __P ((int d, __const char *format, _IO_va_list arg)); +extern int _IO_vsnprintf __P ((char *string, _IO_size_t maxlen, + __const char *format, _IO_va_list args)); + + extern _IO_size_t _IO_getline __P((_IO_FILE*,char*,_IO_size_t,int,int)); extern _IO_ssize_t _IO_getdelim __P((char**, _IO_size_t*, int, _IO_FILE*)); extern double _IO_strtod __P((const char *, char **)); diff --git a/libio/memstream.c b/libio/memstream.c index 71519a5190..a2fe8447cb 100644 --- a/libio/memstream.c +++ b/libio/memstream.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996 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 @@ -18,6 +18,7 @@ Boston, MA 02111-1307, USA. */ #include "strfile.h" #include "libioP.h" +#include <stdio.h> #include <stdlib.h> diff --git a/libio/stdio.h b/libio/stdio.h index bd271ce1fb..70728ed8d9 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -108,6 +108,8 @@ extern int fgetc __P ((FILE *)); extern int fgetpos __P ((FILE* fp, fpos_t *pos)); extern char* fgets __P ((char*, int, FILE*)); extern FILE* fopen __P ((__const char*, __const char*)); +extern FILE* fopencookie __P ((void *cookie, __const char *mode, + _IO_cookie_io_functions_t io_functions)); extern int fprintf __P ((FILE*, __const char* format, ...)); extern int fputc __P ((int, FILE*)); extern int fputs __P ((__const char *str, FILE *fp)); @@ -138,6 +140,9 @@ extern int sprintf __P ((char*, __const char* format, ...)); extern int sscanf __P ((__const char* string, __const char* format, ...)); extern FILE* tmpfile __P ((void)); extern char* tmpnam __P ((char*)); +extern char *__stdio_gen_tempname __P ((__const char *dir, __const char *pfx, + int dir_search, size_t *lenptr, + FILE **streamptr)); extern int ungetc __P ((int c, FILE* fp)); extern int vfprintf __P ((FILE *fp, char __const *fmt0, _G_va_list)); extern int vprintf __P ((char __const *fmt, _G_va_list)); @@ -147,8 +152,10 @@ extern int vsprintf __P ((char* string, __const char* format, _G_va_list)); extern int dprintf __P ((int, __const char *, ...)); extern int vdprintf __P ((int, __const char *, _G_va_list)); extern int vfscanf __P ((FILE*, __const char *, _G_va_list)); +extern int __vfscanf __P ((FILE*, __const char *, _G_va_list)); extern int vscanf __P ((__const char *, _G_va_list)); extern int vsscanf __P ((__const char *, __const char *, _G_va_list)); +extern int __vsscanf __P ((__const char *, __const char *, _G_va_list)); #endif #if !defined(__STRICT_ANSI__) || defined(_POSIX_SOURCE) @@ -166,6 +173,7 @@ extern _IO_ssize_t __getline __P ((char **, size_t *, FILE *)); extern int snprintf __P ((char *, size_t, __const char *, ...)); extern int __snprintf __P ((char *, size_t, __const char *, ...)); extern int vsnprintf __P ((char *, size_t, __const char *, _G_va_list)); +extern int __vsnprintf __P ((char *, size_t, __const char *, _G_va_list)); extern int asprintf __P ((char **, const char *, ...)); extern int vasprintf __P ((char **, const char *, _G_va_list)); diff --git a/libio/strops.c b/libio/strops.c index f4f45259fb..98c5b263d5 100644 --- a/libio/strops.c +++ b/libio/strops.c @@ -51,7 +51,7 @@ DEFUN(_IO_str_init_static, (fp, ptr, size, pstart), This can lose in pathological cases (ptr near the end of the address space). A better solution might be to adjust the size on underflow/overflow. FIXME. */ - for (s; s = 2*size, s > 0 && ptr + s > ptr && s < 0x4000000L; ) + for ( ; s = 2*size, s > 0 && ptr + s > ptr && s < 0x4000000L; ) size = s; size = s; #else |