BSD 4_4 release

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

diff --git a/usr/src/usr.bin/ftp/domacro.c b/usr/src/usr.bin/ftp/domacro.c
index 778fac9..a9df6b6 100644 (file)
--- a/usr/src/usr.bin/ftp/domacro.c
+++ b/usr/src/usr.bin/ftp/domacro.c
@@ -1,12 +1,39 @@
 /*
 /*

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

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)domacro.c  1.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)domacro.c  8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "ftp_var.h"
 
 
 #include "ftp_var.h"
 


@@ -16,29 +43,19 @@ static char sccsid[] = "@(#)domacro.c       1.1 (Berkeley) %G%";
 #include <ctype.h>
 #include <sys/ttychars.h>
 
 #include <ctype.h>
 #include <sys/ttychars.h>
 

-jmp_buf macabort;
-

 domacro(argc, argv)
        int argc;
        char *argv[];
 {
        register int i, j;
        register char *cp1, *cp2;
 domacro(argc, argv)
        int argc;
        char *argv[];
 {
        register int i, j;
        register char *cp1, *cp2;

-       int count = 2, loopflg = 0, (*oldintr)();
-       char **gargs, **cpp, line2[200];
+       int count = 2, loopflg = 0;
+       char line2[200];

        extern char **glob(), *globerr;
        struct cmd *getcmd(), *c;
        extern struct cmd cmdtab[];
 
        extern char **glob(), *globerr;
        struct cmd *getcmd(), *c;
        extern struct cmd cmdtab[];
 

-       if (argc < 2) {
-               strcat(line, " ");
-               printf("(macro name) ");
-               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;


@@ -53,7 +70,7 @@ domacro(argc, argv)
                code = -1;
                return;
        }
                code = -1;
                return;
        }

-       strcpy(line2, line);
+       (void) strcpy(line2, line);

 TOP:
        cp1 = macros[i].mac_start;
        while (cp1 != macros[i].mac_end) {
 TOP:
        cp1 = macros[i].mac_start;
        while (cp1 != macros[i].mac_end) {


@@ -74,7 +91,7 @@ TOP:
                                    }
                                    cp1--;
                                    if (argc - 2 >= j) {
                                    }
                                    cp1--;
                                    if (argc - 2 >= j) {

-                                       strcpy(cp2, argv[j+1]);
+                                       (void) strcpy(cp2, argv[j+1]);

                                        cp2 += strlen(argv[j+1]);
                                    }
                                    break;
                                        cp2 += strlen(argv[j+1]);
                                    }
                                    break;


@@ -83,7 +100,7 @@ TOP:
                                        loopflg = 1;
                                        cp1++;
                                        if (count < argc) {
                                        loopflg = 1;
                                        cp1++;
                                        if (count < argc) {

-                                          strcpy(cp2, argv[count]);
+                                          (void) strcpy(cp2, argv[count]);

                                           cp2 += strlen(argv[count]);
                                        }
                                        break;
                                           cp2 += strlen(argv[count]);
                                        }
                                        break;


@@ -118,9 +135,9 @@ TOP:
                        }
                        (*c->c_handler)(margc, margv);
                        if (bell && c->c_bell) {
                        }
                        (*c->c_handler)(margc, margv);
                        if (bell && c->c_bell) {

-                               putchar(CTRL(g));
+                               (void) putchar('\007');

                        }
                        }

-                       strcpy(line, line2);
+                       (void) strcpy(line, line2);

                        makeargv();
                        argc = margc;
                        argv = margv;
                        makeargv();
                        argc = margc;
                        argv = margv;