===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vim/Attic/memfile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/vim/Attic/memfile.c	1996/09/07 21:40:26	1.1
--- src/usr.bin/vim/Attic/memfile.c	1996/09/21 06:23:07	1.2
***************
*** 1,4 ****
! /*	$OpenBSD: memfile.c,v 1.1 1996/09/07 21:40:26 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
--- 1,4 ----
! /*	$OpenBSD: memfile.c,v 1.2 1996/09/21 06:23:07 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
***************
*** 130,136 ****
  {
  	MEMFILE			*mfp;
  	int				i;
! 	long			size;
  #ifdef UNIX
  	struct STATFS 	stf;
  #endif
--- 130,136 ----
  {
  	MEMFILE			*mfp;
  	int				i;
! 	off_t			size;
  #ifdef UNIX
  	struct STATFS 	stf;
  #endif
***************
*** 346,351 ****
--- 346,357 ----
  	mf_ins_used(mfp, hp);
  	mf_ins_hash(mfp, hp);
  
+ 	/*
+ 	 * Init the data to all zero, to avoid reading uninitialized data.
+ 	 * This also avoids that the passwd file ends up in the swap file!
+ 	 */
+ 	(void)vim_memset((char *)(hp->bh_data), 0, (size_t)mfp->mf_page_size);
+ 
  	return hp;
  }
  
***************
*** 847,853 ****
  	MEMFILE		*mfp;
  	BHDR		*hp;
  {
! 	long_u		offset;
  	unsigned	page_size;
  	unsigned	size;
  
--- 853,859 ----
  	MEMFILE		*mfp;
  	BHDR		*hp;
  {
! 	off_t		offset;
  	unsigned	page_size;
  	unsigned	size;
  
***************
*** 857,863 ****
  	page_size = mfp->mf_page_size;
  	offset = page_size * hp->bh_bnum;
  	size = page_size * hp->bh_page_count;
! 	if ((long_u)lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
  	{
  		EMSG("Seek error in swap file read");
  		return FAIL;
--- 863,869 ----
  	page_size = mfp->mf_page_size;
  	offset = page_size * hp->bh_bnum;
  	size = page_size * hp->bh_page_count;
! 	if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
  	{
  		EMSG("Seek error in swap file read");
  		return FAIL;
***************
*** 880,886 ****
  	MEMFILE		*mfp;
  	BHDR		*hp;
  {
! 	long_u		offset;		/* offset in the file */
  	blocknr_t	nr;			/* block nr which is being written */
  	BHDR		*hp2;
  	unsigned	page_size;	/* number of bytes in a page */
--- 886,892 ----
  	MEMFILE		*mfp;
  	BHDR		*hp;
  {
! 	off_t		offset;		/* offset in the file */
  	blocknr_t	nr;			/* block nr which is being written */
  	BHDR		*hp2;
  	unsigned	page_size;	/* number of bytes in a page */
***************
*** 914,920 ****
  			hp2 = hp;
  
  		offset = page_size * nr;
! 		if ((long_u)lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
  		{
  			EMSG("Seek error in swap file write");
  			return FAIL;
--- 920,926 ----
  			hp2 = hp;
  
  		offset = page_size * nr;
! 		if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
  		{
  			EMSG("Seek error in swap file write");
  			return FAIL;