- (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter

[openssh.git] / progressmeter.c

diff --git a/progressmeter.c b/progressmeter.c
index 948d361d2c1f50fd67935256dd2f25035311a61b..9956201f353d2107ed93d1fea2fb0e5ad4094f5a 100644 (file)
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -62,7 +62,9 @@
 #include "includes.h"
 RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $");
 
+#ifdef HAVE_LIBGEN_H
 #include <libgen.h>
+#endif
 
 #include "atomicio.h"
 #include "progressmeter.h"
@@ -147,8 +149,13 @@ foregroundproc(void)
        if (pgrp == -1)
                pgrp = getpgrp();
 
+#ifdef HAVE_TCGETPGRP
+        return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 &&
+                       ctty_pgrp == pgrp);
+#else
        return ((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 &&
                 ctty_pgrp == pgrp));
+#endif
 }
 
 static void