diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | progressmeter.c | 7 |
3 files changed, 12 insertions, 4 deletions
@@ -81,6 +81,7 @@ | |||
81 | - (djm) Add new object files to Makefile and reorder | 81 | - (djm) Add new object files to Makefile and reorder |
82 | - (djm) Bug #501: gai_strerror should return char*; | 82 | - (djm) Bug #501: gai_strerror should return char*; |
83 | fix from dtucker@zip.com.au | 83 | fix from dtucker@zip.com.au |
84 | - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter | ||
84 | 85 | ||
85 | 20030211 | 86 | 20030211 |
86 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com | 87 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com |
@@ -1181,4 +1182,4 @@ | |||
1181 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1182 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1182 | ok provos@ | 1183 | ok provos@ |
1183 | 1184 | ||
1184 | $Id: ChangeLog,v 1.2617 2003/02/24 01:35:08 djm Exp $ | 1185 | $Id: ChangeLog,v 1.2618 2003/02/24 01:47:15 djm Exp $ |
diff --git a/configure.ac b/configure.ac index 03c5358fe..6965c05f2 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.106 2003/02/10 23:04:03 djm Exp $ | 1 | # $Id: configure.ac,v 1.107 2003/02/24 01:47:16 djm Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -383,7 +383,7 @@ AC_ARG_WITH(libs, | |||
383 | 383 | ||
384 | # Checks for header files. | 384 | # Checks for header files. |
385 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ | 385 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ |
386 | getopt.h glob.h ia.h lastlog.h limits.h login.h \ | 386 | getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \ |
387 | login_cap.h maillock.h netdb.h netgroup.h \ | 387 | login_cap.h maillock.h netdb.h netgroup.h \ |
388 | netinet/in_systm.h paths.h pty.h readpassphrase.h \ | 388 | netinet/in_systm.h paths.h pty.h readpassphrase.h \ |
389 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 389 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
@@ -610,7 +610,7 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | |||
610 | realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ | 610 | realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ |
611 | setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ | 611 | setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ |
612 | setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ | 612 | setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ |
613 | socketpair strerror strlcat strlcpy strmode strnvis sysconf \ | 613 | socketpair strerror strlcat strlcpy strmode strnvis sysconf tcgetpgrp \ |
614 | truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) | 614 | truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) |
615 | 615 | ||
616 | AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) | 616 | AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) |
diff --git a/progressmeter.c b/progressmeter.c index 948d361d2..9956201f3 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -62,7 +62,9 @@ | |||
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.2 2003/01/12 16:57:02 markus Exp $"); |
64 | 64 | ||
65 | #ifdef HAVE_LIBGEN_H | ||
65 | #include <libgen.h> | 66 | #include <libgen.h> |
67 | #endif | ||
66 | 68 | ||
67 | #include "atomicio.h" | 69 | #include "atomicio.h" |
68 | #include "progressmeter.h" | 70 | #include "progressmeter.h" |
@@ -147,8 +149,13 @@ foregroundproc(void) | |||
147 | if (pgrp == -1) | 149 | if (pgrp == -1) |
148 | pgrp = getpgrp(); | 150 | pgrp = getpgrp(); |
149 | 151 | ||
152 | #ifdef HAVE_TCGETPGRP | ||
153 | return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 && | ||
154 | ctty_pgrp == pgrp); | ||
155 | #else | ||
150 | return ((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 && | 156 | return ((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 && |
151 | ctty_pgrp == pgrp)); | 157 | ctty_pgrp == pgrp)); |
158 | #endif | ||
152 | } | 159 | } |
153 | 160 | ||
154 | static void | 161 | static void |