From: Davidlohr Bueso <dave@xxxxxxx>
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@xxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
