Patchwork [U-Boot,PATCHv3,6/8] mkenvimage: Use mmap() when reading from a regular file

login
register
mail settings
Submitter David Wagner
Date Jan. 8, 2012, 1:09 p.m.
Message ID <1326028154-3445-1-git-send-email-david.wagner@free-electrons.com>
Download mbox | patch
Permalink /patch/134908/
State Accepted
Commit 6ee39f8055680654f9cc97b98dcce9588f1ab71e
Headers show

Comments

David Wagner - Jan. 8, 2012, 1:09 p.m.
Fall back to read() if it fails.

Signed-off-by: David Wagner <david.wagner@free-electrons.com>
---

I let an error message be printed when mmap fails, as the user may want to know
why.

 tools/mkenvimage.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

Patch

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 20e53b8..ca32df7 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -37,6 +37,7 @@ 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/mman.h>
 
 #include "compiler.h"
 #include <u-boot/crc.h>
@@ -210,12 +211,24 @@  int main(int argc, char **argv)
 		}
 
 		filesize = txt_file_stat.st_size;
-		/* Read the raw input file and transform it */
-		filebuf = malloc(sizeof(*envptr) * filesize);
-		ret = read(txt_fd, filebuf, sizeof(*envptr) * filesize);
-		if (ret != sizeof(*envptr) * filesize) {
-			fprintf(stderr, "Can't read the whole input file\n");
-			return EXIT_FAILURE;
+
+		filebuf = mmap(NULL, sizeof(*envptr) * filesize, PROT_READ,
+			       MAP_PRIVATE, txt_fd, 0);
+		if (filebuf == MAP_FAILED) {
+			fprintf(stderr, "mmap (%ld bytes) failed: %s\n",
+					sizeof(*envptr) * filesize,
+					strerror(errno));
+			fprintf(stderr, "Falling back to read()\n");
+
+			filebuf = malloc(sizeof(*envptr) * filesize);
+			ret = read(txt_fd, filebuf, sizeof(*envptr) * filesize);
+			if (ret != sizeof(*envptr) * filesize) {
+				fprintf(stderr, "Can't read the whole input file (%ld bytes): %s\n",
+					sizeof(*envptr) * filesize,
+					strerror(errno));
+
+				return EXIT_FAILURE;
+			}
 		}
 		ret = close(txt_fd);
 	}