BSD 4_4 release

[unix-history] / usr / src / usr.bin / ftp / ftp.c

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index c06cc90..77f07c8 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,41 +1,76 @@
 /*
 /*

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

 
 

+#include <sys/param.h>

 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>

-#include <sys/types.h>
+#include <sys/file.h>

 
 #include <netinet/in.h>
 
 #include <netinet/in.h>

+#include <netinet/in_systm.h>
+#include <netinet/ip.h>

 #include <arpa/ftp.h>
 #include <arpa/telnet.h>
 
 #include <arpa/ftp.h>
 #include <arpa/telnet.h>
 

-#include <stdio.h>

 #include <signal.h>
 #include <signal.h>

-#include <errno.h>

 #include <netdb.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <fcntl.h>

+#include <errno.h>

 #include <pwd.h>
 #include <pwd.h>

+#include <varargs.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "ftp_var.h"

 
 struct sockaddr_in hisctladdr;
 struct sockaddr_in data_addr;
 int    data = -1;
 
 struct sockaddr_in hisctladdr;
 struct sockaddr_in data_addr;
 int    data = -1;

-int     telflag = 0;

 int    abrtflag = 0;
 int    ptflag = 0;
 int    abrtflag = 0;
 int    ptflag = 0;

-int    connected;

 struct sockaddr_in myctladdr;
 struct sockaddr_in myctladdr;

-uid_t  getuid();
+sig_t  lostpeer();
+off_t  restart_point = 0;
+
+extern int connected, errno;

 
 FILE   *cin, *cout;
 FILE   *dataconn();
 
 FILE   *cin, *cout;
 FILE   *dataconn();


@@ -46,27 +81,26 @@ hookup(host, port)
        int port;
 {
        register struct hostent *hp = 0;
        int port;
 {
        register struct hostent *hp = 0;

-       int s,len,oldverbose;
+       int s, len, tos;

        static char hostnamebuf[80];
        static char hostnamebuf[80];

-       char msg[2];

 
        bzero((char *)&hisctladdr, sizeof (hisctladdr));
        hisctladdr.sin_addr.s_addr = inet_addr(host);
        if (hisctladdr.sin_addr.s_addr != -1) {
                hisctladdr.sin_family = AF_INET;
 
        bzero((char *)&hisctladdr, sizeof (hisctladdr));
        hisctladdr.sin_addr.s_addr = inet_addr(host);
        if (hisctladdr.sin_addr.s_addr != -1) {
                hisctladdr.sin_family = AF_INET;

-               (void) strcpy(hostnamebuf, host);
-       }
-       else {
+               (void) strncpy(hostnamebuf, host, sizeof(hostnamebuf));
+       } else {

                hp = gethostbyname(host);
                if (hp == NULL) {
                hp = gethostbyname(host);
                if (hp == NULL) {

-                       printf("%s: unknown host\n", host);
+                       fprintf(stderr, "ftp: %s: ", host);
+                       herror((char *)NULL);

                        code = -1;
                        return((char *) 0);
                }
                hisctladdr.sin_family = hp->h_addrtype;
                bcopy(hp->h_addr_list[0],
                    (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                        code = -1;
                        return((char *) 0);
                }
                hisctladdr.sin_family = hp->h_addrtype;
                bcopy(hp->h_addr_list[0],
                    (caddr_t)&hisctladdr.sin_addr, hp->h_length);

-               (void) strcpy(hostnamebuf, hp->h_name);
+               (void) strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));

        }
        hostname = hostnamebuf;
        s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
        }
        hostname = hostnamebuf;
        s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);


@@ -76,9 +110,10 @@ hookup(host, port)
                return (0);
        }
        hisctladdr.sin_port = port;
                return (0);
        }
        hisctladdr.sin_port = port;

-       while (connect(s, &hisctladdr, sizeof (hisctladdr)) < 0) {
+       while (connect(s, (struct sockaddr *)&hisctladdr, sizeof (hisctladdr)) < 0) {

                if (hp && hp->h_addr_list[1]) {
                        int oerrno = errno;
                if (hp && hp->h_addr_list[1]) {
                        int oerrno = errno;

+                       extern char *inet_ntoa();

 
                        fprintf(stderr, "ftp: connect to address %s: ",
                                inet_ntoa(hisctladdr.sin_addr));
 
                        fprintf(stderr, "ftp: connect to address %s: ",
                                inet_ntoa(hisctladdr.sin_addr));


@@ -89,6 +124,13 @@ hookup(host, port)
                             (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                        fprintf(stdout, "Trying %s...\n",
                                inet_ntoa(hisctladdr.sin_addr));
                             (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                        fprintf(stdout, "Trying %s...\n",
                                inet_ntoa(hisctladdr.sin_addr));

+                       (void) close(s);
+                       s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
+                       if (s < 0) {
+                               perror("ftp: socket");
+                               code = -1;
+                               return (0);
+                       }

                        continue;
                }
                perror("ftp: connect");
                        continue;
                }
                perror("ftp: connect");


@@ -96,11 +138,16 @@ hookup(host, port)
                goto bad;
        }
        len = sizeof (myctladdr);
                goto bad;
        }
        len = sizeof (myctladdr);

-       if (getsockname(s, (char *)&myctladdr, &len) < 0) {
+       if (getsockname(s, (struct sockaddr *)&myctladdr, &len) < 0) {

                perror("ftp: getsockname");
                code = -1;
                goto bad;
        }
                perror("ftp: getsockname");
                code = -1;
                goto bad;
        }

+#ifdef IP_TOS
+       tos = IPTOS_LOWDELAY;
+       if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
+               perror("ftp: setsockopt TOS (ignored)");
+#endif

        cin = fdopen(s, "r");
        cout = fdopen(s, "w");
        if (cin == NULL || cout == NULL) {
        cin = fdopen(s, "r");
        cout = fdopen(s, "w");
        if (cin == NULL || cout == NULL) {


@@ -114,7 +161,7 @@ hookup(host, port)
        }
        if (verbose)
                printf("Connected to %s.\n", hostname);
        }
        if (verbose)
                printf("Connected to %s.\n", hostname);

-       if (getreply(0) != 2) {         /* read startup message from server */
+       if (getreply(0) > 2) {  /* read startup message from server */

                if (cin)
                        (void) fclose(cin);
                if (cout)
                if (cin)
                        (void) fclose(cin);
                if (cout)


@@ -122,23 +169,17 @@ hookup(host, port)
                code = -1;
                goto bad;
        }
                code = -1;
                goto bad;
        }

+#ifdef SO_OOBINLINE
+       {
+       int on = 1;

 
 

-/* test to see if server command parser understands TELNET SYNC command */
+       if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))
+               < 0 && debug) {
+                       perror("ftp: setsockopt");
+               }
+       }
+#endif /* SO_OOBINLINE */

 
 

-       fprintf(cout,"%c%c",IAC,NOP);
-       (void) fflush(cout);
-       *msg = IAC;
-       *(msg+1) = DM;
-       if (send(s,msg,2,MSG_OOB) != 2)
-               perror("sync");
-       oldverbose = verbose;
-       if (!debug)
-               verbose = -1;
-       if (command("NOOP") == COMPLETE)
-               telflag = 1;
-       else
-               telflag = 0;
-       verbose = oldverbose;

        return (hostname);
 bad:
        (void) close(s);
        return (hostname);
 bad:
        (void) close(s);


