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 48b7306..63bfee2 100644 (file)
--- a/usr/src/usr.bin/tip/cmds.c
+++ b/usr/src/usr.bin/tip/cmds.c
@@ -1,14 +1,43 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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.6 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)cmds.c     8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "tip.h"
 
 #include "tip.h"

+#include "pathnames.h"
+

 /*
  * tip
  *
 /*
  * tip
  *


@@ -21,10 +50,9 @@ char null = '\0';
 char   *sep[] = { "second", "minute", "hour" };
 static char *argv[10];         /* argument vector for take and put */
 
 char   *sep[] = { "second", "minute", "hour" };
 static char *argv[10];         /* argument vector for take and put */
 

-int    timeout();              /* timeout function called on alarm */
-int    stopsnd();              /* SIGINT handler during file transfers */
-int    intprompt();            /* used in handling SIG_INT during prompt */
-int    intcopy();              /* interrupt routine for file transfers */
+void   timeout();              /* timeout function called on alarm */
+void   stopsnd();              /* SIGINT handler during file transfers */
+void   intcopy();              /* interrupt routine for file transfers */

 
 /*
  * FTP - remote ==> local
 
 /*
  * FTP - remote ==> local


@@ -96,7 +124,8 @@ transfer(buf, fd, eofchars)
        register char *p = buffer;
        register int cnt, eof;
        time_t start;
        register char *p = buffer;
        register int cnt, eof;
        time_t start;

-       int (*f)();
+       sig_t f;
+       char r;

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


@@ -106,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');


@@ -200,6 +230,7 @@ pipefile()
 /*
  * Interrupt service routine for FTP
  */
 /*
  * Interrupt service routine for FTP
  */

+void

 stopsnd()
 {
 
 stopsnd()
 {
 


@@ -254,7 +285,7 @@ transmit(fd, eofchars, command)
        char *pc, lastc;
        int c, ccount, lcount;
        time_t start_t, stop_t;
        char *pc, lastc;
        int c, ccount, lcount;
        time_t start_t, stop_t;

-       int (*f)();
+       sig_t f;

 
        kill(pid, SIGIOT);      /* put TIPOUT into a wait state */
        stop = 0;
 
        kill(pid, SIGIOT);      /* put TIPOUT into a wait state */
        stop = 0;


@@ -312,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) {


@@ -399,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) {


@@ -411,6 +442,7 @@ tryagain:
        }
 }
 
        }
 }
 

+void

 timeout()
 {
        signal(SIGALRM, timeout);
 timeout()
 {
        signal(SIGALRM, timeout);


@@ -468,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)
 {


@@ -501,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);


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

-abort(msg)
+tipabort(msg)

        char *msg;
 {
 
        char *msg;
 {
 


@@ -605,7 +635,7 @@ abort(msg)
                printf("\r\n%s", msg);
        printf("\r\n[EOT]\r\n");
        daemon_uid();
                printf("\r\n%s", msg);
        printf("\r\n[EOT]\r\n");
        daemon_uid();

-       delock(uucplock);
+       (void)uu_unlock(uucplock);

        unraw();
        exit(0);
 }
        unraw();
        exit(0);
 }


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

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

 }
 
 }
 

+void

 intcopy()
 {
 intcopy()
 {

-

        raw();
        quit = 1;
        longjmp(intbuf, 1);
        raw();
        quit = 1;
        longjmp(intbuf, 1);


@@ -638,7 +668,7 @@ execute(s)
                cp = value(SHELL);
        else
                cp++;
                cp = value(SHELL);
        else
                cp++;

-       user_uid();
+       shell_uid();

        execl(value(SHELL), cp, "-c", s, 0);
 }
 
        execl(value(SHELL), cp, "-c", s, 0);
 }
 


@@ -797,7 +827,7 @@ expand(name)
        if ((pid = vfork()) == 0) {
                Shell = value(SHELL);
                if (Shell == NOSTR)
        if ((pid = vfork()) == 0) {
                Shell = value(SHELL);
                if (Shell == NOSTR)

-                       Shell = "/bin/sh";
+                       Shell = _PATH_BSHELL;

                close(pivec[0]);
                close(1);
                dup(pivec[1]);
                close(pivec[0]);
                close(1);
                dup(pivec[1]);