Formerly ../mach/devstream.c.~12~

[kopensolaris-gnu/glibc.git] / mach / devstream.c

diff --git a/mach/devstream.c b/mach/devstream.c
index 8e58617..bdea44b 100644 (file)
--- a/mach/devstream.c
+++ b/mach/devstream.c
@@ -1,7 +1,7 @@
 /* stdio on a Mach device port.
-   Translates \n to \r on output.
+   Translates \n to \r\n on output.
 
-Copyright (C) 1992 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993 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
@@ -19,17 +19,19 @@ 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 <stdio.h>
 #include <mach.h>
-#include <mach/device.h>
+#include <device/device.h>
+#include <errno.h>
+#include <string.h>
 
 static int
 input (FILE *f)
 {
-  error_t err;
+  kern_return_t err;
   char *buffer;
   size_t to_read;
+  mach_msg_type_size_t nread;
   char c;
 
   if (f->__buffer == NULL)
@@ -45,8 +47,8 @@ input (FILE *f)
 
   f->__eof = 0;
 
-  if (err = device_read_inband ((device_t) cookie, 0, f->__target, to_read,
-                               buffer, &nread))
+  if (err = device_read_inband ((device_t) f->__cookie, 0, f->__target,
+                               to_read, buffer, &nread))
     {
       f->__error = 1;
       f->__bufp = f->__get_limit = f->__put_limit = f->__buffer;
@@ -60,38 +62,54 @@ input (FILE *f)
   f->__get_limit = f->__buffer + nread;
   f->__bufp = f->__buffer;
   f->__put_limit = f->__buffer + (f->__mode.__write ? f->__bufsize : 0);
-  return (unsigned char *) *f->__bufp++;
+  return (unsigned char) *f->__bufp++;
 }
 
 static void
 output (FILE *f, int c)
 {
-  error_t err;
-  size_t to_write;
-  char *p;
-
-  if (f->__buffer == NULL)
+  void write_some (const char *p, size_t to_write)
     {
-      if (c != EOF)
+      kern_return_t err;
+      int wrote;
+      while (to_write > 0)
        {
-         char cc = (unsigned char) c;
-         int wrote;
-         if (cc == '\n')
-           cc = '\r';
-         if ((err = device_write_inband ((device_t) f->__cookie, 0,
-                                         f->__target, &cc, 1, &wrote)) ||
-             wrote != 1)
+e        if (err = device_write_inband ((device_t) f->__cookie, 0,
+                                        f->__target, p, to_write, &wrote))
            {
              errno = err;
              f->__error = 1;
+             break;
            }
+         p += wrote;
+         to_write -= wrote;
+         f->__target += wrote;
        }
-      ++f->__target;
+    }
+  void write_crlf (void)
+    {
+      static const char crlf[] = "\r\n";
+      write_some (crlf, 2);
+    }
+
+  if (f->__buffer == NULL)
+    {
+      /* The stream is unbuffered.  */
+
+      if (c == '\n')
+       write_crlf ();
+      else if (c != EOF)
+       {
+         char cc = (unsigned char) c;
+         write_some (&cc, 1);
+       }
+
       return;
     }
 
   if (f->__put_limit == f->__buffer)
     {
+      /* Prime the stream for writing.  */
       f->__put_limit = f->__buffer + f->__bufsize;
       f->__bufp = f->__buffer;
       if (c != EOF)
@@ -101,68 +119,53 @@ output (FILE *f, int c)
        }
     }
 
-  to_write = f->__bufp - f->__buffer;
-  p = f->__buffer;
-  while (1)
-    {
-      char *p2 = memchr (p, '\n', to_write);
-      if (p2 == NULL)
-       break;
-      *p2++ = '\r';
-      to_write -= p2 - p;
-      p = p2;
-    }
+  {
+    /* Search for newlines (LFs) in the buffer.  */
 
-  to_write = f->__bufp - f->__buffer;
-  p = f->__buffer;
-  while (to_write > 0)
-    {
-      int wrote;
-      if (err = device_write_inband ((device_t) f->__cookie, 0, f->__target,
-                                    p, to_write, &wrote))
-       {
-         errno = EIO;
-         f->__error = 1;
-         break;
-       }
-      p += wrote;
-      to_write -= wrote;
-      f->__target += wrote;
-    }
+    char *start = f->__buffer, *p = start;
+
+    while (!ferror (f) && (p = memchr (p, '\n', f->__bufp - start)))
+      {
+       /* Found one.  Replace it with a CR and write out through that CR.  */
+
+       *p = '\r';
+       write_some (start, p + 1 - start);
+
+       /* Change it back to an LF; the next iteration will write it out
+          first thing.  Start the next searching iteration one char later.  */
+
+       start = p;
+       *p++ = '\n';
+      }
+
+    /* Write the remainder of the buffer.  */
+
+    if (!ferror (f))
+      write_some (start, f->__bufp - start);
+  }
 
   f->__bufp = f->__buffer;
 
   if (c != EOF && !ferror (f))
     {
       if (f->__linebuf && (unsigned char) c == '\n')
-       {
-         static const char nl = '\r';
-         if ((err = device_write_inband ((device_t) f->__cookie, 0,
-                                         f->__target, &nl, 1, &wrote)) ||
-             wrote != 1)
-           {
-             errno = EIO;
-             f->__error = 1;
-           }
-         else
-           ++f->__target;
-       }
+       write_crlf ();
       else
        *f->__bufp++ = (unsigned char) c;
     }
 }
 
 FILE *
-mach_open_devstream (device_t dev, const char *mode)
+mach_open_devstream (mach_port_t dev, const char *mode)
 {
-  FILE *stream = fopencookie (dev, mode, __default_io_functions);
+  FILE *stream = fopencookie ((void *) dev, mode, __default_io_functions);
   if (stream == NULL)
     return NULL;
 
   stream->__room_funcs.__input = input;
   stream->__room_funcs.__output = output;
-  stream->__io_funcs.__close = device_close;
+  stream->__io_funcs.__close = (__io_close_fn *) device_close;
   stream->__seen = 1;
 
-  retrun stream;
+  return stream;
 }