checked in for rick: add restart, size, modtime, newer, syst;
[unix-history] / usr / src / usr.bin / ftp / cmds.c
index fd0cc04..00dea2d 100644 (file)
@@ -1,12 +1,28 @@
+/*
+ * Copyright (c) 1985 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.
+ */
+
 #ifndef lint
 #ifndef lint
-static char sccsid[] = "@(#)cmds.c     4.9 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)cmds.c     5.13 (Berkeley) %G%";
+#endif /* not lint */
 
 /*
  * FTP User Program -- Command Routines.
  */
 
 /*
  * FTP User Program -- Command Routines.
  */
-#include <sys/param.h>
-#include <sys/stat.h>
+#include "ftp_var.h"
 #include <sys/socket.h>
 
 #include <arpa/ftp.h>
 #include <sys/socket.h>
 
 #include <arpa/ftp.h>
@@ -15,17 +31,26 @@ static char sccsid[] = "@(#)cmds.c  4.9 (Berkeley) %G%";
 #include <stdio.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <errno.h>
 #include <netdb.h>
+#include <ctype.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/param.h>
 
 
-#include "ftp_var.h"
 
 extern char *globerr;
 extern char **glob();
 extern char *home;
 
 extern char *globerr;
 extern char **glob();
 extern char *home;
-extern short gflag;
 extern char *remglob();
 extern char *getenv();
 extern char *index();
 extern char *rindex();
 extern char *remglob();
 extern char *getenv();
 extern char *index();
 extern char *rindex();
+extern off_t restart_point;
+extern char reply_string[];
+
+char *mname;
+jmp_buf jabort;
+char *dotrans(), *domap();
 
 /*
  * Connect to peer server and
 
 /*
  * Connect to peer server and
@@ -35,24 +60,26 @@ setpeer(argc, argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {
-       struct hostent *host, *hookup();
+       char *host, *hookup();
        int port;
 
        if (connected) {
        int port;
 
        if (connected) {
-               printf("Already connected to %s, use disconnect first.\n",
+               printf("Already connected to %s, use close first.\n",
                        hostname);
                        hostname);
+               code = -1;
                return;
        }
        if (argc < 2) {
                return;
        }
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(to) ");
                printf("(to) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc > 3) {
                printf("usage: %s host-name [port]\n", argv[0]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc > 3) {
                printf("usage: %s host-name [port]\n", argv[0]);
+               code = -1;
                return;
        }
        port = sp->s_port;
                return;
        }
        port = sp->s_port;
@@ -61,6 +88,7 @@ setpeer(argc, argv)
                if (port <= 0) {
                        printf("%s: bad port number-- %s\n", argv[1], argv[2]);
                        printf ("usage: %s host-name [port]\n", argv[0]);
                if (port <= 0) {
                        printf("%s: bad port number-- %s\n", argv[1], argv[2]);
                        printf ("usage: %s host-name [port]\n", argv[0]);
+                       code = -1;
                        return;
                }
                port = htons(port);
                        return;
                }
                port = htons(port);
@@ -68,8 +96,44 @@ setpeer(argc, argv)
        host = hookup(argv[1], port);
        if (host) {
                connected = 1;
        host = hookup(argv[1], port);
        if (host) {
                connected = 1;
-               if (autologin)
-                       login(host);
+               if (autologin) {
+                       int overbose;
+                       (void) login(argv[1]);
+#if defined(unix) && NBBY == 8
+/*
+ * this ifdef is to keep someone form "porting" this to an incompatible
+ * system and not checking this out. This way they have to think about it.
+ */
+                       overbose = verbose, verbose = -1;
+                       if (command("SYST") == COMPLETE && overbose) {
+                               register char *cp, c;
+                               cp = index(reply_string+4, ' ');
+                               if (cp == NULL)
+                                       cp = index(reply_string+4, '\r');
+                               if (cp) {
+                                       if (cp[-1] == '.')
+                                               cp--;
+                                       c = *cp;
+                                       *cp = '\0';
+                               }
+
+                               printf("Remote system type is %s.\n",
+                                       reply_string+4);
+                               if (cp)
+                                       *cp = c;
+                       }
+                       if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) {
+                               setbinary();
+                               if (overbose)
+                                       printf("Using %s mode to transfer files.\n",
+                                               typename);
+                       } else if (overbose && 
+                           !strncmp(reply_string, "215 TOPS20", 10)) {
+                               printf("Remember to set tenex mode when transfering binary files from this machine.\n");
+                       }
+                       verbose = overbose;
+#endif /* unix */
+               }
        }
 }
 
        }
 }
 
@@ -107,10 +171,12 @@ settype(argc, argv)
                                sep = " | ";
                }
                printf(" ]\n");
                                sep = " | ";
                }
                printf(" ]\n");
+               code = -1;
                return;
        }
        if (argc < 2) {
                printf("Using %s mode to transfer files.\n", typename);
                return;
        }
        if (argc < 2) {
                printf("Using %s mode to transfer files.\n", typename);
+               code = 0;
                return;
        }
        for (p = types; p->t_name; p++)
                return;
        }
        for (p = types; p->t_name; p++)
@@ -118,6 +184,7 @@ settype(argc, argv)
                        break;
        if (p->t_name == 0) {
                printf("%s: unknown mode\n", argv[1]);
                        break;
        if (p->t_name == 0) {
                printf("%s: unknown mode\n", argv[1]);
+               code = -1;
                return;
        }
        if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
                return;
        }
        if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
@@ -125,7 +192,7 @@ settype(argc, argv)
        else
                comret = command("TYPE %s", p->t_mode);
        if (comret == COMPLETE) {
        else
                comret = command("TYPE %s", p->t_mode);
        if (comret == COMPLETE) {
-               strcpy(typename, p->t_name);
+               (void) strcpy(typename, p->t_name);
                type = p->t_type;
        }
 }
                type = p->t_type;
        }
 }
@@ -173,67 +240,98 @@ setebcdic()
 /*
  * Set file transfer mode.
  */
 /*
  * Set file transfer mode.
  */
+/*ARGSUSED*/
 setmode(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s mode, sorry.\n", modename);
 setmode(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s mode, sorry.\n", modename);
+       code = -1;
 }
 
 /*
  * Set file transfer format.
  */
 }
 
 /*
  * Set file transfer format.
  */
+/*ARGSUSED*/
 setform(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s format, sorry.\n", formname);
 setform(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s format, sorry.\n", formname);
+       code = -1;
 }
 
 /*
  * Set file transfer structure.
  */
 }
 
 /*
  * Set file transfer structure.
  */
+/*ARGSUSED*/
 setstruct(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s structure, sorry.\n", structname);
 setstruct(argc, argv)
        char *argv[];
 {
 
        printf("We only support %s structure, sorry.\n", structname);
+       code = -1;
 }
 
 }
 