@@ -149,16 +190,15 @@ login(host)
        char *host;
 {
        char tmp[80];
        char *host;
 {
        char tmp[80];

-       char *user, *pass, *acct, *getlogin(), *mygetpass();
+       char *user, *pass, *acct, *getlogin(), *getpass();

        int n, aflag = 0;
 
        user = pass = acct = 0;
        if (ruserpass(host, &user, &pass, &acct) < 0) {
        int n, aflag = 0;
 
        user = pass = acct = 0;
        if (ruserpass(host, &user, &pass, &acct) < 0) {

-               disconnect();

                code = -1;
                return(0);
        }
                code = -1;
                return(0);
        }

-       if (user == NULL) {
+       while (user == NULL) {

                char *myname = getlogin();
 
                if (myname == NULL) {
                char *myname = getlogin();
 
                if (myname == NULL) {


@@ -167,7 +207,10 @@ login(host)
                        if (pp != NULL)
                                myname = pp->pw_name;
                }
                        if (pp != NULL)
                                myname = pp->pw_name;
                }

-               printf("Name (%s:%s): ", host, myname);
+               if (myname)
+                       printf("Name (%s:%s): ", host, myname);
+               else
+                       printf("Name (%s): ", host);

                (void) fgets(tmp, sizeof(tmp) - 1, stdin);
                tmp[strlen(tmp) - 1] = '\0';
                if (*tmp == '\0')
                (void) fgets(tmp, sizeof(tmp) - 1, stdin);
                tmp[strlen(tmp) - 1] = '\0';
                if (*tmp == '\0')


@@ -178,12 +221,12 @@ login(host)
        n = command("USER %s", user);
        if (n == CONTINUE) {
                if (pass == NULL)
        n = command("USER %s", user);
        if (n == CONTINUE) {
                if (pass == NULL)

-                       pass = mygetpass("Password:");
+                       pass = getpass("Password:");

                n = command("PASS %s", pass);
        }
        if (n == CONTINUE) {
                aflag++;
                n = command("PASS %s", pass);
        }
        if (n == CONTINUE) {
                aflag++;

-               acct = mygetpass("Account:");
+               acct = getpass("Account:");

                n = command("ACCT %s", acct);
        }
        if (n != COMPLETE) {
                n = command("ACCT %s", acct);
        }
        if (n != COMPLETE) {


@@ -205,6 +248,7 @@ login(host)
        return (1);
 }
 
        return (1);
 }
 

+void

 cmdabort()
 {
        extern jmp_buf ptabort;
 cmdabort()
 {
        extern jmp_buf ptabort;


@@ -216,16 +260,26 @@ cmdabort()
                longjmp(ptabort,1);
 }
 
                longjmp(ptabort,1);
 }
 

-/*VARARGS1*/
-command(fmt, args)
-       char *fmt;
+/*VARARGS*/
+command(va_alist)
+va_dcl

 {
 {

-       int r, (*oldintr)(), cmdabort();
+       va_list ap;
+       char *fmt;
+       int r;
+       sig_t oldintr;
+       void cmdabort();

 
        abrtflag = 0;
        if (debug) {
                printf("---> ");
 
        abrtflag = 0;
        if (debug) {
                printf("---> ");

-               _doprnt(fmt, &args, stdout);
+               va_start(ap);
+               fmt = va_arg(ap, char *);
+               if (strncmp("PASS ", fmt, 5) == 0)
+                       printf("PASS XXXX");
+               else 
+                       vfprintf(stdout, fmt, ap);
+               va_end(ap);

                printf("\n");
                (void) fflush(stdout);
        }
                printf("\n");
                (void) fflush(stdout);
        }


@@ -234,18 +288,23 @@ command(fmt, args)
                code = -1;
                return (0);
        }
                code = -1;
                return (0);
        }

-       oldintr = signal(SIGINT,cmdabort);
-       _doprnt(fmt, &args, cout);
+       oldintr = signal(SIGINT, cmdabort);
+       va_start(ap);
+       fmt = va_arg(ap, char *);
+       vfprintf(cout, fmt, ap);
+       va_end(ap);

        fprintf(cout, "\r\n");
        (void) fflush(cout);
        cpend = 1;
        r = getreply(!strcmp(fmt, "QUIT"));
        if (abrtflag && oldintr != SIG_IGN)
        fprintf(cout, "\r\n");
        (void) fflush(cout);
        cpend = 1;
        r = getreply(!strcmp(fmt, "QUIT"));
        if (abrtflag && oldintr != SIG_IGN)

-               (*oldintr)();
+               (*oldintr)(SIGINT);

        (void) signal(SIGINT, oldintr);
        return(r);
 }
 
        (void) signal(SIGINT, oldintr);
        return(r);
 }
 

+char reply_string[BUFSIZ];             /* last line of previous reply */
+

 #include <ctype.h>
 
 getreply(expecteof)
 #include <ctype.h>
 
 getreply(expecteof)


@@ -253,14 +312,37 @@ getreply(expecteof)
 {
        register int c, n;
        register int dig;
 {
        register int c, n;
        register int dig;

-       int originalcode = 0, continuation = 0, (*oldintr)(), cmdabort();
+       register char *cp;
+       int originalcode = 0, continuation = 0;
+       sig_t oldintr;

        int pflag = 0;
        char *pt = pasv;
        int pflag = 0;
        char *pt = pasv;

+       void cmdabort();

 
 

-       oldintr = signal(SIGINT,cmdabort);
+       oldintr = signal(SIGINT, cmdabort);

        for (;;) {
                dig = n = code = 0;
        for (;;) {
                dig = n = code = 0;

+               cp = reply_string;

                while ((c = getc(cin)) != '\n') {
                while ((c = getc(cin)) != '\n') {

+                       if (c == IAC) {     /* handle telnet commands */
+                               switch (c = getc(cin)) {
+                               case WILL:
+                               case WONT:
+                                       c = getc(cin);
+                                       fprintf(cout, "%c%c%c", IAC, DONT, c);
+                                       (void) fflush(cout);
+                                       break;
+                               case DO:
+                               case DONT:
+                                       c = getc(cin);
+                                       fprintf(cout, "%c%c%c", IAC, WONT, c);
+                                       (void) fflush(cout);
+                                       break;
+                               default:
+                                       break;
+                               }
+                               continue;
+                       }

                        dig++;
                        if (c == EOF) {
                                if (expecteof) {
                        dig++;
                        if (c == EOF) {
                                if (expecteof) {


@@ -272,9 +354,9 @@ getreply(expecteof)
                                if (verbose) {
                                        printf("421 Service not available, remote server has closed connection\n");
                                        (void) fflush(stdout);
                                if (verbose) {
                                        printf("421 Service not available, remote server has closed connection\n");
                                        (void) fflush(stdout);

-                                       code = 421;
-                                       return(4);

                                }
                                }

+                               code = 421;
+                               return(4);

                        }
                        if (c != '\r' && (verbose > 0 ||
                            (verbose > -1 && n == '5' && dig > 4))) {
                        }
                        if (c != '\r' && (verbose > 0 ||
                            (verbose > -1 && n == '5' && dig > 4))) {


@@ -304,6 +386,8 @@ getreply(expecteof)
                        }
                        if (n == 0)
                                n = c;
                        }
                        if (n == 0)
                                n = c;

+                       if (cp < &reply_string[sizeof(reply_string) - 1])
+                               *cp++ = c;

                }
                if (verbose > 0 || verbose > -1 && n == '5') {
                        (void) putchar(c);
                }
                if (verbose > 0 || verbose > -1 && n == '5') {
                        (void) putchar(c);


@@ -314,61 +398,74 @@ getreply(expecteof)
                                originalcode = code;
                        continue;
                }
                                originalcode = code;
                        continue;
                }

+               *cp = '\0';

                if (n != '1')
                        cpend = 0;
                (void) signal(SIGINT,oldintr);
                if (code == 421 || originalcode == 421)
                        lostpeer();
                if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
                if (n != '1')
                        cpend = 0;
                (void) signal(SIGINT,oldintr);
                if (code == 421 || originalcode == 421)
                        lostpeer();
                if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)

-                       (*oldintr)();
+                       (*oldintr)(SIGINT);

                return (n - '0');
        }
 }
 
 empty(mask, sec)
                return (n - '0');
        }
 }
 
 empty(mask, sec)

-       struct fd_set mask;
+       struct fd_set *mask;

        int sec;
 {
        struct timeval t;
 
        t.tv_sec = (long) sec;
        t.tv_usec = 0;
        int sec;
 {
        struct timeval t;
 
        t.tv_sec = (long) sec;
        t.tv_usec = 0;

-       if (select(20, &mask, (struct fd_set *) 0, (struct fd_set *) 0, &t) < 0)
-               return(-1);
-       return (1);
+       return(select(32, mask, (struct fd_set *) 0, (struct fd_set *) 0, &t));

 }
 
 jmp_buf        sendabort;
 
 }
 
 jmp_buf        sendabort;
 

+void

 abortsend()
 {
 
        mflag = 0;
        abrtflag = 0;
 abortsend()
 {
 
        mflag = 0;
        abrtflag = 0;

-       printf("\nsend aborted\n");
+       printf("\nsend aborted\nwaiting for remote to finish abort\n");

        (void) fflush(stdout);
        longjmp(sendabort, 1);
 }
 
        (void) fflush(stdout);
        longjmp(sendabort, 1);
 }
 

-sendrequest(cmd, local, remote)
+#define HASHBYTES 1024
+
+sendrequest(cmd, local, remote, printnames)

        char *cmd, *local, *remote;
        char *cmd, *local, *remote;

+       int printnames;

 {
 {

-       FILE *fin, *dout = 0, *mypopen();
-       int (*closefunc)(), mypclose(), fclose(), (*oldintr)(), (*oldintp)();
-       int abortsend();
-       char buf[BUFSIZ];
-       long bytes = 0, hashbytes = sizeof (buf);
-       register int c, d;

        struct stat st;
        struct timeval start, stop;
        struct stat st;
        struct timeval start, stop;

-
+       register int c, d;
+       FILE *fin, *dout = 0, *popen();
+       int (*closefunc)(), pclose(), fclose();
+       sig_t oldintr, oldintp;
+       long bytes = 0, hashbytes = HASHBYTES;
+       char *lmode, buf[BUFSIZ], *bufp;
+       void abortsend();
+
+       if (verbose && printnames) {
+               if (local && *local != '-')
+                       printf("local: %s ", local);
+               if (remote)
+                       printf("remote: %s\n", remote);
+       }

        if (proxy) {
                proxtrans(cmd, local, remote);
                return;
        }
        if (proxy) {
                proxtrans(cmd, local, remote);
                return;
        }

+       if (curtype != type)
+               changetype(type, 0);

        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;

+       lmode = "w";

        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);
        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);


@@ -389,7 +486,7 @@ sendrequest(cmd, local, remote)
                fin = stdin;
        else if (*local == '|') {
                oldintp = signal(SIGPIPE,SIG_IGN);
                fin = stdin;
        else if (*local == '|') {
                oldintp = signal(SIGPIPE,SIG_IGN);

-               fin = mypopen(local + 1, "r");
+               fin = popen(local + 1, "r");

                if (fin == NULL) {
                        perror(local + 1);
                        (void) signal(SIGINT, oldintr);
                if (fin == NULL) {
                        perror(local + 1);
                        (void) signal(SIGINT, oldintr);


@@ -397,11 +494,12 @@ sendrequest(cmd, local, remote)
                        code = -1;
                        return;
                }
                        code = -1;
                        return;
                }

-               closefunc = mypclose;
+               closefunc = pclose;

        } else {
                fin = fopen(local, "r");
                if (fin == NULL) {
        } else {
                fin = fopen(local, "r");
                if (fin == NULL) {

-                       perror(local);
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));

                        (void) signal(SIGINT, oldintr);
                        code = -1;
                        return;
                        (void) signal(SIGINT, oldintr);
                        code = -1;
                        return;


@@ -411,6 +509,7 @@ sendrequest(cmd, local, remote)
                    (st.st_mode&S_IFMT) != S_IFREG) {
                        fprintf(stdout, "%s: not a plain file.\n", local);
                        (void) signal(SIGINT, oldintr);
                    (st.st_mode&S_IFMT) != S_IFREG) {
                        fprintf(stdout, "%s: not a plain file.\n", local);
                        (void) signal(SIGINT, oldintr);

+                       fclose(fin);

                        code = -1;
                        return;
                }
                        code = -1;
                        return;
                }


@@ -420,15 +519,40 @@ sendrequest(cmd, local, remote)
                if (oldintp)
                        (void) signal(SIGPIPE, oldintp);
                code = -1;
                if (oldintp)
                        (void) signal(SIGPIPE, oldintp);
                code = -1;

+               if (closefunc != NULL)
+                       (*closefunc)(fin);

                return;
        }
        if (setjmp(sendabort))
                goto abort;
                return;
        }
        if (setjmp(sendabort))
                goto abort;

+
+       if (restart_point &&
+           (strcmp(cmd, "STOR") == 0 || strcmp(cmd, "APPE") == 0)) {
+               if (fseek(fin, (long) restart_point, 0) < 0) {
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
+                       restart_point = 0;
+                       if (closefunc != NULL)
+                               (*closefunc)(fin);
+                       return;
+               }
+               if (command("REST %ld", (long) restart_point)
+                       != CONTINUE) {
+                       restart_point = 0;
+                       if (closefunc != NULL)
+                               (*closefunc)(fin);
+                       return;
+               }
+               restart_point = 0;
+               lmode = "r+w";
+       }

        if (remote) {
                if (command("%s %s", cmd, remote) != PRELIM) {
                        (void) signal(SIGINT, oldintr);
                        if (oldintp)
                                (void) signal(SIGPIPE, oldintp);
        if (remote) {
                if (command("%s %s", cmd, remote) != PRELIM) {
                        (void) signal(SIGINT, oldintr);
                        if (oldintp)
                                (void) signal(SIGPIPE, oldintp);

+                       if (closefunc != NULL)
+                               (*closefunc)(fin);

                        return;
                }
        } else
                        return;
                }
        } else


@@ -436,34 +560,47 @@ sendrequest(cmd, local, remote)
                        (void) signal(SIGINT, oldintr);
                        if (oldintp)
                                (void) signal(SIGPIPE, oldintp);
                        (void) signal(SIGINT, oldintr);
                        if (oldintp)
                                (void) signal(SIGPIPE, oldintp);

+                       if (closefunc != NULL)
+                               (*closefunc)(fin);

                        return;
                }
                        return;
                }

