From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 6 Jan 2005 19:48:59 +0000 (-0500)
Subject: badblocks.c (alarm_intr): Increase the number of spaces reserved
X-Git-Tag: E2FSPROGS-1_36~78
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=c76564a8784c3c44a6a0516e0fc40f10ec6221ed;p=tools%2Fe2fsprogs.git

badblocks.c (alarm_intr): Increase the number of spaces reserved
	for printing block numbers, so we can correctly display
	block numbers numbers greater than 999,999,999.
	(Addresses SourceForge bug #1016163)
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index df95b3f..ea15bc9 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-06  Theodore Ts'o  <tytso@mit.edu>
 
+	* badblocks.c (alarm_intr): Increase the number of spaces reserved
+		for printing block numbers, so we can correctly display
+		block numbers numbers greater than 999,999,999.
+		(Addresses SourceForge bug #1016163)
+
 	* tune2fs.c (main): When specifying the number of reservered
 		blocks that can only be allocated by root, enforce a 50%
 		limit so that the user can't accidentally make a
diff --git a/misc/badblocks.c b/misc/badblocks.c
index 2cd800c..1c8f732 100644
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -141,8 +141,8 @@ static int bb_output (unsigned long bad)
 
 static void print_status(void)
 {
-	fprintf(stderr, "%9ld/%9ld", currently_testing, num_blocks);
-	fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");
+	fprintf(stderr, "%15ld/%15ld", currently_testing, num_blocks);
+	fputs("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", stderr);
 	fflush (stderr);
 }
 
@@ -152,9 +152,7 @@ static void alarm_intr(int alnum EXT2FS_ATTR((unused)))
 	alarm(1);
 	if (!num_blocks)
 		return;
-	fprintf(stderr, "%9ld/%9ld", currently_testing, num_blocks);
-	fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");
-	fflush (stderr);
+	print_status();
 }
 
 static void *terminate_addr = NULL;