+/*
+ * Send a single file.
+ */
 put(argc, argv)
        int argc;
        char *argv[];
 {
        char *cmd;
 put(argc, argv)
        int argc;
        char *argv[];
 {
        char *cmd;
+       int loc = 0;
+       char *oldargv1;
 
 
-       if (argc == 2)
-               argc++, argv[2] = argv[1];
+       if (argc == 2) {
+               argc++;
+               argv[2] = argv[1];
+               loc++;
+       }
        if (argc < 2) {
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(local-file) ");
                printf("(local-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
 usage:
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
 usage:
-               printf("%s local-file remote-file\n", argv[0]);
+               printf("usage:%s local-file remote-file\n", argv[0]);
+               code = -1;
                return;
        }
        if (argc < 3) {
                return;
        }
        if (argc < 3) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-file) ");
                printf("(remote-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) 
                goto usage;
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) 
                goto usage;
-       if (!globulize(&argv[1]))
+       oldargv1 = argv[1];
+       if (!globulize(&argv[1])) {
+               code = -1;
                return;
                return;
-       cmd = (argv[0][0] == 'a') ? "APPE" : "STOR";
+       }
+       /*
+        * If "globulize" modifies argv[1], and argv[2] is a copy of
+        * the old argv[1], make it a copy of the new argv[1].
+        */
+       if (argv[1] != oldargv1 && argv[2] == oldargv1) {
+               argv[2] = argv[1];
+       }
+       cmd = (argv[0][0] == 'a') ? "APPE" : ((sunique) ? "STOU" : "STOR");
+       if (loc && ntflag) {
+               argv[2] = dotrans(argv[2]);
+       }
+       if (loc && mapflag) {
+               argv[2] = domap(argv[2]);
+       }
        sendrequest(cmd, argv[1], argv[2]);
 }
 
        sendrequest(cmd, argv[1], argv[2]);
 }
 
@@ -244,77 +342,281 @@ mput(argc, argv)
        char *argv[];
 {
        register int i;
        char *argv[];
 {
        register int i;
+       int ointer, (*oldintr)(), mabort();
+       extern jmp_buf jabort;
+       char *tp;
 
        if (argc < 2) {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(local-files) ");
                printf("(local-files) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s local-files\n", argv[0]);
+               printf("usage:%s local-files\n", argv[0]);
+               code = -1;
+               return;
+       }
+       mname = argv[0];
+       mflag = 1;
+       oldintr = signal(SIGINT, mabort);
+       (void) setjmp(jabort);
+       if (proxy) {
+               char *cp, *tp2, tmpbuf[MAXPATHLEN];
+
+               while ((cp = remglob(argv,0)) != NULL) {
+                       if (*cp == 0) {
+                               mflag = 0;
+                               continue;
+                       }
+                       if (mflag && confirm(argv[0], cp)) {
+                               tp = cp;
+                               if (mcase) {
+                                       while (*tp && !islower(*tp)) {
+                                               tp++;
+                                       }
+                                       if (!*tp) {
+                                               tp = cp;
+                                               tp2 = tmpbuf;
+                                               while ((*tp2 = *tp) != NULL) {
+                                                    if (isupper(*tp2)) {
+                                                       *tp2 = 'a' + *tp2 - 'A';
+                                                    }
+                                                    tp++;
+                                                    tp2++;
+                                               }
+                                       }
+                                       tp = tmpbuf;
+                               }
+                               if (ntflag) {
+                                       tp = dotrans(tp);
+                               }
+                               if (mapflag) {
+                                       tp = domap(tp);
+                               }
+                               sendrequest((sunique) ? "STOU" : "STOR", cp,tp);
+                               if (!mflag && fromatty) {
+                                       ointer = interactive;
+                                       interactive = 1;
+                                       if (confirm("Continue with","mput")) {
+                                               mflag++;
+                                       }
+                                       interactive = ointer;
+                               }
+                       }
+               }
+               (void) signal(SIGINT, oldintr);
+               mflag = 0;
                return;
        }
        for (i = 1; i < argc; i++) {
                register char **cpp, **gargs;
 
                if (!doglob) {
                return;
        }
        for (i = 1; i < argc; i++) {
                register char **cpp, **gargs;
 
                if (!doglob) {
-                       if (confirm(argv[0], argv[i]))
-                               sendrequest("STOR", argv[i], argv[i]);
+                       if (mflag && confirm(argv[0], argv[i])) {
+                               tp = (ntflag) ? dotrans(argv[i]) : argv[i];
+                               tp = (mapflag) ? domap(tp) : tp;
+                               sendrequest((sunique) ? "STOU" : "STOR",
+                                           argv[i], tp);
+                               if (!mflag && fromatty) {
+                                       ointer = interactive;
+                                       interactive = 1;
+                                       if (confirm("Continue with","mput")) {
+                                               mflag++;
+                                       }
+                                       interactive = ointer;
+                               }
+                       }
                        continue;
                }
                gargs = glob(argv[i]);
                if (globerr != NULL) {
                        printf("%s\n", globerr);
                        continue;
                }
                gargs = glob(argv[i]);
                if (globerr != NULL) {
                        printf("%s\n", globerr);
-                       if (gargs)
+                       if (gargs) {
                                blkfree(gargs);
                                blkfree(gargs);
+                               free(gargs);
+                       }
                        continue;
                }
                        continue;
                }
-               for (cpp = gargs; cpp && *cpp != NULL; cpp++)
-                       if (confirm(argv[0], *cpp))
-                               sendrequest("STOR", *cpp, *cpp);
-               if (gargs != NULL)
+               for (cpp = gargs; cpp && *cpp != NULL; cpp++) {
+                       if (mflag && confirm(argv[0], *cpp)) {
+                               tp = (ntflag) ? dotrans(*cpp) : *cpp;
+                               tp = (mapflag) ? domap(tp) : tp;
+                               sendrequest((sunique) ? "STOU" : "STOR",
+                                          *cpp, tp);
+                               if (!mflag && fromatty) {
+                                       ointer = interactive;
+                                       interactive = 1;
+                                       if (confirm("Continue with","mput")) {
+                                               mflag++;
+                                       }
+                                       interactive = ointer;
+                               }
+                       }
+               }
+               if (gargs != NULL) {
                        blkfree(gargs);
                        blkfree(gargs);
+                       free(gargs);
+               }
        }
        }
+       (void) signal(SIGINT, oldintr);
+       mflag = 0;
+}
+
+reget(argc, argv)
+       char *argv[];
+{
+       (void) getit(argc, argv, 1, "r+w");
+}
+
+get(argc, argv)
+       char *argv[];
+{
+       (void) getit(argc, argv, 0, restart_point ? "r+w" : "w" );
 }
 
 /*
  * Receive one file.
  */
 }
 
 /*
  * Receive one file.
  */
-get(argc, argv)
+getit(argc, argv, restartit, mode)
        char *argv[];
        char *argv[];
