On Wed, Sep 12, 2012 at 03:42:47PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> ---
> common/filetype.c | 3 +++
> include/filetype.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/common/filetype.c b/common/filetype.c
> index 5710394..0eaf119 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -71,6 +71,7 @@ static int is_fat(u8 *buf)
> enum filetype file_detect_type(void *_buf)
> {
> u32 *buf = _buf;
> + u64 *buf64 = _buf;
> u8 *buf8 = _buf;
>
> if (strncmp(buf8, "#!/bin/sh", 9) == 0)
> @@ -103,6 +104,8 @@ enum filetype file_detect_type(void *_buf)
> return filetype_fat;
> if (strncmp(buf8, "BM", 2) == 0)
> return filetype_bmp;
> + if (buf64[0] == le64_to_cpu(0x0a1a0a0d474e5089ull))
> + return filetype_png;
The corresponding string in filetype_str is missing
>
> return filetype_unknown;
> }
> diff --git a/include/filetype.h b/include/filetype.h
> index 6c97159..2924032 100644
> --- a/include/filetype.h
> +++ b/include/filetype.h
> @@ -20,6 +20,7 @@ enum filetype {
> filetype_mips_barebox,
> filetype_fat,
> filetype_bmp,
> + filetype_png,
> };
>
> const char *file_type_to_string(enum filetype f);
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
