add typedef for signal return for better portability

[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 caf501c..9f76af4 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
+ * Copyright (c) 1985, 1989 Regents of the University of California.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted


@@ -16,16 +16,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ftp.c      5.23 (Berkeley) %G%";
+static char sccsid[] = "@(#)ftp.c      5.29 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include "ftp_var.h"
-
+#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/param.h>

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


@@ -39,6 +37,8 @@ static char sccsid[] = "@(#)ftp.c     5.23 (Berkeley) %G%";
 #include <fcntl.h>
 #include <pwd.h>
 
 #include <fcntl.h>
 #include <pwd.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;


@@ -47,7 +47,6 @@ int   ptflag = 0;
 int    connected;
 struct sockaddr_in myctladdr;
 uid_t  getuid();
 int    connected;
 struct sockaddr_in myctladdr;
 uid_t  getuid();

-off_t  restart_point = 0;

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


@@ -65,9 +64,8 @@ hookup(host, port)
        hisctladdr.sin_addr.s_addr = inet_addr(host);
        if (hisctladdr.sin_addr.s_addr != -1) {
                hisctladdr.sin_family = AF_INET;
        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) {
                        fprintf(stderr, "ftp: %s: ", host);
                hp = gethostbyname(host);
                if (hp == NULL) {
                        fprintf(stderr, "ftp: %s: ", host);


@@ -78,7 +76,7 @@ hookup(host, port)
                hisctladdr.sin_family = hp->h_addrtype;
                bcopy(hp->h_addr_list[0],
                    (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                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);


@@ -167,11 +165,10 @@ login(host)
 
        user = pass = acct = 0;
        if (ruserpass(host, &user, &pass, &acct) < 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) {


@@ -180,7 +177,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')


@@ -234,11 +234,15 @@ command(fmt, args)
        char *fmt;
 {
        int r, (*oldintr)(), cmdabort();
        char *fmt;
 {
        int r, (*oldintr)(), cmdabort();

+       char *xxx = "XXX";

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

-               _doprnt(fmt, &args, stdout);
+               if (strncmp(fmt, "PASS", 4) == 0)
+                       _doprnt(fmt, (int *)&xxx, stdout);
+               else
+                       _doprnt(fmt, &args, stdout);

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


@@ -259,7 +263,7 @@ command(fmt, args)
        return(r);
 }
 
        return(r);
 }
 

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

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 


@@ -273,23 +277,23 @@ getreply(expecteof)
        int pflag = 0;
        char *pt = pasv;
 
        int pflag = 0;
        char *pt = pasv;
 

-       cp = reply_string;

        oldintr = signal(SIGINT,cmdabort);
        for (;;) {
                dig = n = code = 0;
        oldintr = signal(SIGINT,cmdabort);
        for (;;) {
                dig = n = code = 0;

+               cp = reply_string;

                while ((c = getc(cin)) != '\n') {
                        if (c == IAC) {     /* handle telnet commands */
                                switch (c = getc(cin)) {
                                case WILL:
                                case WONT:
                                        c = getc(cin);
                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,WONT,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,DONT,c);
+                                       fprintf(cout, "%c%c%c",IAC,WONT,c);

                                        (void) fflush(cout);
                                        break;
                                default:
                                        (void) fflush(cout);
                                        break;
                                default:


@@ -340,7 +344,8 @@ getreply(expecteof)
                        }
                        if (n == 0)
                                n = c;
                        }
                        if (n == 0)
                                n = c;

-                       *cp++ = 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);


@@ -386,23 +391,34 @@ abortsend()
        longjmp(sendabort, 1);
 }
 
        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, *popen();
        int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)();
        int abortsend();
 {
        FILE *fin, *dout = 0, *popen();
        int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)();
        int abortsend();

-       char buf[BUFSIZ];
-       long bytes = 0, hashbytes = sizeof (buf);
+       char buf[BUFSIZ], *bufp;
+       long bytes = 0, hashbytes = HASHBYTES;

        register int c, d;
        struct stat st;
        struct timeval start, stop;
        char *mode;
 
        register int c, d;
        struct stat st;
        struct timeval start, stop;
        char *mode;
 

+       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;


@@ -466,26 +482,6 @@ sendrequest(cmd, local, remote)
        if (setjmp(sendabort))
                goto abort;
 
        if (setjmp(sendabort))
                goto abort;
 

-       if (strcmp(cmd, "STOR") == 0 || strcmp(cmd, "APPE") == 0) {
-               if (restart_point) {
-                       if (fseek(fin, (long) restart_point, 0) < 0) {
-                               perror(local);
-                               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;
-                       mode = "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);


@@ -514,23 +510,34 @@ sendrequest(cmd, local, remote)
        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)) != c)
-                               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;
+                       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)
                        perror(local);
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                if (c < 0)
                        perror(local);

-               if (d < 0) {
-                       if (errno != EPIPE) 
+               if (d <= 0) {
+                       if (d == 0)
+                               fprintf(stderr, "netout: write returned 0?\n");
+                       else if (errno != EPIPE) 

                                perror("netout");
                        bytes = -1;
                }
                                perror("netout");
                        bytes = -1;
                }


@@ -542,7 +549,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;


@@ -580,7 +587,7 @@ sendrequest(cmd, local, remote)
        if (oldintp)
                (void) signal(SIGPIPE, oldintp);
        if (bytes > 0)
        if (oldintp)
                (void) signal(SIGPIPE, oldintp);
        if (bytes > 0)

-               ptransfer("sent", bytes, &start, &stop, local, remote);
+               ptransfer("sent", bytes, &start, &stop);

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


@@ -602,7 +609,7 @@ abort:
        if (closefunc != NULL && fin != NULL)
                (*closefunc)(fin);
        if (bytes > 0)
        if (closefunc != NULL && fin != NULL)
                (*closefunc)(fin);
        if (bytes > 0)

-               ptransfer("sent", bytes, &start, &stop, local, remote);
+               ptransfer("sent", bytes, &start, &stop);

 }
 
 jmp_buf        recvabort;
 }
 
 jmp_buf        recvabort;


@@ -617,19 +624,29 @@ abortrecv()
        longjmp(recvabort, 1);
 }
 
        longjmp(recvabort, 1);
 }
 

