BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/ftp/cmds.c b/usr/src/usr.bin/ftp/cmds.c
index a72dfb9..56cc428 100644 (file)
--- a/usr/src/usr.bin/ftp/cmds.c
+++ b/usr/src/usr.bin/ftp/cmds.c
@@ -2,21 +2,37 @@
  * Copyright (c) 1985, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmds.c     5.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmds.c     5.26 (Berkeley) 3/5/91";

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


@@ -41,7 +57,7 @@ static char sccsid[] = "@(#)cmds.c    5.21 (Berkeley) %G%";
 #include "pathnames.h"
 
 extern char *globerr;
 #include "pathnames.h"
 
 extern char *globerr;

-extern char **glob();
+extern char **ftpglob();

 extern char *home;
 extern char *remglob();
 extern char *getenv();
 extern char *home;
 extern char *remglob();
 extern char *getenv();


@@ -49,12 +65,45 @@ extern      char *index();
 extern char *rindex();
 extern char *strerror();
 extern int  errno;
 extern char *rindex();
 extern char *strerror();
 extern int  errno;

+extern off_t restart_point;

 extern char reply_string[];
 
 char *mname;
 jmp_buf jabort;
 char *dotrans(), *domap();
 
 extern char reply_string[];
 
 char *mname;
 jmp_buf jabort;
 char *dotrans(), *domap();
 

+/*
+ * `Another' gets another argument, and stores the new argc and argv.
+ * It reverts to the top level (via main.c's intr()) on EOF/error.
+ *
+ * Returns false if no new arguments have been added.
+ */
+another(pargc, pargv, prompt)
+       int *pargc;
+       char ***pargv;
+       char *prompt;
+{
+       int len = strlen(line), ret;
+       extern sig_t intr();
+
+       if (len >= sizeof(line) - 3) {
+               printf("sorry, arguments too long\n");
+               intr();
+       }
+       printf("(%s) ", prompt);
+       line[len++] = ' ';
+       if (fgets(&line[len], sizeof(line) - len, stdin) == NULL)
+               intr();
+       len += strlen(&line[len]);
+       if (len > 0 && line[len - 1] == '\n')
+               line[len - 1] = '\0';
+       makeargv();
+       ret = margc > *pargc;
+       *pargc = margc;
+       *pargv = margv;
+       return (ret);
+}
+

 /*
  * Connect to peer server and
  * auto-login, if possible.
 /*
  * Connect to peer server and
  * auto-login, if possible.


@@ -72,15 +121,9 @@ setpeer(argc, argv)
                code = -1;
                return;
        }
                code = -1;
                return;
        }

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(to) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc > 3) {
+       if (argc < 2)
+               (void) another(&argc, &argv, "to");
+       if (argc < 2 || argc > 3) {

                printf("usage: %s host-name [port]\n", argv[0]);
                code = -1;
                return;
                printf("usage: %s host-name [port]\n", argv[0]);
                code = -1;
                return;


@@ -187,6 +230,7 @@ struct      types {
  * Set transfer type.
  */
 settype(argc, argv)
  * Set transfer type.
  */
 settype(argc, argv)

