From: Vladimir Dronnikov <dronnikov@gmail.com>
Date: Sat, 7 Nov 2009 03:14:50 +0000 (+0100)
Subject: fbsplash: allow compressed image files
X-Git-Tag: 1_16_0~258
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6eaac025a1f76c2d271657295b8b00d534e6f8a3;p=oweals%2Fbusybox.git

fbsplash: allow compressed image files

Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 3d225e549..0afd189ca 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