From: Pali Rohár <pali.rohar@gmail.com>
Date: Tue, 6 Jul 2021 12:57:13 +0000 (+0200)
Subject: libfdisk: (dos) Put number of CHS check_consistency errors into summart message
X-Git-Tag: v2.38-rc1~362^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ff6dfd01e1e1a230fc75852b53629be7cae50e;p=thirdparty%2Futil-linux.git

libfdisk: (dos) Put number of CHS check_consistency errors into summart message

Function check_consistency() prints errors to console output but does not
calculate correct error numbers in summary error message. Fix it, so fdisk
prints correct number in summary message "N errors detected.".

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index a4a89f4d78..ab4213ad0e 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1558,19 +1558,20 @@ long2chs(struct fdisk_context *cxt, unsigned long ls,
 	*s = ls % cxt->geom.sectors + 1;	/* sectors count from 1 */
 }
 
-static void check_consistency(struct fdisk_context *cxt, struct dos_partition *p,
+static int check_consistency(struct fdisk_context *cxt, struct dos_partition *p,
 			      size_t partition)
 {
 	unsigned int pbc, pbh, pbs;	/* physical beginning c, h, s */
 	unsigned int pec, peh, pes;	/* physical ending c, h, s */
 	unsigned int lbc, lbh, lbs;	/* logical beginning c, h, s */
 	unsigned int lec, leh, les;	/* logical ending c, h, s */
+	int nerrors = 0;
 
 	if (!is_dos_compatible(cxt))
-		return;
+		return 0;
 
 	if (!cxt->geom.heads || !cxt->geom.sectors || (partition >= 4))
-		return;		/* do not check extended partitions */
+		return 0;		/* do not check extended partitions */
 
 	/* physical beginning c, h, s */
 	pbc = (p->bc & 0xff) | ((p->bs << 2) & 0x300);
@@ -1597,6 +1598,7 @@ static void check_consistency(struct fdisk_context *cxt, struct dos_partition *p
 			partition + 1,
 			pbc, pbh, pbs,
 			lbc, lbh, lbs);
+		nerrors++;
 	}
 
 	/* Same physical / logical ending? */
@@ -1607,6 +1609,7 @@ static void check_consistency(struct fdisk_context *cxt, struct dos_partition *p
 			partition + 1,
 			pec, peh, pes,
 			lec, leh, les);
+		nerrors++;
 	}
 
 	/* Ending on cylinder boundary? */
@@ -1614,7 +1617,10 @@ static void check_consistency(struct fdisk_context *cxt, struct dos_partition *p
 		fdisk_warnx(cxt, _("Partition %zu: does not end on "
 				   "cylinder boundary."),
 			partition + 1);
+		nerrors++;
 	}
+
+	return nerrors;
 }
 
 static void fill_bounds(struct fdisk_context *cxt,
@@ -1655,7 +1661,7 @@ static int dos_verify_disklabel(struct fdisk_context *cxt)
 
 		p = self_partition(cxt, i);
 		if (p && is_used_partition(p) && !IS_EXTENDED(p->sys_ind)) {
-			check_consistency(cxt, p, i);
+			nerrors += check_consistency(cxt, p, i);
 			assert(pe);
 			if (get_abs_partition_start(pe) < first[i]) {
 				fdisk_warnx(cxt, _(