+       int argc;

        char *argv[];
 {
        register struct types *p;
        char *argv[];
 {
        register struct types *p;


@@ -302,6 +346,7 @@ settenex()
  */
 /*ARGSUSED*/
 setmode(argc, argv)
  */
 /*ARGSUSED*/
 setmode(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 


@@ -314,6 +359,7 @@ setmode(argc, argv)
  */
 /*ARGSUSED*/
 setform(argc, argv)
  */
 /*ARGSUSED*/
 setform(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 


@@ -326,6 +372,7 @@ setform(argc, argv)
  */
 /*ARGSUSED*/
 setstruct(argc, argv)
  */
 /*ARGSUSED*/
 setstruct(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 


@@ -349,30 +396,14 @@ put(argc, argv)
                argv[2] = argv[1];
                loc++;
        }
                argv[2] = argv[1];
                loc++;
        }

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(local-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "local-file"))
+               goto usage;
+       if (argc < 3 && !another(&argc, &argv, "remote-file")) {

 usage:
 usage:

-               printf("usage:%s local-file remote-file\n", argv[0]);
+               printf("usage: %s local-file remote-file\n", argv[0]);

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

-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(remote-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 3) 
-               goto usage;

        oldargv1 = argv[1];
        oldargv2 = argv[2];
        if (!globulize(&argv[1])) {
        oldargv1 = argv[1];
        oldargv2 = argv[2];
        if (!globulize(&argv[1])) {


@@ -401,24 +432,18 @@ usage:
  * Send multiple files.
  */
 mput(argc, argv)
  * Send multiple files.
  */
 mput(argc, argv)

-       char *argv[];
+       int argc;
+       char **argv;

 {
 {

+       extern jmp_buf jabort;

        register int i;
        register int i;

+       sig_t oldintr;

        int ointer;
        int ointer;

-       sig_t (*oldintr)(), mabort();
-       extern jmp_buf jabort;

        char *tp;
        char *tp;

+       void mabort();

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(local-files) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
-               printf("usage:%s local-files\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "local-files")) {
+               printf("usage: %s local-files\n", argv[0]);

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


@@ -495,7 +520,7 @@ mput(argc, argv)
                        }
                        continue;
                }
                        }
                        continue;
                }

-               gargs = glob(argv[i]);
+               gargs = ftpglob(argv[i]);

                if (globerr != NULL) {
                        printf("%s\n", globerr);
                        if (gargs) {
                if (globerr != NULL) {
                        printf("%s\n", globerr);
                        if (gargs) {


@@ -529,12 +554,27 @@ mput(argc, argv)
        mflag = 0;
 }
 
        mflag = 0;
 }
 

+reget(argc, argv)
+       int argc;
+       char *argv[];
+{
+       (void) getit(argc, argv, 1, "r+w");
+}
+
+get(argc, argv)
+       int argc;
+       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)
+       int argc;

        char *argv[];
        char *argv[];

+       char *mode;

 {
        int loc = 0;
        char *oldargv1, *oldargv2;
 {
        int loc = 0;
        char *oldargv1, *oldargv2;


@@ -544,35 +584,19 @@ get(argc, argv)
                argv[2] = argv[1];
                loc++;
        }
                argv[2] = argv[1];
                loc++;
        }

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "remote-file"))
+               goto usage;
+       if (argc < 3 && !another(&argc, &argv, "local-file")) {

 usage:
                printf("usage: %s remote-file [ local-file ]\n", argv[0]);
                code = -1;
 usage:
                printf("usage: %s remote-file [ local-file ]\n", argv[0]);
                code = -1;

-               return;
-       }
-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(local-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
+               return (0);

        }
        }

-       if (argc < 3) 
-               goto usage;

        oldargv1 = argv[1];
        oldargv2 = argv[2];
        if (!globulize(&argv[2])) {
                code = -1;
        oldargv1 = argv[1];
        oldargv2 = argv[2];
        if (!globulize(&argv[2])) {
                code = -1;

-               return;
+               return (0);

        }
        if (loc && mcase) {
                char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];
        }
        if (loc && mcase) {
                char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];


@@ -597,10 +621,68 @@ usage:
                argv[2] = dotrans(argv[2]);
        if (loc && mapflag)
                argv[2] = domap(argv[2]);
                argv[2] = dotrans(argv[2]);
        if (loc && mapflag)
                argv[2] = domap(argv[2]);

-       recvrequest("RETR", argv[2], argv[1], "w");
+       if (restartit) {
+               struct stat stbuf;
+               int ret;
+
+               ret = stat(argv[2], &stbuf);
+               if (restartit == 1) {
+                       if (ret < 0) {
+                               fprintf(stderr, "local: %s: %s\n", argv[2],
+                                       strerror(errno));
+                               return (0);
+                       }
+                       restart_point = stbuf.st_size;
+               } else {
+                       if (ret == 0) {
+                               int overbose;
+
+                               overbose = verbose;
+                               if (debug == 0)
+                                       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 {
+                                       printf("%s\n", reply_string);
+                                       verbose = overbose;
+                                       return (0);
+                               }
+                       }
+               }
+       }
+
+       recvrequest("RETR", argv[2], argv[1], mode,
+           argv[1] != oldargv1 || argv[2] != oldargv2);
+       restart_point = 0;
+       return (0);

 }
 
 }
 

