68000 fixes

SCCS-vsn: usr.bin/tip/tip.h 4.7
SCCS-vsn: usr.bin/tip/cmds.c 4.9

diff --git a/usr/src/usr.bin/tip/cmds.c b/usr/src/usr.bin/tip/cmds.c
index 96f3c85..b6aa514 100644 (file)
--- a/usr/src/usr.bin/tip/cmds.c
+++ b/usr/src/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/*     cmds.c  4.8     82/01/06        */
+/*     cmds.c  4.9     82/07/29        */

 #include "tip.h"
 /*
  * tip
 #include "tip.h"
 /*
  * tip


@@ -233,7 +233,7 @@ transmit(fd, eofchars, command)
        FILE *fd;
        char *eofchars, *command;
 {
        FILE *fd;
        char *eofchars, *command;
 {

-       char *pc, lastc;
+       char *pc, lastc, rc;

        int c, ccount, lcount;
        time_t start_t, stop_t;
 
        int c, ccount, lcount;
        time_t start_t, stop_t;
 


@@ -279,7 +279,7 @@ transmit(fd, eofchars, command)
                                                        send(' ');
                                                continue;
                                        }
                                                        send(' ');
                                                continue;
                                        }

-                               } else
+                               } else if (!any(c, value(EXCEPTIONS)))

                                        continue;
                        }
                        send(c);
                                        continue;
                        }
                        send(c);


@@ -290,14 +290,14 @@ transmit(fd, eofchars, command)
                        alarm(10);
                        timedout = 0;
                        do {    /* wait for prompt */
                        alarm(10);
                        timedout = 0;
                        do {    /* wait for prompt */

-                               read(FD, (char *)&c, 1);
+                               read(FD, (char *)&rc, 1);

                                if (timedout || stop) {
                                        if (timedout)
                                                printf("\r\ntimed out at eol\r\n");
                                        alarm(0);
                                        goto out;
                                }
                                if (timedout || stop) {
                                        if (timedout)
                                                printf("\r\ntimed out at eol\r\n");
                                        alarm(0);
                                        goto out;
                                }

-                       } while ((c&0177) != character(value(PROMPT)));
+                       } while ((rc&0177) != character(value(PROMPT)));

                        alarm(0);
                }
        }
                        alarm(0);
                }
        }


@@ -351,7 +351,7 @@ cu_put(cc)
 send(c)
        char c;
 {
 send(c)
        char c;
 {

-       int cc;
+       char cc;

        int retry = 0;
 
        cc = c;
        int retry = 0;
 
        cc = c;

diff --git a/usr/src/usr.bin/tip/tip.h b/usr/src/usr.bin/tip/tip.h
index cfbf675..2f0f497 100644 (file)
--- a/usr/src/usr.bin/tip/tip.h
+++ b/usr/src/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/*     tip.h   4.6     81/12/16        */
+/*     tip.h   4.7     82/07/29        */

 /*
  * tip - terminal interface program
  *
 /*
  * tip - terminal interface program
  *


@@ -92,8 +92,8 @@ typedef
 typedef
        union {
                int     zz_number;
 typedef
        union {
                int     zz_number;

-               short   zz_boolean;
-               char    zz_character;
+               int     zz_boolean;
+               int     zz_character;

                int     *zz_address;
        }
        zzhack;
                int     *zz_address;
        }
        zzhack;