From 05f5578e1fe80be7c9ab6880eae7b7941c8eed98 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 20 Mar 2003 10:08:05 +1100 Subject: [PATCH] - (djm) OpenBSD CVS Sync - markus@cvs.openbsd.org 2003/03/17 10:38:38 [progressmeter.c] don't print \n if backgrounded; from ho@ --- ChangeLog | 8 +++++++- progressmeter.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b53c81590..18f289c31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20030320 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2003/03/17 10:38:38 + [progressmeter.c] + don't print \n if backgrounded; from ho@ + 20030318 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] add nanosleep(). testing/corrections by Darren Tucker @@ -1222,4 +1228,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2631 2003/03/18 18:21:40 tim Exp $ +$Id: ChangeLog,v 1.2632 2003/03/19 23:08:05 djm Exp $ diff --git a/progressmeter.c b/progressmeter.c index 9956201f3..90eb97f37 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -60,7 +60,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $"); +RCSID("$OpenBSD: progressmeter.c,v 1.3 2003/03/17 10:38:38 markus Exp $"); #ifdef HAVE_LIBGEN_H #include @@ -126,7 +126,8 @@ stop_progress_meter() { alarm(0); draw_progress_meter(); - atomicio(write, fileno(stdout), "\n", 1); + if (foregroundproc() != 0) + atomicio(write, fileno(stdout), "\n", 1); } static void