===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/lex.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/mail/lex.c	2001/11/21 15:26:39	1.26
--- src/usr.bin/mail/lex.c	2001/11/21 20:41:55	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: lex.c,v 1.26 2001/11/21 15:26:39 millert Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: lex.c,v 1.27 2001/11/21 20:41:55 millert Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static const char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static const char rcsid[] = "$OpenBSD: lex.c,v 1.26 2001/11/21 15:26:39 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static const char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static const char rcsid[] = "$OpenBSD: lex.c,v 1.27 2001/11/21 20:41:55 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 132,138 ****
  	}
  	shudclob = 1;
  	edit = isedit;
! 	strcpy(prevfile, mailname);
  	if (name != mailname)
  		strlcpy(mailname, name, sizeof(mailname));
  	mailsize = fsize(ibuf);
--- 132,138 ----
  	}
  	shudclob = 1;
  	edit = isedit;
! 	strlcpy(prevfile, mailname, PATHSIZE);
  	if (name != mailname)
  		strlcpy(mailname, name, sizeof(mailname));
  	mailsize = fsize(ibuf);
***************
*** 536,547 ****
   * lists to message list functions.
   */
  void
! setmsize(int sz)
  {
  
! 	if (msgvec != 0)
! 		(void)free(msgvec);
! 	msgvec = (int *)calloc(sz + 1, sizeof(*msgvec));
  }
  
  /*
--- 536,549 ----
   * lists to message list functions.
   */
  void
! setmsize(int n)
  {
+ 	size_t msize;
  
! 	msize = (n + 1) * sizeof(*msgvec);
! 	if ((msgvec = realloc(msgvec, msize)) == NULL)
! 		errx(1, "Out of memory");
! 	memset(msgvec, 0, msize);
  }
  
  /*