@@ -41,8 +41,6 @@
#ifdef _LIBC
# include <wchar.h>
-# include <libio/libioP.h>
-# define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
#endif
#define INIT_BUF_SIZE 200
@@ -48,10 +48,7 @@ char *alloca ();
#include <stdarg.h>
#include <ctype.h>
#include <limits.h>
-#ifdef _LIBC
-# include <../libio/libioP.h>
-# include <wchar.h>
-#endif
+#include <wchar.h>
#ifndef _
/* This is for other GNU distributions with internationalized messages. */
@@ -1769,7 +1766,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
#ifdef _LIBC
char *buf;
- if (_IO_vasprintf (&buf, fmt, ap) < 0)
+ if (__vasprintf (&buf, fmt, ap) < 0)
buf = NULL;
__fxprintf (stream, "%s: %s\n",
@@ -1839,7 +1836,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
#ifdef _LIBC
char *buf;
- if (_IO_vasprintf (&buf, fmt, ap) < 0)
+ if (__vasprintf (&buf, fmt, ap) < 0)
buf = NULL;
__fxprintf (stream, ": %s", buf);
@@ -24,14 +24,10 @@
#include <sysdep.h>
#include <unistd.h>
#include <sys/mman.h>
-
+#include <wchar.h>
extern const char *__progname;
-#include <wchar.h>
-#include <libio/iolibio.h>
-#define fflush(s) _IO_fflush (s)
-
/* This function, when passed a string containing an asserted
expression, a filename, and a line number, prints a message
on the standard error stream of the form:
@@ -20,10 +20,6 @@
#include <grp.h>
#include <stdio.h>
-#include <libio/iolibio.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
/* Define a line parsing function using the common code
used in the nss_files module. */
@@ -21,9 +21,6 @@
#include <string.h>
#include <grp.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
#define _S(x) x ? x : ""
/* Write an entry to the given stream.
@@ -38,21 +38,21 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
{
char *p;
- _IO_flockfile (stream);
+ flockfile (stream);
do
{
buffer[buflen - 1] = '\xff';
p = fgets_unlocked (buffer, buflen, stream);
if (p == NULL && feof_unlocked (stream))
{
- _IO_funlockfile (stream);
+ funlockfile (stream);
*result = NULL;
__set_errno (ENOENT);
return errno;
}
if (p == NULL || buffer[buflen - 1] != '\xff')
{
- _IO_funlockfile (stream);
+ funlockfile (stream);
*result = NULL;
__set_errno (ERANGE);
return errno;
@@ -67,7 +67,7 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
&errno));
- _IO_funlockfile (stream);
+ funlockfile (stream);
*result = resbuf;
return 0;
@@ -40,7 +40,7 @@ putsgent (const struct sgrp *g, FILE *stream)
return -1;
}
- _IO_flockfile (stream);
+ flockfile (stream);
if (fprintf (stream, "%s:%s:", g->sg_namp, _S (g->sg_passwd)) < 0)
++errors;
@@ -75,7 +75,7 @@ putsgent (const struct sgrp *g, FILE *stream)
if (putc_unlocked ('\n', stream) == EOF)
++errors;
- _IO_funlockfile (stream);
+ funlockfile (stream);
return errors ? -1 : 0;
}
@@ -89,9 +89,6 @@ static const char builtin_aliases[] =
#undef BUILTIN_ALIAS
};
-#include <libio/libioP.h>
-#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
-
/* Value of the GCONV_PATH environment variable. */
const char *__gconv_path_envvar;
@@ -1,45 +1 @@
-#if !defined _ISOMAC && defined _IO_MTSAFE_IO
-# include <stdio-lock.h>
-#endif
#include <libio/bits/libio.h>
-
-#ifndef _ISOMAC
-#ifndef _LIBC_LIBIO_H
-#define _LIBC_LIBIO_H
-
-libc_hidden_proto (__overflow)
-libc_hidden_proto (__underflow)
-libc_hidden_proto (__uflow)
-libc_hidden_proto (__woverflow)
-libc_hidden_proto (__wunderflow)
-libc_hidden_proto (__wuflow)
-libc_hidden_proto (_IO_free_backup_area)
-libc_hidden_proto (_IO_free_wbackup_area)
-libc_hidden_proto (_IO_padn)
-libc_hidden_proto (_IO_putc)
-libc_hidden_proto (_IO_sgetn)
-libc_hidden_proto (_IO_vfprintf)
-libc_hidden_proto (_IO_vfscanf)
-
-#ifdef _IO_MTSAFE_IO
-# undef _IO_peekc
-# undef _IO_flockfile
-# undef _IO_funlockfile
-# undef _IO_ftrylockfile
-
-# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
-# if _IO_lock_inexpensive
-# define _IO_flockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_lock (*(_fp)->_lock)
-# define _IO_funlockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_unlock (*(_fp)->_lock)
-# else
-# define _IO_flockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
-# define _IO_funlockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
-# endif
-#endif /* _IO_MTSAFE_IO */
-
-#endif
-#endif
@@ -1,7 +1,12 @@
#ifndef _STDIO_H
+# if !defined _ISOMAC && defined _IO_MTSAFE_IO
+# include <stdio-lock.h>
+# endif
# include <libio/stdio.h>
# ifndef _ISOMAC
+# include <math_ldbl_opt.h>
+
/* Now define the internal interfaces. */
extern int __fcloseall (void) attribute_hidden;
@@ -12,6 +17,7 @@ libc_hidden_proto (__snprintf)
extern int __vsnprintf (char *__restrict __s, size_t __maxlen,
const char *__restrict __format, _G_va_list __arg)
__attribute__ ((__format__ (__printf__, 3, 0)));
+libc_hidden_proto (__vsnprintf)
extern int __vfscanf (FILE *__restrict __s,
const char *__restrict __format,
_G_va_list __arg)
@@ -22,10 +28,15 @@ extern int __vscanf (const char *__restrict __format,
__attribute__ ((__format__ (__scanf__, 1, 0)));
extern _IO_ssize_t __getline (char **__lineptr, size_t *__n,
FILE *__stream) attribute_hidden;
+extern _IO_ssize_t __getdelim (char **__lineptr, size_t *__n,
+ int __delim, FILE *__stream);
+libc_hidden_proto (__getdelim)
+
extern int __vsscanf (const char *__restrict __s,
const char *__restrict __format,
_G_va_list __arg)
__attribute__ ((__format__ (__scanf__, 2, 0)));
+libc_hidden_proto (__vsscanf)
extern int __sprintf_chk (char *, int, size_t, const char *, ...) __THROW;
extern int __snprintf_chk (char *, size_t, int, size_t, const char *, ...)
@@ -125,7 +136,6 @@ extern int __fxprintf_nocancel (FILE *__fp, const char *__fmt, ...)
extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden;
-libc_hidden_proto (__asprintf)
# if IS_IN (libc)
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
# define fopen(fname, mode) _IO_new_fopen (fname, mode)
@@ -142,6 +152,10 @@ extern int _IO_new_fgetpos (_IO_FILE *, _IO_fpos_t *);
# define fgetpos(fp, posp) _IO_new_fgetpos (fp, posp)
# endif
+libc_hidden_proto (__asprintf)
+extern __typeof (vasprintf) __vasprintf
+ __attribute__ ((__format__ (__printf__, 2, 0)));
+libc_hidden_proto (__vasprintf)
libc_hidden_proto (dprintf)
extern __typeof (dprintf) __dprintf
__attribute__ ((__format__ (__printf__, 2, 3)));
@@ -149,6 +163,7 @@ libc_hidden_proto (__dprintf)
libc_hidden_proto (fprintf)
libc_hidden_proto (vfprintf)
libc_hidden_proto (sprintf)
+libc_hidden_proto (vsprintf)
libc_hidden_proto (sscanf)
libc_hidden_proto (fwrite)
libc_hidden_proto (perror)
@@ -157,11 +172,14 @@ libc_hidden_proto (rewind)
libc_hidden_proto (fileno)
extern __typeof (fileno) __fileno;
libc_hidden_proto (__fileno)
+libc_hidden_proto (fread)
libc_hidden_proto (fwrite)
libc_hidden_proto (fseek)
+libc_hidden_proto (ftell)
extern __typeof (ftello) __ftello;
libc_hidden_proto (__ftello)
libc_hidden_proto (fflush)
+libc_hidden_proto (setvbuf)
libc_hidden_proto (fflush_unlocked)
extern __typeof (fflush_unlocked) __fflush_unlocked;
libc_hidden_proto (__fflush_unlocked)
@@ -194,5 +212,48 @@ libc_hidden_proto (__fmemopen)
extern int __gen_tempfd (int flags);
libc_hidden_proto (__gen_tempfd)
+libc_hidden_proto (__overflow)
+libc_hidden_proto (__underflow)
+libc_hidden_proto (__uflow)
+libc_hidden_proto (__woverflow)
+libc_hidden_proto (__wunderflow)
+libc_hidden_proto (__wuflow)
+libc_hidden_proto (_IO_free_backup_area)
+libc_hidden_proto (_IO_free_wbackup_area)
+libc_hidden_proto (_IO_padn)
+libc_hidden_proto (_IO_putc)
+libc_hidden_proto (_IO_sgetn)
+libc_hidden_proto (_IO_vfprintf)
+libc_hidden_proto (_IO_vfscanf)
+
+#ifdef _IO_MTSAFE_IO
+# undef _IO_peekc
+# undef _IO_flockfile
+# undef _IO_funlockfile
+# undef _IO_ftrylockfile
+
+# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
+# if _IO_lock_inexpensive
+# define _IO_flockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_lock (*(_fp)->_lock)
+# define _IO_funlockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_unlock (*(_fp)->_lock)
+# else
+# define _IO_flockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
+# define _IO_funlockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
+# endif
+#endif /* _IO_MTSAFE_IO */
+
+#if IS_IN (libc)
+# undef flockfile
+# define flockfile(s) _IO_flockfile (s)
+# undef funlockfile
+# define funlockfile(s) _IO_funlockfile (s)
+# undef putc
+# define putc(c, fp) _IO_putc (c, fp)
+#endif
+
# endif /* not _ISOMAC */
#endif /* stdio.h */
@@ -42,6 +42,7 @@ _IO_fread (void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp)
libc_hidden_def (_IO_fread)
weak_alias (_IO_fread, fread)
+libc_hidden_weak (fread)
# ifndef _IO_MTSAFE_IO
strong_alias (_IO_fread, __fread_unlocked)
@@ -58,3 +58,4 @@ _IO_ftell (_IO_FILE *fp)
libc_hidden_def (_IO_ftell)
weak_alias (_IO_ftell, ftell)
+libc_hidden_weak (ftell)
@@ -125,3 +125,4 @@ unlock_return:
weak_alias (_IO_getdelim, __getdelim)
weak_alias (_IO_getdelim, getdelim)
+libc_hidden_weak (__getdelim)
@@ -96,3 +96,4 @@ unlock_return:
libc_hidden_def (_IO_setvbuf)
weak_alias (_IO_setvbuf, setvbuf)
+libc_hidden_weak (setvbuf)
@@ -47,3 +47,4 @@ ldbl_hidden_def (__IO_vsprintf, _IO_vsprintf)
ldbl_strong_alias (__IO_vsprintf, _IO_vsprintf)
ldbl_weak_alias (__IO_vsprintf, vsprintf)
+libc_hidden_weak (vsprintf)
@@ -42,4 +42,5 @@ _IO_vsscanf (const char *string, const char *format, _IO_va_list args)
return ret;
}
ldbl_weak_alias (_IO_vsscanf, __vsscanf)
+libc_hidden_weak (__vsscanf)
ldbl_weak_alias (_IO_vsscanf, vsscanf)
@@ -85,4 +85,5 @@ _IO_vasprintf (char **result_ptr, const char *format, _IO_va_list args)
(*result_ptr)[needed - 1] = '\0';
return ret;
}
+ldbl_strong_alias (_IO_vasprintf, __vasprintf)
ldbl_weak_alias (_IO_vasprintf, vasprintf)
@@ -119,3 +119,4 @@ _IO_vsnprintf (char *string, _IO_size_t maxlen, const char *format,
}
ldbl_weak_alias (_IO_vsnprintf, __vsnprintf)
ldbl_weak_alias (_IO_vsnprintf, vsnprintf)
+libc_hidden_weak (__vsnprintf)
@@ -4962,7 +4962,7 @@ __malloc_stats (void)
if (__malloc_initialized < 0)
ptmalloc_init ();
- _IO_flockfile (stderr);
+ flockfile (stderr);
int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
for (i = 0, ar_ptr = &main_arena;; i++)
@@ -4993,7 +4993,7 @@ __malloc_stats (void)
fprintf (stderr, "max mmap bytes = %10lu\n",
(unsigned long) mp_.max_mmapped_mem);
((_IO_FILE *) stderr)->_flags2 |= old_flags2;
- _IO_funlockfile (stderr);
+ funlockfile (stderr);
}
@@ -35,11 +35,6 @@
#include <libc-internal.h>
#include <dso_handle.h>
-
-#include <libio/iolibio.h>
-#define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
-#define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
-
#include <kernel-features.h>
#define TRACE_BUFFER_SIZE 512
@@ -400,10 +400,6 @@ _obstack_memory_used (struct obstack *h)
# define _(msgid) gettext (msgid)
# endif
-# ifdef _LIBC
-# include <libio/iolibio.h>
-# endif
-
static _Noreturn void
print_and_abort (void)
{
@@ -22,10 +22,8 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
-
#include <wchar.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
+
extern char *__progname;
@@ -67,7 +67,6 @@ unsigned int error_message_count;
# define program_name program_invocation_name
# include <errno.h>
# include <limits.h>
-# include <libio/libioP.h>
/* In GNU libc we want do not want to use the common name 'error' directly.
Instead make it a weak alias. */
@@ -80,11 +79,6 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
# define error __error
# define error_at_line __error_at_line
-# include <libio/iolibio.h>
-# define fflush(s) _IO_fflush (s)
-# undef putc
-# define putc(c, fp) _IO_putc (c, fp)
-
# include <libc-lock.h>
#else /* not _LIBC */
@@ -304,7 +298,7 @@ error (int status, int errnum, const char *message, ...)
flush_stdout ();
#ifdef _LIBC
- _IO_flockfile (stderr);
+ flockfile (stderr);
#endif
if (error_print_progname)
(*error_print_progname) ();
@@ -321,7 +315,7 @@ error (int status, int errnum, const char *message, ...)
error_tail (status, errnum, message, args);
#ifdef _LIBC
- _IO_funlockfile (stderr);
+ funlockfile (stderr);
# ifdef __libc_ptf_call
__libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
# endif
@@ -367,7 +361,7 @@ error_at_line (int status, int errnum, const char *file_name,
flush_stdout ();
#ifdef _LIBC
- _IO_flockfile (stderr);
+ flockfile (stderr);
#endif
if (error_print_progname)
(*error_print_progname) ();
@@ -392,7 +386,7 @@ error_at_line (int status, int errnum, const char *file_name,
error_tail (status, errnum, message, args);
#ifdef _LIBC
- _IO_funlockfile (stderr);
+ funlockfile (stderr);
# ifdef __libc_ptf_call
__libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
# endif
@@ -20,10 +20,7 @@
#include <string.h> /* For string function builtin redirect. */
#include <termios.h>
#include <unistd.h>
-
#include <wchar.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
#include <libc-lock.h>
/* It is desirable to use this bit on systems that have it.
@@ -37,9 +37,6 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#include <ctype.h>
#include <string.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
static char zapchar;
static FILE *tf;
@@ -23,9 +23,6 @@
#include <string.h>
#include <sys/types.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
#undef __setmntent
#undef __endmntent
#undef __getmntent_r
@@ -53,13 +53,10 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <stdarg.h>
-#include <libio/iolibio.h>
#include <math_ldbl_opt.h>
#include <kernel-features.h>
-#define ftell(s) _IO_ftell (s)
-
static int LogType = SOCK_DGRAM; /* type of socket connection */
static int LogFile = -1; /* fd for log */
static int connected; /* have done connect */
@@ -31,15 +31,11 @@
#ifdef _LIBC
/* When used as part of glibc, error printing must be done differently
for standards compliance. getopt is not a cancellation point, so
- it must not call functions that are, and it is specified by an
- older standard than stdio locking, so it must not refer to
- functions in the "user namespace" related to stdio locking.
- Finally, it must use glibc's internal message translation so that
- the messages are looked up in the proper text domain. */
+ it must not call functions that are, and it must use glibc's
+ internal message translation so that the messages are looked up in
+ the proper text domain. */
# include <libintl.h>
# define fprintf __fxprintf_nocancel
-# define flockfile(fp) _IO_flockfile (fp)
-# define funlockfile(fp) _IO_funlockfile (fp)
#else
# include "gettext.h"
# define _(msgid) gettext (msgid)
@@ -20,9 +20,6 @@
#include <stdio.h>
#include <pwd.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
/* Define a line parsing function using the common code
used in the nss_files module. */
@@ -20,9 +20,6 @@
#include <shadow.h>
#include <stdio.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
/* Define a line parsing function using the common code
used in the nss_files module. */
@@ -20,9 +20,6 @@
#include <stdio.h>
#include <shadow.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
#define _S(x) x ? x : ""
@@ -18,8 +18,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
-#define vasprintf(s, f, a) _IO_vasprintf (s, f, a)
#undef __asprintf
/* Write formatted output from FORMAT to a string which is
@@ -32,7 +30,7 @@ ___asprintf (char **string_ptr, const char *format, ...)
int done;
va_start (arg, format);
- done = vasprintf (string_ptr, format, arg);
+ done = __vasprintf (string_ptr, format, arg);
va_end (arg);
return done;
@@ -17,7 +17,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
/* Write formatted output to STREAM from the format string FORMAT. */
@@ -15,7 +15,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <libioP.h>
#include <stdarg.h>
#include <stdio.h>
@@ -20,11 +20,6 @@
#undef __getline
-#include "../libio/libioP.h"
-#undef ssize_t
-#define ssize_t _IO_ssize_t
-#define __getdelim _IO_getdelim
-
/* Like getdelim, but always looks for a newline. */
ssize_t
__getline (char **lineptr, size_t *n, FILE *stream)
@@ -17,9 +17,6 @@
#include <stdio.h>
-#include <libio/iolibio.h>
-#define fread(p, m, n, s) _IO_fread (p, m, n, s)
-
/* Read a word (int) from STREAM. */
int
getw (FILE *stream)
@@ -17,7 +17,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
/* Read formatted input from S, according to the format string FORMAT. */
/* VARARGS2 */
@@ -20,7 +20,6 @@
#include <string.h>
#include <unistd.h>
#include <wchar.h>
-#include "libioP.h"
static void
perror_internal (FILE *fp, const char *s, int errnum)
@@ -15,7 +15,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <libioP.h>
#include <stdarg.h>
#include <stdio.h>
@@ -16,8 +16,6 @@
<http://www.gnu.org/licenses/>. */
#include <stdio.h>
-#include <libio/iolibio.h>
-#define fwrite(p, n, m, s) _IO_fwrite (p, n, m, s)
/* Write the word (int) W to STREAM. */
int
@@ -18,8 +18,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
-
/* Read formatted input from stdin according to the format string FORMAT. */
/* VARARGS1 */
@@ -17,8 +17,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
-#define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
/* Write formatted output into S, according to the format
string FORMAT, writing no more than MAXLEN characters. */
@@ -17,8 +17,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
-#define vsprintf(s, f, a) _IO_vsprintf (s, f, a)
/* Write formatted output into S, according to the format string FORMAT. */
/* VARARGS2 */
@@ -17,8 +17,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
-#define __vsscanf(s, f, a) _IO_vsscanf (s, f, a)
/* Read formatted input from S, according to the format string FORMAT. */
/* VARARGS2 */
@@ -20,8 +20,6 @@
#include <stdio.h>
#include <unistd.h>
-#include <iolibio.h>
-#define __fdopen _IO_fdopen
#ifndef tmpfile
# define tmpfile __new_tmpfile
#endif
@@ -60,7 +58,7 @@ tmpfile (void)
(void) __unlink (buf);
}
- if ((f = __fdopen (fd, "w+b")) == NULL)
+ if ((f = fdopen (fd, "w+b")) == NULL)
__close (fd);
return f;
@@ -18,7 +18,6 @@
#include <stdarg.h>
#undef __OPTIMIZE__ /* Avoid inline `vprintf' function. */
#include <stdio.h>
-#include <libioP.h>
#undef vprintf
@@ -22,12 +22,12 @@
#include <langinfo.h>
#include <locale.h>
#include <monetary.h>
-#include "../libio/libioP.h"
-#include "../libio/strfile.h"
#include <printf.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "../libio/libioP.h"
+#include "../libio/strfile.h"
#include "../locale/localeinfo.h"
@@ -35,7 +35,6 @@
#include <libintl.h>
#include <rpc/rpc.h>
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
static char *auth_errmsg (enum auth_stat stat);
@@ -41,10 +41,6 @@
#include <rpc/rpc.h>
#include <rpc/clnt.h>
-#include <libio/iolibio.h>
-#define fflush(s) _IO_fflush (s)
-#define __fdopen(fd,m) _IO_fdopen (fd,m)
-
/*
* returns pid, or -1 for failure
*/
@@ -85,9 +81,9 @@ _openchild (const char *command, FILE ** fto, FILE ** ffrom)
/*
* parent: write into pdto[1], read from pdfrom[0]
*/
- *fto = __fdopen (pdto[1], "w");
+ *fto = fdopen (pdto[1], "w");
__close (pdto[0]);
- *ffrom = __fdopen (pdfrom[0], "r");
+ *ffrom = fdopen (pdfrom[0], "r");
__close (pdfrom[1]);
break;
}
@@ -40,9 +40,7 @@
#include <rpc/pmap_clnt.h>
#include <sys/socket.h>
#include <netdb.h>
-
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
struct proglst_
@@ -61,9 +61,7 @@
#include <sys/poll.h>
#include <errno.h>
#include <stdlib.h>
-
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
/*
@@ -63,7 +63,6 @@
#endif
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
#define rpc_buffer(xprt) ((xprt)->xp_p1)
@@ -49,7 +49,6 @@
#include <rpc/rpc.h>
#include <libintl.h>
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
static bool_t xdrrec_getlong (XDR *, long *);
@@ -40,7 +40,6 @@
#include <rpc/xdr.h>
#include <libintl.h>
#include <wchar.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
#define LASTUNSIGNED ((u_int)0-1)
@@ -39,14 +39,8 @@
#include <stdio.h>
#include <rpc/xdr.h>
-#include <libio/iolibio.h>
#include <shlib-compat.h>
-#define fflush(s) _IO_fflush (s)
-#define fread(p, m, n, s) _IO_fread (p, m, n, s)
-#define ftell(s) _IO_ftell (s)
-#define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
-
static bool_t xdrstdio_getlong (XDR *, long *);
static bool_t xdrstdio_putlong (XDR *, const long *);
static bool_t xdrstdio_getbytes (XDR *, caddr_t, u_int);
@@ -19,7 +19,6 @@
#include <stdarg.h>
#include <stdio.h>
-#include <libioP.h>
#include <wchar.h>
#include <printf.h>
#include <monetary.h>
@@ -22,7 +22,6 @@
#include <hurd/fd.h>
#include <fcntl.h>
#include <unistd.h>
-#include <iolibio.h>
/* This returns a new stream opened on a temporary file (generated
by tmpnam). The file is opened with mode "w+b" (binary read/write).
@@ -21,7 +21,6 @@
#include <stdio_ext.h>
#include <stdlib.h>
#include <string.h>
-#include "libio/libioP.h"
/* Return 1 if the whole area PTR .. PTR+SIZE is not writable.
Return -1 if it is writable. */
@@ -55,7 +54,7 @@ __readonly_area (const char *ptr, size_t size)
while (! feof_unlocked (fp))
{
- if (_IO_getdelim (&line, &linelen, '\n', fp) <= 0)
+ if (__getdelim (&line, &linelen, '\n', fp) <= 0)
break;
char *p;