change a couple #ifdef's so /usr/bin/progress doesn't stomp all over

the tty if it's not in the foreground.

ok'd by jhawk.

diff --git a/include/progressbar.h b/include/progressbar.h
index f0f8485d8a3cc14f085c64f4937ffe18e322be9e..994ca4f809672e63991096d0eb6dbee23fc1caa5 100644 (file)
--- a/include/progressbar.h
+++ b/include/progressbar.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: progressbar.h,v 1.1 2003/01/21 16:08:08 jhawk Exp $    */
+/*     $NetBSD: progressbar.h,v 1.2 2003/02/12 15:18:28 grant Exp $    */
 
 /*-
  * Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -135,13 +135,13 @@ GLOBAL    char   *direction;      /* direction transfer is occurring */
 GLOBAL sigjmp_buf toplevel;    /* non-local goto stuff for cmd scanner */
 #endif /* !STANDALONE_PROGRESS */
 
+int    foregroundproc(void);
 void   alarmtimer(int);
 void   progressmeter(int);
 sigfunc        xsignal(int, sigfunc);
 sigfunc        xsignal_restart(int, sigfunc, int);
 
 #ifndef STANDALONE_PROGRESS
-int    foregroundproc(void);
 void   psummary(int);
 void   ptransfer(int);
 #endif /* !STANDALONE_PROGRESS */

diff --git a/progressbar.c b/progressbar.c
index c1a3a2810e96255b59ce12f5de8035b7e470e8a8..c77bb533726443413a1805a0ccab4ee5852dab41 100644 (file)
--- a/progressbar.c
+++ b/progressbar.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progressbar.c,v 1.1 2003/01/21 16:08:08 jhawk Exp $    */
+/*     $NetBSD: progressbar.c,v 1.2 2003/02/12 15:18:28 grant Exp $    */
 
 /*-
  * Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.1 2003/01/21 16:08:08 jhawk Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.2 2003/02/12 15:18:28 grant Exp $");
 #endif /* not lint */
 
 /*
@@ -95,7 +95,7 @@ __RCSID("$NetBSD: progressbar.c,v 1.1 2003/01/21 16:08:08 jhawk Exp $");
 
 #include "progressbar.h"
 
-#if !defined(NO_PROGRESS) && !defined(STANDALONE_PROGRESS)
+#if !defined(NO_PROGRESS)
 /*
  * return non-zero if we're the current foreground process
  */
@@ -109,7 +109,7 @@ foregroundproc(void)
 
        return (tcgetpgrp(fileno(ttyout)) == pgrp);
 }
-#endif /* !defined(NO_PROGRESS) && !defined(STANDALONE_PROGRESS) */
+#endif /* !defined(NO_PROGRESS) */
 
 
 #ifndef        NO_PROGRESS
@@ -230,14 +230,11 @@ progressmeter(int flag)
                return;
        len = 0;
 
-#ifndef STANDALONE_PROGRESS
        /*
         * print progress bar only if we are foreground process.
         */
        if (! foregroundproc())
                return;
-#endif /* !STANDALONE_PROGRESS */
-
 
        len += snprintf(buf + len, BUFLEFT, "\r");
        if (filesize > 0) {