sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

common/filetype: move partition-table detection into own function 

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Hubert Feurstein 2013-04-19 10:46:04 +02:00 committed by Sascha Hauer
parent 57c64582a0
commit c06956e15f
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/filetype.c
View File

@ -151,6 +151,28 @@ enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec)
return filetype_mbr;
}
enum filetype file_detect_partition_table(const void *_buf, size_t bufsize)
{
const u8 *buf8 = _buf;
enum filetype type;
if (bufsize < 512)
return filetype_unknown;
/*
* EFI GPT need to be detected before MBR otherwise
* we will detect a MBR
*/
if (bufsize >= 520 && is_gpt_valid(buf8))
return filetype_gpt;
type = is_fat_or_mbr(buf8, NULL);
if (type != filetype_unknown)
return type;
return filetype_unknown;
}
enum filetype file_detect_type(const void *_buf, size_t bufsize)
{
const u32 *buf = _buf;
@ -204,21 +226,11 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
if (bufsize < 512)
return filetype_unknown;
/*
* EFI GPT need to be detected before MBR otherwise
* we will detect a MBR
*/
if (bufsize >= 520 && is_gpt_valid(buf8))
return filetype_gpt;
type = is_fat_or_mbr(buf8, NULL);
type = file_detect_partition_table(_buf, bufsize);
if (type != filetype_unknown)
return type;
if (bufsize < 1536)
return filetype_unknown;
if (buf16[512 + 28] == le16_to_cpu(0xef53))
if (bufsize >= 1536 && buf16[512 + 28] == le16_to_cpu(0xef53))
return filetype_ext;
return filetype_unknown;

1
include/filetype.h
View File

@ -31,6 +31,7 @@ enum filetype {
const char *file_type_to_string(enum filetype f);
const char *file_type_to_short_string(enum filetype f);
enum filetype file_detect_partition_table(const void *_buf, size_t bufsize);
enum filetype file_detect_type(const void *_buf, size_t bufsize);
enum filetype file_name_detect_type(const char *filename);
enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec);