(obstack_free): Explicitly convert __obj to

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

diff --git a/mach/devstream.c b/mach/devstream.c
index 9078c92..b54dcff 100644 (file)
--- a/mach/devstream.c
+++ b/mach/devstream.c
@@ -1,23 +1,22 @@
 /* stdio on a Mach device port.
-   Translates \n to \r\n on output.
+   Translates \n to \r\n on output, echos and translates \r to \n on input.
+   Copyright (C) 1992, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-Copyright (C) 1992, 1993, 1994 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 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.
 
-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.  */
+   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 <stdio.h>
 #include <mach.h>
@@ -31,7 +30,7 @@ input (FILE *f)
   kern_return_t err;
   char *buffer;
   size_t to_read;
-  mach_msg_type_size_t nread;
+  mach_msg_type_number_t nread;
   char c;
 
   if (f->__buffer == NULL)
@@ -48,8 +47,10 @@ input (FILE *f)
   f->__eof = 0;
 
   nread = to_read;
-  if (err = device_read_inband ((device_t) f->__cookie, 0, f->__target,
-                               to_read, buffer, &nread))
+  err = device_read_inband ((device_t) f->__cookie, 0, f->__target,
+                           to_read, buffer, &nread);
+
+  if (err)
     {
       f->__error = 1;
       f->__bufp = f->__get_limit = f->__put_limit = f->__buffer;
@@ -57,6 +58,18 @@ input (FILE *f)
       return EOF;
     }
 
+  /* Echo it back.  */
+  err = device_write_inband ((device_t) f->__cookie, 0, f->__target,
+                            buffer, nread, (int *) &to_read);
+
+  /* Translate LF to CR.  */
+  {
+    char *p;
+    for (p = memchr (buffer, '\r', nread); p;
+        p = memchr (p + 1, '\r', (buffer + nread) - (p + 1)))
+      *p = '\n';
+  }
+
   if (f->__buffer == NULL)
     return (unsigned char) c;
 
@@ -78,7 +91,7 @@ output (FILE *f, int c)
       while (to_write > 0)
        {
          if (err = device_write ((device_t) f->__cookie, 0,
-                                 f->__target, (char *)p, 
+                                 f->__target, (char *)p,
                                  to_write, &wrote))
            {
              errno = err;
@@ -134,10 +147,16 @@ output (FILE *f, int c)
     {
       kern_return_t err;
       int wrote;
+      int thiswrite;
+
       while (to_write > 0)
        {
+         thiswrite = to_write;
+         if (thiswrite > IO_INBAND_MAX)
+           thiswrite = IO_INBAND_MAX;
+
          if (err = device_write_inband ((device_t) f->__cookie, 0,
-                                        f->__target, p, to_write, &wrote))
+                                        f->__target, p, thiswrite, &wrote))
            {
              errno = err;
              f->__error = 1;