mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 19:53:32 +08:00
b4e54243c4
(input, output): Functions removed.
(mach_open_devstream): Use devstream_{read,write} as cookie functions,
using only the vanilla fopencookie interface.
* hurd/fopenport.c [! USE_IN_LIBIO] (cookie_io_functions_t): Define
as macro for __io_functions.
(funcsio): Use cookie_io_functions_t type name.
(fopenport): Renamed from __fopenport. Rewrite to call fopencookie.
* libio/iofopncook.c (_IO_cookie_init): New function, broken out of
fopencookie.
(fopencookie): Use it.
* libio/libio.h: Declare _IO_cookie_init.
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Implement using
_IO_cookie_init.
* libio/libio.h (__io_seek_fn): Fix second argument type
to be a pointer, in line with the manual and the old stdio.
* libio/iofopncook.c (_IO_cookie_seek): Fix (sole) caller.
* sysdeps/generic/bits/stdio-lock.h: New file.
This is a stub with #error, but that's better than no file at all.
* sysdeps/unix/sysv/linux/alpha/syscall.S:
* manual/message.texi (Using gettextized software):
* manual/filesys.texi (File Size):
* manual/charset.texi (glibc iconv Implementation):
* locale/programs/ld-collate.c (collate_output):
* manual/stdio.texi (Output Conversion Syntax):
84 lines
2.2 KiB
C
84 lines
2.2 KiB
C
/* Copyright (C) 1991,94,97,2000 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <hurd.h>
|
|
|
|
static ssize_t
|
|
pwrite (void *cookie,
|
|
const char *buf,
|
|
size_t n)
|
|
{
|
|
error_t error = __io_write ((io_t) cookie, buf, n, -1,
|
|
(mach_msg_type_number_t *) &n);
|
|
if (error)
|
|
return __hurd_fail (error);
|
|
return n;
|
|
}
|
|
|
|
/* Write formatted output to PORT, a Mach port supporting the i/o protocol,
|
|
according to the format string FORMAT, using the argument list in ARG. */
|
|
int
|
|
vpprintf (io_t port,
|
|
const char *format,
|
|
va_list arg)
|
|
{
|
|
int done;
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_cookie_file cfile;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} temp_f;
|
|
#ifdef _IO_MTSAFE_IO
|
|
temp_f.cfile.__file._lock = &temp_f.lock;
|
|
#endif
|
|
|
|
_IO_cookie_init (&temp_f.cfile, _IO_NO_READS,
|
|
(void *) port, (cookie_io_functions_t) { write: pwrite });
|
|
|
|
done = _IO_vfprintf (&temp_f.cfile.__file, format, arg);
|
|
|
|
#else
|
|
|
|
FILE f;
|
|
|
|
/* Create an unbuffered stream talking to PORT on the stack. */
|
|
memset ((void *) &f, 0, sizeof (f));
|
|
f.__magic = _IOMAGIC;
|
|
f.__mode.__write = 1;
|
|
f.__cookie = (void *) port;
|
|
f.__room_funcs = __default_room_functions;
|
|
f.__io_funcs.__write = pwrite;
|
|
f.__seen = 1;
|
|
f.__userbuf = 1;
|
|
|
|
/* vfprintf will use a buffer on the stack for the life of the call. */
|
|
done = vfprintf (&f, format, arg);
|
|
|
|
#endif
|
|
|
|
return done;
|
|
}
|