libblkid: add MINIX partitions support
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
60ad0bbba5
commit
b507ce0382
|
@ -16,4 +16,5 @@ libblkid_partitions_la_SOURCES = partitions.c \
|
|||
sgi.c \
|
||||
mac.c \
|
||||
dos.c \
|
||||
dos.h
|
||||
dos.h \
|
||||
minix.c
|
||||
|
|
|
@ -26,6 +26,7 @@ static const struct dos_subtypes {
|
|||
{ BLKID_OPENBSD_PARTITION, &bsd_pt_idinfo },
|
||||
{ BLKID_UNIXWARE_PARTITION, &unixware_pt_idinfo },
|
||||
{ BLKID_SOLARIS_X86_PARTITION, &solaris_x86_pt_idinfo },
|
||||
{ BLKID_MINIX_PARTITION, &minix_pt_idinfo }
|
||||
};
|
||||
|
||||
static inline int is_extended(struct dos_partition *p)
|
||||
|
|
|
@ -0,0 +1,99 @@
|
|||
/*
|
||||
* Minix partition parsing code
|
||||
*
|
||||
* Copyright (C) 2009 Karel Zak <kzak@redhat.com>
|
||||
*
|
||||
* This file may be redistributed under the terms of the
|
||||
* GNU Lesser General Public License.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "partitions.h"
|
||||
#include "dos.h"
|
||||
|
||||
/*
|
||||
* Minix subpartitions are always within primary dos partition.
|
||||
*/
|
||||
#define MINIX_MAXPARTITIONS 4
|
||||
|
||||
static int probe_minix_pt(blkid_probe pr, const struct blkid_idmag *mag)
|
||||
{
|
||||
struct dos_partition *p;
|
||||
blkid_parttable tab = NULL;
|
||||
blkid_partition parent;
|
||||
blkid_partlist ls;
|
||||
unsigned char *data;
|
||||
int i;
|
||||
|
||||
data = blkid_probe_get_sector(pr, 0);
|
||||
if (!data)
|
||||
goto nothing;
|
||||
|
||||
ls = blkid_probe_get_partlist(pr);
|
||||
if (!ls)
|
||||
goto err;
|
||||
|
||||
/* Parent is required, because Minix uses the same PT as DOS and
|
||||
* difference is only in primary partition (parent) type.
|
||||
*/
|
||||
parent = blkid_partlist_get_parent(ls);
|
||||
if (!parent)
|
||||
goto nothing;
|
||||
|
||||
if (blkid_partition_get_type(parent) != BLKID_MINIX_PARTITION)
|
||||
goto nothing;
|
||||
|
||||
if (blkid_partitions_need_typeonly(pr))
|
||||
/* caller does not ask for details about partitions */
|
||||
return 0;
|
||||
|
||||
p = (struct dos_partition *) (data + BLKID_MSDOS_PT_OFFSET);
|
||||
|
||||
tab = blkid_partlist_new_parttable(ls, "minix", BLKID_MSDOS_PT_OFFSET);
|
||||
if (!tab)
|
||||
goto err;
|
||||
|
||||
for (i = 0; i < MINIX_MAXPARTITIONS; i++, p++) {
|
||||
uint32_t start, size;
|
||||
|
||||
if (p->sys_type != BLKID_MINIX_PARTITION)
|
||||
continue;
|
||||
|
||||
start = dos_partition_start(p);
|
||||
size = dos_partition_size(p);
|
||||
|
||||
if (parent && !blkid_is_nested_dimension(parent, start, size)) {
|
||||
DBG(DEBUG_LOWPROBE, printf(
|
||||
"WARNING: minix partition (%d) overflow "
|
||||
"detected, ignore\n", i));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!blkid_partlist_add_partition(ls, tab,
|
||||
p->sys_type, start, size))
|
||||
goto err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
nothing:
|
||||
return 1;
|
||||
err:
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* same as DOS */
|
||||
const struct blkid_idinfo minix_pt_idinfo =
|
||||
{
|
||||
.name = "minix",
|
||||
.probefunc = probe_minix_pt,
|
||||
.magics =
|
||||
{
|
||||
{ .magic = "\x55\xAA", .len = 2, .sboff = 510 },
|
||||
{ NULL }
|
||||
}
|
||||
};
|
||||
|
|
@ -109,7 +109,8 @@ static const struct blkid_idinfo *idinfos[] =
|
|||
&mac_pt_idinfo,
|
||||
&bsd_pt_idinfo,
|
||||
&unixware_pt_idinfo,
|
||||
&solaris_x86_pt_idinfo
|
||||
&solaris_x86_pt_idinfo,
|
||||
&minix_pt_idinfo
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -43,5 +43,6 @@ extern const struct blkid_idinfo sun_pt_idinfo;
|
|||
extern const struct blkid_idinfo sgi_pt_idinfo;
|
||||
extern const struct blkid_idinfo mac_pt_idinfo;
|
||||
extern const struct blkid_idinfo dos_pt_idinfo;
|
||||
extern const struct blkid_idinfo minix_pt_idinfo;
|
||||
|
||||
#endif /* BLKID_PARTITIONS_H */
|
||||
|
|
Loading…
Reference in New Issue