Hurd: hurdsock: reject negative domains

[platform/upstream/glibc.git] / hurd / vpprintf.c

diff --git a/hurd/vpprintf.c b/hurd/vpprintf.c
index b713a06..b0b4ef4 100644 (file)
--- a/hurd/vpprintf.c
+++ b/hurd/vpprintf.c
@@ -1,30 +1,29 @@
-/* Copyright (C) 1991,94,97,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,97,2000,01,11 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.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   Lesser 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.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <hurd.h>
 
+#include <libioP.h>
+
 static ssize_t
-pwrite (void *cookie,
-       const char *buf,
-       size_t n)
+do_write (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);
@@ -36,14 +35,10 @@ pwrite (void *cookie,
 /* 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)
+vpprintf (io_t port, const char *format, va_list arg)
 {
   int done;
 
-#ifdef USE_IN_LIBIO
-
   struct locked_FILE
   {
     struct _IO_cookie_file cfile;
@@ -52,32 +47,13 @@ vpprintf (io_t port,
 #endif
   } temp_f;
 #ifdef _IO_MTSAFE_IO
-  temp_f.cfile.__file._lock = &temp_f.lock;
+  temp_f.cfile.__fp.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
+                  (void *) port, (cookie_io_functions_t) { write: do_write });
 
-  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
+  done = _IO_vfprintf (&temp_f.cfile.__fp.file, format, arg);
 
   return done;
 }