Attachment 1534 Details for Bug 1386 – #ifdef out the readv poll() calls on Tru64

[patch] #ifdef out the readv poll() calls on Tru64

openssh-5.0p1-osf1-readv.patch (text/plain), 1.40 KB, created by Darren Tucker on 2008-06-29 04:40:40 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2008-06-29 04:40:40 AEST

Size: 1.40 KB

patch

obsolete

>Index: atomicio.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/atomicio.c,v
>retrieving revision 1.37
>diff -u -p -r1.37 atomicio.c
>--- atomicio.c	26 Sep 2007 21:00:09 -0000	1.37
>+++ atomicio.c	28 Jun 2008 18:35:13 -0000
>@@ -101,8 +101,10 @@ atomiciov(ssize_t (*f) (int, const struc
> 	/* Make a copy of the iov array because we may modify it below */
> 	memcpy(iov, _iov, iovcnt * sizeof(*_iov));
> 
>+#ifndef BROKEN_READV_COMPARISON
> 	pfd.fd = fd;
> 	pfd.events = f == readv ? POLLIN : POLLOUT;
>+#endif
> 	for (; iovcnt > 0 && iov[0].iov_len > 0;) {
> 		res = (f) (fd, iov, iovcnt);
> 		switch (res) {
>@@ -114,7 +116,9 @@ atomiciov(ssize_t (*f) (int, const struc
> #else
> 			if (errno == EAGAIN) {
> #endif
>+#ifndef BROKEN_READV_COMPARISON
> 				(void)poll(&pfd, 1, -1);
>+#endif
> 				continue;
> 			}
> 			return 0;
>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/configure.ac,v
>retrieving revision 1.397
>diff -u -p -r1.397 configure.ac
>--- configure.ac	27 Mar 2008 01:33:07 -0000	1.397
>+++ configure.ac	28 Jun 2008 18:35:53 -0000
>@@ -828,6 +828,7 @@ mips-sony-bsd|mips-sony-newsos4)
> 	AC_DEFINE(SETEUID_BREAKS_SETUID)
> 	AC_DEFINE(BROKEN_SETREUID)
> 	AC_DEFINE(BROKEN_SETREGID)
>+	AC_DEFINE(BROKEN_READV_COMPARISON, 1, [Can't do comparisons on readv]))
> 	;;
> 
> *-*-nto-qnx*)

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1386: 1373 | 1374 | 1375 | 1376 | 1377 | 1378 | 1520 | 1532 | 1533 | 1534 | 1535 | 1545