===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/xinstall/xinstall.c	2001/08/25 19:52:05	1.28
--- src/usr.bin/xinstall/xinstall.c	2001/11/19 19:02:18	1.29
***************
*** 1,4 ****
! /*	$OpenBSD: xinstall.c,v 1.28 2001/08/25 19:52:05 heko Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: xinstall.c,v 1.29 2001/11/19 19:02:18 mpech Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
  #endif
! static char rcsid[] = "$OpenBSD: xinstall.c,v 1.28 2001/08/25 19:52:05 heko Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
  #endif
! static char rcsid[] = "$OpenBSD: xinstall.c,v 1.29 2001/11/19 19:02:18 mpech Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 90,96 ****
  void	usage __P((void));
  int	create_newfile __P((char *, struct stat *));
  int	create_tempfile __P((char *, char *, size_t));
! int	file_write __P((int, char *, register size_t, int *, int *, int));
  
  int
  main(argc, argv)
--- 90,96 ----
  void	usage __P((void));
  int	create_newfile __P((char *, struct stat *));
  int	create_tempfile __P((char *, char *, size_t));
! int	file_write __P((int, char *, size_t, int *, int *, int));
  
  int
  main(argc, argv)
***************
*** 420,431 ****
   */
  void
  copy(from_fd, from_name, to_fd, to_name, size, sparse)
! 	register int from_fd, to_fd;
  	char *from_name, *to_name;
  	off_t size;
  	int sparse;
  {
! 	register ssize_t nr, nw;
  	int serrno;
  	char *p, buf[MAXBSIZE];
  
--- 420,431 ----
   */
  void
  copy(from_fd, from_name, to_fd, to_name, size, sparse)
! 	int from_fd, to_fd;
  	char *from_name, *to_name;
  	off_t size;
  	int sparse;
  {
! 	ssize_t nr, nw;
  	int serrno;
  	char *p, buf[MAXBSIZE];
  
***************
*** 579,585 ****
  install_dir(path)
          char *path;
  {
! 	register char *p;
  	struct stat sb;
  	int ch;
  
--- 579,585 ----
  install_dir(path)
          char *path;
  {
! 	char *p;
  	struct stat sb;
  	int ch;
  
***************
*** 724,738 ****
  file_write(fd, str, cnt, rem, isempt, sz)
  	int fd;
  	char *str;
! 	register size_t cnt;
  	int *rem;
  	int *isempt;
  	int sz;
  {
! 	register char *pt;
! 	register char *end;
! 	register size_t wcnt;
! 	register char *st = str;
  
  	/*
  	 * while we have data to process
--- 724,738 ----
  file_write(fd, str, cnt, rem, isempt, sz)
  	int fd;
  	char *str;
! 	size_t cnt;
  	int *rem;
  	int *isempt;
  	int sz;
  {
! 	char *pt;
! 	char *end;
! 	size_t wcnt;
! 	char *st = str;
  
  	/*
  	 * while we have data to process