===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/ftp/util.c	1998/09/19 22:38:56	1.20
--- src/usr.bin/ftp/util.c	1998/09/22 04:42:49	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.20 1998/09/19 22:38:56 millert Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.21 1998/09/22 04:42:49 deraadt Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
***************
*** 35,41 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.20 1998/09/19 22:38:56 millert Exp $";
  #endif /* not lint */
  
  /*
--- 35,41 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.21 1998/09/22 04:42:49 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 823,829 ****
  	struct winsize winsize;
  
  	if (ioctl(fileno(ttyout), TIOCGWINSZ, &winsize) != -1)
! 		ttywidth = winsize.ws_col;
  	else
  		ttywidth = 80;
  	errno = save_errno;
--- 823,829 ----
  	struct winsize winsize;
  
  	if (ioctl(fileno(ttyout), TIOCGWINSZ, &winsize) != -1)
! 		ttywidth = winsize.ws_col ? winsize.ws_col : 80;
  	else
  		ttywidth = 80;
  	errno = save_errno;