-       dout = dataconn("w");
+       dout = dataconn(lmode);

        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);
        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);

-       switch (type) {
+       oldintp = signal(SIGPIPE, SIG_IGN);
+       switch (curtype) {

 
        case TYPE_I:
        case TYPE_L:
                errno = d = 0;
 
        case TYPE_I:
        case TYPE_L:
                errno = d = 0;

-               while ((c = read(fileno (fin), buf, sizeof (buf))) > 0) {
-                       if ((d = write(fileno (dout), buf, c)) < 0)
-                               break;
+               while ((c = read(fileno(fin), buf, sizeof (buf))) > 0) {

                        bytes += c;
                        bytes += c;

+                       for (bufp = buf; c > 0; c -= d, bufp += d)
+                               if ((d = write(fileno(dout), bufp, c)) <= 0)
+                                       break;

                        if (hash) {
                        if (hash) {

-                               (void) putchar('#');
+                               while (bytes >= hashbytes) {
+                                       (void) putchar('#');
+                                       hashbytes += HASHBYTES;
+                               }

                                (void) fflush(stdout);
                        }
                }
                if (hash && bytes > 0) {
                                (void) fflush(stdout);
                        }
                }
                if (hash && bytes > 0) {

+                       if (bytes < HASHBYTES)
+                               (void) putchar('#');

                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                if (c < 0)
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                if (c < 0)

-                       perror(local);
-               if (d < 0)
-                       perror("netout");
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
+               if (d < 0) {
+                       if (errno != EPIPE) 
+                               perror("netout");
+                       bytes = -1;
+               }

                break;
 
        case TYPE_A:
                break;
 
        case TYPE_A:


@@ -472,7 +609,7 @@ sendrequest(cmd, local, remote)
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                                        (void) fflush(stdout);
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                                        (void) fflush(stdout);

-                                       hashbytes += sizeof (buf);
+                                       hashbytes += HASHBYTES;

                                }
                                if (ferror(dout))
                                        break;
                                }
                                if (ferror(dout))
                                        break;


@@ -493,9 +630,13 @@ sendrequest(cmd, local, remote)
                        (void) fflush(stdout);
                }
                if (ferror(fin))
                        (void) fflush(stdout);
                }
                if (ferror(fin))

