/* 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, 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
{
kern_return_t err;
char *buffer;
- size_t to_read, nread;
+ size_t to_read;
+ mach_msg_type_size_t nread;
char c;
if (f->__buffer == NULL)
f->__eof = 0;
+ nread = to_read;
if (err = device_read_inband ((device_t) f->__cookie, 0, f->__target,
to_read, buffer, &nread))
{
return (unsigned char) *f->__bufp++;
}
+
static void
output (FILE *f, int c)
{
- kern_return_t err;
- size_t to_write;
- int wrote;
- char *p;
-
- if (f->__buffer == NULL)
+ inline void write_some (const char *p, size_t to_write)
{
- /* The stream is unbuffered. */
-
- if (c != EOF)
+ kern_return_t err;
+ int wrote;
+ while (to_write > 0)
{
- char buf[2];
- size_t n;
- if (c == '\n')
+ if (err = device_write ((device_t) f->__cookie, 0,
+ f->__target, (char *)p,
+ to_write, &wrote))
{
- buf[0] = '\r';
- buf[1] = '\n';
- n = 2;
+ errno = err;
+ f->__error = 1;
+ break;
}
- else
+ p += wrote;
+ to_write -= wrote;
+ f->__target += wrote;
+ }
+ }
+
+ if (f->__buffer != NULL)
+ {
+ 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)
{
- buf[0] = (unsigned char) c;
- n = 1;
+ *f->__bufp++ = (unsigned char) c;
+ c = EOF;
}
+ }
+
+
+ /* Write out the buffer. */
+
+ write_some (f->__buffer, f->__bufp - f->__buffer);
+
+ f->__bufp = f->__buffer;
+ }
+
+ if (c != EOF && !ferror (f))
+ {
+ if (f->__linebuf && (unsigned char) c == '\n')
+ {
+ static const char nl = '\n';
+ write_some (&nl, 1);
+ }
+ else
+ *f->__bufp++ = (unsigned char) c;
+ }
+}
+
+
- if ((err = device_write_inband ((device_t) f->__cookie, 0,
- f->__target, buf, n, &wrote)) ||
- wrote != n)
+#if 0 /* Translates \n to \r\n. */
+static void
+output (FILE *f, int c)
+{
+ void write_some (const char *p, size_t to_write)
+ {
+ kern_return_t err;
+ int wrote;
+ while (to_write > 0)
+ {
+ 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;
+ }
+ }
+ void write_crlf (void)
+ {
+ static const char crlf[] = "\r\n";
+ write_some (crlf, 2);
+ }
+
+ if (f->__buffer == NULL)
+ {
+ /* The stream is unbuffered. */
- f->__target += n;
+ 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)
}
}
- 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)
- {
- 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 crlf[] = "\r\n";
- if ((err = device_write_inband ((device_t) f->__cookie, 0,
- f->__target, crlf, 2, &wrote)) ||
- wrote != 2)
- {
- errno = EIO;
- f->__error = 1;
- }
- else
- f->__target += 2;
- }
+ write_crlf ();
else
*f->__bufp++ = (unsigned char) c;
}
}
+#endif
FILE *
-mach_open_devstream (device_t dev, const char *mode)
+mach_open_devstream (mach_port_t dev, const char *mode)
{
FILE *stream = fopencookie ((void *) dev, mode, __default_io_functions);
if (stream == 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;
return stream;
projects / kopensolaris-gnu / glibc.git / blobdiff