From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 7 Jan 2015 21:24:39 +0000 (+0000)
Subject: look: remove dead code
X-Git-Tag: v2.26-rc1~62^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9329e724af186e57020f8c74abff108c0778b280;p=thirdparty%2Futil-linux.git

look: remove dead code

MAP_FILE is ignored compatibility flag.

Reference: http://man7.org/linux/man-pages/man2/mmap.2.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/look.c b/misc-utils/look.c
index dc6a8d0fc8..96a02c41d7 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -153,9 +153,6 @@ main(int argc, char *argv[])
 	if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb))
 		err(EXIT_FAILURE, "%s", file);
 	front = mmap(NULL, (size_t) sb.st_size, PROT_READ,
-#ifdef MAP_FILE
-		     MAP_FILE |
-#endif
 		     MAP_SHARED, fd, (off_t) 0);
 	if
 #ifdef MAP_FAILED
@@ -164,13 +161,6 @@ main(int argc, char *argv[])
 		((void *)(front) <= (void *)0)
 #endif
 			err(EXIT_FAILURE, "%s", file);
-
-#if 0
-	/* workaround for mmap problem (rmiller@duskglow.com) */
-	if (front == (void *)0)
-		return 1;
-#endif
-
 	back = front + sb.st_size;
 	return look(front, back);
 }