tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Damien Miller 2003-02-24 12:47:15 +11:00
parent 30947c7287
commit b16f874d89
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -81,6 +81,7 @@
- (djm) Add new object files to Makefile and reorder - (djm) Add new object files to Makefile and reorder
- (djm) Bug #501: gai_strerror should return char*; - (djm) Bug #501: gai_strerror should return char*;
fix from dtucker@zip.com.au fix from dtucker@zip.com.au
- (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter
20030211 20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@ -1181,4 +1182,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2617 2003/02/24 01:35:08 djm Exp $ $Id: ChangeLog,v 1.2618 2003/02/24 01:47:15 djm Exp $

6
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.106 2003/02/10 23:04:03 djm Exp $ # $Id: configure.ac,v 1.107 2003/02/24 01:47:16 djm Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -383,7 +383,7 @@ AC_ARG_WITH(libs,
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
getopt.h glob.h ia.h lastlog.h limits.h login.h \ getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \
login_cap.h maillock.h netdb.h netgroup.h \ login_cap.h maillock.h netdb.h netgroup.h \
netinet/in_systm.h paths.h pty.h readpassphrase.h \ netinet/in_systm.h paths.h pty.h readpassphrase.h \
rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ 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 \
realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
socketpair strerror strlcat strlcpy strmode strnvis sysconf \ socketpair strerror strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))

7
progressmeter.c
View File

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