summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Dronnikov <dronnikov@gmail.com>2009-11-07 03:14:50 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-11-07 03:14:50 (GMT)
commit6eaac025a1f76c2d271657295b8b00d534e6f8a3 (patch)
treec6a3a624eae1ab80e7b86eda84ae49ad5ccf7bac
parent9be4f31da0c5133bf012c1d404cdaf6823c72938 (diff)
downloadbusybox-6eaac025a1f76c2d271657295b8b00d534e6f8a3.tar.gz
busybox-6eaac025a1f76c2d271657295b8b00d534e6f8a3.tar.bz2
fbsplash: allow compressed image files
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/fbsplash.c9
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