From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 3 Apr 2004 12:36:03 +0000 (-0000)
Subject: Everything should be made as simple as possible.  But no simpler.
X-Git-Tag: 1_00_pre9~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=522a2f3b395eec6576c24dbc0b4aa53aacff82f6;p=oweals%2Fbusybox.git

Everything should be made as simple as possible.  But no simpler.
---

diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 930525848..bd4527581 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -107,12 +107,18 @@ int fdformat_main(int argc,char **argv)
 	bb_xioctl(fd, FDFMTBEG,NULL,"FDFMTBEG");
 
 	/* n == track */
-	for (n = 0; n < param.track; n++) {
-		descr.track = n;
-		for(descr.head=0, print_and_flush("%3d\b\b\b", n) ; descr.head < param.head; descr.head++){
-			bb_xioctl(fd,FDFMTTRK, &descr,"FDFMTTRK");
-		}
+	for (n = 0; n < param.track; n++)
+	{
+	    descr.head = 0;
+	    descr.track = n;
+	    bb_xioctl(fd, FDFMTTRK,&descr,"FDFMTTRK");
+	    print_and_flush("%3d\b\b\b", n);
+	    if (param.head == 2) {
+		descr.head = 1;
+		bb_xioctl(fd, FDFMTTRK,&descr,"FDFMTTRK");
+	    }
 	}
+
 	bb_xioctl(fd,FDFMTEND,NULL,"FDFMTEND");
 	print_and_flush("done\n", NULL);