summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-09-19 20:02:24 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-09-19 20:02:24 +0000
commit9f39d555faf51581a495a637ebd40e316979cc8f (patch)
tree579cfee0b25604161ce62c8f7fd0213312e17614 /usr.bin
parent7572e1f03542537ddf867d3925abbc0865580746 (diff)
Don't turn of progress meter when output file is stdout. The meter will go to stderr in this case.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ftp/ftp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index d0e3094739e..0798d3247c6 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp.c,v 1.29 1998/07/07 17:26:41 art Exp $ */
+/* $OpenBSD: ftp.c,v 1.30 1998/09/19 20:02:23 millert Exp $ */
/* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-static char rcsid[] = "$OpenBSD: ftp.c,v 1.29 1998/07/07 17:26:41 art Exp $";
+static char rcsid[] = "$OpenBSD: ftp.c,v 1.30 1998/09/19 20:02:23 millert Exp $";
#endif
#endif /* not lint */
@@ -871,7 +871,6 @@ recvrequest(cmd, local, remote, lmode, printnames, ignorespecial)
goto abort;
if (!ignorespecial && strcmp(local, "-") == 0) {
fout = stdout;
- progress = 0;
preserve = 0;
} else if (!ignorespecial && *local == '|') {
oldintp = signal(SIGPIPE, SIG_IGN);