projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 4b38c26..77f07c8 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,22 +1,38 @@
 /*
 /*
- * Copyright (c) 1985, 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1985, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF 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[] = "@(#)ftp.c      5.27 (Berkeley) %G%";
+static char sccsid[] = "@(#)ftp.c      8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -27,15 +43,21 @@ static char sccsid[] = "@(#)ftp.c   5.27 (Berkeley) %G%";
 #include <sys/file.h>
 
 #include <netinet/in.h>
 #include <sys/file.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"
 
 
 #include "ftp_var.h"
 
@@ -44,9 +66,11 @@ struct       sockaddr_in data_addr;
 int    data = -1;
 int    abrtflag = 0;
 int    ptflag = 0;
 int    data = -1;
 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();
@@ -57,7 +81,7 @@ hookup(host, port)
        int port;
 {
        register struct hostent *hp = 0;
        int port;
 {
        register struct hostent *hp = 0;
-       int s,len;
+       int s, len, tos;
        static char hostnamebuf[80];
 
        bzero((char *)&hisctladdr, sizeof (hisctladdr));
        static char hostnamebuf[80];
 
        bzero((char *)&hisctladdr, sizeof (hisctladdr));
@@ -86,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));
@@ -113,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) {
@@ -143,12 +173,12 @@ hookup(host, port)
        {
        int on = 1;
 
        {
        int on = 1;
 
-       if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &on, sizeof(on))
+       if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))
                < 0 && debug) {
                        perror("ftp: setsockopt");
                }
        }
                < 0 && debug) {
                        perror("ftp: setsockopt");
                }
        }
-#endif SO_OOBINLINE
+#endif /* SO_OOBINLINE */
 
        return (hostname);
 bad:
 
        return (hostname);
 bad:
@@ -168,7 +198,7 @@ login(host)
                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) {
@@ -177,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')
@@ -215,6 +248,7 @@ login(host)
        return (1);
 }
 
        return (1);
 }
 
+void
 cmdabort()
 {
        extern jmp_buf ptabort;
 cmdabort()
 {
        extern jmp_buf ptabort;
@@ -226,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);
        }
@@ -244,14 +288,17 @@ 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);
 }
@@ -266,11 +313,13 @@ getreply(expecteof)
        register int c, n;
        register int dig;
        register char *cp;
        register int c, n;
        register int dig;
        register char *cp;
-       int originalcode = 0, continuation = 0, (*oldintr)(), cmdabort();
+       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;
                cp = reply_string;
        for (;;) {
                dig = n = code = 0;
                cp = reply_string;
@@ -280,13 +329,13 @@ getreply(expecteof)
                                case WILL:
                                case WONT:
                                        c = getc(cin);
                                case WILL:
                                case WONT:
                                        c = getc(cin);
-                                       fprintf(cout, "%c%c%c",IAC,DONT,c);
+                                       fprintf(cout, "%c%c%c", IAC, DONT, c);
                                        (void) fflush(cout);
                                        break;
                                case DO:
                                case DONT:
                                        c = getc(cin);
                                        (void) fflush(cout);
                                        break;
                                case DO:
                                case DONT:
                                        c = getc(cin);
-                                       fprintf(cout, "%c%c%c",IAC,WONT,c);
+                                       fprintf(cout, "%c%c%c", IAC, WONT, c);
                                        (void) fflush(cout);
                                        break;
                                default:
                                        (void) fflush(cout);
                                        break;
                                default:
@@ -356,7 +405,7 @@ getreply(expecteof)
                if (code == 421 || originalcode == 421)
                        lostpeer();
                if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
                if (code == 421 || originalcode == 421)
                        lostpeer();
                if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
-                       (*oldintr)();
+                       (*oldintr)(SIGINT);
                return (n - '0');
        }
 }
                return (n - '0');
        }
 }
@@ -374,12 +423,13 @@ empty(mask, sec)
 
 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);
 }
@@ -390,15 +440,15 @@ sendrequest(cmd, local, remote, printnames)
        char *cmd, *local, *remote;
        int printnames;
 {
        char *cmd, *local, *remote;
        int printnames;
 {
-       FILE *fin, *dout = 0, *popen();
-       int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)();
-       int abortsend();
-       char buf[BUFSIZ], *bufp;
-       long bytes = 0, hashbytes = HASHBYTES;
-       register int c, d;
        struct stat st;
        struct timeval start, stop;
        struct stat st;
        struct timeval start, stop;
-       char *mode;
+       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 != '-')
 
        if (verbose && printnames) {
                if (local && *local != '-')
@@ -410,10 +460,12 @@ sendrequest(cmd, local, remote, printnames)
                proxtrans(cmd, local, remote);
                return;
        }
                proxtrans(cmd, local, remote);
                return;
        }
