[PATCH 1/7] fdisk: stop buffering welcome message

[PATCH 1/7] fdisk: stop buffering welcome message

[Davidlohr Bueso]

From: Davidlohr Bueso <dave@gnu.org>

Recently, commit 0a86755fe8af1da510d2eca43bdfcd70af098c19 directed the welcome message output from stderr to stdout breaking regression tests.
Correct this by flushing stdout and stop buffering the output - a trivial function is created as well.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 fdisk/fdisk.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 12706c2..084253d 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1984,6 +1984,15 @@ unknown_command(int c) {
 	printf(_("%c: unknown command\n"), c);
 }
 
+static void print_welcome(void)
+{
+	printf(_("Welcome to fdisk (%s).\n\n"
+		 "Changes will remain in memory only, until you decide to write them.\n"
+		 "Be careful before using the write command.\n\n"), PACKAGE_STRING);
+
+	fflush(stdout);
+}
+
 static void command_prompt(void)
 {
 	int c;
@@ -2211,9 +2220,7 @@ int main(int argc, char **argv)
 	else
 		usage(stderr);
 
-	printf(_("Welcome to fdisk (%s).\n\n"
-		"Changes will remain in memory only, until you decide to write them.\n"
-		"Be careful before using the write command.\n\n"), PACKAGE_STRING);
+	print_welcome();
 
 	gpt_warning(cxt->dev_path);
 	get_boot(0);
-- 
1.7.4.1

Re: [PATCH 1/7] fdisk: stop buffering welcome message

[Karel Zak]

On Sun, May 27, 2012 at 09:43:56PM +0200, Davidlohr Bueso wrote:
>  fdisk/fdisk.c |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)

 All 7 patches applied. Thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com