-sig_t
+void

 mabort()
 {
        int ointer;
 mabort()
 {
        int ointer;


@@ -625,23 +707,17 @@ mabort()
  * Get multiple files.
  */
 mget(argc, argv)
  * Get multiple files.
  */
 mget(argc, argv)

-       char *argv[];
+       int argc;
+       char **argv;

 {
 {

-       char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
-       int ointer;
-       sig_t (*oldintr)(), mabort();

        extern jmp_buf jabort;
        extern jmp_buf jabort;

+       sig_t oldintr;
+       int ointer;
+       char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
+       void mabort();

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-files) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
-               printf("usage:%s remote-files\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "remote-files")) {
+               printf("usage: %s remote-files\n", argv[0]);

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


@@ -769,6 +845,7 @@ onoff(bool)
  */
 /*ARGSUSED*/
 status(argc, argv)
  */
 /*ARGSUSED*/
 status(argc, argv)

+       int argc;

        char *argv[];
 {
        int i;
        char *argv[];
 {
        int i;


@@ -913,6 +990,7 @@ setglob()
  */
 /*VARARGS*/
 setdebug(argc, argv)
  */
 /*VARARGS*/
 setdebug(argc, argv)

+       int argc;

        char *argv[];
 {
        int val;
        char *argv[];
 {
        int val;


@@ -940,19 +1018,12 @@ setdebug(argc, argv)
  * on remote machine.
  */
 cd(argc, argv)
  * on remote machine.
  */
 cd(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-directory) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
-               printf("usage:%s remote-directory\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "remote-directory")) {
+               printf("usage: %s remote-directory\n", argv[0]);

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


@@ -968,6 +1039,7 @@ cd(argc, argv)
  * on local machine.
  */
 lcd(argc, argv)
  * on local machine.
  */
 lcd(argc, argv)

+       int argc;

        char *argv[];
 {
        char buf[MAXPATHLEN];
        char *argv[];
 {
        char buf[MAXPATHLEN];


@@ -976,7 +1048,7 @@ lcd(argc, argv)
        if (argc < 2)
                argc++, argv[1] = home;
        if (argc != 2) {
        if (argc < 2)
                argc++, argv[1] = home;
        if (argc != 2) {

-               printf("usage:%s local-directory\n", argv[0]);
+               printf("usage: %s local-directory\n", argv[0]);

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


@@ -997,19 +1069,12 @@ lcd(argc, argv)
  * Delete a single file.
  */
 delete(argc, argv)
  * Delete a single file.
  */
 delete(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
-               printf("usage:%s remote-file\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "remote-file")) {
+               printf("usage: %s remote-file\n", argv[0]);

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


@@ -1020,23 +1085,17 @@ delete(argc, argv)
  * Delete multiple files.
  */
 mdelete(argc, argv)
  * Delete multiple files.
  */
 mdelete(argc, argv)

-       char *argv[];
+       int argc;
+       char **argv;

 {
 {

-       char *cp;
-       int ointer;
-       sig_t (*oldintr)(), mabort();

        extern jmp_buf jabort;
        extern jmp_buf jabort;

+       sig_t oldintr;
+       int ointer;
+       char *cp;
+       void mabort();

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-files) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
-               printf("usage:%s remote-files\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "remote-files")) {
+               printf("usage: %s remote-files\n", argv[0]);

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


@@ -1069,33 +1128,18 @@ mdelete(argc, argv)
  * Rename a remote file.
  */
 renamefile(argc, argv)
  * Rename a remote file.
  */
 renamefile(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(from-name) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "from-name"))
+               goto usage;
+       if (argc < 3 && !another(&argc, &argv, "to-name")) {

 usage:
                printf("%s from-name to-name\n", argv[0]);
                code = -1;
                return;
        }
 usage:
                printf("%s from-name to-name\n", argv[0]);
                code = -1;
                return;
        }

-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(to-name) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 3) 
-               goto usage;

        if (command("RNFR %s", argv[1]) == CONTINUE)
                (void) command("RNTO %s", argv[2]);
 }
        if (command("RNFR %s", argv[1]) == CONTINUE)
                (void) command("RNTO %s", argv[2]);
 }


@@ -1105,6 +1149,7 @@ usage:
  * of remote files.
  */
 ls(argc, argv)
  * of remote files.
  */
 ls(argc, argv)

+       int argc;

        char *argv[];
 {
        char *cmd;
        char *argv[];
 {
        char *cmd;


@@ -1136,38 +1181,28 @@ ls(argc, argv)
  * of multiple remote files.
  */
 mls(argc, argv)
  * of multiple remote files.
  */
 mls(argc, argv)

-       char *argv[];
+       int argc;
+       char **argv;

 {
 {

-       char *cmd, mode[1], *dest;
-       int ointer, i;
-       sig_t (*oldintr)(), mabort();

        extern jmp_buf jabort;
        extern jmp_buf jabort;

+       sig_t oldintr;
+       int ointer, i;
+       char *cmd, mode[1], *dest;
+       void mabort();

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(remote-files) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(local-file) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 3) {
-               printf("usage:%s remote-files local-file\n", argv[0]);
+       if (argc < 2 && !another(&argc, &argv, "remote-files"))
+               goto usage;
+       if (argc < 3 && !another(&argc, &argv, "local-file")) {
+usage:
+               printf("usage: %s remote-files local-file\n", argv[0]);

                code = -1;
                return;
        }
        dest = argv[argc - 1];
        argv[argc - 1] = NULL;
        if (strcmp(dest, "-") && *dest != '|')
                code = -1;
                return;
        }
        dest = argv[argc - 1];
        argv[argc - 1] = NULL;
        if (strcmp(dest, "-") && *dest != '|')

-               if (!globulize(&dest) || !confirm("output to local-file:", dest)) {
+               if (!globulize(&dest) ||
+                   !confirm("output to local-file:", dest)) {

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


@@ -1197,10 +1232,11 @@ mls(argc, argv)
  */
 /*ARGSUSED*/
 shell(argc, argv)
  */
 /*ARGSUSED*/
 shell(argc, argv)

-       char *argv[];
+       int argc;
+       char **argv;

 {
        int pid;
 {
        int pid;

-       sig_t (*old1)(), (*old2)();
+       sig_t old1, old2;

        char shellnam[40], *shell, *namep; 
        union wait status;
 
        char shellnam[40], *shell, *namep; 
        union wait status;
 


@@ -1236,7 +1272,7 @@ shell(argc, argv)
                exit(1);
                }
        if (pid > 0)
                exit(1);
                }
        if (pid > 0)

-               while (wait(&status) != pid)
+               while (wait((int *)&status) != pid)

                        ;
        (void) signal(SIGINT, old1);
        (void) signal(SIGQUIT, old2);
                        ;
        (void) signal(SIGINT, old1);
        (void) signal(SIGQUIT, old2);


@@ -1260,15 +1296,9 @@ user(argc, argv)
        char acct[80], *getpass();
        int n, aflag = 0;
 
        char acct[80], *getpass();
        int n, aflag = 0;
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(username) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc > 4) {
+       if (argc < 2)
+               (void) another(&argc, &argv, "username");
+       if (argc < 2 || argc > 4) {

                printf("usage: %s username [password] [account]\n", argv[0]);
                code = -1;
                return (0);
                printf("usage: %s username [password] [account]\n", argv[0]);
                code = -1;
                return (0);


@@ -1322,18 +1352,11 @@ pwd()
  * Make a directory.
  */
 makedir(argc, argv)
  * Make a directory.
  */
 makedir(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(directory-name) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "directory-name")) {

                printf("usage: %s directory-name\n", argv[0]);
                code = -1;
                return;
                printf("usage: %s directory-name\n", argv[0]);
                code = -1;
                return;


@@ -1349,18 +1372,11 @@ makedir(argc, argv)
  * Remove a directory.
  */
 removedir(argc, argv)
  * Remove a directory.
  */
 removedir(argc, argv)

+       int argc;

        char *argv[];
 {
 
        char *argv[];
 {
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(directory-name) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "directory-name")) {

                printf("usage: %s directory-name\n", argv[0]);
                code = -1;
                return;
                printf("usage: %s directory-name\n", argv[0]);
                code = -1;
                return;


@@ -1376,64 +1392,56 @@ removedir(argc, argv)
  * Send a line, verbatim, to the remote machine.
  */
 quote(argc, argv)
  * Send a line, verbatim, to the remote machine.
  */
 quote(argc, argv)

+       int argc;

        char *argv[];
 {
        char *argv[];
 {

-       int i;
-       char buf[BUFSIZ];

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(command line to send) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "command line to send")) {

                printf("usage: %s line-to-send\n", argv[0]);
                code = -1;
                return;
        }
                printf("usage: %s line-to-send\n", argv[0]);
                code = -1;
                return;
        }

-       (void) strcpy(buf, argv[1]);
-       for (i = 2; i < argc; i++) {
-               (void) strcat(buf, " ");
-               (void) strcat(buf, argv[i]);
-       }
-       if (command(buf) == PRELIM) {
-               while (getreply(0) == PRELIM);
-       }
+       quote1("", argc, argv);

 }
 
 /*
  * Send a SITE command to the remote machine.  The line
 }
 
 /*
  * Send a SITE command to the remote machine.  The line

- * is sent almost verbatim to the remote machine, the
- * first argument is changed to SITE.
+ * is sent verbatim to the remote machine, except that the
+ * word "SITE" is added at the front.

  */
  */

-

 site(argc, argv)
 site(argc, argv)

+       int argc;

        char *argv[];
 {
        char *argv[];
 {

-       int i;
-       char buf[BUFSIZ];

 
 

-       if (argc < 2) {
-               (void) strcat(line, " ");
-               printf("(arguments to SITE command) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 2) {
+       if (argc < 2 && !another(&argc, &argv, "arguments to SITE command")) {

                printf("usage: %s line-to-send\n", argv[0]);
                code = -1;
                return;
        }
                printf("usage: %s line-to-send\n", argv[0]);
                code = -1;
                return;
        }

-       (void) strcpy(buf, "SITE ");
-       (void) strcat(buf, argv[1]);
-       for (i = 2; i < argc; i++) {
-               (void) strcat(buf, " ");
-               (void) strcat(buf, argv[i]);
+       quote1("SITE ", argc, argv);
+}
+
+/*
+ * Turn argv[1..argc) into a space-separated string, then prepend initial text.
+ * Send the result as a one-line command and get response.
+ */
+quote1(initial, argc, argv)
+       char *initial;
+       int argc;
+       char **argv;
+{
+       register int i, len;
+       char buf[BUFSIZ];               /* must be >= sizeof(line) */
+
+       (void) strcpy(buf, initial);
+       if (argc > 1) {
+               len = strlen(buf);
+               len += strlen(strcpy(&buf[len], argv[1]));
+               for (i = 2; i < argc; i++) {
+                       buf[len++] = ' ';
+                       len += strlen(strcpy(&buf[len], argv[i]));
+               }

        }
        if (command(buf) == PRELIM) {
                while (getreply(0) == PRELIM);
        }
        if (command(buf) == PRELIM) {
                while (getreply(0) == PRELIM);


@@ -1441,30 +1449,23 @@ site(argc, argv)
 }
 
 do_chmod(argc, argv)
 }
 
 do_chmod(argc, argv)

+       int argc;

        char *argv[];
 {
        char *argv[];
 {

-       if (argc == 2) {
-               printf("usage: %s mode file-name\n", argv[0]);
-               code = -1;
-               return;
-       }
-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(mode and file-name) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc != 3) {
+
+       if (argc < 2 && !another(&argc, &argv, "mode"))
+               goto usage;
+       if (argc < 3 && !another(&argc, &argv, "file-name")) {
+usage:

                printf("usage: %s mode file-name\n", argv[0]);
                code = -1;
                return;
        }
                printf("usage: %s mode file-name\n", argv[0]);
                code = -1;
                return;
        }

-       (void)command("SITE CHMOD %s %s", argv[1], argv[2]);
+       (void) command("SITE CHMOD %s %s", argv[1], argv[2]);

 }
 
 do_umask(argc, argv)
 }
 
 do_umask(argc, argv)

+       int argc;

        char *argv[];
 {
        int oldverbose = verbose;
        char *argv[];
 {
        int oldverbose = verbose;


@@ -1475,6 +1476,7 @@ do_umask(argc, argv)
 }
 
 idle(argc, argv)
 }
 
 idle(argc, argv)

+       int argc;

        char *argv[];
 {
        int oldverbose = verbose;
        char *argv[];
 {
        int oldverbose = verbose;


@@ -1488,6 +1490,7 @@ idle(argc, argv)
  * Ask the other side for help.
  */
 rmthelp(argc, argv)
  * Ask the other side for help.
  */
 rmthelp(argc, argv)

+       int argc;

        char *argv[];
 {
        int oldverbose = verbose;
        char *argv[];
 {
        int oldverbose = verbose;


@@ -1544,7 +1547,8 @@ confirm(cmd, file)
                return (1);
        printf("%s %s? ", cmd, file);
        (void) fflush(stdout);
                return (1);
        printf("%s %s? ", cmd, file);
        (void) fflush(stdout);

-       (void) gets(line);
+       if (fgets(line, sizeof line, stdin) == NULL)
+               return (0);

        return (*line != 'n' && *line != 'N');
 }
 
        return (*line != 'n' && *line != 'N');
 }
 


@@ -1569,7 +1573,7 @@ globulize(cpp)
 
        if (!doglob)
                return (1);
 
        if (!doglob)
                return (1);

-       globbed = glob(*cpp);
+       globbed = ftpglob(*cpp);

        if (globerr != NULL) {
                printf("%s: %s\n", *cpp, globerr);
                if (globbed) {
        if (globerr != NULL) {
                printf("%s: %s\n", *cpp, globerr);
                if (globbed) {


@@ -1615,7 +1619,7 @@ account(argc,argv)
 
 jmp_buf abortprox;
 
 
 jmp_buf abortprox;
 

-sig_t
+void

 proxabort()
 {
        extern int proxy;
 proxabort()
 {
        extern int proxy;


@@ -1637,22 +1641,15 @@ doproxy(argc,argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-       sig_t (*oldintr)(), proxabort();
-       register struct cmd *c;
-       struct cmd *getcmd();

        extern struct cmd cmdtab[];
        extern jmp_buf abortprox;
        extern struct cmd cmdtab[];
        extern jmp_buf abortprox;

+       register struct cmd *c;
+       struct cmd *getcmd();
+       sig_t oldintr;
+       void proxabort();

 
 

-       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]);
+       if (argc < 2 && !another(&argc, &argv, "command")) {
+               printf("usage: %s command\n", argv[0]);

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


@@ -1776,15 +1773,7 @@ setnmap(argc, argv)
                code = mapflag;
                return;
        }
                code = mapflag;
                return;
        }

-       if (argc < 3) {
-               (void) strcat(line, " ");
-               printf("(mapout) ");
-               (void) gets(&line[strlen(line)]);
-               makeargv();
-               argc = margc;
-               argv = margv;
-       }
-       if (argc < 3) {
+       if (argc < 3 && !another(&argc, &argv, "mapout")) {

                printf("Usage: %s [mapin mapout]\n",argv[0]);
                code = -1;
                return;
                printf("Usage: %s [mapin mapout]\n",argv[0]);
                code = -1;
                return;


@@ -1997,6 +1986,20 @@ 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. %s\n", restart_point,
+                   "execute get, put or append to initiate transfer");
+       }
+}

 
 /* show remote system type */
 syst()
 
 /* show remote system type */
 syst()


@@ -2016,15 +2019,7 @@ macdef(argc, argv)
                code = -1;
                return;
        }
                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) {
+       if (argc < 2 && !another(&argc, &argv, "macro name")) {

                printf("Usage: %s macro_name\n",argv[0]);
                code = -1;
                return;
                printf("Usage: %s macro_name\n",argv[0]);
                code = -1;
                return;


@@ -2076,19 +2071,12 @@ macdef(argc, argv)
  * get size of file on remote machine
  */
 sizecmd(argc, argv)
  * get size of file on remote machine
  */
 sizecmd(argc, argv)

+       int argc;

        char *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]);
+       if (argc < 2 && !another(&argc, &argv, "filename")) {
+               printf("usage: %s filename\n", argv[0]);

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


@@ -2099,20 +2087,13 @@ sizecmd(argc, argv)
  * get last modification time of file on remote machine
  */
 modtime(argc, argv)
  * get last modification time of file on remote machine
  */
 modtime(argc, argv)

+       int argc;

        char *argv[];
 {
        int overbose;
 
        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]);
+       if (argc < 2 && !another(&argc, &argv, "filename")) {
+               printf("usage: %s filename\n", argv[0]);

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


@@ -2132,10 +2113,23 @@ modtime(argc, argv)
 }
 
 /*
 }
 
 /*

- * show status on remote machine
+ * show status on reomte machine

  */
 rmtstatus(argc, argv)
  */
 rmtstatus(argc, argv)

+       int argc;

        char *argv[];
 {
        (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }
        char *argv[];
 {
        (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }

+
+/*
+ * get file if modtime is more recent than current file
+ */
+newer(argc, argv)
+       int argc;
+       char *argv[];
+{
+       if (getit(argc, argv, -1, "w"))
+               printf("Local file \"%s\" is newer than remote file \"%s\"\n",
+                       argv[1], argv[2]);
+}