-                       perror(local);
-               if (ferror(dout))
-                       perror("netout");
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
+               if (ferror(dout)) {
+                       if (errno != EPIPE)
+                               perror("netout");
+                       bytes = -1;
+               }

                break;
        }
        (void) gettimeofday(&stop, (struct timezone *)0);
                break;
        }
        (void) gettimeofday(&stop, (struct timezone *)0);


@@ -504,8 +645,10 @@ sendrequest(cmd, local, remote)
        (void) fclose(dout);
        (void) getreply(0);
        (void) signal(SIGINT, oldintr);
        (void) fclose(dout);
        (void) getreply(0);
        (void) signal(SIGINT, oldintr);

-       if (bytes > 0 && verbose)
-               ptransfer("sent", bytes, &start, &stop, local, remote);
+       if (oldintp)
+               (void) signal(SIGPIPE, oldintp);
+       if (bytes > 0)
+               ptransfer("sent", bytes, &start, &stop);

        return;
 abort:
        (void) gettimeofday(&stop, (struct timezone *)0);
        return;
 abort:
        (void) gettimeofday(&stop, (struct timezone *)0);


@@ -526,42 +669,54 @@ abort:
        code = -1;
        if (closefunc != NULL && fin != NULL)
                (*closefunc)(fin);
        code = -1;
        if (closefunc != NULL && fin != NULL)
                (*closefunc)(fin);

-       if (bytes > 0 && verbose)
-               ptransfer("sent", bytes, &start, &stop, local, remote);
+       if (bytes > 0)
+               ptransfer("sent", bytes, &start, &stop);

 }
 
 jmp_buf        recvabort;
 
 }
 
 jmp_buf        recvabort;
 

+void

 abortrecv()
 {
 
        mflag = 0;
        abrtflag = 0;
 abortrecv()
 {
 
        mflag = 0;
        abrtflag = 0;

-       printf("\n");
+       printf("\nreceive aborted\nwaiting for remote to finish abort\n");

        (void) fflush(stdout);
        longjmp(recvabort, 1);
 }
 
        (void) fflush(stdout);
        longjmp(recvabort, 1);
 }
 

-recvrequest(cmd, local, remote, mode)
-       char *cmd, *local, *remote, *mode;
+recvrequest(cmd, local, remote, lmode, printnames)
+       char *cmd, *local, *remote, *lmode;

 {
 {

-       FILE *fout, *din = 0, *mypopen();
-       int (*closefunc)(), mypclose(), fclose(), (*oldintr)(), (*oldintp)(); 
-       int abortrecv(), oldverbose, oldtype = 0, tcrflag;
-       char buf[BUFSIZ], *gunique();
-       long bytes = 0, hashbytes = sizeof (buf);
-       struct fd_set mask;
+       FILE *fout, *din = 0, *popen();
+       int (*closefunc)(), pclose(), fclose();
+       sig_t oldintr, oldintp;
+       int is_retr, tcrflag, bare_lfs = 0;
+       char *gunique();
+       static int bufsize;
+       static char *buf;
+       long bytes = 0, hashbytes = HASHBYTES;

        register int c, d;
        struct timeval start, stop;
        register int c, d;
        struct timeval start, stop;

+       struct stat st;
+       void abortrecv();

 
 

-       if (proxy && strcmp(cmd,"RETR") == 0) {
+       is_retr = strcmp(cmd, "RETR") == 0;
+       if (is_retr && verbose && printnames) {
+               if (local && *local != '-')
+                       printf("local: %s ", local);
+               if (remote)
+                       printf("remote: %s\n", remote);
+       }
+       if (proxy && is_retr) {

                proxtrans(cmd, local, remote);
                return;
        }
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;
                proxtrans(cmd, local, remote);
                return;
        }
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;

-       tcrflag = !crflag && !strcmp(cmd, "RETR");
+       tcrflag = !crflag && is_retr;

        if (setjmp(recvabort)) {
                while (cpend) {
                        (void) getreply(0);
        if (setjmp(recvabort)) {
                while (cpend) {
                        (void) getreply(0);


@@ -581,7 +736,8 @@ recvrequest(cmd, local, remote, mode)
                        char *dir = rindex(local, '/');
 
                        if (errno != ENOENT && errno != EACCES) {
                        char *dir = rindex(local, '/');
 
                        if (errno != ENOENT && errno != EACCES) {

-                               perror(local);
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));

                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;
                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;


@@ -592,14 +748,17 @@ recvrequest(cmd, local, remote, mode)
                        if (dir != NULL)
                                *dir = '/';
                        if (d < 0) {
                        if (dir != NULL)
                                *dir = '/';
                        if (d < 0) {

-                               perror(local);
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));

                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;
                        }
                        if (!runique && errno == EACCES &&
                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;
                        }
                        if (!runique && errno == EACCES &&

-                           chmod(local,0600) < 0) {
-                               perror(local);
+                           chmod(local, 0600) < 0) {
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));
+                               (void) signal(SIGINT, oldintr);

                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;
                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;


@@ -617,6 +776,11 @@ recvrequest(cmd, local, remote, mode)
                        return;
                }
        }
                        return;
                }
        }

+       if (!is_retr) {
+               if (curtype != TYPE_A)
+                       changetype(TYPE_A, 0);
+       } else if (curtype != type)
+               changetype(type, 0);

        if (initconn()) {
                (void) signal(SIGINT, oldintr);
                code = -1;
        if (initconn()) {
                (void) signal(SIGINT, oldintr);
                code = -1;


@@ -624,54 +788,17 @@ recvrequest(cmd, local, remote, mode)
        }
        if (setjmp(recvabort))
                goto abort;
        }
        if (setjmp(recvabort))
                goto abort;

-       if (strcmp(cmd, "RETR") && type != TYPE_A) {
-               oldtype = type;
-               oldverbose = verbose;
-               if (!debug)
-                       verbose = 0;
-               setascii();
-               verbose = oldverbose;
-       }
+       if (is_retr && restart_point &&
+           command("REST %ld", (long) restart_point) != CONTINUE)
+               return;

        if (remote) {
                if (command("%s %s", cmd, remote) != PRELIM) {
                        (void) signal(SIGINT, oldintr);
        if (remote) {
                if (command("%s %s", cmd, remote) != PRELIM) {
                        (void) signal(SIGINT, oldintr);

-                       if (oldtype) {
-                               if (!debug)
-                                       verbose = 0;
-                               switch (oldtype) {
-                                       case TYPE_I:
-                                               setbinary();
-                                               break;
-                                       case TYPE_E:
-                                               setebcdic();
-                                               break;
-                                       case TYPE_L:
-                                               settenex();
-                                               break;
-                               }
-                               verbose = oldverbose;
-                       }

                        return;
                }
        } else {
                if (command("%s", cmd) != PRELIM) {
                        (void) signal(SIGINT, oldintr);
                        return;
                }
        } else {
                if (command("%s", cmd) != PRELIM) {
                        (void) signal(SIGINT, oldintr);

-                       if (oldtype) {
-                               if (!debug)
-                                       verbose = 0;
-                               switch (oldtype) {
-                                       case TYPE_I:
-                                               setbinary();
-                                               break;
-                                       case TYPE_E:
-                                               setebcdic();
-                                               break;
-                                       case TYPE_L:
-                                               settenex();
-                                               break;
-                               }
-                               verbose = oldverbose;
-                       }

                        return;
                }
        }
                        return;
                }
        }


@@ -682,67 +809,132 @@ recvrequest(cmd, local, remote, mode)
                fout = stdout;
        else if (*local == '|') {
                oldintp = signal(SIGPIPE, SIG_IGN);
                fout = stdout;
        else if (*local == '|') {
                oldintp = signal(SIGPIPE, SIG_IGN);

-               fout = mypopen(local + 1, "w");
+               fout = popen(local + 1, "w");

                if (fout == NULL) {
                        perror(local+1);
                        goto abort;
                }
                if (fout == NULL) {
                        perror(local+1);
                        goto abort;
                }

-               closefunc = mypclose;
-       }
-       else {
-               fout = fopen(local, mode);
+               closefunc = pclose;
+       } else {
+               fout = fopen(local, lmode);

                if (fout == NULL) {
                if (fout == NULL) {

-                       perror(local);
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));

                        goto abort;
                }
                closefunc = fclose;
        }
                        goto abort;
                }
                closefunc = fclose;
        }

