about summary refs log tree commit diff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/cleanup.c3
-rw-r--r--libio/filedoalloc.c7
-rw-r--r--libio/fileops.c10
-rw-r--r--libio/iofopncook.c16
-rw-r--r--libio/iopopen.c13
-rw-r--r--libio/libio.h10
-rw-r--r--libio/libioP.h7
-rw-r--r--libio/memstream.c3
-rw-r--r--libio/stdio.h8
-rw-r--r--libio/strops.c2
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