diff options
author | Thomas Bushnell, BSG <thomas@gnu.org> | 1997-01-17 19:29:07 +0000 |
---|---|---|
committer | Thomas Bushnell, BSG <thomas@gnu.org> | 1997-01-17 19:29:07 +0000 |
commit | b51c27c0328382d5e0909f6c595ed381392b9200 (patch) | |
tree | f03feca2886e3251670cda53e30cdbd0eeca939d | |
parent | 038ebe2459c2d5f35f8dafb7c357767459244ab0 (diff) | |
download | glibc-b51c27c0328382d5e0909f6c595ed381392b9200.zip glibc-b51c27c0328382d5e0909f6c595ed381392b9200.tar.gz glibc-b51c27c0328382d5e0909f6c595ed381392b9200.tar.bz2 |
Fri Jan 17 14:16:28 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>cvs/libc-970118
* stdio/vdprintf.c: Moved file to ...
* sysdeps/posix/vdprintf.c: Here. De-ansideclificate.
* sysdeps/stub/vdprintf.c: New file.
* sysdeps/mach/hurd/vdprintf.c: New file.
-rw-r--r-- | sysdeps/mach/hurd/vdprintf.c | 57 | ||||
-rw-r--r-- | sysdeps/posix/vdprintf.c (renamed from stdio/vdprintf.c) | 6 | ||||
-rw-r--r-- | sysdeps/stub/vdprintf.c | 31 |
3 files changed, 90 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/vdprintf.c b/sysdeps/mach/hurd/vdprintf.c new file mode 100644 index 0000000..002f8c6 --- /dev/null +++ b/sysdeps/mach/hurd/vdprintf.c @@ -0,0 +1,57 @@ +/* Copyright (C) 1991, 1992, 1993, 1997 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <errno.h> +#include <limits.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <hurd/fd.h> + +/* Write formatted output to file descriptor D according to the format string + FORMAT, using the argument list in ARG. */ +int +vdprintf (int d, const char *format, va_list arg) +{ + int done; + FILE f; + struct hurd_fd *fd; + + HURD_CRITICAL_BEGIN; + fd = _hurd_fd_get (fd); + HURD_CRITICAL_END; + + if (!fd) + return 0; + + /* Create an unbuffered stream talking to D on the stack. */ + memset ((PTR) &f, 0, sizeof(f)); + f.__magic = _IOMAGIC; + f.__mode.__write = 1; + f.__cookie = fd; + f.__room_funcs = __default_room_functions; + f.__io_funcs = __default_io_functions; + f.__seen = 1; + f.__userbuf = 1; + + /* vfprintf will use a buffer on the stack for the life of the call, + and flush it when finished. */ + done = vfprintf (&f, format, arg); + + return done; +} diff --git a/stdio/vdprintf.c b/sysdeps/posix/vdprintf.c index 9df4e53..5147bb8 100644 --- a/stdio/vdprintf.c +++ b/sysdeps/posix/vdprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1997 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <errno.h> #include <limits.h> #include <stdarg.h> @@ -27,8 +26,7 @@ Cambridge, MA 02139, USA. */ /* Write formatted output to file descriptor D according to the format string FORMAT, using the argument list in ARG. */ int -DEFUN(vdprintf, (d, format, arg), - int d AND CONST char *format AND va_list arg) +vdprintf (int d, const char *format, va_list arg) { int done; FILE f; diff --git a/sysdeps/stub/vdprintf.c b/sysdeps/stub/vdprintf.c new file mode 100644 index 0000000..729f012 --- /dev/null +++ b/sysdeps/stub/vdprintf.c @@ -0,0 +1,31 @@ +/* Copyright (C) 1997 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <errno.h> +#include <stdio.h> + +/* Write formatted output to file descriptor D according to the format string + FORMAT, using the argument list in ARG. */ +int +vdprintf (int d, const char *format, va_list arg) +{ + __set_errno (ENOSYS); + return NULL; +} + +stub_warning (vdprintf) |