+       char *mode;
 {
 {
+       int loc = 0;
 
 
-       if (argc == 2)
-               argc++, argv[2] = argv[1];
+       if (argc == 2) {
+               argc++;
+               argv[2] = argv[1];
+               loc++;
+       }
        if (argc < 2) {
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-file) ");
                printf("(remote-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
 usage:
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
 usage:
-               printf("%s remote-file [ local-file ]\n", argv[0]);
-               return;
+               printf("usage: %s remote-file [ local-file ]\n", argv[0]);
+               code = -1;
+               return 0;
        }
        if (argc < 3) {
        }
        if (argc < 3) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(local-file) ");
                printf("(local-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) 
                goto usage;
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) 
                goto usage;
-       if (!globulize(&argv[2]))
-               return;
-       recvrequest("RETR", argv[2], argv[1], "w");
+       if (!globulize(&argv[2])) {
+               code = -1;
+               return 0;
+       }
+       if (loc && mcase) {
+               char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];
+
+               while (*tp && !islower(*tp)) {
+                       tp++;
+               }
+               if (!*tp) {
+                       tp = argv[2];
+                       tp2 = tmpbuf;
+                       while ((*tp2 = *tp) != NULL) {
+                               if (isupper(*tp2)) {
+                                       *tp2 = 'a' + *tp2 - 'A';
+                               }
+                               tp++;
+                               tp2++;
+                       }
+                       argv[2] = tmpbuf;
+               }
+       }
+       if (loc && ntflag) {
+               argv[2] = dotrans(argv[2]);
+       }
+       if (loc && mapflag) {
+               argv[2] = domap(argv[2]);
+       }
+       if (restartit) {
+               struct stat stbuf;
+               int ret;
+               ret = stat(argv[2], &stbuf);
+               if (restartit == 1) {
+                       if (ret < 0) {
+                               perror(argv[2]);
+                               return 0;
+                       }
+                       restart_point = stbuf.st_size;
+               } else {
+                       if (ret == 0) {
+                               int overbose;
+                               overbose = verbose; verbose = -1;
+                               if (command("MDTM %s", argv[1]) == COMPLETE) {
+                                       int yy, mo, day, hour, min, sec;
+                                       struct tm *tm;
+                                       verbose = overbose;
+                                       sscanf(reply_string,
+                                           "%*s %04d%02d%02d%02d%02d%02d",
+                                           &yy, &mo, &day, &hour, &min, &sec);
+                                       tm = gmtime(&stbuf.st_mtime);
+                                       tm->tm_mon++;
+                                       if (tm->tm_year > yy%100)
+                                               return 1;
+                                       else if (tm->tm_year == yy%100) {
+                                               if (tm->tm_mon > mo)
+                                                       return 1;
+                                       } else if (tm->tm_mon == mo) {
+                                               if (tm->tm_mday > day)
+                                                       return 1;
+                                       } else if (tm->tm_mday == day) {
+                                               if (tm->tm_hour > hour)
+                                                       return 1;
+                                       } else if (tm->tm_hour == hour) {
+                                               if (tm->tm_min > min)
+                                                       return 1;
+                                       } else if (tm->tm_min == min) {
+                                               if (tm->tm_sec > sec)
+                                                       return 1;
+                                       }
+                               } else {
+                                       fputs(reply_string, stdout);
+                                       verbose = overbose;
+                                       return 0;
+                               }
+                       }
+               }
+       }
+
+       recvrequest("RETR", argv[2], argv[1], mode);
+       restart_point = 0;
+       return 0;
+}
+
+mabort()
+{
+       int ointer;
+       extern jmp_buf jabort;
+
+       printf("\n");
+       (void) fflush(stdout);
+       if (mflag && fromatty) {
+               ointer = interactive;
+               interactive = 1;
+               if (confirm("Continue with", mname)) {
+                       interactive = ointer;
+                       longjmp(jabort,0);
+               }
+               interactive = ointer;
+       }
+       mflag = 0;
+       longjmp(jabort,0);
 }
 
 /*
 }
 
 /*
@@ -323,28 +625,76 @@ usage:
 mget(argc, argv)
        char *argv[];
 {
 mget(argc, argv)
        char *argv[];
 {
-       char *cp;
+       char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
+       int ointer, (*oldintr)(), mabort();
+       extern jmp_buf jabort;
 
        if (argc < 2) {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-files) ");
                printf("(remote-files) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s remote-files\n", argv[0]);
+               printf("usage:%s remote-files\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       while ((cp = remglob(argc, argv)) != NULL)
-               if (confirm(argv[0], cp))
-                       recvrequest("RETR", cp, cp, "w");
+       mname = argv[0];
+       mflag = 1;
+       oldintr = signal(SIGINT,mabort);
+       (void) setjmp(jabort);
+       while ((cp = remglob(argv,proxy)) != NULL) {
+               if (*cp == '\0') {
+                       mflag = 0;
+                       continue;
+               }
+               if (mflag && confirm(argv[0], cp)) {
+                       tp = cp;
+                       if (mcase) {
+                               while (*tp && !islower(*tp)) {
+                                       tp++;
+                               }
+                               if (!*tp) {
+                                       tp = cp;
+                                       tp2 = tmpbuf;
+                                       while ((*tp2 = *tp) != NULL) {
+                                               if (isupper(*tp2)) {
+                                                       *tp2 = 'a' + *tp2 - 'A';
+                                               }
+                                               tp++;
+                                               tp2++;
+                                       }
+                               }
+                               tp = tmpbuf;
+                       }
+                       if (ntflag) {
+                               tp = dotrans(tp);
+                       }
+                       if (mapflag) {
+                               tp = domap(tp);
+                       }
+                       recvrequest("RETR", tp, cp, "w");
+                       if (!mflag && fromatty) {
+                               ointer = interactive;
+                               interactive = 1;
+                               if (confirm("Continue with","mget")) {
+                                       mflag++;
+                               }
+                               interactive = ointer;
+                       }
+               }
+       }
+       (void) signal(SIGINT,oldintr);
+       mflag = 0;
 }
 
 char *
 }
 
 char *
-remglob(argc, argv)
+remglob(argv,doswitch)
        char *argv[];
        char *argv[];
+       int doswitch;
 {
        char temp[16];
        static char buf[MAXPATHLEN];
 {
        char temp[16];
        static char buf[MAXPATHLEN];
@@ -353,6 +703,18 @@ remglob(argc, argv)
        int oldverbose, oldhash;
        char *cp, *mode;
 
        int oldverbose, oldhash;
        char *cp, *mode;
 
+       if (!mflag) {
+               if (!doglob) {
+                       args = NULL;
+               }
+               else {
+                       if (ftemp) {
+                               (void) fclose(ftemp);
+                               ftemp = NULL;
+                       }
+               }
+               return(NULL);
+       }
        if (!doglob) {
                if (args == NULL)
                        args = argv;
        if (!doglob) {
                if (args == NULL)
                        args = argv;
@@ -361,22 +723,28 @@ remglob(argc, argv)
                return (cp);
        }
        if (ftemp == NULL) {
                return (cp);
        }
        if (ftemp == NULL) {
-               strcpy(temp, "/tmp/ftpXXXXXX");
-               mktemp(temp);
+               (void) strcpy(temp, "/tmp/ftpXXXXXX");
+               (void) mktemp(temp);
                oldverbose = verbose, verbose = 0;
                oldhash = hash, hash = 0;
                oldverbose = verbose, verbose = 0;
                oldhash = hash, hash = 0;
+               if (doswitch) {
+                       pswitch(!proxy);
+               }
                for (mode = "w"; *++argv != NULL; mode = "a")
                        recvrequest ("NLST", temp, *argv, mode);
                for (mode = "w"; *++argv != NULL; mode = "a")
                        recvrequest ("NLST", temp, *argv, mode);
+               if (doswitch) {
+                       pswitch(!proxy);
+               }
                verbose = oldverbose; hash = oldhash;
                ftemp = fopen(temp, "r");
                verbose = oldverbose; hash = oldhash;
                ftemp = fopen(temp, "r");
-               unlink(temp);
+               (void) unlink(temp);
                if (ftemp == NULL) {
                        printf("can't find list of remote files, oops\n");
                        return (NULL);
                }
        }
        if (fgets(buf, sizeof (buf), ftemp) == NULL) {
                if (ftemp == NULL) {
                        printf("can't find list of remote files, oops\n");
                        return (NULL);
                }
        }
        if (fgets(buf, sizeof (buf), ftemp) == NULL) {
-               fclose(ftemp), ftemp = NULL;
+               (void) fclose(ftemp), ftemp = NULL;
                return (NULL);
        }
        if ((cp = index(buf, '\n')) != NULL)
                return (NULL);
        }
        if ((cp = index(buf, '\n')) != NULL)
@@ -395,21 +763,55 @@ onoff(bool)
 /*
  * Show status.
  */
 /*
  * Show status.
  */
