summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-03-20 10:08:05 +1100
committerDamien Miller <djm@mindrot.org>2003-03-20 10:08:05 +1100
commit05f5578e1fe80be7c9ab6880eae7b7941c8eed98 (patch)
tree9e67b84a19f4d038d8601a6e66903f2ae194ba72
parent4e4dc561ae948a410fb82fd8b0960ec2cf8e2e70 (diff)
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/03/17 10:38:38 [progressmeter.c] don't print \n if backgrounded; from ho@
-rw-r--r--ChangeLog8
-rw-r--r--progressmeter.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b53c8159..18f289c3 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 <dtucker@zip.com.au>
@@ -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 9956201f..90eb97f3 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 <libgen.h>
@@ -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