From 1f56f817112df3e3644c4039c806e770620ca692 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 28 Nov 2011 21:50:54 +0100 Subject: add generic uncompress command Using the new uncompress function we can now implement a command which can uncompress all known compression types. This supplements the unlzo command. Signed-off-by: Sascha Hauer --- commands/Kconfig | 10 ++++---- commands/Makefile | 2 +- commands/uncompress.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ commands/unlzo.c | 69 -------------------------------------------------- 4 files changed, 76 insertions(+), 75 deletions(-) create mode 100644 commands/uncompress.c delete mode 100644 commands/unlzo.c (limited to 'commands') diff --git a/commands/Kconfig b/commands/Kconfig index 6b21a2ea7d..c2492fa6c9 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -422,13 +422,13 @@ config CMD_GPIO include gpio_set_value, gpio_get_value, gpio_direction_input and gpio_direction_output commands to control gpios. -config CMD_UNLZO +config CMD_UNCOMPRESS bool - select LZO_DECOMPRESS - prompt "unlzo" + prompt "uncompress" help - Say yes here to get the unlzo command. lzo is a fast compression - algorithm by Markus Franz Xaver Johannes Oberhumer. + Say yes here to get the uncompress command. uncompress handles + lzo, gzip and bzip2 compressed files depending on the compiled + in compression libraries config CMD_I2C bool diff --git a/commands/Makefile b/commands/Makefile index 45f9ccfd56..f82dcfa8dd 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -48,7 +48,7 @@ obj-$(CONFIG_CMD_INSMOD) += insmod.o obj-$(CONFIG_CMD_BMP) += bmp.o obj-$(CONFIG_USB_GADGET_DFU) += dfu.o obj-$(CONFIG_CMD_GPIO) += gpio.o -obj-$(CONFIG_CMD_UNLZO) += unlzo.o +obj-$(CONFIG_CMD_UNCOMPRESS) += uncompress.o obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_UBI) += ubi.o obj-$(CONFIG_CMD_MENU) += menu.o diff --git a/commands/uncompress.c b/commands/uncompress.c new file mode 100644 index 0000000000..fff62275bb --- /dev/null +++ b/commands/uncompress.c @@ -0,0 +1,70 @@ +/* + * uncompress.c - uncompress a lzo compressed file + * + * Copyright (c) 2010 Sascha Hauer , Pengutronix + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include + +static int do_uncompress(struct command *cmdtp, int argc, char *argv[]) +{ + int from, to, ret; + + if (argc != 3) + return COMMAND_ERROR_USAGE; + + from = open(argv[1], O_RDONLY); + if (from < 0) { + perror("open"); + return 1; + } + + to = open(argv[2], O_WRONLY | O_CREAT); + if (to < 0) { + perror("open"); + ret = 1; + goto exit_close; + } + + ret = uncompress_fd_to_fd(from, to, uncompress_err_stdout); + + if (ret) + printf("failed to decompress\n"); + + close(to); +exit_close: + close(from); + return ret; +} + +static const __maybe_unused char cmd_uncompress_help[] = +"Usage: uncompress \n" +"Uncompress a compressed file\n"; + +BAREBOX_CMD_START(uncompress) + .cmd = do_uncompress, + .usage = "lzop ", + BAREBOX_CMD_HELP(cmd_uncompress_help) +BAREBOX_CMD_END + diff --git a/commands/unlzo.c b/commands/unlzo.c deleted file mode 100644 index 0b6dd4b961..0000000000 --- a/commands/unlzo.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * unlzo.c - uncompress a lzo compressed file - * - * Copyright (c) 2010 Sascha Hauer , Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include -#include - -static int do_unlzo(struct command *cmdtp, int argc, char *argv[]) -{ - int from, to, ret, retlen; - - if (argc != 3) - return COMMAND_ERROR_USAGE; - - from = open(argv[1], O_RDONLY); - if (from < 0) { - perror("open"); - return 1; - } - - to = open(argv[2], O_WRONLY | O_CREAT); - if (to < 0) { - perror("open"); - ret = 1; - goto exit_close; - } - - ret = unlzo(from, to, &retlen); - if (ret) - printf("failed to decompress\n"); - - close(to); -exit_close: - close(from); - return ret; -} - -static const __maybe_unused char cmd_unlzo_help[] = -"Usage: unlzo \n" -"Uncompress a lzo compressed file\n"; - -BAREBOX_CMD_START(unlzo) - .cmd = do_unlzo, - .usage = "lzop ", - BAREBOX_CMD_HELP(cmd_unlzo_help) -BAREBOX_CMD_END - -- cgit v1.2.3