-recvrequest(cmd, local, remote, mode)
+recvrequest(cmd, local, remote, mode, printnames)

        char *cmd, *local, *remote, *mode;
 {
        FILE *fout, *din = 0, *popen();
        int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)(); 
        char *cmd, *local, *remote, *mode;
 {
        FILE *fout, *din = 0, *popen();
        int (*closefunc)(), pclose(), fclose(), (*oldintr)(), (*oldintp)(); 

-       int abortrecv(), oldverbose, oldtype = 0, is_retr, tcrflag, nfnd;
-       char buf[BUFSIZ], *gunique(), msg;
-       long bytes = 0, hashbytes = sizeof (buf);
+       int abortrecv(), is_retr, tcrflag, nfnd;
+       char *bufp, *gunique(), msg;
+       static char *buf;
+       static int bufsize;
+       long bytes = 0, hashbytes = HASHBYTES;

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

+       struct stat st;
+       extern char *malloc();

 
        is_retr = 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;
        if (proxy && is_retr) {
                proxtrans(cmd, local, remote);
                return;


@@ -693,6 +710,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;


@@ -700,59 +722,17 @@ recvrequest(cmd, local, remote, mode)
        }
        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;
-               }
-       } else if (restart_point) {
-               if (command("REST %ld", (long) restart_point) != CONTINUE)
-                       return;
-       }
+       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;
                }
        }


@@ -769,8 +749,7 @@ recvrequest(cmd, local, remote, mode)
                        goto abort;
                }
                closefunc = pclose;
                        goto abort;
                }
                closefunc = pclose;

-       }
-       else {
+       } else {

                fout = fopen(local, mode);
                if (fout == NULL) {
                        perror(local);
                fout = fopen(local, mode);
                if (fout == NULL) {
                        perror(local);


@@ -778,29 +757,41 @@ recvrequest(cmd, local, remote, mode)
                }
                closefunc = fclose;
        }
                }
                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(st.st_blksize);
+               if (buf == NULL) {
+                       perror("malloc");
+                       bufsize = 0;
+                       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), (long) restart_point, L_SET) < 0) {
-                       perror(local);
-                       if (closefunc != NULL)
-                               (*closefunc)(fout);
-                       return;
-               }

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

-               while ((c = read(fileno(din), buf, sizeof (buf))) > 0) {
+               while ((c = read(fileno(din), buf, bufsize)) > 0) {

                        if ((d = write(fileno(fout), buf, c)) != c)
                                break;
                        bytes += c;
                        if (hash) {
                        if ((d = write(fileno(fout), buf, c)) != c)
                                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);
                }


@@ -809,61 +800,56 @@ recvrequest(cmd, local, remote, mode)
                                perror("netin");
                        bytes = -1;
                }
                                perror("netin");
                        bytes = -1;
                }

-               if (d < 0)
-                       perror(local);
+               if (d < c) {
+                       if (d < 0)
+                               perror(local);
+                       else
+                               fprintf(stderr, "%s: short write\n", local);
+               }

                break;
 
        case TYPE_A:
                break;
 
        case TYPE_A:

