===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/backupfile.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/patch/backupfile.c	2004/08/05 21:47:24	1.18
--- src/usr.bin/patch/backupfile.c	2006/03/11 19:41:30	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: backupfile.c,v 1.18 2004/08/05 21:47:24 deraadt Exp $	*/
  
  /*
   * backupfile.c -- make Emacs style backup file names Copyright (C) 1990 Free
--- 1,4 ----
! /*	$OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $	*/
  
  /*
   * backupfile.c -- make Emacs style backup file names Copyright (C) 1990 Free
***************
*** 17,23 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: backupfile.c,v 1.18 2004/08/05 21:47:24 deraadt Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 17,23 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 45,51 ****
  static char	*concat(const char *, const char *);
  static char	*make_version_name(const char *, int);
  static int	max_backup_version(const char *, const char *);
! static int	version_number(const char *, const char *, int);
  static int	argmatch(const char *, const char **);
  static void	invalid_arg(const char *, const char *, int);
  
--- 45,51 ----
  static char	*concat(const char *, const char *);
  static char	*make_version_name(const char *, int);
  static int	max_backup_version(const char *, const char *);
! static int	version_number(const char *, const char *, size_t);
  static int	argmatch(const char *, const char **);
  static void	invalid_arg(const char *, const char *, int);
  
***************
*** 88,94 ****
  {
  	DIR	*dirp;
  	struct dirent	*dp;
! 	int	highest_version, this_version, file_name_length;
  
  	dirp = opendir(dir);
  	if (dirp == NULL)
--- 88,95 ----
  {
  	DIR	*dirp;
  	struct dirent	*dp;
! 	int	highest_version, this_version;
! 	size_t	file_name_length;
  
  	dirp = opendir(dir);
  	if (dirp == NULL)
***************
*** 129,135 ****
   * already have ".~" appended to it.
   */
  static int
! version_number(const char *base, const char *backup, int base_length)
  {
  	int		version;
  	const char	*p;
--- 130,136 ----
   * already have ".~" appended to it.
   */
  static int
! version_number(const char *base, const char *backup, size_t base_length)
  {
  	int		version;
  	const char	*p;