diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-14 04:32:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-14 04:32:19 +0000 |
| commit | 1e56142f89dd7f340eec7460e4de51d43f815bf8 (patch) | |
| tree | 30a5ef6b529ecc3ad8da08545388ecc2d77638f9 /usr.bin/ftp/domacro.c | |
| parent | 144475db6bbada25390f979901aba4d87716f1d3 (diff) | |
Sync with NetBSD and fix "get foo.txt /dev/tty" wrt progress meter
and setting times.
Diffstat (limited to 'usr.bin/ftp/domacro.c')
| -rw-r--r-- | usr.bin/ftp/domacro.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c index 5dbc939f052..dd16c312bc6 100644 --- a/usr.bin/ftp/domacro.c +++ b/usr.bin/ftp/domacro.c @@ -1,5 +1,5 @@ -/* $OpenBSD: domacro.c,v 1.4 1997/02/03 01:05:36 millert Exp $ */ -/* $NetBSD: domacro.c,v 1.8 1997/01/19 14:19:08 lukem Exp $ */ +/* $OpenBSD: domacro.c,v 1.5 1997/03/14 04:32:13 millert Exp $ */ +/* $NetBSD: domacro.c,v 1.9 1997/03/13 06:23:14 lukem Exp $ */ /* * Copyright (c) 1985, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: domacro.c,v 1.4 1997/02/03 01:05:36 millert Exp $"; +static char rcsid[] = "$OpenBSD: domacro.c,v 1.5 1997/03/14 04:32:13 millert Exp $"; #endif #endif /* not lint */ @@ -59,7 +59,7 @@ domacro(argc, argv) struct cmd *c; if (argc < 2 && !another(&argc, &argv, "macro name")) { - printf("Usage: %s macro_name.\n", argv[0]); + printf("usage: %s macro_name\n", argv[0]); code = -1; return; } @@ -121,11 +121,11 @@ TOP: makeargv(); c = getcmd(margv[0]); if (c == (struct cmd *)-1) { - puts("?Ambiguous command"); + puts("?Ambiguous command."); code = -1; } else if (c == 0) { - puts("?Invalid command"); + puts("?Invalid command."); code = -1; } else if (c->c_conn && !connected) { @@ -133,9 +133,8 @@ TOP: code = -1; } else { - if (verbose) { + if (verbose) puts(line); - } (*c->c_handler)(margc, margv); if (bell && c->c_bell) { (void)putchar('\007'); |