+/*ARGSUSED*/
 status(argc, argv)
        char *argv[];
 {
 status(argc, argv)
        char *argv[];
 {
+       int i;
 
        if (connected)
                printf("Connected to %s.\n", hostname);
        else
                printf("Not connected.\n");
 
        if (connected)
                printf("Connected to %s.\n", hostname);
        else
                printf("Not connected.\n");
+       if (!proxy) {
+               pswitch(1);
+               if (connected) {
+                       printf("Connected for proxy commands to %s.\n", hostname);
+               }
+               else {
+                       printf("No proxy connection.\n");
+               }
+               pswitch(0);
+       }
        printf("Mode: %s; Type: %s; Form: %s; Structure: %s\n",
                modename, typename, formname, structname);
        printf("Verbose: %s; Bell: %s; Prompting: %s; Globbing: %s\n", 
                onoff(verbose), onoff(bell), onoff(interactive),
                onoff(doglob));
        printf("Mode: %s; Type: %s; Form: %s; Structure: %s\n",
                modename, typename, formname, structname);
        printf("Verbose: %s; Bell: %s; Prompting: %s; Globbing: %s\n", 
                onoff(verbose), onoff(bell), onoff(interactive),
                onoff(doglob));
+       printf("Store unique: %s; Receive unique: %s\n", onoff(sunique),
+               onoff(runique));
+       printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
+       if (ntflag) {
+               printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
+       }
+       else {
+               printf("Ntrans: off\n");
+       }
+       if (mapflag) {
+               printf("Nmap: (in) %s (out) %s\n", mapin, mapout);
+       }
+       else {
+               printf("Nmap: off\n");
+       }
        printf("Hash mark printing: %s; Use of PORT cmds: %s\n",
                onoff(hash), onoff(sendport));
        printf("Hash mark printing: %s; Use of PORT cmds: %s\n",
                onoff(hash), onoff(sendport));
+       if (macnum > 0) {
+               printf("Macros:\n");
+               for (i=0; i<macnum; i++) {
+                       printf("\t%s\n",macros[i].mac_name);
+               }
+       }
+       code = 0;
 }
 
 /*
 }
 
 /*
@@ -421,6 +823,7 @@ setbell()
 
        bell = !bell;
        printf("Bell mode %s.\n", onoff(bell));
 
        bell = !bell;
        printf("Bell mode %s.\n", onoff(bell));
+       code = bell;
 }
 
 /*
 }
 
 /*
@@ -432,6 +835,7 @@ settrace()
 
        trace = !trace;
        printf("Packet tracing %s.\n", onoff(trace));
 
        trace = !trace;
        printf("Packet tracing %s.\n", onoff(trace));
+       code = trace;
 }
 
 /*
 }
 
 /*
@@ -443,6 +847,7 @@ sethash()
 
        hash = !hash;
        printf("Hash mark printing %s", onoff(hash));
 
        hash = !hash;
        printf("Hash mark printing %s", onoff(hash));
+       code = hash;
        if (hash)
                printf(" (%d bytes/hash mark)", BUFSIZ);
        printf(".\n");
        if (hash)
                printf(" (%d bytes/hash mark)", BUFSIZ);
        printf(".\n");
@@ -457,6 +862,7 @@ setverbose()
 
        verbose = !verbose;
        printf("Verbose mode %s.\n", onoff(verbose));
 
        verbose = !verbose;
        printf("Verbose mode %s.\n", onoff(verbose));
+       code = verbose;
 }
 
 /*
 }
 
 /*
@@ -468,6 +874,7 @@ setport()
 
        sendport = !sendport;
        printf("Use of PORT cmds %s.\n", onoff(sendport));
 
        sendport = !sendport;
        printf("Use of PORT cmds %s.\n", onoff(sendport));
+       code = sendport;
 }
 
 /*
 }
 
 /*
@@ -480,6 +887,7 @@ setprompt()
 
        interactive = !interactive;
        printf("Interactive mode %s.\n", onoff(interactive));
 
        interactive = !interactive;
        printf("Interactive mode %s.\n", onoff(interactive));
+       code = interactive;
 }
 
 /*
 }
 
 /*
@@ -492,6 +900,7 @@ setglob()
        
        doglob = !doglob;
        printf("Globbing %s.\n", onoff(doglob));
        
        doglob = !doglob;
        printf("Globbing %s.\n", onoff(doglob));
+       code = doglob;
 }
 
 /*
 }
 
 /*
@@ -508,6 +917,7 @@ setdebug(argc, argv)
                val = atoi(argv[1]);
                if (val < 0) {
                        printf("%s: bad debugging value.\n", argv[1]);
                val = atoi(argv[1]);
                if (val < 0) {
                        printf("%s: bad debugging value.\n", argv[1]);
+                       code = -1;
                        return;
                }
        } else
                        return;
                }
        } else
@@ -518,6 +928,7 @@ setdebug(argc, argv)
        else
                options &= ~SO_DEBUG;
        printf("Debugging %s (debug=%d).\n", onoff(debug), debug);
        else
                options &= ~SO_DEBUG;
        printf("Debugging %s (debug=%d).\n", onoff(debug), debug);
+       code = debug > 0;
 }
 
 /*
 }
 
 /*
@@ -529,15 +940,16 @@ cd(argc, argv)
 {
 
        if (argc < 2) {
 {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-directory) ");
                printf("(remote-directory) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s remote-directory\n", argv[0]);
+               printf("usage:%s remote-directory\n", argv[0]);
+               code = -1;
                return;
        }
        (void) command("CWD %s", argv[1]);
                return;
        }
        (void) command("CWD %s", argv[1]);
@@ -555,16 +967,21 @@ lcd(argc, argv)
        if (argc < 2)
                argc++, argv[1] = home;
        if (argc != 2) {
        if (argc < 2)
                argc++, argv[1] = home;
        if (argc != 2) {
-               printf("%s local-directory\n", argv[0]);
+               printf("usage:%s local-directory\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       if (!globulize(&argv[1]))
+       if (!globulize(&argv[1])) {
+               code = -1;
                return;
                return;
+       }
        if (chdir(argv[1]) < 0) {
                perror(argv[1]);
        if (chdir(argv[1]) < 0) {
                perror(argv[1]);
+               code = -1;
                return;
        }
        printf("Local directory now %s\n", getwd(buf));
                return;
        }
        printf("Local directory now %s\n", getwd(buf));
+       code = 0;
 }
 
 /*
 }
 
 /*
@@ -575,15 +992,16 @@ delete(argc, argv)
 {
 
        if (argc < 2) {
 {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-file) ");
                printf("(remote-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s remote-file\n", argv[0]);
+               printf("usage:%s remote-file\n", argv[0]);
+               code = -1;
                return;
        }
        (void) command("DELE %s", argv[1]);
                return;
        }
        (void) command("DELE %s", argv[1]);
@@ -596,22 +1014,45 @@ mdelete(argc, argv)
        char *argv[];
 {
        char *cp;
        char *argv[];
 {
        char *cp;
+       int ointer, (*oldintr)(), mabort();
+       extern jmp_buf jabort;
 
        if (argc < 2) {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-files) ");
                printf("(remote-files) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s remote-files\n", argv[0]);
+               printf("usage:%s remote-files\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       while ((cp = remglob(argc, argv)) != NULL)
-               if (confirm(argv[0], cp))
+       mname = argv[0];
+       mflag = 1;
+       oldintr = signal(SIGINT, mabort);
+       (void) setjmp(jabort);
+       while ((cp = remglob(argv,0)) != NULL) {
+               if (*cp == '\0') {
+                       mflag = 0;
+                       continue;
+               }
+               if (mflag && confirm(argv[0], cp)) {
                        (void) command("DELE %s", cp);
                        (void) command("DELE %s", cp);
+                       if (!mflag && fromatty) {
+                               ointer = interactive;
+                               interactive = 1;
+                               if (confirm("Continue with", "mdelete")) {
+                                       mflag++;
+                               }
+                               interactive = ointer;
+                       }
+               }
+       }
+       (void) signal(SIGINT, oldintr);
+       mflag = 0;
 }
 
 /*
 }
 
 /*
@@ -622,9 +1063,9 @@ renamefile(argc, argv)
 {
 
        if (argc < 2) {
 {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(from-name) ");
                printf("(from-name) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
                makeargv();
                argc = margc;
                argv = margv;
@@ -632,12 +1073,13 @@ renamefile(argc, argv)
        if (argc < 2) {
 usage:
                printf("%s from-name to-name\n", argv[0]);
        if (argc < 2) {
 usage:
                printf("%s from-name to-name\n", argv[0]);
+               code = -1;
                return;
        }
        if (argc < 3) {
                return;
        }
        if (argc < 3) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(to-name) ");
                printf("(to-name) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
                makeargv();
                argc = margc;
                argv = margv;
@@ -663,11 +1105,19 @@ ls(argc, argv)
                argc++, argv[2] = "-";
        if (argc > 3) {
                printf("usage: %s remote-directory local-file\n", argv[0]);
                argc++, argv[2] = "-";
        if (argc > 3) {
                printf("usage: %s remote-directory local-file\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       cmd = argv[0][0] == 'l' ? "NLST" : "LIST";
-       if (strcmp(argv[2], "-") && !globulize(&argv[2]))
+       cmd = argv[0][0] == 'n' ? "NLST" : "LIST";
+       if (strcmp(argv[2], "-") && !globulize(&argv[2])) {
+               code = -1;
                return;
                return;
+       }
+       if (strcmp(argv[2], "-") && *argv[2] != '|')
+               if (!globulize(&argv[2]) || !confirm("output to local-file:", argv[2])) {
+                       code = -1;
+                       return;
+       }
        recvrequest(cmd, argv[2], argv[1], "w");
 }
 
        recvrequest(cmd, argv[2], argv[1], "w");
 }
 
@@ -678,104 +1128,113 @@ ls(argc, argv)
 mls(argc, argv)
        char *argv[];
 {
 mls(argc, argv)
        char *argv[];
 {
-       char *cmd, *mode, *cp, *dest;
+       char *cmd, mode[1], *dest;
+       int ointer, i, (*oldintr)(), mabort();
+       extern jmp_buf jabort;
 
        if (argc < 2) {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(remote-files) ");
                printf("(remote-files) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(local-file) ");
                printf("(local-file) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 3) {
-               printf("%s remote-files local-file\n", argv[0]);
+               printf("usage:%s remote-files local-file\n", argv[0]);
+               code = -1;
                return;
        }
        dest = argv[argc - 1];
        argv[argc - 1] = NULL;
                return;
        }
        dest = argv[argc - 1];
        argv[argc - 1] = NULL;
-       if (strcmp(dest, "-"))
-               if (globulize(&dest) && confirm("local-file", dest))
+       if (strcmp(dest, "-") && *dest != '|')
+               if (!globulize(&dest) || !confirm("output to local-file:", dest)) {
+                       code = -1;
                        return;
                        return;
-       cmd = argv[0][1] == 'l' ? "NLST" : "LIST";
-       for (mode = "w"; cp = remglob(argc, argv); mode = "a")
-               if (confirm(argv[0], cp))
-                       recvrequest(cmd, dest, cp, mode);
+       }
+       cmd = argv[0][1] == 'n' ? "NLST" : "LIST";
+       mname = argv[0];
+       mflag = 1;
+       oldintr = signal(SIGINT, mabort);
+       (void) setjmp(jabort);
+       for (i = 1; mflag && i < argc-1; ++i) {
+               *mode = (i == 1) ? 'w' : 'a';
+               recvrequest(cmd, dest, argv[i], mode);
+               if (!mflag && fromatty) {
+                       ointer = interactive;
+                       interactive = 1;
+                       if (confirm("Continue with", argv[0])) {
+                               mflag ++;
+                       }
+                       interactive = ointer;
+               }
+       }
+       (void) signal(SIGINT, oldintr);
+       mflag = 0;
 }
 
 /*
  * Do a shell escape
  */
 }
 
 /*
  * Do a shell escape
  */
