===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cookie.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/ftp/cookie.c	2007/06/13 13:52:26	1.1
--- src/usr.bin/ftp/cookie.c	2007/10/08 18:39:37	1.2
***************
*** 1,4 ****
! /* $OpenBSD: cookie.c,v 1.1 2007/06/13 13:52:26 pyr Exp $	*/
  /*
   * Copyright (c) 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: cookie.c,v 1.2 2007/10/08 18:39:37 pyr Exp $	*/
  /*
   * Copyright (c) 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
   *
***************
*** 85,94 ****
  			lbuf[len] = '\0';
  			line = lbuf;
  		}
! 		if (len > 0 && line[len - 1] == '\r') {
! 			line[len - 1] = '\0';
! 			--len;
! 		}
  
  		line += strspn(line, " \t");
  		if ((*line == '#') || (*line == '\0')) {
--- 85,91 ----
  			lbuf[len] = '\0';
  			line = lbuf;
  		}
! 		line[strcspn(line, "\r")] = '\0';
  
  		line += strspn(line, " \t");
  		if ((*line == '#') || (*line == '\0')) {