===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -r1.80 -r1.81
*** src/usr.bin/ftp/main.c	2009/08/09 18:36:11	1.80
--- src/usr.bin/ftp/main.c	2010/06/29 23:12:33	1.81
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.80 2009/08/09 18:36:11 sobrado Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.81 2010/06/29 23:12:33 halex Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
***************
*** 79,84 ****
--- 79,85 ----
  #include "cmds.h"
  
  int family = PF_UNSPEC;
+ int pipeout;
  
  int
  main(volatile int argc, char *argv[])
***************
*** 246,253 ****
  
  		case 'o':
  			outfile = optarg;
! 			if (strcmp(outfile, "-") == 0)
! 				ttyout = stderr;
  			break;
  
  		case 'p':
--- 247,260 ----
  
  		case 'o':
  			outfile = optarg;
! 			if (*outfile == '\0') {
! 				pipeout = 0;
! 				outfile = NULL;
! 				ttyout = stdout;
! 			} else {
! 				pipeout = strcmp(outfile, "-") == 0;
! 				ttyout = pipeout ? stderr : stdout;
! 			}
  			break;
  
  		case 'p':