From 5a46db4b808ab3c17e5b7acce16da10085415a1b Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Fri, 8 Jan 2010 19:28:16 +0330
Subject: [PATCH] draw: update draw.c from the latest fbpad

---
 draw.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/draw.c b/draw.c
index 457c0b0..5e8d622 100644
--- a/draw.c
+++ b/draw.c
@@ -21,9 +21,9 @@ static struct fb_fix_screeninfo finfo;
 static int rl, rr, gl, gr, bl, br;
 static int nr, ng, nb;
 
-static int fb_len()
+static int fb_len(void)
 {
-	return vinfo.xres_virtual * vinfo.yres_virtual * BPP;
+	return finfo.line_length * vinfo.yres_virtual;
 }
 
 static void fb_cmap_save(int save)
@@ -96,6 +96,7 @@ void fb_init(void)
 		xerror("ioctl failed");
 	if ((vinfo.bits_per_pixel + 7) >> 3 != BPP)
 		xdie("fbval_t does not match framebuffer depth");
+	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
 	init_colors();
 	fb = mmap(NULL, fb_len(), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	if (fb == MAP_FAILED)
@@ -111,7 +112,7 @@ void fb_set(int r, int c, fbval_t *mem, int len)
 	memcpy(fb + loc, mem, len * BPP);
 }
 
-void fb_free()
+void fb_free(void)
 {
 	fb_cmap_save(0);
 	munmap(fb, fb_len());
-- 
2.11.4.GIT