Attachment 233 Details for Bug 499 – Solves the progressmeter.c build problems

[patch] Solves the progressmeter.c build problems

progressmeter.diff (text/plain), 3.73 KB, created by Corinna Vinschen on 2003-02-19 19:13:08 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Corinna Vinschen

Created: 2003-02-19 19:13:08 AEDT

Size: 3.73 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.106
>diff -u -p -r1.106 configure.ac
>--- configure.ac	10 Feb 2003 23:04:03 -0000	1.106
>+++ configure.ac	19 Feb 2003 07:45:46 -0000
>@@ -383,7 +383,7 @@ AC_ARG_WITH(libs,
> 
> # Checks for header files.
> 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 \
> 	netinet/in_systm.h paths.h pty.h readpassphrase.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
> 	realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
> 	setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
> 	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)
> 
> AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
>Index: progressmeter.c
>===================================================================
>RCS file: /cvs/openssh_cvs/progressmeter.c,v
>retrieving revision 1.3
>diff -u -p -r1.3 progressmeter.c
>--- progressmeter.c	20 Jan 2003 04:15:13 -0000	1.3
>+++ progressmeter.c	19 Feb 2003 07:45:48 -0000
>@@ -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
>Index: openbsd-compat/bsd-cygwin_util.c
>===================================================================
>RCS file: /cvs/openssh_cvs/openbsd-compat/bsd-cygwin_util.c,v
>retrieving revision 1.9
>diff -u -p -r1.9 bsd-cygwin_util.c
>--- openbsd-compat/bsd-cygwin_util.c	9 Nov 2002 15:59:29 -0000	1.9
>+++ openbsd-compat/bsd-cygwin_util.c	19 Feb 2003 07:45:49 -0000
>@@ -37,6 +37,7 @@ RCSID("$Id: bsd-cygwin_util.c,v 1.9 2002
> 
> #include <fcntl.h>
> #include <stdlib.h>
>+#include <sys/cygwin.h>
> #include <sys/utsname.h>
> #include <sys/vfs.h>
> #include <windows.h>
>@@ -91,7 +92,6 @@ static int has_capability(int what)
> 
> 	if (!inited) {
> 		struct utsname uts;
>-		char *c;
> 		
> 		if (!uname(&uts)) {
> 			int major_high = 0;
>@@ -225,6 +225,16 @@ void register_9x_service(void)
> 			  GetProcAddress(kerneldll, "RegisterServiceProcess")))
> 		return;
> 	RegisterServiceProcess(0, 1);
>+}
>+
>+char *basename(char *path)
>+{
>+  char posix_path[PATH_MAX];
>+  char *last_slash;
>+
>+  cygwin_conv_to_posix_path (path, posix_path);
>+  last_slash = strrchr (posix_path, '/');
>+  return last_slash ? last_slash + 1 : posix_path;
> }
> 
> #endif /* HAVE_CYGWIN */
>Index: openbsd-compat/bsd-cygwin_util.h
>===================================================================
>RCS file: /cvs/openssh_cvs/openbsd-compat/bsd-cygwin_util.h,v
>retrieving revision 1.7
>diff -u -p -r1.7 bsd-cygwin_util.h
>--- openbsd-compat/bsd-cygwin_util.h	15 Apr 2002 22:00:52 -0000	1.7
>+++ openbsd-compat/bsd-cygwin_util.h	19 Feb 2003 07:45:49 -0000
>@@ -43,6 +43,7 @@ int binary_pipe(int fd[2]);
> int check_nt_auth(int pwd_authenticated, struct passwd *pw);
> int check_ntsec(const char *filename);
> void register_9x_service(void);
>+char *basename(char *path);
> 
> #define open binary_open
> #define pipe binary_pipe

Actions: View | Diff

Attachments on bug 499: 233