summaryrefslogtreecommitdiffstats
path: root/init/initramfs.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
commit889c92d21db40be0b7d22a59395060237895bb85 (patch)
treedb76e1e002e450cccc1b7a8119ad629eccc24da8 /init/initramfs.c
parent6c11b12ac6f101732d43b5682f5b3ae4dda4205f (diff)
downloadlinux-889c92d21db40be0b7d22a59395060237895bb85.tar.gz
linux-889c92d21db40be0b7d22a59395060237895bb85.tar.bz2
linux-889c92d21db40be0b7d22a59395060237895bb85.zip
bzip2/lzma: centralize format detection
Centralize the compression format detection to a common routine in the lib directory, and use it for both initramfs and initrd. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'init/initramfs.c')
-rw-r--r--init/initramfs.c39
1 files changed, 7 insertions, 32 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index a3ba91cdab89..2f42984e5582 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -416,13 +416,13 @@ static int __init flush_buffer(void *bufv, unsigned len)
static unsigned my_inptr; /* index of next byte to be processed in inbuf */
-#include <linux/decompress/bunzip2.h>
-#include <linux/decompress/unlzma.h>
-#include <linux/decompress/inflate.h>
+#include <linux/decompress/generic.h>
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
int written;
+ decompress_fn decompress;
+
dry_run = check_only;
header_buf = kmalloc(110, GFP_KERNEL);
symlink_buf = kmalloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1, GFP_KERNEL);
@@ -450,35 +450,10 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
continue;
}
this_header = 0;
-#ifdef CONFIG_RD_GZIP
- if (!gunzip(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL)
- goto ok;
-#endif
-
-#ifdef CONFIG_RD_BZIP2
- message = NULL; /* Zero out message, or else cpio will
- think an error has already occured */
- if (!bunzip2(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL) {
- goto ok;
- }
-#endif
-
-#ifdef CONFIG_RD_LZMA
- message = NULL; /* Zero out message, or else cpio will
- think an error has already occured */
- if (!unlzma(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL) {
- goto ok;
- }
-#endif
-#if defined CONFIG_RD_GZIP || defined CONFIG_RD_BZIP2 || defined CONFIG_RD_LZMA
-ok:
-#endif
+ decompress = decompress_method(buf, len, NULL);
+ if (decompress)
+ decompress(buf, len, NULL, flush_buffer, NULL,
+ &my_inptr, error);
if (state != Reset)
error("junk in compressed archive");
this_header = saved_offset + my_inptr;