diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/monojob.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/monojob.c b/src/core/monojob.c index 7431f88a3..7917b4272 100644 --- a/src/core/monojob.c +++ b/src/core/monojob.c @@ -53,7 +53,7 @@ struct interface monojob = INTF_INIT ( monojob_intf_desc ); /** * Wait for single foreground job to complete * - * @v string Job description to display + * @v string Job description to display, or NULL to be silent * @ret rc Job final status code */ int monojob_wait ( const char *string ) { @@ -67,7 +67,8 @@ int monojob_wait ( const char *string ) { unsigned int percentage; int shown_percentage = 0; - printf ( "%s...", string ); + if ( string ) + printf ( "%s...", string ); monojob_rc = -EINPROGRESS; last_progress = currticks(); while ( monojob_rc == -EINPROGRESS ) { @@ -83,7 +84,7 @@ int monojob_wait ( const char *string ) { } } elapsed = ( currticks() - last_progress ); - if ( elapsed >= TICKS_PER_SEC ) { + if ( string && ( elapsed >= TICKS_PER_SEC ) ) { if ( shown_percentage ) printf ( "\b\b\b\b \b\b\b\b" ); job_progress ( &monojob, &progress ); @@ -106,10 +107,13 @@ int monojob_wait ( const char *string ) { if ( shown_percentage ) printf ( "\b\b\b\b \b\b\b\b" ); - if ( rc ) { - printf ( " %s\n", strerror ( rc ) ); - } else { - printf ( " ok\n" ); + if ( string ) { + if ( rc ) { + printf ( " %s\n", strerror ( rc ) ); + } else { + printf ( " ok\n" ); + } } + return rc; } |