+       if (curtype != type)
+               changetype(type, 0);
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;
-       mode = "w";
+       lmode = "w";
        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);
        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);
@@ -446,7 +498,8 @@ sendrequest(cmd, local, remote, printnames)
        } 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;
@@ -473,6 +526,26 @@ sendrequest(cmd, local, remote, printnames)
        if (setjmp(sendabort))
                goto abort;
 
        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 (remote) {
                if (command("%s %s", cmd, remote) != PRELIM) {
                        (void) signal(SIGINT, oldintr);
@@ -491,21 +564,18 @@ sendrequest(cmd, local, remote, printnames)
                                (*closefunc)(fin);
                        return;
                }
                                (*closefunc)(fin);
                        return;
                }
-       dout = dataconn(mode);
+       dout = dataconn(lmode);
        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);
        oldintp = signal(SIGPIPE, SIG_IGN);
        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);
        oldintp = signal(SIGPIPE, SIG_IGN);
-       switch (type) {
+       switch (curtype) {
 
        case TYPE_I:
        case TYPE_L:
                errno = d = 0;
                while ((c = read(fileno(fin), buf, sizeof (buf))) > 0) {
                        bytes += c;
 
        case TYPE_I:
        case TYPE_L:
                errno = d = 0;
                while ((c = read(fileno(fin), buf, sizeof (buf))) > 0) {
                        bytes += c;
-                       for (bufp = buf; c > 0; c -= d, bufp += d)
-                               if ((d = write(fileno(dout), bufp, c)) <= 0)
-                                       break;
                        for (bufp = buf; c > 0; c -= d, bufp += d)
                                if ((d = write(fileno(dout), bufp, c)) <= 0)
                                        break;
                        for (bufp = buf; c > 0; c -= d, bufp += d)
                                if ((d = write(fileno(dout), bufp, c)) <= 0)
                                        break;
@@ -524,11 +594,10 @@ sendrequest(cmd, local, remote, printnames)
                        (void) fflush(stdout);
                }
                if (c < 0)
                        (void) fflush(stdout);
                }
                if (c < 0)
-                       perror(local);
-               if (d <= 0) {
-                       if (d == 0)
-                               fprintf(stderr, "netout: write returned 0?\n");
-                       else if (errno != EPIPE) 
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
+               if (d < 0) {
+                       if (errno != EPIPE) 
                                perror("netout");
                        bytes = -1;
                }
                                perror("netout");
                        bytes = -1;
                }
@@ -561,7 +630,8 @@ sendrequest(cmd, local, remote, printnames)
                        (void) fflush(stdout);
                }
                if (ferror(fin))
                        (void) fflush(stdout);
                }
                if (ferror(fin))
