BSD 4_4 release

[unix-history] / usr / src / usr.bin / tip / cmds.c

diff --git a/usr/src/usr.bin/tip/cmds.c b/usr/src/usr.bin/tip/cmds.c
index bb07023..63bfee2 100644 (file)
--- a/usr/src/usr.bin/tip/cmds.c
+++ b/usr/src/usr.bin/tip/cmds.c
@@ -1,22 +1,38 @@
 /*
 /*

- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmds.c     5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmds.c     8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include "tip.h"
 #endif /* not lint */
 
 #include "tip.h"


@@ -109,6 +125,7 @@ transfer(buf, fd, eofchars)
        register int cnt, eof;
        time_t start;
        sig_t f;
        register int cnt, eof;
        time_t start;
        sig_t f;

+       char r;

 
        pwrite(FD, buf, size(buf));
        quit = 0;
 
        pwrite(FD, buf, size(buf));
        quit = 0;


@@ -118,7 +135,8 @@ transfer(buf, fd, eofchars)
        /*
         * finish command
         */
        /*
         * finish command
         */

-       pwrite(FD, "\r", 1);
+       r = '\r';
+       pwrite(FD, &r, 1);

        do
                read(FD, &c, 1); 
        while ((c&0177) != '\n');
        do
                read(FD, &c, 1); 
        while ((c&0177) != '\n');


@@ -325,7 +343,7 @@ transmit(fd, eofchars, command)
                        printf("\r%d", ++lcount);
                if (boolean(value(ECHOCHECK))) {
                        timedout = 0;
                        printf("\r%d", ++lcount);
                if (boolean(value(ECHOCHECK))) {
                        timedout = 0;

-                       alarm(value(ETIMEOUT));
+                       alarm((int)value(ETIMEOUT));

                        do {    /* wait for prompt */
                                read(FD, (char *)&c, 1);
                                if (timedout || stop) {
                        do {    /* wait for prompt */
                                read(FD, (char *)&c, 1);
                                if (timedout || stop) {


@@ -412,7 +430,7 @@ send(c)
        }
 tryagain:
        timedout = 0;
        }
 tryagain:
        timedout = 0;

-       alarm(value(ETIMEOUT));
+       alarm((int)value(ETIMEOUT));

        read(FD, &cc, 1);
        alarm(0);
        if (timedout) {
        read(FD, &cc, 1);
        alarm(0);
        if (timedout) {


@@ -482,11 +500,9 @@ pipeout(c)
 #ifdef CONNECT
 /*
  * Fork a program with:
 #ifdef CONNECT
 /*
  * Fork a program with:

- *  0 <-> local tty in
- *  1 <-> local tty out
+ *  0 <-> remote tty in
+ *  1 <-> remote tty out

  *  2 <-> local tty out
  *  2 <-> local tty out

- *  3 <-> remote tty in
- *  4 <-> remote tty out

  */
 consh(c)
 {
  */
 consh(c)
 {


@@ -515,9 +531,9 @@ consh(c)
        } else {
                register int i;
 
        } else {
                register int i;
 

-               dup2(FD, 3);
-               dup2(3, 4);
-               for (i = 5; i < 20; i++)
+               dup2(FD, 0);
+               dup2(3, 1);
+               for (i = 3; i < 20; i++)

                        close(i);
                signal(SIGINT, SIG_DFL);
                signal(SIGQUIT, SIG_DFL);
                        close(i);
                signal(SIGINT, SIG_DFL);
                signal(SIGQUIT, SIG_DFL);


@@ -609,7 +625,7 @@ chdirectory()
        printf("!\r\n");
 }
 
        printf("!\r\n");
 }
 

-abort(msg)
+tipabort(msg)

        char *msg;
 {
 
        char *msg;
 {
 


@@ -632,7 +648,7 @@ finish()
                write(FD, dismsg, strlen(dismsg));
                sleep(5);
        }
                write(FD, dismsg, strlen(dismsg));
                sleep(5);
        }

-       abort(NOSTR);
+       tipabort(NOSTR);

 }
 
 void
 }
 
 void