first cut at new makefile; file reorg, new depend

[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 c93e9b5..8d1ac88 100644 (file)
--- a/usr/src/usr.bin/ftp/domacro.c
+++ b/usr/src/usr.bin/ftp/domacro.c
@@ -3,15 +3,20 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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[] = "@(#)domacro.c  1.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)domacro.c  1.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "ftp_var.h"
 #endif /* not lint */
 
 #include "ftp_var.h"


@@ -122,7 +127,7 @@ TOP:
                        }
                        (*c->c_handler)(margc, margv);
                        if (bell && c->c_bell) {
                        }
                        (*c->c_handler)(margc, margv);
                        if (bell && c->c_bell) {

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

                        }
                        (void) strcpy(line, line2);
                        makeargv();
                        }
                        (void) strcpy(line, line2);
                        makeargv();