Reworked output handling.

[nmh] / uip / fmtdump.c

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 594a46149fcee6e06a2807d2c6b7d6dd4453065d..a3eec4059a11eb66ad458c6465dd9340be5da624 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -492,10 +492,10 @@ static void
 litputs(char *s)
 {
        if (s) {
 litputs(char *s)
 {
        if (s) {

-               putc('"', stdout);
+               putchar('"');

                while (*s)
                        litputc(*s++);
                while (*s)
                        litputc(*s++);

-               putc('"', stdout);
+               putchar('"');

        } else
                fputs("<nil>", stdout);
 }
        } else
                fputs("<nil>", stdout);
 }


@@ -504,30 +504,30 @@ static void
 litputc(char c)
 {
        if (c & ~ 0177) {
 litputc(char c)
 {
        if (c & ~ 0177) {

-               putc('M', stdout);
-               putc('-', stdout);
+               putchar('M');
+               putchar('-');

                c &= 0177;
        }
        if (c < 0x20 || c == 0177) {
                if (c == '\b') {
                c &= 0177;
        }
        if (c < 0x20 || c == 0177) {
                if (c == '\b') {

-                       putc('\\', stdout);
-                       putc('b', stdout);
+                       putchar('\\');
+                       putchar('b');

                } else if (c == '\f') {
                } else if (c == '\f') {

-                       putc('\\', stdout);
-                       putc('f', stdout);
+                       putchar('\\');
+                       putchar('f');

                } else if (c == '\n') {
                } else if (c == '\n') {

-                       putc('\\', stdout);
-                       putc('n', stdout);
+                       putchar('\\');
+                       putchar('n');

                } else if (c == '\r') {
                } else if (c == '\r') {

-                       putc('\\', stdout);
-                       putc('r', stdout);
+                       putchar('\\');
+                       putchar('r');

                } else if (c == '\t') {
                } else if (c == '\t') {

-                       putc('\\', stdout);
-                       putc('t', stdout);
+                       putchar('\\');
+                       putchar('t');

                } else {
                } else {

-                       putc('^', stdout);
-                       putc(c ^ 0x40, stdout); /* DEL to ?, others to alpha */
+                       putchar('^');
+                       putchar(c ^ 0x40);      /* DEL to ?, others to alpha */

                }
        } else
                }
        } else

-               putc(c, stdout);
+               putchar(c);

 }
 }