-               if (restart_point) {
-                       register int i, n, c;
-                       if (fseek(fout, 0L, L_SET) < 0)
-                               goto done;
-                       n = restart_point;
-                       i = 0;
-                       while(i++ < n) {
-                               if ((c=getc(fout)) == EOF)
-                                       goto done;
-                               if (c == '\n')
-                                       i++;
-                       }       
-                       if (fseek(fout, 0L, L_INCR) < 0) {
-done:
-                               perror(local);
-                               if (closefunc != NULL)
-                                       (*closefunc)(fout);
-                               return;
-                       }
-               }

                while ((c = getc(din)) != EOF) {
                        while (c == '\r') {
                                while (hash && (bytes >= hashbytes)) {
                                        (void) putchar('#');
                                        (void) fflush(stdout);
                while ((c = getc(din)) != EOF) {
                        while (c == '\r') {
                                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 == EOF)
+                                               goto contin2;

                                }
                        }
                                }
                        }

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

                        bytes++;
                        bytes++;

+       contin2:        ;

                }
                }

+break2:

                if (hash) {
                        if (bytes < hashbytes)
                                (void) putchar('#');
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }
                if (hash) {
                        if (bytes < hashbytes)
                                (void) putchar('#');
                        (void) putchar('\n');
                        (void) fflush(stdout);
                }

-               if (ferror (din)){
+               if (ferror(din)) {

                        if (errno != EPIPE)
                        if (errno != EPIPE)

-                               perror ("netin");
+                               perror("netin");

                        bytes = -1;
                }
                        bytes = -1;
                }

-               if (ferror (fout))
-                       perror (local);
+               if (ferror(fout))
+                       perror(local);

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


@@ -875,23 +861,7 @@ done:
        (void) fclose(din);
        (void) getreply(0);
        if (bytes > 0 && is_retr)
        (void) fclose(din);
        (void) getreply(0);
        if (bytes > 0 && is_retr)

-               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;
-       }
+               ptransfer("received", bytes, &start, &stop);

        return;
 abort:
 
        return;
 abort:
 


@@ -901,22 +871,6 @@ abort:
        if (oldintp)
                (void) signal(SIGPIPE, oldintr);
        (void) signal(SIGINT,SIG_IGN);
        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;
-       }

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


@@ -946,7 +900,7 @@ abort:
                lostpeer();
        }
        if (din && FD_ISSET(fileno(din), &mask)) {
                lostpeer();
        }
        if (din && FD_ISSET(fileno(din), &mask)) {

-               while ((c = read(fileno(din), buf, sizeof (buf))) > 0)
+               while ((c = read(fileno(din), buf, bufsize)) > 0)

                        ;
        }
        if ((c = getreply(0)) == ERROR && code == 552) { /* needed for nic style abort */
                        ;
        }
        if ((c = getreply(0)) == ERROR && code == 552) { /* needed for nic style abort */


@@ -967,7 +921,7 @@ abort:
        if (din)
                (void) fclose(din);
        if (bytes > 0)
        if (din)
                (void) fclose(din);
        if (bytes > 0)

-               ptransfer("received", bytes, &start, &stop, local, remote);
+               ptransfer("received", bytes, &start, &stop);

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


@@ -1059,8 +1013,8 @@ dataconn(mode)
        return (fdopen(data, mode));
 }
 
        return (fdopen(data, mode));
 }
 

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

        long bytes;
        struct timeval *t0, *t1;
 {
        long bytes;
        struct timeval *t0, *t1;
 {


@@ -1074,11 +1028,6 @@ ptransfer(direction, bytes, t0, t1, local, remote)
                bs = bytes / nz(s);
                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.);

-       } else {
-               if (local && *local != '-')
-                       printf("local: %s ", local);
-               if (remote)
-                       printf("remote: %s\n", remote);

        }
 }
 
        }
 }
 


@@ -1122,6 +1071,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;


@@ -1132,7 +1082,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;


@@ -1143,8 +1093,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;


@@ -1169,8 +1118,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;


@@ -1218,7 +1167,7 @@ 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;
+       int (*oldintr)(), abortpt(), prox_type, secndflag = 0, nfnd;

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


@@ -1227,11 +1176,18 @@ proxtrans(cmd, local, remote)
                cmd2 = "RETR";
        else
                cmd2 = runique ? "STOU" : "STOR";
                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");


@@ -1239,40 +1195,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;
        }


@@ -1281,22 +1206,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;
        }


@@ -1310,22 +1219,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);


@@ -1340,22 +1233,6 @@ 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];
 
                        if (cpend) {
                                char msg[2];
 


@@ -1415,22 +1292,6 @@ abort:
        if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
                if (command("%s %s", cmd2, local) != PRELIM) {
                        pswitch(0);
        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];
 
                        if (cpend) {
                                char msg[2];
 


@@ -1503,22 +1364,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;