Re: [PATCH 10/16] add file detection support

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1.1: Type: text/plain, Size: 5525 bytes --]

On 11/28/2011 11:10 PM, Sascha Hauer wrote:
> Several filetypes can be autodetected. Barebox could make use
> of this in several ways:
> 
> - Add a command to detect filetypes
> - detect arm zImages and uImages to unify the different boot commands
> - maybe detect UBI or JFFS2 images to construct parts of the kernel
>   command line
> - select correct uncompression function based on filetype
> 
> This patch adds basic support to detect filetypes.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  common/Makefile    |    1 +
>  common/filetype.c  |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  include/filetype.h |   23 +++++++++++
>  3 files changed, 128 insertions(+), 0 deletions(-)
>  create mode 100644 common/filetype.c
>  create mode 100644 include/filetype.h
> 
> diff --git a/common/Makefile b/common/Makefile
> index 3edf38f..55d9dbc 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_CMD_BOOTM) += image.o
>  obj-y += startup.o
>  obj-y += misc.o
>  obj-y += memsize.o
> +obj-y += filetype.o
>  obj-$(CONFIG_MENU) += menu.o
>  obj-$(CONFIG_PASSWORD) += password.o
>  obj-$(CONFIG_MODULES) += module.o
> diff --git a/common/filetype.c b/common/filetype.c
> new file mode 100644
> index 0000000..5d246b4
> --- /dev/null
> +++ b/common/filetype.c
> @@ -0,0 +1,104 @@
> +/*
> + * filetype.c - detect filetypes
> + *
> + * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, 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.
> + */
> +#include <common.h>
> +#include <filetype.h>
> +#include <asm/byteorder.h>
> +#include <fcntl.h>
> +#include <fs.h>
> +#include <malloc.h>
> +
> +const char *file_type_to_string(enum filetype f)
> +{

you can use an const array char pointers here:

static const char *filetype_str[] = {
        [filetype_unknown] = "unknown",
...
}


> +	switch (f) {
> +	case filetype_unknown:
> +		return "unkown";
> +	case filetype_arm_zimage:
> +		return "arm Linux zImage";
> +	case filetype_lzo_compressed:
> +		return "lzo compressed";
> +	case filetype_arm_barebox:
> +		return "arm barebox image";
> +	case filetype_uimage:
> +		return "U-Boot uImage";
> +	case filetype_ubi:
> +		return "UBI image";
> +	case filetype_jffs2:
> +		return "JFFS2 image";
> +	case filetype_gzip:
> +		return "gzip compressed";
> +	case filetype_bzip2:
> +		return "bzip2 compressed";
> +	}
> +	return NULL;
> +}
> +
> +enum filetype file_detect_type(void *_buf)
> +{
> +	u32 *buf = _buf;
> +	u8 *buf8 = _buf;
> +
> +	if (buf[8] == 0x65726162 && buf[9] == 0x00786f62)
> +		return filetype_arm_barebox;
> +	if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01)
> +		return filetype_arm_zimage;
> +	if (buf8[0] == 0x89 && buf8[1] == 0x4c && buf8[2] == 0x5a &&
> +			buf8[3] == 0x4f)
> +		return filetype_lzo_compressed;
> +	if (buf[0] == be32_to_cpu(0x27051956))
> +		return filetype_uimage;
> +	if (buf[0] == 0x23494255)
> +		return filetype_ubi;
> +	if (buf[0] == 0x20031985)
> +		return filetype_jffs2;
> +	if (buf8[0] == 0x1f && buf8[1] == 0x8b && buf8[2] == 0x08)
> +		return filetype_gzip;
> +	if (buf8[0] == 'B' && buf8[1] == 'Z' && buf8[2] == 'h' &&
> +			buf8[3] > '0' && buf8[3] <= '9')
> +                return filetype_bzip2;
> +
> +	return filetype_unknown;
> +}
> +
> +enum filetype file_name_detect_type(const char *filename)
> +{
> +	int fd, ret;
> +	void *buf;
> +	enum filetype type = filetype_unknown;
> +
> +	fd = open(filename, O_RDONLY);
> +	if (fd < 0)
> +		return fd;
> +
> +	buf = xmalloc(512);
> +
> +	ret = read(fd, buf, 512);
> +	if (ret != 512)
> +		goto err_out;
> +
> +	type = file_detect_type(buf);
> +
> +err_out:
> +	close(fd);
> +	free(buf);
> +
> +	return type;
> +}
> diff --git a/include/filetype.h b/include/filetype.h
> new file mode 100644
> index 0000000..64d32ef
> --- /dev/null
> +++ b/include/filetype.h
> @@ -0,0 +1,23 @@
> +#ifndef __FILE_TYPE_H
> +#define __FILE_TYPE_H
> +
> +/*
> + * List of file types we know
> + */
> +enum filetype {
> +	filetype_unknown,
> +	filetype_arm_zimage,
> +	filetype_lzo_compressed,
> +	filetype_arm_barebox,
> +	filetype_uimage,
> +	filetype_ubi,
> +	filetype_jffs2,
> +	filetype_gzip,
> +	filetype_bzip2,
> +};
> +
> +const char *file_type_to_string(enum filetype f);
> +enum filetype file_detect_type(void *_buf);
> +enum filetype file_name_detect_type(const char *filename);
> +
> +#endif /* __FILE_TYPE_H */

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox