[git commit master] fbsplash: allow compressed image files

Denys Vlasenko vda.linux at googlemail.com
Sat Nov 7 03:14:50 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=6eaac025a1f76c2d271657295b8b00d534e6f8a3
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Vladimir Dronnikov <dronnikov at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/fbsplash.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 3d225e5..0afd189 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -221,7 +221,14 @@ static void fb_drawimage(void)
 	unsigned char *pixline;
 	unsigned i, j, width, height, line_size;
 
-	theme_file = xfopen_stdin(G.image_filename);
+	if (LONE_DASH(G.image_filename))
+		theme_file = stdin;
+	else {
+		int fd = open_zipped(G.image_filename);
+		if (fd < 0)
+			bb_simple_perror_msg_and_die(G.image_filename);
+		theme_file = fdopen(fd, "r");
+	}
 	head = xmalloc(256);
 
 	/* parse ppm header
-- 
1.6.3.3



More information about the busybox-cvs mailing list