From b2d4a671a5432220ba3fc9a09a31df66695ad926 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 6 Apr 2012 10:12:32 +0200 Subject: [PATCH] sfdisk: make -l less verbose about missing PT Signed-off-by: Karel Zak --- fdisk/sfdisk.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c index a090772a86..87929d3bd3 100644 --- a/fdisk/sfdisk.c +++ b/fdisk/sfdisk.c @@ -200,8 +200,6 @@ msdos_signature(struct sector *s) { unsigned char *data = (unsigned char *)s->data; if (data[510] == 0x55 && data[511] == 0xaa) return 1; - error(_("ERROR: sector %lu does not have an msdos signature\n"), - s->sectornumber); return 0; } @@ -1110,9 +1108,10 @@ static void out_partitions(char *dev, struct disk_desc *z) { int pno, format = 0; - if (z->partno == 0) - warnx(_("No partitions found\n")); - else { + if (z->partno == 0) { + if (!opt_list) + warnx(_("No partitions found\n")); + } else { if (get_fdisk_geometry(z) && !dump) { warnx(_("Warning: The partition table looks like it was made\n" " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n" @@ -1415,9 +1414,11 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) if (!(s = get_sector(dev, fd, here))) break; - if (!msdos_signature(s)) + if (!msdos_signature(s)) { + error(_("ERROR: sector %lu does not have an msdos signature\n"), + s->sectornumber); break; - + } cp = s->data + 0x1be; if (pno + 4 >= ARRAY_SIZE(z->partitions)) { @@ -1632,7 +1633,8 @@ get_partitions(char *dev, int fd, struct disk_desc *z) { && !osf_partition(dev, fd, 0, z) && !sun_partition(dev, fd, 0, z) && !amiga_partition(dev, fd, 0, z)) { - warnx(_(" %s: unrecognized partition table type\n"), dev); + if (!opt_list) + warnx(_(" %s: unrecognized partition table type\n"), dev); return; } } -- 2.47.3