summaryrefslogtreecommitdiffstats
path: root/libblkid/src/partitions/atari.c
diff options
context:
space:
mode:
Diffstat (limited to 'libblkid/src/partitions/atari.c')
-rw-r--r--libblkid/src/partitions/atari.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libblkid/src/partitions/atari.c b/libblkid/src/partitions/atari.c
index 1ec17d486..432df2025 100644
--- a/libblkid/src/partitions/atari.c
+++ b/libblkid/src/partitions/atari.c
@@ -107,6 +107,13 @@ static int parse_partition(blkid_partlist ls, blkid_parttable tab,
start = be32_to_cpu(part->start) + offset;
size = be32_to_cpu(part->size);
+ if (blkid_partlist_get_partition_by_start(ls, start)) {
+ /* Don't increment partno for extended parts */
+ if (!offset)
+ blkid_partlist_increment_partno(ls);
+ return 0;
+ }
+
par = blkid_partlist_add_partition(ls, tab, start, size);
if (!par)
return -ENOMEM;
@@ -151,7 +158,7 @@ static int parse_extended(blkid_probe pr, blkid_partlist ls,
return 0;
rc = parse_partition(ls, tab, &xrs->part[i], xstart);
- if (rc < 0)
+ if (rc <= 0)
return rc;
if (!IS_ACTIVE(xrs->part[i+1]))