+       if (fstat(fileno(fout), &st) < 0 || st.st_blksize == 0)
+               st.st_blksize = BUFSIZ;
+       if (st.st_blksize > bufsize) {
+               if (buf)
+                       (void) free(buf);
+               buf = malloc((unsigned)st.st_blksize);
+               if (buf == NULL) {
+                       perror("malloc");
+                       bufsize = 0;
+                       goto abort;
+               }
+               bufsize = st.st_blksize;
+       }

        (void) gettimeofday(&start, (struct timezone *)0);
        (void) gettimeofday(&start, (struct timezone *)0);

-       switch (type) {
+       switch (curtype) {

 
        case TYPE_I:
        case TYPE_L:
 
        case TYPE_I:
        case TYPE_L:

+               if (restart_point &&
+                   lseek(fileno(fout), (off_t)restart_point, L_SET) < 0) {
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
+                       if (closefunc != NULL)
+                               (*closefunc)(fout);
+                       return;
+               }

                errno = d = 0;
                errno = d = 0;

-               while ((c = read(fileno(din), buf, sizeof (buf))) > 0) {
-                       if ((d = write(fileno(fout), buf, c)) < 0)
+               while ((c = read(fileno(din), buf, bufsize)) > 0) {
+                       if ((d = write(fileno(fout), buf, c)) != c)

                                break;
                        bytes += c;
                        if (hash) {
                                break;
                        bytes += c;
                        if (hash) {

-                               (void) putchar('#');
+                               while (bytes >= hashbytes) {
+                                       (void) putchar('#');
+                                       hashbytes += HASHBYTES;
+                               }

                                (void) fflush(stdout);
                        }
                }
                if (hash && bytes > 0) {
                                (void) fflush(stdout);
                        }
                }
                if (hash && bytes > 0) {

+                       if (bytes < HASHBYTES)
+                               (void) putchar('#');

                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }

-               if (c < 0)
-                       perror("netin");
-               if (d < 0)
-                       perror(local);
+               if (c < 0) {
+                       if (errno != EPIPE)
+                               perror("netin");
+                       bytes = -1;
+               }
+               if (d < c) {
+                       if (d < 0)
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));
+                       else
+                               fprintf(stderr, "%s: short write\n", local);
+               }

                break;
 
        case TYPE_A:
                break;
 
        case TYPE_A:

+               if (restart_point) {
+                       register int i, n, ch;
+
+                       if (fseek(fout, 0L, L_SET) < 0)
+                               goto done;
+                       n = restart_point;
+                       for (i = 0; i++ < n;) {
+                               if ((ch = getc(fout)) == EOF)
+                                       goto done;
+                               if (ch == '\n')
+                                       i++;
+                       }
+                       if (fseek(fout, 0L, L_INCR) < 0) {
+done:
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));
+                               if (closefunc != NULL)
+                                       (*closefunc)(fout);
+                               return;
+                       }
+               }

                while ((c = getc(din)) != EOF) {
                while ((c = getc(din)) != EOF) {

-                       if (c == '\r') {
+                       if (c == '\n')
+                               bare_lfs++;
+                       while (c == '\r') {

                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                                        (void) fflush(stdout);
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                                        (void) fflush(stdout);

-                                       hashbytes += sizeof (buf);
+                                       hashbytes += HASHBYTES;

                                }
                                bytes++;
                                if ((c = getc(din)) != '\n' || tcrflag) {
                                }
                                bytes++;
                                if ((c = getc(din)) != '\n' || tcrflag) {

-                                       if (ferror (fout))
-                                               break;
-                                       (void) putc ('\r', fout);
+                                       if (ferror(fout))
+                                               goto break2;
+                                       (void) putc('\r', fout);
+                                       if (c == '\0') {
+                                               bytes++;
+                                               goto contin2;
+                                       }
+                                       if (c == EOF)
+                                               goto contin2;

                                }
                                }

-                               /*if (c == '\0') {
-                                       bytes++;
-                                       continue;
-                               }*/

                        }
                        }

-                       (void) putc (c, fout);
+                       (void) putc(c, fout);

                        bytes++;
                        bytes++;

+       contin2:        ;
+               }
+break2:
+               if (bare_lfs) {
+                       printf("WARNING! %d bare linefeeds received in ASCII mode\n", bare_lfs);
+                       printf("File may not have transferred correctly.\n");

                }
                if (hash) {
                        if (bytes < hashbytes)
                }
                if (hash) {
                        if (bytes < hashbytes)


@@ -750,10 +942,14 @@ recvrequest(cmd, local, remote, mode)
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }

-               if (ferror (din))
-                       perror ("netin");
-               if (ferror (fout))
-                       perror (local);
+               if (ferror(din)) {
+                       if (errno != EPIPE)
+                               perror("netin");
+                       bytes = -1;
+               }
+               if (ferror(fout))
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));

                break;
        }
        if (closefunc != NULL)
                break;
        }
        if (closefunc != NULL)


@@ -764,89 +960,24 @@ recvrequest(cmd, local, remote, mode)
        (void) gettimeofday(&stop, (struct timezone *)0);
        (void) fclose(din);
        (void) getreply(0);
        (void) gettimeofday(&stop, (struct timezone *)0);
        (void) fclose(din);
        (void) getreply(0);

-       if (bytes > 0 && verbose)
-               ptransfer("received", bytes, &start, &stop, local, remote);
-       if (oldtype) {
-               if (!debug)
-                       verbose = 0;
-               switch (oldtype) {
-                       case TYPE_I:
-                               setbinary();
-                               break;
-                       case TYPE_E:
-                               setebcdic();
-                               break;
-                       case TYPE_L:
-                               settenex();
-                               break;
-               }
-               verbose = oldverbose;
-       }
+       if (bytes > 0 && is_retr)
+               ptransfer("received", bytes, &start, &stop);

        return;
 abort:
 
        return;
 abort:
 

-/* if server command parser understands TELNET commands, abort using */
-/* recommended IP,SYNC sequence                                      */
+/* abort using RFC959 recommended IP,SYNC sequence  */

 
        (void) gettimeofday(&stop, (struct timezone *)0);
        if (oldintp)
                (void) signal(SIGPIPE, oldintr);
 
        (void) gettimeofday(&stop, (struct timezone *)0);
        if (oldintp)
                (void) signal(SIGPIPE, oldintr);

-       (void) signal(SIGINT,SIG_IGN);
-       if (oldtype) {
-               if (!debug)
-                       verbose = 0;
-               switch (oldtype) {
-                       case TYPE_I:
-                               setbinary();
-                               break;
-                       case TYPE_E:
-                               setebcdic();
-                               break;
-                       case TYPE_L:
-                               settenex();
-                               break;
-               }
-               verbose = oldverbose;
-       }
+       (void) signal(SIGINT, SIG_IGN);

        if (!cpend) {
                code = -1;
        if (!cpend) {
                code = -1;

-               (void) signal(SIGINT,oldintr);
+               (void) signal(SIGINT, oldintr);

                return;
        }
                return;
        }