-                       perror(local);
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
                if (ferror(dout)) {
                        if (errno != EPIPE)
                                perror("netout");
                if (ferror(dout)) {
                        if (errno != EPIPE)
                                perror("netout");
@@ -605,31 +675,32 @@ abort:
 
 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, printnames)
-       char *cmd, *local, *remote, *mode;
+recvrequest(cmd, local, remote, lmode, printnames)
+       char *cmd, *local, *remote, *lmode;
 {
        FILE *fout, *din = 0, *popen();
 {
        FILE *fout, *din = 0, *popen();
-       int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)(); 
-       int abortrecv(), oldverbose, oldtype = 0, is_retr, tcrflag, nfnd;
-       char *bufp, *gunique(), msg;
-       static char *buf;
+       int (*closefunc)(), pclose(), fclose();
+       sig_t oldintr, oldintp;
+       int is_retr, tcrflag, bare_lfs = 0;
+       char *gunique();
        static int bufsize;
        static int bufsize;
+       static char *buf;
        long bytes = 0, hashbytes = HASHBYTES;
        long bytes = 0, hashbytes = HASHBYTES;
-       struct fd_set mask;
        register int c, d;
        struct timeval start, stop;
        struct stat st;
        register int c, d;
        struct timeval start, stop;
        struct stat st;
-       extern char *malloc();
+       void abortrecv();
 
        is_retr = strcmp(cmd, "RETR") == 0;
        if (is_retr && verbose && printnames) {
 
        is_retr = strcmp(cmd, "RETR") == 0;
        if (is_retr && verbose && printnames) {
@@ -665,7 +736,8 @@ recvrequest(cmd, local, remote, mode, printnames)
                        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;
@@ -676,14 +748,17 @@ recvrequest(cmd, local, remote, mode, printnames)
                        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 &&
                            chmod(local, 0600) < 0) {
                                (void) signal(SIGINT, oldintr);
                                code = -1;
                                return;
                        }
                        if (!runique && errno == EACCES &&
                            chmod(local, 0600) < 0) {
-                               perror(local);
+                               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;
@@ -701,6 +776,11 @@ recvrequest(cmd, local, remote, mode, printnames)
                        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;
@@ -708,56 +788,17 @@ recvrequest(cmd, local, remote, mode, printnames)
        }
        if (setjmp(recvabort))
                goto abort;
        }
        if (setjmp(recvabort))
                goto abort;
-       if (!is_retr) {
-               if (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;
                }
        }
@@ -775,9 +816,10 @@ recvrequest(cmd, local, remote, mode, printnames)
                }
                closefunc = pclose;
        } else {
                }
                closefunc = pclose;
        } else {
-               fout = fopen(local, mode);
+               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;
@@ -787,20 +829,27 @@ recvrequest(cmd, local, remote, mode, printnames)
        if (st.st_blksize > bufsize) {
                if (buf)
                        (void) free(buf);
        if (st.st_blksize > bufsize) {
                if (buf)
                        (void) free(buf);
-               buf = malloc(st.st_blksize);
+               buf = malloc((unsigned)st.st_blksize);
                if (buf == NULL) {
                        perror("malloc");
                        bufsize = 0;
                if (buf == NULL) {
                        perror("malloc");
                        bufsize = 0;
-                       bufsize = 0;
                        goto abort;
                }
                bufsize = st.st_blksize;
        }
        (void) gettimeofday(&start, (struct timezone *)0);
                        goto abort;
                }
                bufsize = st.st_blksize;
        }
        (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;
                while ((c = read(fileno(din), buf, bufsize)) > 0) {
                        if ((d = write(fileno(fout), buf, c)) != c)
                errno = d = 0;
                while ((c = read(fileno(din), buf, bufsize)) > 0) {
                        if ((d = write(fileno(fout), buf, c)) != c)
@@ -827,14 +876,38 @@ recvrequest(cmd, local, remote, mode, printnames)
                }
                if (d < c) {
                        if (d < 0)
                }
                if (d < c) {
                        if (d < 0)
-                               perror(local);
+                               fprintf(stderr, "local: %s: %s\n", local,
+                                       strerror(errno));
                        else
                                fprintf(stderr, "%s: short write\n", local);
                }
                break;
 
        case TYPE_A:
                        else
                                fprintf(stderr, "%s: short write\n", local);
                }
                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 == '\n')
+                               bare_lfs++;
                        while (c == '\r') {
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                        while (c == '\r') {
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
@@ -852,9 +925,6 @@ recvrequest(cmd, local, remote, mode, printnames)
                                        }
                                        if (c == EOF)
                                                goto contin2;
                                        }
                                        if (c == EOF)
                                                goto contin2;
-                                       }
-                                       if (c == EOF)
-                                               goto contin2;
                                }
                        }
                        (void) putc(c, fout);
                                }
                        }
                        (void) putc(c, fout);
@@ -862,6 +932,10 @@ recvrequest(cmd, local, remote, mode, printnames)
        contin2:        ;
                }
 break2:
        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)
                                (void) putchar('#');
                if (hash) {
                        if (bytes < hashbytes)
                                (void) putchar('#');
@@ -874,7 +948,8 @@ break2:
                        bytes = -1;
                }
                if (ferror(fout))
                        bytes = -1;
                }
                if (ferror(fout))
-                       perror(local);
+                       fprintf(stderr, "local: %s: %s\n", local,
+                               strerror(errno));
                break;
        }
        if (closefunc != NULL)
                break;
        }
        if (closefunc != NULL)
@@ -887,22 +962,6 @@ break2:
        (void) getreply(0);
        if (bytes > 0 && is_retr)
                ptransfer("received", bytes, &start, &stop);
        (void) getreply(0);
        if (bytes > 0 && is_retr)
                ptransfer("received", bytes, &start, &stop);
-       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;
 abort:
 
        return;
 abort:
 
@@ -911,63 +970,14 @@ abort:
        (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;
        }
 