+/*ARGSUSED*/
 shell(argc, argv)
        char *argv[];
 {
 shell(argc, argv)
        char *argv[];
 {
-       int pid, status, (*old1)(), (*old2)();
-       char shellnam[40], *shell, *namep;
-       char **cpp, **gargs;
+       int pid, (*old1)(), (*old2)();
+       char shellnam[40], *shell, *namep; 
+       union wait status;
 
        old1 = signal (SIGINT, SIG_IGN);
        old2 = signal (SIGQUIT, SIG_IGN);
        if ((pid = fork()) == 0) {
                for (pid = 3; pid < 20; pid++)
 
        old1 = signal (SIGINT, SIG_IGN);
        old2 = signal (SIGQUIT, SIG_IGN);
        if ((pid = fork()) == 0) {
                for (pid = 3; pid < 20; pid++)
-                       close(pid);
-               signal(SIGINT, SIG_DFL);
-               signal(SIGQUIT, SIG_DFL);
-               if (argc <= 1) {
-                       shell = getenv("SHELL");
-                       if (shell == NULL)
-                               shell = "/bin/sh";
-                       namep = rindex(shell,'/');
-                       if (namep == NULL)
-                               namep = shell;
-                       strcpy(shellnam,"-");
-                       strcat(shellnam, ++namep);
-                       if (strcmp(namep, "sh") != 0)
-                               shellnam[0] = '+';
-                       if (debug) {
-                               printf ("%s\n", shell);
-                               fflush (stdout);
-                       }
-                       execl(shell, shellnam, 0);
-                       perror(shell);
-                       exit(1);
-               }
-               cpp = &argv[1];
-               if (argc > 2) {
-                       if ((gargs = glob(cpp)) != NULL)
-                               cpp = gargs;
-                       if (globerr != NULL) {
-                               printf("%s\n", globerr);
-                               exit(1);
-                       }
-               }
+                       (void) close(pid);
+               (void) signal(SIGINT, SIG_DFL);
+               (void) signal(SIGQUIT, SIG_DFL);
+               shell = getenv("SHELL");
+               if (shell == NULL)
+                       shell = "/bin/sh";
+               namep = rindex(shell,'/');
+               if (namep == NULL)
+                       namep = shell;
+               (void) strcpy(shellnam,"-");
+               (void) strcat(shellnam, ++namep);
+               if (strcmp(namep, "sh") != 0)
+                       shellnam[0] = '+';
                if (debug) {
                if (debug) {
-                       register char **zip = cpp;
-
-                       printf("%s", *zip);
-                       while (*++zip != NULL)
-                               printf(" %s", *zip);
-                       printf("\n");
-                       fflush(stdout);
+                       printf ("%s\n", shell);
+                       (void) fflush (stdout);
                }
                }
-               execvp(argv[1], cpp);
-               perror(argv[1]);
+               if (argc > 1) {
+                       execl(shell,shellnam,"-c",altarg,(char *)0);
+               }
+               else {
+                       execl(shell,shellnam,(char *)0);
+               }
+               perror(shell);
+               code = -1;
                exit(1);
                exit(1);
-       }
+               }
        if (pid > 0)
                while (wait(&status) != pid)
                        ;
        if (pid > 0)
                while (wait(&status) != pid)
                        ;
-       signal(SIGINT, old1);
-       signal(SIGQUIT, old2);
-       if (pid == -1)
+       (void) signal(SIGINT, old1);
+       (void) signal(SIGQUIT, old2);
+       if (pid == -1) {
                perror("Try again later");
                perror("Try again later");
+               code = -1;
+       }
+       else {
+               code = 0;
+       }
        return (0);
 }
 
        return (0);
 }
 