-       if (telflag) {
-               char msg[2];
-
-               fprintf(cout,"%c%c",IAC,IP);
-               (void) fflush(cout); 
-               *msg = IAC;
-               *(msg+1) = DM;
-               if (send(fileno(cout),msg,2,MSG_OOB) != 2)
-                       perror("abort");
-       }
-       fprintf(cout,"ABOR\r\n");
-       (void) fflush(cout);
-       FD_ZERO((char *) &mask);
-       FD_SET(fileno(cin), &mask);
-       if (din) { 
-               FD_SET(fileno(din), &mask);
-       }
-       if (empty(mask,10) < 0) {
-               perror("abort");
-               code = -1;
-               lostpeer();
-       }
-       if (din && FD_ISSET(fileno(din), &mask)) {
-               while ((c = read(fileno(din), buf, sizeof (buf))) > 0)
-                       ;
-       }
-       if ((c = getreply(0)) == ERROR) { /* needed for nic style abort */
-               if (data >= 0) {
-                       (void) close(data);
-                       data = -1;
-               }
-               (void) getreply(0);
-       }
-       (void) getreply(0);
+
+       abort_remote(din);

        code = -1;
        if (data >= 0) {
                (void) close(data);
        code = -1;
        if (data >= 0) {
                (void) close(data);


@@ -856,30 +987,27 @@ abort:
                (*closefunc)(fout);
        if (din)
                (void) fclose(din);
                (*closefunc)(fout);
        if (din)
                (void) fclose(din);

-       if (bytes > 0 && verbose)
-               ptransfer("received", bytes, &start, &stop, local, remote);
-       (void) signal(SIGINT,oldintr);
+       if (bytes > 0)
+               ptransfer("received", bytes, &start, &stop);
+       (void) signal(SIGINT, oldintr);

 }
 
 /*
 }
 
 /*

- * Need to start a listen on the data channel
- * before we send the command, otherwise the
- * server's connect may fail.
+ * Need to start a listen on the data channel before we send the command,
+ * otherwise the server's connect may fail.

  */
  */

-static int sendport = -1;
-

 initconn()
 {
        register char *p, *a;
        int result, len, tmpno = 0;
 initconn()
 {
        register char *p, *a;
        int result, len, tmpno = 0;

-       char on = 1;
+       int on = 1;

 
 noport:
        data_addr = myctladdr;
        if (sendport)
                data_addr.sin_port = 0; /* let system pick one */ 
        if (data != -1)
 
 noport:
        data_addr = myctladdr;
        if (sendport)
                data_addr.sin_port = 0; /* let system pick one */ 
        if (data != -1)

-               (void) close (data);
+               (void) close(data);

        data = socket(AF_INET, SOCK_STREAM, 0);
        if (data < 0) {
                perror("ftp: socket");
        data = socket(AF_INET, SOCK_STREAM, 0);
        if (data < 0) {
                perror("ftp: socket");


@@ -888,8 +1016,8 @@ noport:
                return (1);
        }
        if (!sendport)
                return (1);
        }
        if (!sendport)

-               if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0) {
-                       perror("ftp: setsockopt (resuse address)");
+               if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof (on)) < 0) {
+                       perror("ftp: setsockopt (reuse address)");

                        goto bad;
                }
        if (bind(data, (struct sockaddr *)&data_addr, sizeof (data_addr)) < 0) {
                        goto bad;
                }
        if (bind(data, (struct sockaddr *)&data_addr, sizeof (data_addr)) < 0) {


@@ -897,10 +1025,10 @@ noport:
                goto bad;
        }
        if (options & SO_DEBUG &&
                goto bad;
        }
        if (options & SO_DEBUG &&

-           setsockopt(data, SOL_SOCKET, SO_DEBUG, &on, sizeof (on)) < 0)
+           setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof (on)) < 0)

                perror("ftp: setsockopt (ignored)");
        len = sizeof (data_addr);
                perror("ftp: setsockopt (ignored)");
        len = sizeof (data_addr);

-       if (getsockname(data, (char *)&data_addr, &len) < 0) {
+       if (getsockname(data, (struct sockaddr *)&data_addr, &len) < 0) {

                perror("ftp: getsockname");
                goto bad;
        }
                perror("ftp: getsockname");
                goto bad;
        }


@@ -923,6 +1051,11 @@ noport:
        }
        if (tmpno)
                sendport = 1;
        }
        if (tmpno)
                sendport = 1;

+#ifdef IP_TOS
+       on = IPTOS_THROUGHPUT;
+       if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
+               perror("ftp: setsockopt TOS (ignored)");
+#endif

        return (0);
 bad:
        (void) close(data), data = -1;
        return (0);
 bad:
        (void) close(data), data = -1;


@@ -932,11 +1065,11 @@ bad:
 }
 
 FILE *
 }
 
 FILE *

-dataconn(mode)
-       char *mode;
+dataconn(lmode)
+       char *lmode;

 {
        struct sockaddr_in from;
 {
        struct sockaddr_in from;

-       int s, fromlen = sizeof (from);
+       int s, fromlen = sizeof (from), tos;

 
        s = accept(data, (struct sockaddr *) &from, &fromlen);
        if (s < 0) {
 
        s = accept(data, (struct sockaddr *) &from, &fromlen);
        if (s < 0) {


@@ -946,27 +1079,30 @@ dataconn(mode)
        }
        (void) close(data);
        data = s;
        }
        (void) close(data);
        data = s;

-       return (fdopen(data, mode));
+#ifdef IP_TOS
+       tos = IPTOS_THROUGHPUT;
+       if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
+               perror("ftp: setsockopt TOS (ignored)");
+#endif
+       return (fdopen(data, lmode));

 }
 
 }
 