-       fprintf(cout,"%c%c",IAC,IP);
-       (void) fflush(cout); 
-       msg = IAC;
-/* send IAC in urgent mode instead of DM because UNIX places oob mark */
-/* after urgent byte rather than before as now is protocol            */
-       if (send(fileno(cout),&msg,1,MSG_OOB) != 1) {
-               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");
-               }
-               code = -1;
-               lostpeer();
-       }
-       if (din && FD_ISSET(fileno(din), &mask)) {
-               while ((c = read(fileno(din), buf, bufsize)) > 0)
-                       ;
-       }
-       if ((c = getreply(0)) == ERROR && code == 552) { /* 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);
@@ -979,16 +989,13 @@ abort:
                (void) fclose(din);
        if (bytes > 0)
                ptransfer("received", bytes, &start, &stop);
                (void) fclose(din);
        if (bytes > 0)
                ptransfer("received", bytes, &start, &stop);
-       (void) signal(SIGINT,oldintr);
+       (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.
  */
  */
-int sendport = -1;
-
 initconn()
 {
        register char *p, *a;
 initconn()
 {
        register char *p, *a;
@@ -1000,7 +1007,7 @@ noport:
        if (sendport)
                data_addr.sin_port = 0; /* let system pick one */ 
        if (data != -1)
        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");
@@ -1021,7 +1028,7 @@ noport:
            setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof (on)) < 0)
                perror("ftp: setsockopt (ignored)");
        len = sizeof (data_addr);
            setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof (on)) < 0)
                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;
        }
@@ -1044,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;
@@ -1053,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) {
@@ -1067,7 +1079,12 @@ 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)
 }
 
 ptransfer(direction, bytes, t0, t1)
@@ -1108,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;
@@ -1119,7 +1137,7 @@ pswitch(flag)
        int flag;
 {
        extern int proxy, abrtflag;
        int flag;
 {
        extern int proxy, abrtflag;
-       int (*oldintr)();
+       sig_t oldintr;
        static struct comvars {
                int connect;
                char name[MAXHOSTNAMELEN];
        static struct comvars {
                int connect;
                char name[MAXHOSTNAMELEN];
@@ -1128,6 +1146,7 @@ pswitch(flag)
                FILE *in;
                FILE *out;
                int tpe;
                FILE *in;
                FILE *out;
                int tpe;
+               int curtpe;
                int cpnd;
                int sunqe;
                int runqe;
                int cpnd;
                int sunqe;
                int runqe;
@@ -1138,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;
@@ -1149,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;
@@ -1175,8 +1193,8 @@ pswitch(flag)
        cout = op->out;
        ip->tpe = type;
        type = op->tpe;
        cout = op->out;
        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;
@@ -1204,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");
@@ -1224,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, nfnd;
+       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");
@@ -1245,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;
        }
@@ -1287,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;
        }
@@ -1316,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);
@@ -1346,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) {
-                               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(&mask);
-                               FD_SET(fileno(cin), &mask);
-                               if ((nfnd = empty(&mask,10)) <= 0) {
-                                       if (nfnd < 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)
@@ -1393,74 +1320,14 @@ abort:
                (void) signal(SIGINT, oldintr);
                return;
        }
                (void) signal(SIGINT, oldintr);
                return;
        }
-       if (cpend) {
-               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(&mask);
-               FD_SET(fileno(cin), &mask);
-               if ((nfnd = empty(&mask,10)) <= 0) {
-                       if (nfnd < 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) {
-                               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(&mask);
-                               FD_SET(fileno(cin), &mask);
-                               if ((nfnd = empty(&mask,10)) <= 0) {
-                                       if (nfnd < 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;
@@ -1468,35 +1335,13 @@ abort:
                        return;
                }
        }
                        return;
                }
        }
-       if (cpend) {
-               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(&mask);
-               FD_SET(fileno(cin), &mask);
-               if ((nfnd = empty(&mask,10)) <= 0) {
-                       if (nfnd < 0) {
-                               perror("abort");
-                       }
-                       if (ptabflg)
-                               code = -1;
-                       lostpeer();
-               }
-               (void) getreply(0);
-               (void) getreply(0);
-       }
+       if (cpend)
+               abort_remote((FILE *) NULL);
        pswitch(!proxy);
        if (cpend) {
                FD_ZERO(&mask);
                FD_SET(fileno(cin), &mask);
        pswitch(!proxy);
        if (cpend) {
                FD_ZERO(&mask);
                FD_SET(fileno(cin), &mask);
-               if ((nfnd = empty(&mask,10)) <= 0) {
+               if ((nfnd = empty(&mask, 10)) <= 0) {
                        if (nfnd < 0) {
                                perror("abort");
                        }
                        if (nfnd < 0) {
                                perror("abort");
                        }
@@ -1509,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;
@@ -1565,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);
@@ -1595,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);
+}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.