@@ -787,18 +1246,19 @@ user(argc, argv)
        char **argv;
 {
        char acct[80], *getpass();
        char **argv;
 {
        char acct[80], *getpass();
-       int n;
+       int n, aflag = 0;
 
        if (argc < 2) {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(username) ");
                printf("(username) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc > 4) {
                printf("usage: %s username [password] [account]\n", argv[0]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc > 4) {
                printf("usage: %s username [password] [account]\n", argv[0]);
+               code = -1;
                return (0);
        }
        n = command("USER %s", argv[1]);
                return (0);
        }
        n = command("USER %s", argv[1]);
@@ -814,12 +1274,16 @@ user(argc, argv)
                        acct[strlen(acct) - 1] = '\0';
                        argv[3] = acct; argc++;
                }
                        acct[strlen(acct) - 1] = '\0';
                        argv[3] = acct; argc++;
                }
-               n = command("ACCT %s", acct);
+               n = command("ACCT %s", argv[3]);
+               aflag++;
        }
        if (n != COMPLETE) {
        }
        if (n != COMPLETE) {
-               fprintf(stderr, "Login failed.\n");
+               fprintf(stdout, "Login failed.\n");
                return (0);
        }
                return (0);
        }
+       if (!aflag && argc == 4) {
+               (void) command("ACCT %s", argv[3]);
+       }
        return (1);
 }
 
        return (1);
 }
 
@@ -830,7 +1294,7 @@ user(argc, argv)
 pwd()
 {
 
 pwd()
 {
 
-       (void) command("XPWD");
+       (void) command("PWD");
 }
 
 /*
 }
 
 /*
@@ -841,18 +1305,19 @@ makedir(argc, argv)
 {
 
        if (argc < 2) {
 {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(directory-name) ");
                printf("(directory-name) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s directory-name\n", argv[0]);
+               printf("usage: %s directory-name\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       (void) command("XMKD %s", argv[1]);
+       (void) command("MKD %s", argv[1]);
 }
 
 /*
 }
 
 /*
@@ -863,18 +1328,19 @@ removedir(argc, argv)
 {
 
        if (argc < 2) {
 {
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(directory-name) ");
                printf("(directory-name) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
-               printf("%s directory-name\n", argv[0]);
+               printf("usage: %s directory-name\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       (void) command("XRMD %s", argv[1]);
+       (void) command("RMD %s", argv[1]);
 }
 
 /*
 }
 
 /*
@@ -887,23 +1353,26 @@ quote(argc, argv)
        char buf[BUFSIZ];
 
        if (argc < 2) {
        char buf[BUFSIZ];
 
        if (argc < 2) {
-               strcat(line, " ");
+               (void) strcat(line, " ");
                printf("(command line to send) ");
                printf("(command line to send) ");
-               gets(&line[strlen(line)]);
+               (void) gets(&line[strlen(line)]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                printf("usage: %s line-to-send\n", argv[0]);
                makeargv();
                argc = margc;
                argv = margv;
        }
        if (argc < 2) {
                printf("usage: %s line-to-send\n", argv[0]);
+               code = -1;
                return;
        }
                return;
        }
-       strcpy(buf, argv[1]);
+       (void) strcpy(buf, argv[1]);
        for (i = 2; i < argc; i++) {
        for (i = 2; i < argc; i++) {
-               strcat(buf, " ");
-               strcat(buf, argv[i]);
+               (void) strcat(buf, " ");
+               (void) strcat(buf, argv[i]);
+       }
+       if (command(buf) == PRELIM) {
+               while (getreply(0) == PRELIM);
        }
        }
-       (void) command(buf);
 }
 
 /*
 }
 
 /*
@@ -926,7 +1395,12 @@ rmthelp(argc, argv)
 quit()
 {
 
 quit()
 {
 
-       disconnect();
+       if (connected)
+               disconnect();
+       pswitch(1);
+       if (connected) {
+               disconnect();
+       }
        exit(0);
 }
 
        exit(0);
 }
 
@@ -941,10 +1415,15 @@ disconnect()
        if (!connected)
                return;
        (void) command("QUIT");
        if (!connected)
                return;
        (void) command("QUIT");
-       (void) fclose(cout);
+       if (cout) {
+               (void) fclose(cout);
+       }
        cout = NULL;
        connected = 0;
        data = -1;
        cout = NULL;
        connected = 0;
        data = -1;
+       if (!proxy) {
+               macnum = 0;
+       }
 }
 
 confirm(cmd, file)
 }
 
 confirm(cmd, file)
@@ -955,8 +1434,8 @@ confirm(cmd, file)
        if (!interactive)
                return (1);
        printf("%s %s? ", cmd, file);
        if (!interactive)
                return (1);
        printf("%s %s? ", cmd, file);
-       fflush(stdout);
-       gets(line);
+       (void) fflush(stdout);
+       (void) gets(line);
        return (*line != 'n' && *line != 'N');
 }
 
        return (*line != 'n' && *line != 'N');
 }
 
@@ -964,7 +1443,7 @@ fatal(msg)
        char *msg;
 {
 
        char *msg;
 {
 
-       fprintf(stderr, "ftp: %s\n");
+       fprintf(stderr, "ftp: %s\n", msg);
        exit(1);
 }
 
        exit(1);
 }
 
@@ -984,15 +1463,588 @@ globulize(cpp)
        globbed = glob(*cpp);
        if (globerr != NULL) {
                printf("%s: %s\n", *cpp, globerr);
        globbed = glob(*cpp);
        if (globerr != NULL) {
                printf("%s: %s\n", *cpp, globerr);
-               if (globbed)
+               if (globbed) {
                        blkfree(globbed);
                        blkfree(globbed);
+                       free(globbed);
+               }
                return (0);
        }
        if (globbed) {
                *cpp = *globbed++;
                /* don't waste too much memory */
                return (0);
        }
        if (globbed) {
                *cpp = *globbed++;
                /* don't waste too much memory */
-               if (*globbed)
+               if (*globbed) {
                        blkfree(globbed);
                        blkfree(globbed);
+                       free(globbed);
+               }
        }
        return (1);
 }
        }
        return (1);
 }
