- (djm) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2003/03/17 10:38:38
     [progressmeter.c]
     don't print \n if backgrounded; from ho@

diff --git a/ChangeLog b/ChangeLog
index b49e6022255f45522bb0a0af05c6013f3bdae23a..72b47bddeb4ecec2c7c66ea6737d770e8762eb82 100644 (file)
--- 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>

diff --git a/progressmeter.c b/progressmeter.c
index 9956201f353d2107ed93d1fea2fb0e5ad4094f5a..90eb97f375f38bddb50e54da5abdf0c23fcc1c74 100644 (file)
--- 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