===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sort/file.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/sort/file.c	2015/04/02 12:19:51	1.15
+++ src/usr.bin/sort/file.c	2015/04/02 12:21:18	1.16
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.15 2015/04/02 12:19:51 millert Exp $	*/
+/*	$OpenBSD: file.c,v 1.16 2015/04/02 12:21:18 millert Exp $	*/
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
@@ -75,7 +75,6 @@
 	size_t			 cbsz;
 	size_t			 mmapsize;
 	size_t			 strbeg;
-	int			 fd;
 	char			 elsymb;
 };
 
@@ -577,10 +576,8 @@
 		sz = stat_buf.st_size;
 
 		addr = mmap(NULL, sz, PROT_READ, 0, fd, 0);
-		if (addr == MAP_FAILED) {
-			close(fd);
-		} else {
-			ret->fd = fd;
+		close(fd);
+		if (addr != MAP_FAILED) {
 			ret->mmapaddr = addr;
 			ret->mmapsize = sz;
 			ret->mmapptr = ret->mmapaddr;
@@ -724,9 +721,6 @@
 {
 	if (fr->mmapaddr)
 		munmap(fr->mmapaddr, fr->mmapsize);
-
-	if (fr->fd)
-		close(fr->fd);
 
 	sort_free(fr->buffer);