+
+account(argc,argv)
+       int argc;
+       char **argv;
+{
+       char acct[50], *getpass(), *ap;
+
+       if (argc > 1) {
+               ++argv;
+               --argc;
+               (void) strncpy(acct,*argv,49);
+               acct[49] = '\0';
+               while (argc > 1) {
+                       --argc;
+                       ++argv;
+                       (void) strncat(acct,*argv, 49-strlen(acct));
+               }
+               ap = acct;
+       }
+       else {
+               ap = getpass("Account:");
+       }
+       (void) command("ACCT %s", ap);
+}
+
+jmp_buf abortprox;
+
+proxabort()
+{
+       extern int proxy;
+
+       if (!proxy) {
+               pswitch(1);
+       }
+       if (connected) {
+               proxflag = 1;
+       }
+       else {
+               proxflag = 0;
+       }
+       pswitch(0);
+       longjmp(abortprox,1);
+}
+
+doproxy(argc,argv)
+       int argc;
+       char *argv[];
+{
+       int (*oldintr)(), proxabort();
+       register struct cmd *c;
+       struct cmd *getcmd();
+       extern struct cmd cmdtab[];
+       extern jmp_buf abortprox;
+
+       if (argc < 2) {
+               (void) strcat(line, " ");
+               printf("(command) ");
+               (void) gets(&line[strlen(line)]);
+               makeargv();
+               argc = margc;
+               argv = margv;
+       }
+       if (argc < 2) {
+               printf("usage:%s command\n", argv[0]);
+               code = -1;
+               return;
+       }
+       c = getcmd(argv[1]);
+       if (c == (struct cmd *) -1) {
+               printf("?Ambiguous command\n");
+               (void) fflush(stdout);
+               code = -1;
+               return;
+       }
+       if (c == 0) {
+               printf("?Invalid command\n");
+               (void) fflush(stdout);
+               code = -1;
+               return;
+       }
+       if (!c->c_proxy) {
+               printf("?Invalid proxy command\n");
+               (void) fflush(stdout);
+               code = -1;
+               return;
+       }
+       if (setjmp(abortprox)) {
+               code = -1;
+               return;
+       }
+       oldintr = signal(SIGINT, proxabort);
+       pswitch(1);
+       if (c->c_conn && !connected) {
+               printf("Not connected\n");
+               (void) fflush(stdout);
+               pswitch(0);
+               (void) signal(SIGINT, oldintr);
+               code = -1;
+               return;
+       }
+       (*c->c_handler)(argc-1, argv+1);
+       if (connected) {
+               proxflag = 1;
+       }
+       else {
+               proxflag = 0;
+       }
+       pswitch(0);
+       (void) signal(SIGINT, oldintr);
+}
+
+setcase()
+{
+       mcase = !mcase;
+       printf("Case mapping %s.\n", onoff(mcase));
+       code = mcase;
+}
+
+setcr()
+{
+       crflag = !crflag;
+       printf("Carriage Return stripping %s.\n", onoff(crflag));
+       code = crflag;
+}
+
+setntrans(argc,argv)
+       int argc;
+       char *argv[];
+{
+       if (argc == 1) {
+               ntflag = 0;
+               printf("Ntrans off.\n");
+               code = ntflag;
+               return;
+       }
+       ntflag++;
+       code = ntflag;
+       (void) strncpy(ntin, argv[1], 16);
+       ntin[16] = '\0';
+       if (argc == 2) {
+               ntout[0] = '\0';
+               return;
+       }
+       (void) strncpy(ntout, argv[2], 16);
+       ntout[16] = '\0';
+}
+
+char *
+dotrans(name)
+       char *name;
+{
+       static char new[MAXPATHLEN];
+       char *cp1, *cp2 = new;
+       register int i, ostop, found;
+
+       for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
+       for (cp1 = name; *cp1; cp1++) {
+               found = 0;
+               for (i = 0; *(ntin + i) && i < 16; i++) {
+                       if (*cp1 == *(ntin + i)) {
+                               found++;
+                               if (i < ostop) {
+                                       *cp2++ = *(ntout + i);
+                               }
+                               break;
+                       }
+               }
+               if (!found) {
+                       *cp2++ = *cp1;
+               }
+       }
+       *cp2 = '\0';
+       return(new);
+}
+
+setnmap(argc, argv)
+       int argc;
+       char *argv[];
+{
+       char *cp;
+
+       if (argc == 1) {
+               mapflag = 0;
+               printf("Nmap off.\n");
+               code = mapflag;
+               return;
+       }
+       if (argc < 3) {
+               (void) strcat(line, " ");
+               printf("(mapout) ");
+               (void) gets(&line[strlen(line)]);
+               makeargv();
+               argc = margc;
+               argv = margv;
+       }
+       if (argc < 3) {
+               printf("Usage: %s [mapin mapout]\n",argv[0]);
+               code = -1;
+               return;
+       }
+       mapflag = 1;
+       code = 1;
+       cp = index(altarg, ' ');
+       if (proxy) {
+               while(*++cp == ' ');
+               altarg = cp;
+               cp = index(altarg, ' ');
+       }
+       *cp = '\0';
+       (void) strncpy(mapin, altarg, MAXPATHLEN - 1);
+       while (*++cp == ' ');
+       (void) strncpy(mapout, cp, MAXPATHLEN - 1);
+}
+
+char *
+domap(name)
+       char *name;
+{
+       static char new[MAXPATHLEN];
+       register char *cp1 = name, *cp2 = mapin;
+       char *tp[9], *te[9];
+       int i, toks[9], toknum = 0, match = 1;
+
+       for (i=0; i < 9; ++i) {
+               toks[i] = 0;
+       }
+       while (match && *cp1 && *cp2) {
+               switch (*cp2) {
+                       case '\\':
+                               if (*++cp2 != *cp1) {
+                                       match = 0;
+                               }
+                               break;
+                       case '$':
+                               if (*(cp2+1) >= '1' && (*cp2+1) <= '9') {
+                                       if (*cp1 != *(++cp2+1)) {
+                                               toks[toknum = *cp2 - '1']++;
+                                               tp[toknum] = cp1;
+                                               while (*++cp1 && *(cp2+1)
+                                                       != *cp1);
+                                               te[toknum] = cp1;
+                                       }
+                                       cp2++;
+                                       break;
+                               }
+                               /* FALLTHROUGH */
+                       default:
+                               if (*cp2 != *cp1) {
+                                       match = 0;
+                               }
+                               break;
+               }
+               if (match && *cp1) {
+                       cp1++;
+               }
+               if (match && *cp2) {
+                       cp2++;
+               }
+       }
+       if (!match && *cp1) /* last token mismatch */
+       {
+               toks[toknum] = 0;
+       }
+       cp1 = new;
+       *cp1 = '\0';
+       cp2 = mapout;
+       while (*cp2) {
+               match = 0;
+               switch (*cp2) {
+                       case '\\':
+                               if (*(cp2 + 1)) {
+                                       *cp1++ = *++cp2;
+                               }
+                               break;
+                       case '[':
+LOOP:
+                               if (*++cp2 == '$' && isdigit(*(cp2+1))) { 
+                                       if (*++cp2 == '0') {
+                                               char *cp3 = name;
+
+                                               while (*cp3) {
+                                                       *cp1++ = *cp3++;
+                                               }
+                                               match = 1;
+                                       }
+                                       else if (toks[toknum = *cp2 - '1']) {
+                                               char *cp3 = tp[toknum];
+
+                                               while (cp3 != te[toknum]) {
+                                                       *cp1++ = *cp3++;
+                                               }
+                                               match = 1;
+                                       }
+                               }
+                               else {
+                                       while (*cp2 && *cp2 != ',' && 
+                                           *cp2 != ']') {
+                                               if (*cp2 == '\\') {
+                                                       cp2++;
+                                               }
+                                               else if (*cp2 == '$' &&
+                                                       isdigit(*(cp2+1))) {
+                                                       if (*++cp2 == '0') {
+                                                          char *cp3 = name;
+
+                                                          while (*cp3) {
+                                                               *cp1++ = *cp3++;
+                                                          }
+                                                       }
+                                                       else if (toks[toknum =
+                                                           *cp2 - '1']) {
+                                                          char *cp3=tp[toknum];
+
+                                                          while (cp3 !=
+                                                                 te[toknum]) {
+                                                               *cp1++ = *cp3++;
+                                                          }
+                                                       }
+                                               }
+                                               else if (*cp2) {
+                                                       *cp1++ = *cp2++;
+                                               }
+                                       }
+                                       if (!*cp2) {
+                                               printf("nmap: unbalanced brackets\n");
+                                               return(name);
+                                       }
+                                       match = 1;
+                                       cp2--;
+                               }
+                               if (match) {
+                                       while (*++cp2 && *cp2 != ']') {
+                                             if (*cp2 == '\\' && *(cp2 + 1)) {
+                                                       cp2++;
+                                             }
+                                       }
+                                       if (!*cp2) {
+                                               printf("nmap: unbalanced brackets\n");
+                                               return(name);
+                                       }
+                                       break;
+                               }
+                               switch (*++cp2) {
+                                       case ',':
+                                               goto LOOP;
+                                       case ']':
+                                               break;
+                                       default:
+                                               cp2--;
+                                               goto LOOP;
+                               }
+                               break;
+                       case '$':
+                               if (isdigit(*(cp2 + 1))) {
+                                       if (*++cp2 == '0') {
+                                               char *cp3 = name;
+
+                                               while (*cp3) {
+                                                       *cp1++ = *cp3++;
+                                               }
+                                       }
+                                       else if (toks[toknum = *cp2 - '1']) {
+                                               char *cp3 = tp[toknum];
+
+                                               while (cp3 != te[toknum]) {
+                                                       *cp1++ = *cp3++;
+                                               }
+                                       }
+                                       break;
+                               }
+                               /* intentional drop through */
+                       default:
+                               *cp1++ = *cp2;
+                               break;
+               }
+               cp2++;
+       }
+       *cp1 = '\0';
+       if (!*new) {
+               return(name);
+       }
+       return(new);
+}
+
+setsunique()
+{
+       sunique = !sunique;
+       printf("Store unique %s.\n", onoff(sunique));
+       code = sunique;
+}
+
+setrunique()
+{
+       runique = !runique;
+       printf("Receive unique %s.\n", onoff(runique));
+       code = runique;
+}
+
+/* change directory to perent directory */
+cdup()
+{
+       (void) command("CDUP");
+}
+
+/* restart transfer at specific point */
+restart(argc, argv)
+       int argc;
+       char *argv[];
+{
+       extern long atol();
+       if (argc != 2)
+               printf("restart: offset not specified\n");
+       else {
+               restart_point = atol(argv[1]);
+               printf("restarting at %ld. execute get, put or append to initiate transfer\n",
+                       restart_point);
+       }
+}
+
+/* show remote system type */
+syst()
+{
+       (void) command("SYST");
+}
+
+macdef(argc, argv)
+       int argc;
+       char *argv[];
+{
+       char *tmp;
+       int c;
+
+       if (macnum == 16) {
+               printf("Limit of 16 macros have already been defined\n");
+               code = -1;
+               return;
+       }
+       if (argc < 2) {
+               (void) strcat(line, " ");
+               printf("(macro name) ");
+               (void) gets(&line[strlen(line)]);
+               makeargv();
+               argc = margc;
+               argv = margv;
+       }
+       if (argc != 2) {
+               printf("Usage: %s macro_name\n",argv[0]);
+               code = -1;
+               return;
+       }
+       if (interactive) {
+               printf("Enter macro line by line, terminating it with a null line\n");
+       }
+       (void) strncpy(macros[macnum].mac_name, argv[1], 8);
+       if (macnum == 0) {
+               macros[macnum].mac_start = macbuf;
+       }
+       else {
+               macros[macnum].mac_start = macros[macnum - 1].mac_end + 1;
+       }
+       tmp = macros[macnum].mac_start;
+       while (tmp != macbuf+4096) {
+               if ((c = getchar()) == EOF) {
+                       printf("macdef:end of file encountered\n");
+                       code = -1;
+                       return;
+               }
+               if ((*tmp = c) == '\n') {
+                       if (tmp == macros[macnum].mac_start) {
+                               macros[macnum++].mac_end = tmp;
+                               code = 0;
+                               return;
+                       }
+                       if (*(tmp-1) == '\0') {
+                               macros[macnum++].mac_end = tmp - 1;
+                               code = 0;
+                               return;
+                       }
+                       *tmp = '\0';
+               }
+               tmp++;
+       }
+       while (1) {
+               while ((c = getchar()) != '\n' && c != EOF)
+                       /* LOOP */;
+               if (c == EOF || getchar() == '\n') {
+                       printf("Macro not defined - 4k buffer exceeded\n");
+                       code = -1;
+                       return;
+               }
+       }
+}
+
+/*
+ * get size of file on remote machine
+ */
+sizecmd(argc, argv)
+       char *argv[];
+{
+
+       if (argc < 2) {
+               (void) strcat(line, " ");
+               printf("(filename) ");
+               (void) gets(&line[strlen(line)]);
+               makeargv();
+               argc = margc;
+               argv = margv;
+       }
+       if (argc < 2) {
+               printf("usage:%s filename\n", argv[0]);
+               code = -1;
+               return;
+       }
+       (void) command("SIZE %s", argv[1]);
+}
+
+/*
+ * get last modification time of file on remote machine
+ */
+modtime(argc, argv)
+       char *argv[];
+{
+       int overbose;
+
+       if (argc < 2) {
+               (void) strcat(line, " ");
+               printf("(filename) ");
+               (void) gets(&line[strlen(line)]);
+               makeargv();
+               argc = margc;
+               argv = margv;
+       }
+       if (argc < 2) {
+               printf("usage:%s filename\n", argv[0]);
+               code = -1;
+               return;
+       }
+       overbose = verbose; verbose = -1;
+       if (command("MDTM %s", argv[1]) == COMPLETE) {
+               int yy, mo, day, hour, min, sec;
+               sscanf(reply_string, "%*s %04d%02d%02d%02d%02d%02d", &yy, &mo,
+                       &day, &hour, &min, &sec);
+               /* might want to print this in local time */
+               printf("%s\t%02d/%02d/%04d %02d:%02d:%02d GMT\n", argv[1],
+                       mo, day, yy, hour, min, sec);
+       } else
+               fputs(reply_string, stdout);
+       verbose = overbose;
+}
+
+/*
+ * show status on reomte machine
+ */
+rmtstatus(argc, argv)
+       char *argv[];
+{
+       (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
+}
+
+/*
+ * get file if modtime is more recent than current file
+ */
+newer(argc, argv)
+       char *argv[];
+{
+       if (getit(argc, argv, -1, "w"))
+               printf("Local file \"%s\" is newer than remote file \"%s\"\n",
+                       argv[1], argv[2]);
+}