diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | progressmeter.c | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20030320 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2003/03/17 10:38:38 | ||
4 | [progressmeter.c] | ||
5 | don't print \n if backgrounded; from ho@ | ||
6 | |||
1 | 20030318 | 7 | 20030318 |
2 | - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] | 8 | - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] |
3 | add nanosleep(). testing/corrections by Darren Tucker <dtucker@zip.com.au> | 9 | add nanosleep(). testing/corrections by Darren Tucker <dtucker@zip.com.au> |
@@ -1222,4 +1228,4 @@ | |||
1222 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1228 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1223 | ok provos@ | 1229 | ok provos@ |
1224 | 1230 | ||
1225 | $Id: ChangeLog,v 1.2631 2003/03/18 18:21:40 tim Exp $ | 1231 | $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 @@ | |||
60 | */ | 60 | */ |
61 | 61 | ||
62 | #include "includes.h" | 62 | #include "includes.h" |
63 | RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $"); | 63 | RCSID("$OpenBSD: progressmeter.c,v 1.3 2003/03/17 10:38:38 markus Exp $"); |
64 | 64 | ||
65 | #ifdef HAVE_LIBGEN_H | 65 | #ifdef HAVE_LIBGEN_H |
66 | #include <libgen.h> | 66 | #include <libgen.h> |
@@ -126,7 +126,8 @@ stop_progress_meter() | |||
126 | { | 126 | { |
127 | alarm(0); | 127 | alarm(0); |
128 | draw_progress_meter(); | 128 | draw_progress_meter(); |
129 | atomicio(write, fileno(stdout), "\n", 1); | 129 | if (foregroundproc() != 0) |
130 | atomicio(write, fileno(stdout), "\n", 1); | ||
130 | } | 131 | } |
131 | 132 | ||
132 | static void | 133 | static void |