From 702e0be44ed44a7625ceae96827878b41859e3f6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 24 Jul 2008 20:08:31 +0100 Subject: [PATCH] [ui] Add progress dots while waiting on any foreground job Print one dot per second while waiting in monojob.c (e.g. for DHCP, for file downloads, etc.), to inform user that the system has not locked up. Patch contributed by Andrew Schran , minor modification by me. --- src/core/monojob.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/core/monojob.c b/src/core/monojob.c index ea9bc834..2c91e132 100644 --- a/src/core/monojob.c +++ b/src/core/monojob.c @@ -24,6 +24,7 @@ #include #include #include +#include /** @file * @@ -62,9 +63,11 @@ struct job_interface monojob = { int monojob_wait ( const char *string ) { int key; int rc; + tick_t last_progress_dot; - printf ( "%s... ", string ); + printf ( "%s.", string ); monojob_rc = -EINPROGRESS; + last_progress_dot = currticks(); while ( monojob_rc == -EINPROGRESS ) { step(); if ( iskey() ) { @@ -78,14 +81,18 @@ int monojob_wait ( const char *string ) { break; } } + if ( ( currticks() - last_progress_dot ) > TICKS_PER_SEC ) { + printf ( "." ); + last_progress_dot = currticks(); + } } rc = monojob_rc; done: if ( rc ) { - printf ( "%s\n", strerror ( rc ) ); + printf ( " %s\n", strerror ( rc ) ); } else { - printf ( "ok\n" ); + printf ( " ok\n" ); } return rc; }