-ptransfer(direction, bytes, t0, t1, local, remote)
-       char *direction, *local, *remote;
+ptransfer(direction, bytes, t0, t1)
+       char *direction;

        long bytes;
        struct timeval *t0, *t1;
 {
        struct timeval td;
        float s, bs;
 
        long bytes;
        struct timeval *t0, *t1;
 {
        struct timeval td;
        float s, bs;
 

-       tvsub(&td, t1, t0);
-       s = td.tv_sec + (td.tv_usec / 1000000.);
+       if (verbose) {
+               tvsub(&td, t1, t0);
+               s = td.tv_sec + (td.tv_usec / 1000000.);

 #define        nz(x)   ((x) == 0 ? 1 : (x))
 #define        nz(x)   ((x) == 0 ? 1 : (x))

-       bs = bytes / nz(s);
-       if (local && *local != '-')
-               printf("local: %s ", local);
-       if (remote)
-               printf("remote: %s\n", remote);
-       printf("%ld bytes %s in %.2g seconds (%.2g Kbytes/s)\n",
-               bytes, direction, s, bs / 1024.);
+               bs = bytes / nz(s);
+               printf("%ld bytes %s in %.2g seconds (%.2g Kbytes/s)\n",
+                   bytes, direction, s, bs / 1024.);
+       }

 }
 
 /*tvadd(tsum, t0)
 }
 
 /*tvadd(tsum, t0)


@@ -989,6 +1125,7 @@ tvsub(tdiff, t1, t0)
                tdiff->tv_sec--, tdiff->tv_usec += 1000000;
 }
 
                tdiff->tv_sec--, tdiff->tv_usec += 1000000;
 }
 

+void

 psabort()
 {
        extern int abrtflag;
 psabort()
 {
        extern int abrtflag;


@@ -1000,16 +1137,16 @@ pswitch(flag)
        int flag;
 {
        extern int proxy, abrtflag;
        int flag;
 {
        extern int proxy, abrtflag;

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

        static struct comvars {
                int connect;
        static struct comvars {
                int connect;

-               char name[32];
+               char name[MAXHOSTNAMELEN];

                struct sockaddr_in mctl;
                struct sockaddr_in hctl;
                FILE *in;
                FILE *out;
                struct sockaddr_in mctl;
                struct sockaddr_in hctl;
                FILE *in;
                FILE *out;

-               int tflag;

                int tpe;
                int tpe;

+               int curtpe;

                int cpnd;
                int sunqe;
                int runqe;
                int cpnd;
                int sunqe;
                int runqe;


@@ -1020,7 +1157,7 @@ pswitch(flag)
                int mapflg;
                char mi[MAXPATHLEN];
                char mo[MAXPATHLEN];
                int mapflg;
                char mi[MAXPATHLEN];
                char mo[MAXPATHLEN];

-               } proxstruct, tmpstruct;
+       } proxstruct, tmpstruct;

        struct comvars *ip, *op;
 
        abrtflag = 0;
        struct comvars *ip, *op;
 
        abrtflag = 0;


@@ -1031,8 +1168,7 @@ pswitch(flag)
                ip = &tmpstruct;
                op = &proxstruct;
                proxy++;
                ip = &tmpstruct;
                op = &proxstruct;
                proxy++;

-       }
-       else {
+       } else {

                if (!proxy)
                        return;
                ip = &proxstruct;
                if (!proxy)
                        return;
                ip = &proxstruct;


@@ -1041,8 +1177,11 @@ pswitch(flag)
        }
        ip->connect = connected;
        connected = op->connect;
        }
        ip->connect = connected;
        connected = op->connect;

-       (void) strncpy(ip->name, hostname, 31);
-       (ip->name)[strlen(ip->name)] = '\0';
+       if (hostname) {
+               (void) strncpy(ip->name, hostname, sizeof(ip->name) - 1);
+               ip->name[strlen(ip->name)] = '\0';
+       } else
+               ip->name[0] = 0;

        hostname = op->name;
        ip->hctl = hisctladdr;
        hisctladdr = op->hctl;
        hostname = op->name;
        ip->hctl = hisctladdr;
        hisctladdr = op->hctl;


@@ -1052,12 +1191,10 @@ pswitch(flag)
        cin = op->in;
        ip->out = cout;
        cout = op->out;
        cin = op->in;
        ip->out = cout;
        cout = op->out;

-       ip->tflag = telflag;
-       telflag = op->tflag;

        ip->tpe = type;
        type = op->tpe;
        ip->tpe = type;
        type = op->tpe;

-       if (!type)
-               type = 1;
+       ip->curtpe = curtype;
+       curtype = op->curtpe;

        ip->cpnd = cpend;
        cpend = op->cpnd;
        ip->sunqe = sunique;
        ip->cpnd = cpend;
        cpend = op->cpnd;
        ip->sunqe = sunique;


@@ -1085,13 +1222,14 @@ pswitch(flag)
        (void) signal(SIGINT, oldintr);
        if (abrtflag) {
                abrtflag = 0;
        (void) signal(SIGINT, oldintr);
        if (abrtflag) {
                abrtflag = 0;

-               (*oldintr)();
+               (*oldintr)(SIGINT);

        }
 }
 
 jmp_buf ptabort;
 int ptabflg;
 
        }
 }
 
 jmp_buf ptabort;
 int ptabflg;
 

+void

 abortpt()
 {
        printf("\n");
 abortpt()
 {
        printf("\n");


@@ -1105,20 +1243,29 @@ abortpt()
 proxtrans(cmd, local, remote)
        char *cmd, *local, *remote;
 {
 proxtrans(cmd, local, remote)
        char *cmd, *local, *remote;
 {

-       int (*oldintr)(), abortpt(), tmptype, oldtype = 0, secndflag = 0;
+       sig_t oldintr;
+       int secndflag = 0, prox_type, nfnd;

        extern jmp_buf ptabort;
        char *cmd2;
        struct fd_set mask;
        extern jmp_buf ptabort;
        char *cmd2;
        struct fd_set mask;

+       void abortpt();

 
        if (strcmp(cmd, "RETR"))
                cmd2 = "RETR";
        else
                cmd2 = runique ? "STOU" : "STOR";
 
        if (strcmp(cmd, "RETR"))
                cmd2 = "RETR";
        else
                cmd2 = runique ? "STOU" : "STOR";

+       if ((prox_type = type) == 0) {
+               if (unix_server && unix_proxy)
+                       prox_type = TYPE_I;
+               else
+                       prox_type = TYPE_A;
+       }
+       if (curtype != prox_type)
+               changetype(prox_type, 1);

        if (command("PASV") != COMPLETE) {
        if (command("PASV") != COMPLETE) {

-               printf("proxy server does not support third part transfers.\n");
+               printf("proxy server does not support third party transfers.\n");

                return;
        }
                return;
        }

-       tmptype = type;

        pswitch(0);
        if (!connected) {
                printf("No primary connection\n");
        pswitch(0);
        if (!connected) {
                printf("No primary connection\n");


@@ -1126,40 +1273,9 @@ proxtrans(cmd, local, remote)
                code = -1;
                return;
        }
                code = -1;
                return;
        }

-       if (type != tmptype) {
-               oldtype = type;
-               switch (tmptype) {
-                       case TYPE_A:
-                               setascii();
-                               break;
-                       case TYPE_I:
-                               setbinary();
-                               break;
-                       case TYPE_E:
-                               setebcdic();
-                               break;
-                       case TYPE_L:
-                               settenex();
-                               break;
-               }
-       }
+       if (curtype != prox_type)
+               changetype(prox_type, 1);

        if (command("PORT %s", pasv) != COMPLETE) {
        if (command("PORT %s", pasv) != COMPLETE) {

-               switch (oldtype) {
-                       case 0:
-                               break;
-                       case TYPE_A:
-                               setascii();
-                               break;
-                       case TYPE_I:
-                               setbinary();
-                               break;
-                       case TYPE_E:
-                               setebcdic();
-                               break;
-                       case TYPE_L:
-                               settenex();
-                               break;
-               }

                pswitch(1);
                return;
        }
                pswitch(1);
                return;
        }


@@ -1168,22 +1284,6 @@ proxtrans(cmd, local, remote)
        oldintr = signal(SIGINT, abortpt);
        if (command("%s %s", cmd, remote) != PRELIM) {
                (void) signal(SIGINT, oldintr);
        oldintr = signal(SIGINT, abortpt);
        if (command("%s %s", cmd, remote) != PRELIM) {
                (void) signal(SIGINT, oldintr);

-               switch (oldtype) {
-                       case 0:
-                               break;
-                       case TYPE_A:
-                               setascii();
-                               break;
-                       case TYPE_I:
-                               setbinary();
-                               break;
-                       case TYPE_E:
-                               setebcdic();
-                               break;
-                       case TYPE_L:
-                               settenex();
-                               break;
-               }

                pswitch(1);
                return;
        }
                pswitch(1);
                return;
        }


@@ -1197,22 +1297,6 @@ proxtrans(cmd, local, remote)
        pswitch(0);
        (void) getreply(0);
        (void) signal(SIGINT, oldintr);
        pswitch(0);
        (void) getreply(0);
        (void) signal(SIGINT, oldintr);

-       switch (oldtype) {
-               case 0:
-                       break;
-               case TYPE_A:
-                       setascii();
-                       break;
-               case TYPE_I:
-                       setbinary();
-                       break;
-               case TYPE_E:
-                       setebcdic();
-                       break;
-               case TYPE_L:
-                       settenex();
-                       break;
-       }

        pswitch(1);
        ptflag = 0;
        printf("local: %s remote: %s\n", local, remote);
        pswitch(1);
        ptflag = 0;
        printf("local: %s remote: %s\n", local, remote);


@@ -1227,46 +1311,8 @@ abort:
        if (!cpend && !secndflag) {  /* only here if cmd = "STOR" (proxy=1) */
                if (command("%s %s", cmd2, local) != PRELIM) {
                        pswitch(0);
        if (!cpend && !secndflag) {  /* only here if cmd = "STOR" (proxy=1) */
                if (command("%s %s", cmd2, local) != PRELIM) {
                        pswitch(0);

-                       switch (oldtype) {
-                               case 0:
-                                       break;
-                               case TYPE_A:
-                                       setascii();
-                                       break;
-                               case TYPE_I:
-                                       setbinary();
-                                       break;
-                               case TYPE_E:
-                                       setebcdic();
-                                       break;
-                               case TYPE_L:
-                                       settenex();
-                                       break;
-                       }
-                       if (cpend && telflag) {
-                               char msg[2];
-
-                               fprintf(cout,"%c%c",IAC,IP);
-                               (void) fflush(cout); 
-                               *msg = IAC;
-                               *(msg+1) = DM;
-                               if (send(fileno(cout),msg,2,MSG_OOB) != 2)
-                                       perror("abort");
-                       }
-                       if (cpend) {
-                               fprintf(cout,"ABOR\r\n");
-                               (void) fflush(cout);
-                               FD_ZERO((char *) &mask);
-                               FD_SET(fileno(cin), &mask);
-                               if (empty(mask,10) < 0) {
-                                       perror("abort");
-                                       if (ptabflg)
-                                               code = -1;
-                                       lostpeer();
-                               }
-                               (void) getreply(0);
-                               (void) getreply(0);
-                       }
+                       if (cpend)
+                               abort_remote((FILE *) NULL);

                }
                pswitch(1);
                if (ptabflg)
                }
                pswitch(1);
                if (ptabflg)


@@ -1274,74 +1320,14 @@ abort:
                (void) signal(SIGINT, oldintr);
                return;
        }
                (void) signal(SIGINT, oldintr);
                return;
        }

