BSD 4_3_Net_2 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 9b9910f..2e1a92c 100644 (file)
--- a/usr/src/usr.bin/tip/cmds.c
+++ b/usr/src/usr.bin/tip/cmds.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY 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.12 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)cmds.c     5.15 (Berkeley) 3/4/91";

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


@@ -327,7 +341,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) {


@@ -414,7 +428,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) {


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

-abort(msg)
+tipabort(msg)

        char *msg;
 {
 
        char *msg;
 {
 


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

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

 }
 
 void
 }
 
 void