===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/ftp/main.c	1997/04/28 20:35:59	1.31
--- src/usr.bin/ftp/main.c	1997/06/01 22:30:49	1.32
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.31 1997/04/28 20:35:59 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.21 1997/04/05 03:27:39 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.32 1997/06/01 22:30:49 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.21 1997/04/05 03:27:39 lukem Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.31 1997/04/28 20:35:59 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.32 1997/06/01 22:30:49 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 122,130 ****
  	ttyout = stdout;
  	if (isatty(fileno(ttyout)) && !dumb_terminal)
  		progress = 1;		/* progress bar on if going to a tty */
! 	else {
! 		ttyout = stderr;
  		outfd = fileno(stdout);
  	}
  
  	while ((ch = getopt(argc, argv, "adeginpPr:tvV")) != -1) {
--- 122,131 ----
  	ttyout = stdout;
  	if (isatty(fileno(ttyout)) && !dumb_terminal)
  		progress = 1;		/* progress bar on if going to a tty */
! 
! 	if (!isatty(fileno(ttyout))) {
  		outfd = fileno(stdout);
+ 		ttyout = stderr;
  	}
  
  	while ((ch = getopt(argc, argv, "adeginpPr:tvV")) != -1) {