-       if (cpend && telflag) {
-               char msg[2];
-
-               fprintf(cout,"%c%c",IAC,IP);
-               (void) fflush(cout); 
-               *msg = IAC;
-               *(msg+1) = DM;
-               if (send(fileno(cout),msg,2,MSG_OOB) != 2)
-                       perror("abort");
-       }
-       if (cpend) {
-               fprintf(cout,"ABOR\r\n");
-               (void) fflush(cout);
-               FD_ZERO((char *) &mask);
-               FD_SET(fileno(cin), &mask);
-               if ((empty(mask,10)) < 0) {
-                       perror("abort");
-                       if (ptabflg)
-                               code = -1;
-                       lostpeer();
-               }
-               (void) getreply(0);
-               (void) getreply(0);
-       }
+       if (cpend)
+               abort_remote((FILE *) NULL);

        pswitch(!proxy);
        if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
                if (command("%s %s", cmd2, local) != PRELIM) {
                        pswitch(0);
        pswitch(!proxy);
        if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
                if (command("%s %s", cmd2, local) != PRELIM) {
                        pswitch(0);

-                       switch (oldtype) {
-                               case 0:
-                                       break;
-                               case TYPE_A:
-                                       setascii();
-                                       break;
-                               case TYPE_I:
-                                       setbinary();
-                                       break;
-                               case TYPE_E:
-                                       setebcdic();
-                                       break;
-                               case TYPE_L:
-                                       settenex();
-                                       break;
-                       }
-                       if (cpend && telflag) {
-                               char msg[2];
-
-                               fprintf(cout,"%c%c",IAC,IP);
-                               (void) fflush(cout); 
-                               *msg = IAC;
-                               *(msg+1) = DM;
-                               if (send(fileno(cout),msg,2,MSG_OOB) != 2)
-                                       perror("abort");
-                       }
-                       if (cpend) {
-                               fprintf(cout,"ABOR\r\n");
-                               (void) fflush(cout);
-                               FD_ZERO((char *) &mask);
-                               FD_SET(fileno(cin), &mask);
-                               if (empty(mask,10) < 0) {
-                                       perror("abort");
-                                       if (ptabflg)
-                                               code = -1;
-                                       lostpeer();
-                               }
-                               (void) getreply(0);
-                               (void) getreply(0);
-                       }
+                       if (cpend)
+                               abort_remote((FILE *) NULL);

                        pswitch(1);
                        if (ptabflg)
                                code = -1;
                        pswitch(1);
                        if (ptabflg)
                                code = -1;


@@ -1349,36 +1335,16 @@ abort:
                        return;
                }
        }
                        return;
                }
        }

-       if (cpend && telflag) {
-               char msg[2];
-
-               fprintf(cout,"%c%c",IAC,IP);
-               (void) fflush(cout); 
-               *msg = IAC;
-               *(msg+1) = DM;
-               if (send(fileno(cout),msg,2,MSG_OOB) != 2)
-                       perror("abort");
-       }
-       if (cpend) {
-               fprintf(cout,"ABOR\r\n");
-               (void) fflush(cout);
-               FD_ZERO((char *) &mask);
-               FD_SET(fileno(cin), &mask);
-               if (empty(mask,10) < 0) {
-                       perror("abort");
-                       if (ptabflg)
-                               code = -1;
-                       lostpeer();
-               }
-               (void) getreply(0);
-               (void) getreply(0);
-       }
+       if (cpend)
+               abort_remote((FILE *) NULL);

        pswitch(!proxy);
        if (cpend) {
        pswitch(!proxy);
        if (cpend) {

-               FD_ZERO((char *) &mask);
+               FD_ZERO(&mask);

                FD_SET(fileno(cin), &mask);
                FD_SET(fileno(cin), &mask);

-               if (empty(mask,10) < 0) {
-                       perror("abort");
+               if ((nfnd = empty(&mask, 10)) <= 0) {
+                       if (nfnd < 0) {
+                               perror("abort");
+                       }

                        if (ptabflg)
                                code = -1;
                        lostpeer();
                        if (ptabflg)
                                code = -1;
                        lostpeer();


@@ -1388,22 +1354,6 @@ abort:
        }
        if (proxy)
                pswitch(0);
        }
        if (proxy)
                pswitch(0);

-       switch (oldtype) {
-               case 0:
-                       break;
-               case TYPE_A:
-                       setascii();
-                       break;
-               case TYPE_I:
-                       setbinary();
-                       break;
-               case TYPE_E:
-                       setebcdic();
-                       break;
-               case TYPE_L:
-                       settenex();
-                       break;
-       }

        pswitch(1);
        if (ptabflg)
                code = -1;
        pswitch(1);
        if (ptabflg)
                code = -1;


@@ -1415,15 +1365,15 @@ reset()
        struct fd_set mask;
        int nfnd = 1;
 
        struct fd_set mask;
        int nfnd = 1;
 

-       FD_ZERO((char *) &mask);
-       while (nfnd) {
+       FD_ZERO(&mask);
+       while (nfnd > 0) {

                FD_SET(fileno(cin), &mask);
                FD_SET(fileno(cin), &mask);

-               if ((nfnd = empty(mask,0)) < 0) {
+               if ((nfnd = empty(&mask,0)) < 0) {

                        perror("reset");
                        code = -1;
                        lostpeer();
                }
                        perror("reset");
                        code = -1;
                        lostpeer();
                }

-               else {
+               else if (nfnd) {

                        (void) getreply(0);
                }
        }
                        (void) getreply(0);
                }
        }


@@ -1444,7 +1394,7 @@ gunique(local)
        if (cp)
                *cp = '/';
        if (d < 0) {
        if (cp)
                *cp = '/';
        if (d < 0) {

-               perror(local);
+               fprintf(stderr, "local: %s: %s\n", local, strerror(errno));

                return((char *) 0);
        }
        (void) strcpy(new, local);
                return((char *) 0);
        }
        (void) strcpy(new, local);


@@ -1474,3 +1424,43 @@ gunique(local)
        }
        return(new);
 }
        }
        return(new);
 }

+
+abort_remote(din)
+FILE *din;
+{
+       char buf[BUFSIZ];
+       int nfnd;
+       struct fd_set mask;
+
+       /*
+        * send IAC in urgent mode instead of DM because 4.3BSD places oob mark
+        * after urgent byte rather than before as is protocol now
+        */
+       sprintf(buf, "%c%c%c", IAC, IP, IAC);
+       if (send(fileno(cout), buf, 3, MSG_OOB) != 3)
+               perror("abort");
+       fprintf(cout,"%cABOR\r\n", DM);
+       (void) fflush(cout);
+       FD_ZERO(&mask);
+       FD_SET(fileno(cin), &mask);
+       if (din) { 
+               FD_SET(fileno(din), &mask);
+       }
+       if ((nfnd = empty(&mask, 10)) <= 0) {
+               if (nfnd < 0) {
+                       perror("abort");
+               }
+               if (ptabflg)
+                       code = -1;
+               lostpeer();
+       }
+       if (din && FD_ISSET(fileno(din), &mask)) {
+               while (read(fileno(din), buf, BUFSIZ) > 0)
+                       /* LOOP */;
+       }
+       if (getreply(0) == ERROR && code == 552) {
+               /* 552 needed for nic style abort */
+               (void) getreply(0);
+       }
+       (void) getreply(0);
+}